From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/plan/plan.js | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 77720d3..28807e1 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -3,6 +3,21 @@
var treeCond;
var admin;
var planNeedXmlSelData;
+let nowUserId2 = 0;
+fPlan();
+function fPlan() {
+ layui.jquery.ajax({
+ url: baseUrl + "/dashboard/user/id/popup/auth",
+ data:{token : localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ nowUserId2 = res.data;
+ }
+ }
+ })
+}
+
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
}).extend({
@@ -142,7 +157,7 @@
,{field: 'id', align: 'center',title: 'ID'}
// ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100, sort:true}
- ,{field: 'cstmrId', align: 'left',title: '涓氬姟鍛�',hide: true, width: 100, sort:true}
+ ,{field: 'cstmrId', align: 'left',title: 'cstmrId',hide: true}
, {
field: 'cstmrId$',
align: 'center',
@@ -152,7 +167,7 @@
width: 350,
hide: false, sort:true
}
- ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false, sort:true}
+ ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 130,hide: false, sort:true}
,{
field: 'name',
align: 'left',
@@ -171,8 +186,10 @@
templet:function(d){
return emptyShow(d.planNeed$)
},
- hide: false
+ hide: false,
+ width: 200
}
+ , {field: 'settleSize', align: 'center', title: '娴佺▼闀垮害', hide: true}
,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true}
,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100, sort:true}
// ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true}
@@ -180,13 +197,12 @@
field: 'orderId$',
align: 'left',
title: '璺熻釜椤圭洰',
- width: 220,
+ width: 120,
style: 'color: #1890ff;cursor:pointer',
event: 'orderMore',
hide: false,
sort:true
}
- ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true}
// ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
// ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
// ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
@@ -200,16 +216,20 @@
,{field: 'settle$', align: 'center',title: '杩涘害', width: 150, sort:true}
// ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
// ,{field: 'comment', align: 'center',title: '璇勮'}
- ,{field: 'statusAll$', align: 'center',title: '鐘舵��', sort:true, sort:true}
- ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true, sort:true}
+ ,{field: 'statusAll$', align: 'center',title: '鐘舵��', hide:true, sort:true,width: 100}
+ ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', hide: true, sort:true,width: 120}
,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100, sort:true}
- ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true, sort:true}
+ ,{field: 'updateTime$', align: 'left',title: '鏇存柊鏃堕棿', hide: false, sort:true,width: 120}
,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true, sort:true}
,{field: 'center', align: 'left',title: '鍏宠仈娴佺▼', toolbar: '#tbLook', minWidth: 160, hide: false}
- ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
+ ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false,width: 80}
,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
+ ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false, sort:true,width: 120}
+ ,{field: 'nowUserId', title: 'nowUserId', hide: true, templet:function(){return nowUserId2}}
+ ,{field: 'userId',title: 'userId', hide: true}
+ ,{field: 'director',title: 'director', hide: true}
// ,{field: 'assistantPlanIdSignType', align: 'left',title: '闆嗘垚璐ф灦鏍囧織', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
@@ -218,6 +238,9 @@
pageSize: 'limit'
},
parseData: function (res) {
+ res.data.records.forEach((item,index) => {
+ item.nowUserId = nowUserId2
+ })
return {
'code': res.code,
'msg': res.msg,
@@ -302,19 +325,18 @@
$("#upload-filename-id-" + file.lastModified).html(filename)
let token = localStorage.getItem("token");
$.ajax({
- url: baseUrl+"/plan/insert/file/auth",
+ url: baseUrl+"/plan/url/insert/file/auth",
headers: {'token': localStorage.getItem('token')},
data: {
'planId': $('.layui-layer-title').text(),
'filename': filename,
- 'filesize': file.size,
- 'token': token
+ 'filesize': file.size
},
method: 'POST',
success: function (res) {
if (res.code === 200){
layer.close(index)
- console.log(res)
+ // console.log(res)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -323,7 +345,7 @@
}
});
}).catch((e) => {
- console.log(e)
+ // console.log(e)
layer.msg('涓婁紶澶辫触', {icon: 2});
$("#upload-file-id-" + file.lastModified).html("涓婁紶澶辫触")
})
@@ -370,7 +392,7 @@
method: 'GET',
success: function (res0) {
let planType = res0.data.planType;
- console.log(planType.html)
+ // console.log(planType.html)
if (res0.code === 200) {
admin.open({
type: 1,
@@ -395,7 +417,7 @@
});
layDateRender();
form.on('submit(editSubmit)', function (data) {
- console.log(data)
+ // console.log(data)
data.field.planType = planType.id;
data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null;
data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null;
@@ -556,7 +578,7 @@
}, function (i) {
layer.close(i);
// 鎸囧畾瑙勫垝鍛�
- if (data.settle === 1) {
+ if (data.settle === 1 && data.settleSize === 4) {
admin.open({
type: 1,
area: '300px',
@@ -639,14 +661,16 @@
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+planIdSign,
+ title: '涓婁紶鏂囦欢-'+planIdSign+'-'+data.id,
content: $('#myModal')
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
- url: '/plan/view/file/auth',
+ url: '/plan/url/view/file/auth',
+ headers: {'token': localStorage.getItem('token')},
data:{
- planId:planIdSign
+ planId:planIdSign,
+ planIdI:data.id,
},
success: function(response) {
if (response.code==200){
@@ -750,14 +774,14 @@
,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: true}
,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: true}
,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340}
]],
request: {
pageName: 'curr',
pageSize: 'limit'
},
parseData: function (res) {
- console.log(res)
+ // console.log(res)
return {
'code': res.code,
'msg': res.msg,
--
Gitblit v1.9.1