Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

# Conflicts: # topages/workquery/workquery.html # topages/workquery/workquery.js

Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test
# Conflicts: # topages/workquery/workquery.html # topages/workquery/workquery.js
liuqimichale
2 parents 0ef65eb4 d46f2bd8
Showing 6 changed files with 153 additions and 8 deletions
resource/img/dataicon.png
resource/img/search-btn.png
topages/workfill/workfill.js
topages/workquery/workquery.css
topages/workquery/workquery.html
topages/workquery/workquery.js
@@ -47,16 +47,21 @@ $(&#39;#time-opr-prevbtn&#39;).on(&#39;click&#39;,function () {
 $('#time-opr-nextbtn').on('click',function () {
     fun.timeoprnextbtn();
 });
+
 //提交事件
-$('.workfill-list-btn').on('click',function () {
+$(document).on('click','.workfill-list-btn',function () {
     var _this=$(this);
-    console.log(_this);
-    if($('.workfill-projectCon').hasClass('display-none')){
+    if(_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').hasClass('display-none')){
         _this.text('提交');
+        _this.parent().parent().find(".workfill-list-container").attr("contenteditable","true");
     }else {
         _this.text('编辑');
+        _this.parent().parent().find(".workfill-list-container").attr("contenteditable","false");
     }
     _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon').toggleClass('display-none');
+    var projectName=_this.parent().parent().find('.workfill-list-projectnamewrap .workfill-projectCon .work-projectName').find("option:selected").text();
     _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').toggleClass('display-none');
+    _this.parent().parent().find('.workfill-list-projectnamewrap .workfill-list-projectname').text(projectName);
+
 });
+.workquery-cardlist{
+    height: 138px;
+    width: 100%;
+}
 .workquery-cardlist li{
     width:324px ;
     height: 136px;
@@ -36,10 +40,75 @@
 /*----------------------------------------时间*/
+.workquery-timeopr-wrap{
+    height: 34px;
+    margin-top: 30px;
+    margin-bottom: 30px;
+}
+.workquery-timeopr-wrap .timeopr-text{
+    height: 34px;
+    line-height: 34px;
+    color: #363d5d;
+    font-size: 14px;
+    width: 72px;
+}
+.ITD-daterange-btn {
+    float: left;
+    width: 120px;
+    height: 34px;
+    line-height: 34px;
-
-
-
+    padding-top: 1px !important;
+}
+.ITD-daterange-bg {
+    width: 90px;
+    text-align: left;
+    background: url(../../resource/img/dataicon.png) no-repeat 94% 9px !important;
+    background-color: #fff !important;
+    padding-right: 25px;
+    z-index: 9999;
+    border-radius: 4px !important;
+}
+.ITD-input-bordercolor {
+    color: rgba(0,0,0,0.45);
+    border: 1px solid #d8e2e5 !important;
+    border-radius: 4px !important;
+}
+.ITD-parkinput78 {
+    width: 180px;
+    height: 34px;
+    line-height: 34px;
+}
+.paddingleft-10 {
+    padding-left: 10px;
+}
+.workquery-timeopr-div{
+    width: 200px;
+    height: 34px;
+    line-height: 34px;
+}
+/*input 样式*/
+.bootstrap-select.btn-group .dropdown-toggle .filter-option {
+    text-align: left !important;
+}
+.bootstrap-select.btn-group .dropdown-toggle .caret{
+    position: absolute;
+    top: 50%;
+    left:170px !important;;
+    margin-top: -2px;
+    vertical-align: middle;
+}
+.margin-right-40{
+    margin-right: 40px;
+}
+/*查询按钮*/
+.workquery-searchbtn{
+    background: url("../../resource/img/search-btn.png") no-repeat;
+    width: 66px;
+    height: 66px;
+    top: -12px;
+    right: 0px;
+}
 /*----------------------------------------列表*/
 .workquery-list-wrap>li{
@@ -13,11 +13,33 @@
         <div class="workquery-card-counter workquery-card-nocommitedcounter">3</div>
     </li>
 </ul>
-<div class="workquery-timeopr-wrap">时间操作区域</div>
+<!--查询 sta-->
+<div class="workquery-timeopr-wrap pos-rel clearfix">
+    <div class="timeopr-text float-left">选择时间</div>
+        <div class="input-group ITD-daterange-btn" >
+            <input type="text" class="form-control ITD-daterange-bg ITD-common-color070" id="workquery-daterange-btnsta" readonly="">
+        </div>
+        <span class="float-left" style="height: 34px;line-height: 34px;margin: 0 5px;">-</span>
+        <div class="input-group ITD-daterange-btn margin-right-40">
+            <input type="text" class="form-control daterange-str ITD-daterange-bg ITD-common-color070" id="workquery-daterange-btnend" readonly="">
+        </div>
+    <div class="timeopr-text float-left">选择项目</div>
+    <div class="float-left workquery-timeopr-div margin-right-40">
+        <select id="workquery-projectName" class="selectpicker" data-width="100%"  data-size="5" data-live-search="true">
+            <option value="1">企业云</option>
+            <option value="2">任你停</option>
+            <option value="3">政府云</option>
+        </select>
+    </div>
+    <div class="timeopr-text float-left">人员名称</div>
+    <input type="text" class="ITD-parkinput78 paddingleft-10 ITD-input-bordercolor" maxlength="16" id="perName">
+    <div class="workquery-searchbtn pos-abs cursor-pointer" id="queryBtn"></div>
+</div>
+<!--查询 end-->
-<ul class="workquery-list-wrap" id="workquery-list-wrap">
+<ul class="workquery-list-wrap">
     <li>
         <ul class="workquery-list-title clearfix boxshadow">
             <li>项目1</li>
+/**
+ * Created by mac on 18/7/24.
+ */
+var fun={
+    init:function () {
+        $('#workquery-projectName').selectpicker('render');
+        fun.dateInit();
+    },
+    dateInit:function () {
+        //时间初始化
+        $('#workquery-daterange-btnsta').val(moment().subtract('days', 6).format('YYYY-MM-DD'));
+        $('#workquery-daterange-btnend').val(moment().subtract('days', 0).format('YYYY-MM-DD'));
+        //开始日期
+        $("#workquery-daterange-btnsta").datetimepicker({
+            endDate: moment().subtract('days', 0).format('YYYY-MM-DD'),
+            format: 'yyyy-mm-dd',
+            autoclose: true,
+            startView: 2,
+            //maxDate:moment().subtract('months', 3),
+            minView: 2,
+            forceParse: false,
+            clearBtn: true , //添加清除按钮，可选值：true/false
+            locale: "zh-CN",
+            language: 'zh-CN',
+            pickerPosition: "bottom-right"
+        }).on("change", function () {
+            $("#workquery-daterange-btnend").val('');
+        });
+        //结束日期
+        $("#workquery-daterange-btnend").datetimepicker({
+            endDate: moment().subtract('days', 0).format('YYYY-MM-DD'),
+            //startDate:startVal,
+            format: 'yyyy-mm-dd',
+            weekStart: 1,
+            autoclose: true,
+            clearBtn: true , //添加清除按钮，可选值：true/false
+            startView: 2,
+            minView: 2,
+            forceParse: false,
+            locale: "zh-CN",
+            language: 'zh-CN',
+            pickerPosition: "bottom-right"
+        }).on("click", function () {
+            $("#workquery-daterange-btnend").datetimepicker("setStartDate", $("#workquery-daterange-btnsta").val())
+        });
+    },
+
+}
+fun.init();
 \ No newline at end of file