Merge remote-tracking branch 'origin/test' into test

王富生
2 parents 830c458c 6cd51ae8
Showing 3 changed files with 36 additions and 27 deletions
topages/staffmanage/staffmanage.html
topages/staffmanage/staffmanage.js
topages/workfill/workfill.html
@@ -11,5 +11,5 @@
 <table id="staffmanageTable" class="common-tableh47 bootstrap-table ITD-fix-table fixed-table-container table table-hover table-striped">
 </table>
-<script src="../../topages/staffmanage/staffmanage.js"></script>
+<script src="../topages/staffmanage/staffmanage.js"></script>
@@ -28,20 +28,29 @@ var fun = {
                     field: 'id',
                     title: '<span class="type-icon"></span>类型',
                     width: '15%',
-                    align: "left"
+                    align: "left",
+                    formatter: fun.formattfer
                 },
                 {
                     field: 'opName',
                     title: '<span class="state-icon"></span>状态',
                     width: '15%',
-                    align: "left"
-                },
+                    align: "left",
+                    formatter: fun.formattfer
+                }
             ]
         });
     },
+    formattfer: function (value, row, index) {
+        if (value == null) {
+            return "-";
+        } else {
+            return value;
+        }
+    },
     /*获取查询参数*/
     getQueryParam: function () {
         /**员工名字*/
@@ -79,8 +88,8 @@ function tableLoadRequest(params) {
         contentType: 'application/json; charset=utf-8',
         dataType: 'json',
         success: function (res) {
-            if (res.code == '8888') {
-                //console.log(res.data);
+            if (res.success == true) {
+                console.log(res.data);
                 params.success(res.data);
             }
         }
@@ -11,8 +11,8 @@
 <ul class="workfill-list-wrap clearfix">
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周一</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday1">周一</span>
+            <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit1">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -22,7 +22,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true" id="daily-report1">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
@@ -34,8 +34,8 @@
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周二</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday2">周二</span>
+            <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit2">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -45,7 +45,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true" id="daily-report2">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
@@ -57,8 +57,8 @@
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周三</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday3">周三</span>
+            <span class="float-right workfill-list-btn cursor-pointer" id="btn-commit3">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -68,7 +68,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true" id="daily-report3">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
@@ -80,8 +80,8 @@
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周四</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday4">周四</span>
+            <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit4">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -91,7 +91,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true" id="daily-report4">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
@@ -103,8 +103,8 @@
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周五</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday5">周五</span>
+            <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit5">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -114,7 +114,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true"  id="daily-report5">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
@@ -126,8 +126,8 @@
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周六</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday6">周六</span>
+            <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit6">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -137,7 +137,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true" id="daily-report6">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。
@@ -149,8 +149,8 @@
     </li>
     <li class="workfill-list-li boxshadow">
         <div class="workfill-list-weekday-wrap clearfix">
-            <span class="float-left workfill-list-weekday">周日</span>
-            <span class="float-right workfill-list-btn cursor-pointer">提交</span>
+            <span class="float-left workfill-list-weekday" id="weekday7">周日</span>
+            <span class="float-right workfill-list-btn cursor-pointer"  id="btn-commit7">提交</span>
         </div>
         <div class="workfill-list-projectnamewrap">
             <div class="pos-abs workfill-projectCon">
@@ -160,7 +160,7 @@
             </div>
             <div class="workfill-list-projectname display-none">项目名称</div>
         </div>
-        <div class="workfill-list-container"  contenteditable="true">
+        <div class="workfill-list-container"  contenteditable="true" id="daily-report7">
             相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。此外，由于房价普遍上涨，多地的公积金贷款上限已经明显偏低，难以满足购房者的资金需求。专家建议，各地应上调公积金贷款额度。
             异地购房、离婚购房提取公积金受限相继调整公积金提取政策，收紧了异地购房、离婚购房提取公积金等操作，但多地也都强调，支持提取公积金用于购买首套住房或二套改善型住房。