From 72f84864736d4fb8edde5ccf057b9d15c241dcb6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 24 十一月 2022 16:06:57 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index fae71ab..c39deaf 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -139,17 +139,17 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
- ,{field: 'userId$', align: 'center',title: '涓氬姟鍛�'}
- ,{field: 'planType$', align: 'center',title: '涓氬姟绫诲瀷'}
- ,{field: 'name', align: 'center',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�'}
- ,{field: 'planNeed$', align: 'center',title: '鎵�闇�'}
- ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�'}
- ,{field: 'orderId$', align: 'center',title: '璺熻釜椤圭洰'}
- ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅'}
- ,{field: 'uuid', align: 'center',title: '瑙勫垝鍗曚唬鍙�'}
- ,{field: 'appleTime$', align: 'center',title: '鐢宠鏃ユ湡'}
+ ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�'}
+ ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150}
+ ,{field: 'name', align: 'left',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'more'}
+ ,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100}
+ ,{field: 'planNeed$', align: 'left',title: '鎵�闇�', templet:function(d){return emptyShow(d.planNeed$)}}
+ ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�'}
+ ,{field: 'orderId$', align: 'left',title: '璺熻釜椤圭洰', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore'}
+ // ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore'}
+ ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: true}
// ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
- ,{field: 'planner', align: 'center',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
+ // ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
// ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
// ,{field: 'form', align: 'center',title: '琛ㄥ崟鍐呭'}
// ,{field: 'change$', align: 'center',title: '鏇存敼鏂规'}
@@ -162,9 +162,10 @@
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
// ,{field: 'comment', align: 'center',title: '璇勮'}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '娉ㄩ噴', hide: true}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: false}
+ ,{field: 'updateBy$', align: 'left',title: '淇敼浜�'}
+ ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
@@ -398,7 +399,6 @@
layer.close(loadIndex);
if (res.code === 200){
let plan = res.data;
- console.log(plan)
admin.open({
type: 1,
area: ["95%", "90%"],
@@ -406,10 +406,36 @@
title: '缂栬緫鍞墠瑙勫垝鐢宠鍗� - ' + plan.planType$,
content: $('#editDialog').html(),
success: function (layero, dIndex) {
- $('#customizeBox').html(plan.formHtml)
- layDateRender(mData);
- form.val('detail', mData);
+ $('#customizeBox').html(plan.formHtml);
+ let orderSel = loadOrderSel();
+ let cstmrSel = loadCstmrSel();
+ let userSel = loadUserSel();
+ let planNeedSel = loadPlanNeedSel();
+ if (plan.orderId) { orderSel.setValue([{name: plan.orderId$, value: plan.orderId}]); }
+ if (plan.cstmrId) { cstmrSel.setValue([{name: plan.cstmrId$, value: plan.cstmrId}]); }
+ if (plan.userId) { userSel.setValue([{name: plan.userId$, value: plan.userId}]); }
+ if (plan.planNeed) { planNeedSel.setValue([{name: plan.planNeed$, value: plan.planNeed}]); }
+ layDateRender(plan);
+ plan['planTypeName'] = plan.planType$;
+ form.val('detail', plan);
form.on('submit(editSubmit)', function (data) {
+ data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
+ data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
+ data.field.userId = userSel.getValue()[0] ? userSel.getValue()[0].value : null;
+ data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null;
+
+ delete data.field.select;delete data.field.planTypeName;
+
+ if (!data.field.orderId) {
+ layer.msg("璺熻釜椤圭洰涓嶈兘涓虹┖", {icon: 2});
+ top.requireTip($('#orderXmlSel'));
+ return false;
+ }
+ if (!data.field.cstmrId) {
+ layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2});
+ top.requireTip($('#cstmrXmlSel'));
+ return false;
+ }
let loadIndex = layer.load(2);
$.ajax({
url: baseUrl+"/plan/update/auth",
@@ -475,13 +501,7 @@
// 鎼滅储
form.on('submit(search)', function (data) {
pageCurr = 1;
- tableReload();
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
+ pageCount = 0;
tableReload();
});
@@ -496,22 +516,22 @@
layDate.render({
elem: '#appleTime\\$',
type: 'date',
- value: data!==undefined?data['appleTime\\$']:null
+ value: data!==undefined?data['appleTime$']:null
});
layDate.render({
elem: '#finishTime\\$',
type: 'date',
- value: data!==undefined?data['finishTime\\$']:null
+ value: data!==undefined?data['finishTime$']:null
});
layDate.render({
elem: '#createTime\\$',
type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
+ value: data!==undefined?data['createTime$']:null
});
layDate.render({
elem: '#updateTime\\$',
type: 'datetime',
- value: data!==undefined?data['updateTime\\$']:null
+ value: data!==undefined?data['updateTime$']:null
});
}, 300);
@@ -672,6 +692,9 @@
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
+ if (treeCond) {
+ searchData[treeCond.key] = treeCond.val;
+ }
tableIns.reload({
where: searchData,
page: {curr: pageCurr}
--
Gitblit v1.9.1