明树Git Lab

Commit f5ab5a67 authored by yangyajing's avatar yangyajing

股东信息还原

parent 733ec51e
Pipeline #104429 passed with stage
in 13 seconds
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
<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"> <template v-if="!loading">
<el-button type="primary" v-if="formData.projectLzType === 1 || !formData.projectLzType" @click="saveClick('save')">保存</el-button> <el-button type="primary" v-if="formData.projectLzType == 1 || !formData.projectLzType" @click="saveClick('save')">保存</el-button>
<el-button type="primary" v-if="formData.projectLzType === 1" @click="saveClick('submit')">发起立项填报</el-button> <el-button type="primary" v-if="formData.projectLzType == 1" @click="saveClick('submit')">发起立项填报</el-button>
</template> </template>
</div> </div>
</div> </div>
...@@ -844,14 +844,14 @@ ...@@ -844,14 +844,14 @@
</el-tabs> </el-tabs>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="决策信息填报" name="决策信息填报" v-if="formData.projectLzType === 5 || formData.projectLzType === 7"> <el-tab-pane label="决策信息填报" name="决策信息填报" v-if="formData.projectLzType == 5 || formData.projectLzType == 7">
<div class="project-tab-content"> <div class="project-tab-content">
<div class="add-project-header"> <div class="add-project-header">
<div class="header-left"></div> <div class="header-left"></div>
<div class="header-right"> <div class="header-right">
<el-button type="default" @click="backClick">返回</el-button> <el-button type="default" @click="backClick">返回</el-button>
<el-button type="primary" @click="saveClick('save')">保存</el-button> <el-button type="primary" @click="saveClick('save')">保存</el-button>
<el-button type="primary" v-if="jcFormData.projectLzType === 7" @click="saveClick('submit')">发起决策信息填报</el-button> <el-button type="primary" v-if="jcFormData.projectLzType == 7" @click="saveClick('submit')">发起决策信息填报</el-button>
</div> </div>
</div> </div>
<el-tabs v-model="jcTabActiveName"> <el-tabs v-model="jcTabActiveName">
...@@ -2459,14 +2459,15 @@ ...@@ -2459,14 +2459,15 @@
if (index < gdxxData.length - 1) { if (index < gdxxData.length - 1) {
if (item.gdlx) { if (item.gdlx) {
if (!obj[item.gdlx]) { if (!obj[item.gdlx]) {
console.log(item.gdlx);
obj[item.gdlx] = { obj[item.gdlx] = {
name: gdlxList.filter(gdlx => gdlx.id === item.gdlx)[0].value name: gdlxList.filter(gdlx => gdlx.id == item.gdlx)[0].value
}; };
} }
obj[item.gdlx].cgbl = _.add((obj[item.gdlx].cgbl || 0), item.cgbl) obj[item.gdlx].cgbl = _.add((Number(obj[item.gdlx].cgbl) || 0), Number(item.cgbl))
obj[item.gdlx].cze = _.add((obj[item.gdlx].cze || 0), item.cze) obj[item.gdlx].cze = _.add((Number(obj[item.gdlx].cze) || 0), Number(item.cze))
obj[item.gdlx].yjzczb = _.add((obj[item.gdlx].yjzczb || 0), item.yjzczb) obj[item.gdlx].yjzczb = _.add((Number(obj[item.gdlx].yjzczb) || 0), Number(item.yjzczb))
obj[item.gdlx].ycxmzbj = _.add((obj[item.gdlx].ycxmzbj || 0), item.ycxmzbj) obj[item.gdlx].ycxmzbj = _.add((Number(obj[item.gdlx].ycxmzbj) || 0), Number(item.ycxmzbj))
} }
} }
}) })
...@@ -2676,15 +2677,15 @@ ...@@ -2676,15 +2677,15 @@
if (index < jcGdxxData.length - 1) { if (index < jcGdxxData.length - 1) {
if (!obj[item.gdlx]) { if (!obj[item.gdlx]) {
obj[item.gdlx] = { obj[item.gdlx] = {
name: gdlxList.filter(gdlx => gdlx.id === item.gdlx)[0].value name: gdlxList.filter(gdlx => gdlx.id == item.gdlx)[0].value
}; };
} }
obj[item.gdlx].mycgbl = _.add((obj[item.gdlx].mycgbl || 0), item.mycgbl) obj[item.gdlx].mycgbl = _.add((Number(obj[item.gdlx].mycgbl) || 0), Number(item.mycgbl))
obj[item.gdlx].cgbl = _.add((obj[item.gdlx].cgbl || 0), item.cgbl) obj[item.gdlx].cgbl = _.add((Number(obj[item.gdlx].cgbl) || 0), Number(item.cgbl))
obj[item.gdlx].lrfpbl = _.add((obj[item.gdlx].lrfpbl || 0), item.lrfpbl) obj[item.gdlx].lrfpbl = _.add((Number(obj[item.gdlx].lrfpbl) || 0), Number(item.lrfpbl))
obj[item.gdlx].cze = _.add((obj[item.gdlx].cze || 0), item.cze) obj[item.gdlx].cze = _.add((Number(obj[item.gdlx].cze) || 0), Number(item.cze))
obj[item.gdlx].yjzczb = _.add((obj[item.gdlx].yjzczb || 0), item.yjzczb) obj[item.gdlx].yjzczb = _.add((Number(obj[item.gdlx].yjzczb) || 0), Number(item.yjzczb))
obj[item.gdlx].ycxmzbj = _.add((obj[item.gdlx].ycxmzbj || 0), item.ycxmzbj) obj[item.gdlx].ycxmzbj = _.add((Number(obj[item.gdlx].ycxmzbj) || 0), Number(item.ycxmzbj))
} }
}) })
jcgdxxSums.value = obj; jcgdxxSums.value = obj;
...@@ -3054,7 +3055,7 @@ ...@@ -3054,7 +3055,7 @@
let qxgjList = ref([]); // 区县(境内)/国家(境外) // 级联 let qxgjList = ref([]); // 区县(境内)/国家(境外) // 级联
const changeJnw = (val) => { const changeJnw = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = jnwList.filter(item => item.id === val); let selectData = jnwList.filter(item => item.id == val);
szjList.value = selectData[0] && selectData[0].children || []; szjList.value = selectData[0] && selectData[0].children || [];
dsgjList.value = []; dsgjList.value = [];
qxgjList.value = []; qxgjList.value = [];
...@@ -3062,14 +3063,14 @@ ...@@ -3062,14 +3063,14 @@
}; };
const changeSzj = (val) => { const changeSzj = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = szjList.value.filter(item => item.id === val); let selectData = szjList.value.filter(item => item.id == val);
dsgjList.value = selectData[0] && selectData[0].children || []; dsgjList.value = selectData[0] && selectData[0].children || [];
qxgjList.value = []; qxgjList.value = [];
} }
} }
const changeDsgj = (val) => { const changeDsgj = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = dsgjList.value.filter(item => item.id === val); let selectData = dsgjList.value.filter(item => item.id == val);
qxgjList.value = selectData[0] && selectData[0].children || []; qxgjList.value = selectData[0] && selectData[0].children || [];
} }
} }
...@@ -3079,7 +3080,7 @@ ...@@ -3079,7 +3080,7 @@
let tzsxejflList = ref([]); // 投资属性二级分类 let tzsxejflList = ref([]); // 投资属性二级分类
const changeTzsxyjfl = (val) => { const changeTzsxyjfl = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzsxyjflList.filter(item => item.id === val); let selectData = tzsxyjflList.filter(item => item.id == val);
tzsxejflList.value = selectData[0] && selectData[0].children || []; tzsxejflList.value = selectData[0] && selectData[0].children || [];
} }
}; };
...@@ -3087,7 +3088,7 @@ ...@@ -3087,7 +3088,7 @@
let tzsxxfbkList = ref([]); // 投资属性细分板块 let tzsxxfbkList = ref([]); // 投资属性细分板块
const changeTzsxtzbk = (val) => { const changeTzsxtzbk = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzsxtzbkList.filter(item => item.id === val); let selectData = tzsxtzbkList.filter(item => item.id == val);
tzsxxfbkList.value = selectData[0] && selectData[0].children || []; tzsxxfbkList.value = selectData[0] && selectData[0].children || [];
} }
} }
...@@ -3095,7 +3096,7 @@ ...@@ -3095,7 +3096,7 @@
let tzmdejflList = ref([]); // 投资目的二级分类 let tzmdejflList = ref([]); // 投资目的二级分类
const changeTzmdyjfl = (val) => { const changeTzmdyjfl = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzmdyjflList.filter(item => item.id === val); let selectData = tzmdyjflList.filter(item => item.id == val);
tzmdejflList.value = selectData[0] && selectData[0].children || []; tzmdejflList.value = selectData[0] && selectData[0].children || [];
} }
}; };
...@@ -3104,7 +3105,7 @@ ...@@ -3104,7 +3105,7 @@
let tzznejflList = ref([]); // 投资指南二级分类 let tzznejflList = ref([]); // 投资指南二级分类
const changeTzznyjfl = (val) => { const changeTzznyjfl = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzznyjflList.filter(item => item.id === val); let selectData = tzznyjflList.filter(item => item.id == val);
tzznejflList.value = selectData[0] && selectData[0].children || []; tzznejflList.value = selectData[0] && selectData[0].children || [];
} }
}; };
...@@ -3134,7 +3135,7 @@ ...@@ -3134,7 +3135,7 @@
let tzhsfsList = reactive([]); // 投资回收方式 let tzhsfsList = reactive([]); // 投资回收方式
const changeJcJnw = (val) => { const changeJcJnw = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = jnwList.filter(item => item.id === val); let selectData = jnwList.filter(item => item.id == val);
jcSzjList.value = selectData[0] && selectData[0].children || []; jcSzjList.value = selectData[0] && selectData[0].children || [];
jcDsgjList.value = []; jcDsgjList.value = [];
jcQxgjList.value = []; jcQxgjList.value = [];
...@@ -3142,42 +3143,42 @@ ...@@ -3142,42 +3143,42 @@
}; };
const changeJcSzj = (val) => { const changeJcSzj = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = jcSzjList.value.filter(item => item.id === val); let selectData = jcSzjList.value.filter(item => item.id == val);
jcDsgjList.value = selectData[0] && selectData[0].children || []; jcDsgjList.value = selectData[0] && selectData[0].children || [];
jcQxgjList.value = []; jcQxgjList.value = [];
} }
} }
const changeJcDsgj = (val) => { const changeJcDsgj = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = jcDsgjList.value.filter(item => item.id === val); let selectData = jcDsgjList.value.filter(item => item.id == val);
jcQxgjList.value = selectData[0] && selectData[0].children || []; jcQxgjList.value = selectData[0] && selectData[0].children || [];
} }
} }
let jcTzsxejflList = ref([]); // 投资属性二级分类 let jcTzsxejflList = ref([]); // 投资属性二级分类
const changeJcTzsxyjfl = (val) => { const changeJcTzsxyjfl = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzsxyjflList.filter(item => item.id === val); let selectData = tzsxyjflList.filter(item => item.id == val);
jcTzsxejflList.value = selectData[0] && selectData[0].children || []; jcTzsxejflList.value = selectData[0] && selectData[0].children || [];
} }
}; };
let jcTzsxxfbkList = ref([]); // 投资属性细分板块 let jcTzsxxfbkList = ref([]); // 投资属性细分板块
const changeJcTzsxtzbk = (val) => { const changeJcTzsxtzbk = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzsxtzbkList.filter(item => item.id === val); let selectData = tzsxtzbkList.filter(item => item.id == val);
jcTzsxxfbkList.value = selectData[0] && selectData[0].children || []; jcTzsxxfbkList.value = selectData[0] && selectData[0].children || [];
} }
} }
let jcTzmdejflList = ref([]); // 投资目的二级分类 let jcTzmdejflList = ref([]); // 投资目的二级分类
const changeJcTzmdyjfl = (val) => { const changeJcTzmdyjfl = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzmdyjflList.filter(item => item.id === val); let selectData = tzmdyjflList.filter(item => item.id == val);
jcTzmdejflList.value = selectData[0] && selectData[0].children || []; jcTzmdejflList.value = selectData[0] && selectData[0].children || [];
} }
}; };
let jcTzznejflList = ref([]); // 投资指南二级分类 let jcTzznejflList = ref([]); // 投资指南二级分类
const changeJcTzznyjfl = (val) => { const changeJcTzznyjfl = (val) => {
if (val || val === 0) { if (val || val === 0) {
let selectData = tzznyjflList.filter(item => item.id === val); let selectData = tzznyjflList.filter(item => item.id == val);
jcTzznejflList.value = selectData[0] && selectData[0].children || []; jcTzznejflList.value = selectData[0] && selectData[0].children || [];
} }
}; };
...@@ -3199,7 +3200,8 @@ ...@@ -3199,7 +3200,8 @@
let data = res.lixiang || {}; let data = res.lixiang || {};
Object.assign(formData, data); Object.assign(formData, data);
Object.assign(swlzbData, data.projectJsgms); Object.assign(swlzbData, data.projectJsgms);
Object.assign(gdxxData, data.projectGdxxs); Object.assign(gdxxData, data.projectGdxxs.concat([{}]));
changeGdxxSums();
Object.assign(zcclData.value, data.lxzl); Object.assign(zcclData.value, data.lxzl);
Object.assign(tzzeqkjData, data.projectXmtzzes); Object.assign(tzzeqkjData, data.projectXmtzzes);
Object.assign(cwpjzbData, data.projectCwpjzbs); Object.assign(cwpjzbData, data.projectCwpjzbs);
...@@ -3208,13 +3210,13 @@ ...@@ -3208,13 +3210,13 @@
Object.assign(spyjTableData, data.projectSpyjs); Object.assign(spyjTableData, data.projectSpyjs);
Object.assign(shclData.value, data.xgshcl); Object.assign(shclData.value, data.xgshcl);
// 关联筛选 // 关联筛选
szjList.value = jnwList.filter(item => item.id === data.jnw)[0]?.children || []; szjList.value = jnwList.filter(item => item.id == data.jnw)[0]?.children || [];
dsgjList.value = szjList.value.filter(item => item.id === data.sjnzjjw)[0]?.children || []; dsgjList.value = szjList.value.filter(item => item.id == data.sjnzjjw)[0]?.children || [];
qxgjList.value = dsgjList.value.filter(item => item.id === data.dsjngjjw)[0]?.children || []; qxgjList.value = dsgjList.value.filter(item => item.id == data.dsjngjjw)[0]?.children || [];
tzsxejflList.value = tzsxyjflList.filter(item => item.id === data.tzsxyjfl)[0]?.children || []; tzsxejflList.value = tzsxyjflList.filter(item => item.id == data.tzsxyjfl)[0]?.children || [];
tzsxxfbkList.value = tzsxtzbkList.filter(item => item.id === data.tzbk)[0]?.children || []; tzsxxfbkList.value = tzsxtzbkList.filter(item => item.id == data.tzbk)[0]?.children || [];
tzmdejflList.value = tzmdyjflList.filter(item => item.id === data.tzmdyjfl)[0]?.children || []; tzmdejflList.value = tzmdyjflList.filter(item => item.id == data.tzmdyjfl)[0]?.children || [];
tzznejflList.value = tzznyjflList.filter(item => item.id === data.tzznyjfl)[0]?.children || []; tzznejflList.value = tzznyjflList.filter(item => item.id == data.tzznyjfl)[0]?.children || [];
// 决策 // 决策
let jcData = res.juece || res.lixiang || {}; let jcData = res.juece || res.lixiang || {};
...@@ -3222,7 +3224,8 @@ ...@@ -3222,7 +3224,8 @@
Object.assign(jcSwlzbData, jcData.projectJsgms); Object.assign(jcSwlzbData, jcData.projectJsgms);
Object.assign(dbzqData, jcData.projectZqrzs); Object.assign(dbzqData, jcData.projectZqrzs);
Object.assign(fxglData, jcData.projectFxgls); Object.assign(fxglData, jcData.projectFxgls);
Object.assign(jcGdxxData, jcData.projectGdxxs); Object.assign(jcGdxxData, jcData.projectGdxxs.concat([{}]));
changeJcGdxxSums();
Object.assign(lcbjdData, jcData.projectLcbjds); Object.assign(lcbjdData, jcData.projectLcbjds);
Object.assign(lcbspData.value, jcData.lcbjhspb); Object.assign(lcbspData.value, jcData.lcbjhspb);
Object.assign(kyclData.value, jcData.kycl); Object.assign(kyclData.value, jcData.kycl);
...@@ -3236,13 +3239,13 @@ ...@@ -3236,13 +3239,13 @@
Object.assign(tzztshqkData, jcData.projectTzzts); Object.assign(tzztshqkData, jcData.projectTzzts);
Object.assign(jcspyjData, jcData.projectSpyjs); Object.assign(jcspyjData, jcData.projectSpyjs);
// 关联筛选 // 关联筛选
jcSzjList.value = jnwList.filter(item => item.id === jcData.jnw)[0]?.children || []; jcSzjList.value = jnwList.filter(item => item.id == jcData.jnw)[0]?.children || [];
jcDsgjList.value = jcSzjList.value.filter(item => item.id === jcData.sjnzjjw)[0]?.children || []; jcDsgjList.value = jcSzjList.value.filter(item => item.id == jcData.sjnzjjw)[0]?.children || [];
jcQxgjList.value = jcDsgjList.value.filter(item => item.id === jcData.dsjngjjw)[0]?.children || []; jcQxgjList.value = jcDsgjList.value.filter(item => item.id == jcData.dsjngjjw)[0]?.children || [];
jcTzsxejflList.value = tzsxyjflList.filter(item => item.id === jcData.tzsxyjfl)[0]?.children || []; jcTzsxejflList.value = tzsxyjflList.filter(item => item.id == jcData.tzsxyjfl)[0]?.children || [];
jcTzsxxfbkList.value = tzsxtzbkList.filter(item => item.id === jcData.tzbk)[0]?.children || []; jcTzsxxfbkList.value = tzsxtzbkList.filter(item => item.id == jcData.tzbk)[0]?.children || [];
jcTzmdejflList.value = tzmdyjflList.filter(item => item.id === jcData.tzmdyjfl)[0]?.children || []; jcTzmdejflList.value = tzmdyjflList.filter(item => item.id == jcData.tzmdyjfl)[0]?.children || [];
jcTzznejflList.value = tzznyjflList.filter(item => item.id === jcData.tzznyjfl)[0]?.children || []; jcTzznejflList.value = tzznyjflList.filter(item => item.id == jcData.tzznyjfl)[0]?.children || [];
} }
}); });
}; };
...@@ -3281,19 +3284,19 @@ ...@@ -3281,19 +3284,19 @@
// 返回列表页 // 返回列表页
const backClick = () => { const backClick = () => {
if (!formData.projectLzType || formData.projectLzType === 1) { if (!formData.projectLzType || formData.projectLzType == 1) {
router.replace("/projectDraft"); router.replace("/projectDraft");
} else if (jcFormData && jcFormData.projectLzType === 7) { } else if (jcFormData && jcFormData.projectLzType == 7) {
router.replace("/projectArgument"); router.replace("/projectArgument");
} else if (jcFormData && (jcFormData.projectLzType === 8 || jcFormData.projectLzType === 9)) { } else if (jcFormData && (jcFormData.projectLzType == 8 || jcFormData.projectLzType == 9)) {
router.replace("/projectDecision"); router.replace("/projectDecision");
} else if (formData.projectLzType === 3 || formData.projectLzType === 5) { } else if (formData.projectLzType == 3 || formData.projectLzType == 5) {
router.replace("/projectSetUp"); router.replace("/projectSetUp");
} }
} }
// 保存数据 // 保存数据
const saveClick = (type) => { const saveClick = (type) => {
if (!formData.projectLzType || formData.projectLzType === 1) { if (!formData.projectLzType || formData.projectLzType == 1) {
let url = formData.id ? type === "submit" ? "startLixiang" : "saveProjectPreLixiang" : "createProject"; let url = formData.id ? type === "submit" ? "startLixiang" : "saveProjectPreLixiang" : "createProject";
let gdxxNewArr = JSON.parse(JSON.stringify(gdxxData)); let gdxxNewArr = JSON.parse(JSON.stringify(gdxxData));
gdxxNewArr.splice(-1); gdxxNewArr.splice(-1);
...@@ -3319,7 +3322,7 @@ ...@@ -3319,7 +3322,7 @@
router.push("/projectDraft"); router.push("/projectDraft");
} }
}) })
} else if (jcFormData.projectLzType === 5 || jcFormData.projectLzType === 7) { } else if (jcFormData.projectLzType == 5 || jcFormData.projectLzType == 7) {
let url = type === "submit" ? "startJuece" : "saveJuece"; let url = type === "submit" ? "startJuece" : "saveJuece";
let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData)); let gdxxNewArr = JSON.parse(JSON.stringify(jcGdxxData));
gdxxNewArr.splice(-1); gdxxNewArr.splice(-1);
......
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