From 4fd3a2736011c69c8729f2b28902a5cd9d09fd2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 09:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/static/js/plan/plan.js | 141 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 118 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 7e684c5..5c60d0f 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,11 +162,12 @@
// ,{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}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 180}
]],
request: {
pageName: 'curr',
@@ -224,11 +225,11 @@
let planTypeId = data.field.planType;
let loadIndex0 = layer.load(2);
$.ajax({
- url: baseUrl + "/planType/" + planTypeId + "/auth",
+ url: baseUrl + "/planType/" + planTypeId + "/plan/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res0) {
- let planType = res0.data;
+ let planType = res0.data.planType;
if (res0.code === 200) {
admin.open({
type: 1,
@@ -243,6 +244,9 @@
let orderSel = loadOrderSel();
let cstmrSel = loadCstmrSel();
let userSel = loadUserSel();
+ userSel.setValue([
+ {name: res0.data.nickName, value: Number(res0.data.userId)},
+ ])
let planNeedSel = loadPlanNeedSel();
form.val('detail', {
planTypeName: planType.name
@@ -265,6 +269,11 @@
if (!data.field.cstmrId) {
layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2});
top.requireTip($('#cstmrXmlSel'));
+ return false;
+ }
+ if (!data.field.userId) {
+ layer.msg("涓氬姟鍛樹笉鑳戒负绌�", {icon: 2});
+ top.requireTip($('#userXmlSel'));
return false;
}
var loadIndex = layer.load(2);
@@ -378,6 +387,68 @@
}
})
break;
+ case 'approval':
+ layer.confirm('瀹℃壒閫氳繃锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1,
+ offset: '200px',
+ title: data.name
+ }, function (i) {
+ layer.close(i);
+ // 鎸囧畾瑙勫垝鍛�
+ if (data.settle === 2) {
+ admin.open({
+ type: 1,
+ area: '300px',
+ title: '閫夋嫨瑙勫垝鍛�',
+ content: $('#plannerListDialog').html(),
+ success: function (layero, dIndex) {
+ let plannerSel = xmSelect.render({
+ el: '#plannerXmlSel',
+ autoRow: true,
+ filterable: true,
+ remoteSearch: true,
+ radio: true,
+ remoteMethod: function (val, cb, show) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/plan/planner/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ planId: data.id
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200) {
+ cb(res.data)
+ } else {
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ }
+ });
+
+ form.on('submit(editSubmit)', function () {
+ let plannerId = plannerSel.getValue()[0] ? plannerSel.getValue()[0].value : null;
+ if (!plannerId) {
+ layer.msg("璇烽�夋嫨瑙勫垝鍛�", {icon: 2});
+ top.requireTip($('#plannerXmlSel'));
+ return false;
+ }
+ approval(data.id, plannerId, dIndex);
+ });
+
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ }
+ })
+ } else {
+ approval(data.id);
+ }
+ });
+ break;
case 'edit':
showEditModel(data);
break;
@@ -386,6 +457,33 @@
break;
}
});
+
+ function approval(planId, plannerId, dIdx) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/plan/approval/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ planId: planId,
+ plannerId: plannerId
+ },
+ method: 'POST',
+ success: function (res) {
+ if (dIdx) {
+ layer.close(dIdx);
+ }
+ 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});
+ }
+ }
+ })
+ }
/* 寮圭獥 - 鏂板銆佷慨鏀� */
function showEditModel(mData) {
@@ -500,13 +598,7 @@
// 鎼滅储
form.on('submit(search)', function (data) {
pageCurr = 1;
- tableReload();
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
+ pageCount = 0;
tableReload();
});
@@ -697,6 +789,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