From 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 14 九月 2023 12:46:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/priOnline2/priOnline.js | 90 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index 4a16343..925d0e5 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -84,14 +84,17 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
- ,{field: 'templateName', align: 'center',title: '鏍镐环鍚�',hide: false}
- ,{field: 'orderNum', align: 'center',title: '鏍镐环鍗曞彿'}
- ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
+ ,{field: 'templateName', align: 'center',title: '瀹㈡埛鍚嶇О', style: 'color: #1890ff;cursor:pointer', event: 'moreCstmr', width: 350,hide: false}
+ ,{field: 'cstmrId$', align: 'center',title: '瀹㈡埛id',hide: true}
+ ,{field: 'orderNum', align: 'center',title: '鏍镐环鍗曞彿',hide: false}
+ ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿', style: 'color: #1890ff;cursor:pointer', event: 'morePlan',hide: false}
+ ,{field: 'itemId', align: 'center',title: '瑙勫垝鍗曞彿', hide: true}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
- ,{field: 'user$', align: 'center',title: '鍒涘缓浜哄憳'}
+ ,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
+ // ,{field: 'user$', align: 'center',title: '鍒涘缓浜哄憳'}
,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳'}
,{field: 'checkDataStatus$', align: 'center',title: '鎶ヤ环鏁版嵁'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:350}
@@ -169,7 +172,7 @@
} else {
layer.confirm('纭畾鍒犻櫎'+(ids.length===1?'姝�':ids.length)+'鏉℃暟鎹悧', function(){
$.ajax({
- url: baseUrl+"/priOnline/delete/auth",
+ url: baseUrl+"/priOnline2/delete/auth",
headers: {'token': localStorage.getItem('token')},
data: {ids: ids},
method: 'POST',
@@ -207,7 +210,7 @@
'fields': fields
};
$.ajax({
- url: baseUrl+"/priOnline/export/auth",
+ url: baseUrl+"/priOnline2/export/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
dataType:'json',
@@ -233,6 +236,53 @@
table.on('tool(priOnline)', function(obj){
var data = obj.data;
switch (obj.event) {
+ case 'approval':
+ layer.confirm('瀹℃壒閫氳繃锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1,
+ offset: '200px',
+ title: data.name
+ }, function (i) {
+ layer.close(i);
+ approval(data.id);
+ });
+ break;
+ case 'moreCstmr':
+ top.cstmrByMore = data.cstmrId$;
+ admin.popupRight({
+ type: 1,
+ window: "top",
+ area: "1250px",
+ url: "../cstmr/cstmr_more.html",
+ end: function () {
+ // $(".layui-laypage-btn")[0].click();
+ }
+ })
+ break;
+ case 'morePlan':
+ top.planByMore = data.itemId;
+ admin.popupRight({
+ type: 1,
+ window: "top",
+ area: "1250px",
+ url: "../plan/plan_more_other.html",
+ end: function () {
+ // $(".layui-laypage-btn")[0].click();
+ }
+ })
+ break;
+ case 'more':
+ top.priOnlineByMore = data.id;
+ admin.popupRight({
+ type: 1,
+ window: "top",
+ area: "1250px",
+ url: "priOnline_more.html",
+ end: function () {
+ // $(".layui-laypage-btn")[0].click();
+ }
+ })
+ break;
// 鏍镐环
case 'check':
layer.open({
@@ -447,6 +497,34 @@
});
}
+
+ function approval(priOnlineId, plannerId, dIdx) {
+ let loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/priOnline2/approval/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ priOnlineId: priOnlineId,
+ 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});
+ }
+ }
+ })
+ }
+
});
// 鍏抽棴鍔ㄤ綔
--
Gitblit v1.9.1