From 7ef52aef3afefc4885564a0d073100059d406816 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 15 三月 2023 16:14:16 +0800
Subject: [PATCH] 修复报价预算单之前的在线excel数据
---
src/main/webapp/static/js/plan/plan.js | 107 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 88 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 2023dcf..5c60d0f 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -225,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,
@@ -244,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
@@ -266,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);
@@ -387,24 +395,58 @@
title: data.name
}, function (i) {
layer.close(i);
- let loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/plan/approval/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {planId: data.id},
- method: 'POST',
- success: function (res) {
- 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});
+ // 鎸囧畾瑙勫垝鍛�
+ 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':
@@ -416,6 +458,33 @@
}
});
+ 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) {
let loadIndex = layer.load(2);
--
Gitblit v1.9.1