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 | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index cdd15b8..58e08f0 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -24,22 +24,23 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId', align: 'center',title: ''}
- ,{field: 'uuid', align: 'center',title: '璁㈠崟鍙�'}
- ,{field: 'name', 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: '璁″垝寮�濮嬫椂闂�'}
- ,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿'}
- ,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�'}
- ,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿'}
- ,{field: 'type$', 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: '鏃堕棿璺ㄥ害(鏈�)'}
+ ,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)', width: 115}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
,{field: 'dutyDepartment', align: 'center', title: '璐ｄ换閮ㄩ棬'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -49,7 +50,7 @@
// ,{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',
@@ -159,9 +160,23 @@
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({
@@ -228,6 +243,34 @@
});
}
+ /* 鍒濆鍖栭」鐩妭鐐� */
+ 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) {
--
Gitblit v1.9.1