From 91d64baf46b6b2460adac1a6d52b1809ee51c0fe Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 24 Mar 2025 09:15:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E8=AE=A1=E5=88=92=E6=92=A4?=
=?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
index.html | 9 ++---
js/demandPlan/apply_plan_list.js | 5 ++-
js/demandPlan/child/apply_plan_detail.js | 42 +++++++++++++++++++++++-
3 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/index.html b/index.html
index 66fb00d..9d6ca78 100644
--- a/index.html
+++ b/index.html
@@ -163,6 +163,7 @@
window.history.pushState({}, 0, url);
}
initPage(miniAdmin);
+ sessionStorage.setItem('us', JSON.stringify(result.data));
} else if (result.code === 401) {
closeWindowOpen();
}
@@ -171,8 +172,8 @@
}, null);
} else {
// console.log('走的自己登录');
- // login(miniAdmin);
- window.location = 'page/401.html';
+ login(miniAdmin);
+ // window.location = 'page/401.html';
}
/* var options = {
iniUrl: "api/init.json", // 初始化接口
@@ -224,9 +225,9 @@
// 登录获取token
let login_url = dataUrl + 'login/userLogin'
const params = {
- "username": 'bns',
+ "username": 'sa',
// "password": '3NBzZK7qxhMhrmvi63FnuQ==',
- "password": '1769fb2837e10e9d22c1c25add76355a',
+ "password": 'ebbd6ea34bbab2b0813afcf59c8c9556',
}
ajaxRequest(login_url, "POST", params, true, function () {
}, function (result) {
diff --git a/js/demandPlan/apply_plan_list.js b/js/demandPlan/apply_plan_list.js
index 32809ec..bdc5916 100644
--- a/js/demandPlan/apply_plan_list.js
+++ b/js/demandPlan/apply_plan_list.js
@@ -176,7 +176,7 @@ function initTable() {
let status = getCheckStatus(d.statusType, d.status);
let html = "";
html += "详情";
- if (status.indexOf('驳回') > -1) {
+ if (status.indexOf('驳回') > -1 || status.indexOf('已撤回') > -1) {
html += "|
修改";
}
return html;
@@ -208,6 +208,9 @@ function exportExcel() {
//审核状态
function getCheckStatus(statusType, status) {
var company = "";
+ if(statusType === '0' && status === '0'){
+ return "●已撤回";
+ }
if (statusType === '1') {
return "●审核通过";
} else if (statusType === '2') {
diff --git a/js/demandPlan/child/apply_plan_detail.js b/js/demandPlan/child/apply_plan_detail.js
index dd64bca..ba01ddd 100644
--- a/js/demandPlan/child/apply_plan_detail.js
+++ b/js/demandPlan/child/apply_plan_detail.js
@@ -225,7 +225,7 @@ function setOperRecordInfo(list, obj) {
if (item.hours === 0 && item.minutes === 0) {
minutes = 1;
}
- if (item.auditType === '0' || item.auditType === '1') {
+ if (item.auditType === '0' || item.auditType === '1' || item.auditType === '-1') {
dept = '项目部';
} else if (item.auditType === '2') {
dept = '分公司';
@@ -237,6 +237,8 @@ function setOperRecordInfo(list, obj) {
// 操作流程
if (item.auditType === '0') {
operData = '发起申请';
+ } else if (item.auditType === '-1') {
+ operData = '撤回申请';
} else if (item.auditType === '1') {
operData = '重新提交申请';
} else if (item.auditType === '2' && item.auditStatus === '2') {
@@ -280,11 +282,23 @@ function setOperRecordInfo(list, obj) {
function setCheckStatus() {
$('#code').empty().html(objParam.code);
$('#checkStatus').html(getCheckStatus(objParam.statusType, objParam.status));
+ if(objParam.statusType === '2' && objParam.status === '1' && objParam.checkType !== 2){ // 待分公司审核可以撤回 && 申请人可以撤回 && 不是审核页面跳转
+ let user = sessionStorage.getItem('us');
+ if(user){
+ let userObj = JSON.parse(user);
+ if(userObj.username === objParam.creator){
+ $('#print').before("");
+ }
+ }
+ }
}
// 审核状态
function getCheckStatus(statusType, status) {
var company = "";
+ if(statusType === '0' && status === '0'){
+ return "●已撤回";
+ }
if (statusType === '1') {
return "●审核通过";
} else if (statusType === '2') {
@@ -338,6 +352,32 @@ function print() {
});
}
+// 撤回
+function withdrawData(data) {
+ layer.confirm("确定撤回此条数据吗？", { 'title': '操作提示', move: false }, function () {
+ let loadingMsg = layer.msg('数据撤回中,请稍候...', { icon: 16, scrollbar: false, time: 0 });
+ let url = dataUrl + "backstage/planApplication/withdrawData"
+ let obj = { id: data.id }
+ let params = {
+ encryptedData: JSON.stringify(obj)
+ }
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ console.error(result);
+ layer.close(loadingMsg); // 关闭提示层
+ if (result.code === 200) {
+ parent.layer.msg(result.msg, { icon: 1 })
+ closePage();
+ } else {
+ layer.msg(result.msg, { icon: 2 })
+ }
+ }, function (xhr) {
+ layer.close(loadingMsg); // 关闭提示层
+ error(xhr)
+ });
+ })
+}
+
// 需求计划申请审核
function check() {
objParam.checkType = '2'; // 需求计划申请审核