From c2f77cb1c01b8215fd2fc8c76fd4180629b7f08f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 12 九月 2022 14:47:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/itemManager/itemManager.js | 76 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
index a1794b9..e033165 100644
--- a/src/main/webapp/static/js/itemManager/itemManager.js
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -19,30 +19,32 @@
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
toolbar: '#toolbar',
- cellMinWidth: 50,
+ cellMinWidth: 100,
cols: [[
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId', align: 'center',title: ''}
- ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'}
- ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
- ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿', hide: true}
+ ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�', width: 130}
+ ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
+ ,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
- ,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
-
+ ,{field: 'projectStatus$', align: 'center',title: '杩涘害'}
+ ,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬', width: 115}
+ ,{field: 'planCarnumber', align: 'center', title: '棰勮杞﹁締鏁伴噺', width: 115}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
- ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�'}
- ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
- ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
- ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
- ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
- ,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
- ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(鏈�)'}
- ,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
- ,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'plandeDate0$', align: 'center',title: '棰勮鍙戣揣鏃ユ湡', width: 115}
+ ,{field: 'realdeDate0$', align: 'center',title: '瀹為檯鍙戣揣鏃ユ湡', width: 115}
+ ,{field: 'planinDate0$', align: 'center', title: '棰勮瀹夎鏃ユ湡', width: 115}
+ ,{field: 'realinDate0$', align: 'center', title: '瀹為檯瀹夎鏃ユ湡', width: 115}
+ ,{field: 'plandeAmt', align: 'center', title: '棰勮杩愯垂'}
+ ,{field: 'realdeAmt', align: 'center', title: '瀹為檯杩愯垂'}
+ ,{field: 'planinAmt', align: 'center', title: '棰勮瀹夎璐�', width: 115}
+ ,{field: 'realinAmt', align: 'center', title: '瀹為檯瀹夎璐�', width: 115}
+ ,{field: 'planFADate0$', align: 'center', title: '棰勮鍒濋獙鏃堕棿', width: 115}
+ ,{field: 'realFADate0$', align: 'center',title: '瀹為檯鍒濋獙鏃堕棿', width: 115}
+ ,{field: 'planLADate0$', align: 'center', title: '棰勮缁堥獙鏃堕棿', width: 115}
+ ,{field: 'realLADate0$', align: 'center',title: '瀹為檯缁堥獙鏃堕棿', width: 115}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
@@ -276,6 +278,46 @@
type: 'datetime',
value: mData!==null&&mData!==undefined?strToDate(mData['modifyTime$']):null
});
+ layDate.render({
+ elem: '#planinDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['planinDate$']):null
+ });
+ layDate.render({
+ elem: '#plandeDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['plandeDate$']):null
+ });
+ layDate.render({
+ elem: '#planFADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['planFADate$']):null
+ });
+ layDate.render({
+ elem: '#planLADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['planLADate$']):null
+ });
+ layDate.render({
+ elem: '#realdeDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realdeDate$']):null
+ });
+ layDate.render({
+ elem: '#realinDate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realinDate$']):null
+ });
+ layDate.render({
+ elem: '#realFADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realFADate$']):null
+ });
+ layDate.render({
+ elem: '#realLADate',
+ type: 'datetime',
+ value: mData!==null&&mData!==undefined?strToDate(mData['realLADate$']):null
+ });
}, 500);
}
--
Gitblit v1.9.1