From 36de27cf6c6010bd2c8a5d1e09f12fc49932f4a9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 14 一月 2022 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitblit/zypms' into zypms

---
 src/main/webapp/static/js/projectPlan/projectPlan.js |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/main/webapp/static/js/projectPlan/projectPlan.js b/src/main/webapp/static/js/projectPlan/projectPlan.js
index bc873fd..73e8a33 100644
--- a/src/main/webapp/static/js/projectPlan/projectPlan.js
+++ b/src/main/webapp/static/js/projectPlan/projectPlan.js
@@ -169,7 +169,7 @@
             title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
             content: $('#editDialog').html(),
             success: function (layero, dIndex) {
-                layDateRender();
+                layDateRender(mData);
                 form.val('detail', mData);
                 form.on('submit(editSubmit)', function (data) {
                     if(mData === '娣诲姞'){
@@ -244,31 +244,39 @@
     });
 
     // 鏃堕棿閫夋嫨鍣�
-    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();

--
Gitblit v1.9.1