From e52ba640d14d79570345aa766dacbd15c7bad1cf Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 06 四月 2022 12:59:21 +0800
Subject: [PATCH] .

---
 src/main/webapp/static/js/projectPlan/projectPlan.js |  101 ++++++++++++++++++++++++++++----------------------
 1 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index ab05220..c4adcfa 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -1,6 +1,9 @@
 var pageCurr;
 var items;
+var insTb2;
 getItems();
+
+
 
 layui.config({
     base: baseUrl + "/static/layui/lay/modules/"
@@ -13,7 +16,7 @@
     var admin = layui.admin;
 
     // 鏁版嵁娓叉煋
-    tableIns = table.render({
+    insTb2 = table.render({
         elem: '#projectPlan',
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/projectPlan/list/auth',
@@ -25,25 +28,25 @@
         where: {
             items: items
         },
-
+        height: 'full-100',
         cols: [[
-            {type: 'checkbox'}
+            {type: 'checkbox', hide:true}
             // ,{field: 'id', align: 'center',title: '鍞竴ID'}
-            // ,{field: 'itemId', align: 'center',title: '椤圭洰ID'}
-            ,{field: 'flowName', align: 'center',title: '鑺傜偣鍚嶇О'}
-            ,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�'}
+            ,{field: 'itemId$', align: 'center',title: '椤圭洰鍚嶇О'}
+            ,{field: 'flowId$', align: 'center',title: '鑺傜偣鍚嶇О', width:180}
+            ,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�', hide:true}
             // ,{field: 'flowId', align: 'center',title: '鑺傜偣ID'}
 
-            ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
-            ,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
-            ,{field: 'realStartTime$', align: 'center',title: '瀹為檯寮�濮嬫椂闂�'}
-            ,{field: 'realEndTime$', align: 'center',title: '瀹為檯缁撴潫鏃堕棿'}
-            ,{field: 'delay', align: 'center',title: '寤舵湡澶╂暟'}
+            ,{field: 'startTime$', align: 'center',title: '璁″垝寮�濮嬫椂闂�', width:115}
+            ,{field: 'endTime$', align: 'center',title: '璁″垝缁撴潫鏃堕棿', width:115}
+            ,{field: 'realStartTime$', align: 'center',title: '瀹為檯寮�濮嬫椂闂�', width:115}
+            ,{field: 'realEndTime$', align: 'center',title: '瀹為檯缁撴潫鏃堕棿', width:115}
+            ,{field: 'delay', align: 'center',title: '寤舵湡澶╂暟', width:90}
             ,{field: 'delayReason', align: 'center',title: '寤舵湡鍘熷洜'}
             ,{field: 'memo', align: 'center',title: '澶囨敞'}
             ,{field: 'dutyDepartment', align: 'center',title: '璐d换閮ㄩ棬'}
-            ,{field: 'dutyMan', align: 'center',title: '璐d换浜�'}
-            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+            ,{field: 'dutyMan', align: 'center',title: '璐d换浜�', width:80}
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:70}
         ]],
         request: {
             pageName: 'curr',
@@ -77,7 +80,7 @@
         });
         searchData['orderByField'] = obj.field;
         searchData['orderByType'] = obj.type;
-        tableIns.reload({
+        insTb2.reload({
             where: searchData,
             page: {curr: 1}
         });
@@ -169,11 +172,12 @@
             title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
             content: $('#editDialog').html(),
             success: function (layero, dIndex) {
-                layDateRender();
+                layDateRender(mData);
                 form.val('detail', mData);
                 form.on('submit(editSubmit)', function (data) {
-                    data.field.itemId = items
-
+                    if(mData === '娣诲姞'){
+                        data.field.push(items);
+                    }
                     var loadIndex = layer.load(2);
                     $.ajax({
                         url: baseUrl+"/projectPlan/"+(mData?'update':'add')+"/auth",
@@ -238,36 +242,44 @@
     // 閲嶇疆
     form.on('submit(reset)', function (data) {
         pageCurr = 1;
-        clearFormVal($('#search-box'));
+        $('#mysearch').val('');
         tableReload(false);
     });
 
     // 鏃堕棿閫夋嫨鍣�
-    function layDateRender() {
+    function layDateRender(mData) {
+        setTimeout(function () {
             layDate.render({
-        elem: '#startTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#realStartTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#endTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#realEndTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#createTime\\$',
-        type: 'datetime'
-    });
-        layDate.render({
-        elem: '#modifyTime\\$',
-        type: 'datetime'
-    });
+                elem: '#startTime',
+                type: 'datetime',
+                value: mData!==null&&mData!==undefined?strToDate(mData['startTime$']):null
+            });
+            layDate.render({
+                elem: '#realStartTime',
+                type: 'datetime',
+                value: mData!==null&&mData!==undefined?strToDate(mData['realStartTime$']):null
+            });
+            layDate.render({
+                elem: '#endTime',
+                type: 'datetime',
+                value: mData!==null&&mData!==undefined?strToDate(mData['endTime$']):null
+            });
+            layDate.render({
+                elem: '#realEndTime',
+                type: 'datetime',
+                value: mData!==null&&mData!==undefined?strToDate(mData['realEndTime$']):null
+            });
+            layDate.render({
+                elem: '#createTime\\$',
+                type: 'datetime',
+                value: mData!==null&&mData!==undefined?strToDate(mData['createTime$']):null
+            });
+            layDate.render({
+                elem: '#modifyTime\\$',
+                type: 'datetime',
+                value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
+            });
+        }, 500);
 
     }
     layDateRender();
@@ -284,7 +296,7 @@
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });
-    tableIns.reload({
+    insTb2.reload({
         where: searchData,
         page: {curr: pageCurr}
      });
@@ -295,7 +307,8 @@
 
         if (res.data != null) {
             // console.log(res.data[0].key)
-            items = res.data[0].key;
+            // items = res.data[0].key;
+            items='0';
             var tpl = $("#parentNodeGroup").html();
             var template = Handlebars.compile(tpl);
             var html = template(res);

--
Gitblit v1.9.1