From 5c39f26d19269ddcb8d442aeeecfee5a9665bb59 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 06 九月 2022 13:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms
---
src/main/webapp/static/js/item/item.js | 146 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 9aa3041..58e08f0 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -11,6 +11,7 @@
// 鏁版嵁娓叉煋
tableIns = table.render({
+
elem: '#item',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/item/list/auth',
@@ -21,24 +22,35 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'uuid', align: 'center',title: '椤圭洰缂栧彿'}
- ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О'}
- ,{field: 'inUuid', align: 'center',title: '鍐呴儴缂栧彿'}
- ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'cstmr', align: 'center',title: '瀹㈡埛'}
- ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
- ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
- ,{field: 'startTime$', align: 'center',title: '寮�濮嬫椂闂�'}
- ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'hostId', align: 'center',title: ''}
+ ,{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: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
+ // ,{field: 'type', align: 'center', title: '璁㈠崟绫诲瀷鎻忚堪', width: 115}
+ // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
+ // ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
+ ,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�', width: 115}
+ ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿', width: 115}
+ ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�', width: 115}
+ ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿', width: 115}
+
+ ,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)', width: 115}
+ ,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
+ ,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',event: 'updateBy', style: 'cursor:pointer'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
+ // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:165}
]],
request: {
pageName: 'curr',
@@ -56,6 +68,7 @@
statusCode: 200
},
done: function(res, curr, count) {
+ // console.log(res)
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
@@ -80,7 +93,7 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(item)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
+ var checkStatus = table.checkStatus(obj.config.id).data;
switch(obj.event) {
case 'addData':
showEditModel();
@@ -147,17 +160,32 @@
var ids = [data.id];
del(ids);
break;
+ case "initPlan":
+ initPlan(data.id);
+ break;
+ case "report":
+ initReport(obj);
+ break;
}
});
+ function initReport(obj) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: '鎬荤粨鐢熸垚',
+ content: $('#initReport').html()
+ });
+ }
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
admin.open({
type: 1,
area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ title: (mData ? '淇敼' : '娣诲姞') + '椤圭洰淇℃伅',
content: $('#editDialog').html(),
success: function (layero, dIndex) {
+ layDateRender(mData);
form.val('detail', mData);
form.on('submit(editSubmit)', function (data) {
var loadIndex = layer.load(2);
@@ -189,7 +217,7 @@
/* 鍒犻櫎 */
function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ layer.confirm('纭畾瑕佺鐢ㄩ�変腑鏁版嵁鍚楋紵', {
skin: 'layui-layer-admin',
shade: .1
}, function (i) {
@@ -215,8 +243,37 @@
});
}
+ /* 鍒濆鍖栭」鐩妭鐐� */
+ function initPlan(id) {
+ layer.confirm('纭畾瑕佺敓鎴愯椤圭洰璁″垝鑺傜偣鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/item/initPlan/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {id: id},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
// 鎼滅储
form.on('submit(search)', function (data) {
+
pageCurr = 1;
tableReload(false);
});
@@ -229,23 +286,43 @@
});
// 鏃堕棿閫夋嫨鍣�
- layDate.render({
- elem: '#startTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#endTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime'
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime'
- });
+ function layDateRender(mData) {
+ console.log(mData)
+ setTimeout(function () {
+ layDate.render({
+ 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();
});
@@ -256,6 +333,7 @@
function tableReload(child) {
var searchData = {};
+
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
--
Gitblit v1.9.1