明树Git Lab

Commit ec2bef8a authored by zhanghan's avatar zhanghan

重新决策处理

parent 9ec31e45
Pipeline #109511 passed with stage
in 21 seconds
...@@ -47,14 +47,14 @@ export default { ...@@ -47,14 +47,14 @@ export default {
item.setAttribute("id", `collapse-${name}`); item.setAttribute("id", `collapse-${name}`);
} }
console.log("Navigation item:", { // console.log("Navigation item:", {
name, // name,
title, // title,
id: item.getAttribute("id"), // id: item.getAttribute("id"),
allAttrs: Array.from(item.attributes).map( // allAttrs: Array.from(item.attributes).map(
(attr) => `${attr.name}="${attr.value}"`, // (attr) => `${attr.name}="${attr.value}"`,
), // ),
}); // });
navItems.push({ navItems.push({
name, name,
......
...@@ -28,7 +28,9 @@ ...@@ -28,7 +28,9 @@
link link
type="primary" type="primary"
size="small" size="small"
v-if="canAudit && row.projectLzType == 9" v-if="
canAudit && (row.projectLzType == 9 || row.projectLzType == 13)
"
:loading="row.loading" :loading="row.loading"
@click="editProject(row)" @click="editProject(row)"
> >
......
...@@ -2,12 +2,6 @@ ...@@ -2,12 +2,6 @@
<div class="add-project-container"> <div class="add-project-container">
<div class="add-project-content" v-loading="loading"> <div class="add-project-content" v-loading="loading">
<routerBack <routerBack
:show-save="
!loading &&
!isPreview &&
(!formData.projectLzType ||
['1', '5', '7', '9'].includes(formData.projectLzType.toString()))
"
:loading="loading" :loading="loading"
@save="() => saveClick('save')" @save="() => saveClick('save')"
></routerBack> ></routerBack>
...@@ -3137,15 +3131,7 @@ ...@@ -3137,15 +3131,7 @@
<div class="header-right"> <div class="header-right">
<el-button type="default" @click="backClick">返回</el-button> <el-button type="default" @click="backClick">返回</el-button>
<template v-if="!loading && !isPreview"> <template v-if="!loading && !isPreview">
<el-button <el-button type="primary" @click="saveClick('save')"
type="primary"
v-if="
!formData.projectLzType ||
['1', '5', '7', '9'].includes(
formData.projectLzType.toString(),
)
"
@click="saveClick('save')"
>保存</el-button >保存</el-button
> >
<el-button <el-button
...@@ -3164,7 +3150,8 @@ ...@@ -3164,7 +3150,8 @@
type="primary" type="primary"
v-if=" v-if="
jcFormData.projectLzType == '9' || jcFormData.projectLzType == '9' ||
jcFormData.projectLzType == '11' jcFormData.projectLzType == '11' ||
jcFormData.projectLzType == '13'
" "
@click="saveClick('zaiSubmit')" @click="saveClick('zaiSubmit')"
>重新决策</el-button >重新决策</el-button
...@@ -4655,7 +4642,7 @@ const getProjectInfo = () => { ...@@ -4655,7 +4642,7 @@ const getProjectInfo = () => {
pageActiveName.value = "决策信息填报"; pageActiveName.value = "决策信息填报";
} }
// 决策 // 决策
let jcData = res.zaijuece || res.lixiang || {}; let jcData = res.zaijuece || res.juece || {};
Object.assign(jcFormData, jcData); Object.assign(jcFormData, jcData);
if (res.zaijuece) { if (res.zaijuece) {
Object.assign(jcSwlzbData, jcData.projectJsgms); Object.assign(jcSwlzbData, jcData.projectJsgms);
...@@ -4903,147 +4890,57 @@ const getLrbData = () => { ...@@ -4903,147 +4890,57 @@ const getLrbData = () => {
// 保存数据 // 保存数据
const saveClick = (type) => { const saveClick = (type) => {
if (!formData.projectLzType || formData.projectLzType.toString() === "1") { let url = type === "zaiSubmit" ? "startZaiJuece" : "saveZaiJuece";
let url = formData.id let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData));
? type === "submit" gdxxNewArr.splice(-1);
? "startLixiang" let params = {
: "saveProjectPreLixiang" ...jcFormData,
: "createProject"; projectJsgms: jcSwlzbData,
let gdxxNewArr = JSON.parse(JSON.stringify(gdxxData)); projectZqrzs: dbzqData,
gdxxNewArr.splice(-1); projectFxgls: fxglData,
let params = { projectGdxxs: gdxxNewArr,
...formData, projectLcbjds: lcbjdData,
projectJsgms: swlzbData, lcbjhspb: lcbspData.value,
projectGdxxs: gdxxNewArr, kycl: kyclData.value,
lxzl: zcclData.value, jjzbcbcscl: jjzbcsData.value,
projectXmtzzes: tzzeqkjData, qtxgzccl: tpzcclData.value,
projectCwpjzbs: cwpjzbData, bcxgzccl: tpbczcclData.value,
lxpfwj: lxpfwjData.value, shya: shyaData.value,
projectSpyjs: spyjTableData, projectXmtzzes: jcTzzeqkjData,
xgshcl: shclData.value, projectCwpjzbs: jcCwpjzbData,
}; projectBjtjs: jcHxbjtjData.value,
if (type === "submit") { projectJczts: jcztshqkData,
params.buttonType = "submit"; projectTzzts: tzztshqkData,
} projectSpyjs: jcspyjData,
proxy.$post({ };
url: "/api/project/" + url, // 获取动态表格数据
data: params, let tjjhArr = getTjjhData();
callback: (data) => { if (tjjhArr.length) {
router.push("/decision"); params.tjjh = tjjhArr;
},
});
} else if (
jcFormData.projectLzType.toString() === "5" ||
jcFormData.projectLzType.toString() === "7"
) {
let url = type === "submit" ? "startJuece" : "saveJuece";
let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData));
gdxxNewArr.splice(-1);
let params = {
...jcFormData,
projectJsgms: jcSwlzbData,
projectZqrzs: dbzqData,
projectFxgls: fxglData,
projectGdxxs: gdxxNewArr,
projectLcbjds: lcbjdData,
lcbjhspb: lcbspData.value,
kycl: kyclData.value,
jjzbcbcscl: jjzbcsData.value,
qtxgzccl: tpzcclData.value,
bcxgzccl: tpbczcclData.value,
shya: shyaData.value,
projectXmtzzes: jcTzzeqkjData,
projectCwpjzbs: jcCwpjzbData,
projectBjtjs: jcHxbjtjData.value,
projectJczts: jcztshqkData,
projectTzzts: tzztshqkData,
projectSpyjs: jcspyjData,
};
// 获取动态表格数据
let tjjhArr = getTjjhData();
if (tjjhArr.length) {
params.tjjh = tjjhArr;
}
let xmtzzjllArr = getXmtzzjllData();
if (xmtzzjllArr.length) {
params.xmtzzjll = xmtzzjllArr;
}
let xmzbjxjllArr = getXmzbjxjllData();
if (xmzbjxjllArr.length) {
params.xmzbjxjll = xmzbjxjllArr;
}
let njfxjllArr = getNjfxjllData();
if (njfxjllArr.length) {
params.njfxjll = njfxjllArr;
}
let lrbArr = getLrbData();
if (lrbArr.length) {
params.lrb = lrbArr;
}
proxy.$post({
url: "/api/project/" + url,
data: params,
callback: (data) => {
router.push("/decision");
},
});
} else if (
jcFormData.projectLzType.toString() === "9" ||
jcFormData.projectLzType.toString() === "11"
) {
// 再决策(已决策 或 再决策填报中)
let url = type === "zaiSubmit" ? "startZaiJuece" : "saveZaiJuece";
let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData));
gdxxNewArr.splice(-1);
let params = {
...jcFormData,
projectJsgms: jcSwlzbData,
projectZqrzs: dbzqData,
projectFxgls: fxglData,
projectGdxxs: gdxxNewArr,
projectLcbjds: lcbjdData,
lcbjhspb: lcbspData.value,
kycl: kyclData.value,
jjzbcbcscl: jjzbcsData.value,
qtxgzccl: tpzcclData.value,
bcxgzccl: tpbczcclData.value,
shya: shyaData.value,
projectXmtzzes: jcTzzeqkjData,
projectCwpjzbs: jcCwpjzbData,
projectBjtjs: jcHxbjtjData.value,
projectJczts: jcztshqkData,
projectTzzts: tzztshqkData,
projectSpyjs: jcspyjData,
};
// 获取动态表格数据
let tjjhArr = getTjjhData();
if (tjjhArr.length) {
params.tjjh = tjjhArr;
}
let xmtzzjllArr = getXmtzzjllData();
if (xmtzzjllArr.length) {
params.xmtzzjll = xmtzzjllArr;
}
let xmzbjxjllArr = getXmzbjxjllData();
if (xmzbjxjllArr.length) {
params.xmzbjxjll = xmzbjxjllArr;
}
let njfxjllArr = getNjfxjllData();
if (njfxjllArr.length) {
params.njfxjll = njfxjllArr;
}
let lrbArr = getLrbData();
if (lrbArr.length) {
params.lrb = lrbArr;
}
proxy.$post({
url: "/api/project/" + url,
data: params,
callback: (data) => {
router.push("/decision");
},
});
} }
let xmtzzjllArr = getXmtzzjllData();
if (xmtzzjllArr.length) {
params.xmtzzjll = xmtzzjllArr;
}
let xmzbjxjllArr = getXmzbjxjllData();
if (xmzbjxjllArr.length) {
params.xmzbjxjll = xmzbjxjllArr;
}
let njfxjllArr = getNjfxjllData();
if (njfxjllArr.length) {
params.njfxjll = njfxjllArr;
}
let lrbArr = getLrbData();
if (lrbArr.length) {
params.lrb = lrbArr;
}
proxy.$post({
url: "/api/project/" + url,
data: params,
callback: (data) => {
router.push("/decision");
},
});
}; };
// 审核 // 审核
let auditFormData = ref({}); let auditFormData = ref({});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment