From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/priOnline2/priOnline.js | 148 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 70 deletions(-)
diff --git a/src/main/webapp/static/js/priOnline2/priOnline.js b/src/main/webapp/static/js/priOnline2/priOnline.js
index de4daa2..0a90cb0 100644
--- a/src/main/webapp/static/js/priOnline2/priOnline.js
+++ b/src/main/webapp/static/js/priOnline2/priOnline.js
@@ -29,13 +29,14 @@
// 鏍戝舰鍥�
var organizationTree;
- window.loadTree = function (condition) {
+ window.loadTree = function (condition,allSwitch) {
var loadIndex = layer.load(2);
$.ajax({
url: baseUrl + "/dept/user/tree/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- 'condition': condition
+ 'condition': condition,
+ 'allSwitch': allSwitch
},
method: 'POST',
success: function (res) {
@@ -104,7 +105,7 @@
hide: false
}
, {field: 'itemId', align: 'center', title: '瑙勫垝鍗曞彿', hide: true}
- , {field: 'status$', align: 'center', title: '鐘舵��', hide: false}
+ , {field: 'statusAll$', align: 'center',title: '鐘舵��'}
// ,{field: 'memberId$', align: 'center',title: ''}
, {
field: 'settle$',
@@ -121,6 +122,10 @@
, {field: 'createTime$', align: 'center', title: '鍒涘缓鏃堕棿', hide: true}
, {field: 'updateUserId$', align: 'center', title: '鏇存柊浜哄憳', hide: false}
, {field: 'updateTime$', align: 'center', title: '鏇存柊鏃堕棿', hide: false}
+ ,{field: 'assistantHostSign$', align: 'left',title: '涓诲壇鏍囪', hide: false}
+ ,{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: 350}
]],
request: {
@@ -375,7 +380,7 @@
console.log(data)
layer.close(i);
// 鎸囧畾妯℃澘
- if ((data.settle === 1 && data.settleSize===3) || (data.settle===2 && data.settleSize===4)) {
+ if (((data.settle === 1 && data.settleSize===3) || (data.settle===2 && data.settleSize===4)) && data.assistantHostSign==0) {
admin.open({
type: 1,
area: '300px',
@@ -600,17 +605,20 @@
case "uploadLink":
// 鎵撳紑寮圭獥
// 鏋勫缓甯﹀弬鏁扮殑鍐呭
- console.log(data)
+ var planIdSign = data.id;
+ if (data.assistantHostSign==1){
+ planIdSign = data.hostPlanId;
+ }
layer.open({
type: 1,
- title: '涓婁紶鏂囦欢-'+data.itemId,
+ title: '涓婁紶鏂囦欢-'+planIdSign,
content: $('#myModal')
});
// 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶
$.ajax({
url: '/plan/view/file/auth',
data:{
- planId:data.itemId
+ planId:planIdSign
},
success: function(response) {
if (response.code==200){
@@ -695,41 +703,41 @@
});
}
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel2(mData) {
- admin.open({
- type: 1,
- area: '800px',
- title: '鎺ュ彇' + '鏍镐环',
- content: $('#editDialogHJ').html(),
- success: function (layero, dIndex) {
- let loadNameXml = loadNameXmlSel()
- form.val('detailHJ', mData);
- form.on('submit(editSubmitHJ)', function (data) {
- data.field.id = loadNameXml.getValue()[0] ? loadNameXml.getValue()[0].id : null;
- $.ajax({
- url: baseUrl+"/priOnline2/HJ/add/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- tableReload()
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
+ // /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ // function showEditModel2(mData) {
+ // admin.open({
+ // type: 1,
+ // area: '800px',
+ // title: '鎺ュ彇' + '鏍镐环',
+ // content: $('#editDialogHJ').html(),
+ // success: function (layero, dIndex) {
+ // let loadNameXml = loadNameXmlSel()
+ // form.val('detailHJ', mData);
+ // form.on('submit(editSubmitHJ)', function (data) {
+ // data.field.id = loadNameXml.getValue()[0] ? loadNameXml.getValue()[0].id : null;
+ // $.ajax({
+ // url: baseUrl+"/priOnline2/HJ/add/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: data.field,
+ // method: 'POST',
+ // success: function (res) {
+ // if (res.code === 200){
+ // layer.close(dIndex);
+ // layer.msg(res.msg, {icon: 1});
+ // tableReload()
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // }else {
+ // layer.msg(res.msg, {icon: 2});
+ // }
+ // }
+ // })
+ // });
+ // $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ // layui.form.render('select');
+ // }
+ // });
+ // }
//鏇存柊form
function showEditForm(mData) {
@@ -824,34 +832,34 @@
})
}
- window.loadNameXmlSel = function () {
- return xmSelect.render({
- el: '#nameXmlSel',
- autoRow: true,
- filterable: true,
- remoteSearch: true,
- clickClose: true,
- radio: true,
- remoteMethod: function (val, cb, show) {
- $.ajax({
- url: baseUrl + "/priOnline2/HJ/search/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {
- condition: val
- },
- method: 'POST',
- success: function (res) {
- if (res.code === 200) {
- cb(res.data)
- } else {
- cb([]);
- layer.msg(res.msg, {icon: 2});
- }
- }
- });
- }
- });
- }
+ // window.loadNameXmlSel = function () {
+ // return xmSelect.render({
+ // el: '#nameXmlSel',
+ // autoRow: true,
+ // filterable: true,
+ // remoteSearch: true,
+ // clickClose: true,
+ // radio: true,
+ // remoteMethod: function (val, cb, show) {
+ // $.ajax({
+ // url: baseUrl + "/priOnline2/HJ/search/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: {
+ // condition: val
+ // },
+ // method: 'POST',
+ // success: function (res) {
+ // if (res.code === 200) {
+ // cb(res.data)
+ // } else {
+ // cb([]);
+ // layer.msg(res.msg, {icon: 2});
+ // }
+ // }
+ // });
+ // }
+ // });
+ // }
});
--
Gitblit v1.9.1