From 3b54a67b0ce6d74004d2adaaff9f3b5bf2d72693 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sat, 26 Mar 2022 11:22:45 +0800
Subject: [PATCH] feat: There is no way the,
---
.../qbfs/common/formListStep5.vue | 109 ++++++++++--------
.../pages/creatProcess/qbfs/step4.vue | 29 +++--
.../pages/creatProcess/qbfs/step5.vue | 5 +-
.../pages/creatProcess/qbfs/stepC4.vue | 28 +++--
.../pages/creatProcess/qbfs/stepDetail.vue | 6 +-
5 files changed, 116 insertions(+), 61 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
index c2e011d4c..2b077d5f3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
@@ -189,9 +189,15 @@
-
-
-
+
+
+
+
+
+
+
+
+
@@ -220,12 +226,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -829,44 +835,57 @@ export default {
this.modelOptions = res.data
})
},
+ async getDataAsync(){
+ let res = await this.getDicTypeListCode()
+ if(res && res.data){
+ this.countryOptions = res.data.COUNTRY
+ this.applyCountryOptions = res.data.COUNTRY
+ this.regionOptions = res.data.REGION // 区域
+ this.standStateOptions = res.data.BUSSSTATE
+ this.energyKindOptions = res.data.ENERGYTYPES
+ this.standGeneraOptions = res.data.BUSSBIGCLASS
+ this.standSubclassOptions = res.data.BUSSFINECLASS
+ this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+ this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+ this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+ this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+ this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+ this.categoryOptions = res.data.NYLXCLASS // 能源类型
+ this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+ this.cysdOptions = res.data.WSCYSD // 我司参与深度
+ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+ this.txlbOptions = res.data.TXLBCLASS // 体系类别
+ this.qcdwOptions = res.data.QCDW // 起草单位
+ this.qcrOptions = res.data.QCRBUSS // 起草人
+ this.nylxOptions = res.data.NYLXCLASS // 能源类型
+ this.syrzOptions = res.data.SYRZCLASS // 适用认证
+ this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+ this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
+
+ this.$emit('emitDataLoading',false)
+ }
+ },
+ getDicTypeListCode(res,json) {
+ return new Promise((resolve, reject) => {
+ this.$http.get('sys/dictype/getDicTypeListCode', '', {
+ _this: this
+ }, res => {
+ const history = res;
+ resolve(history)
+ })
+ })
+ },
},
mounted () {
- this.form = this.formSub
- this.LXDList = this.LXDListSub
- this.FSDList = this.FSDListSub
- this.$http.get('sys/dictype/getDicTypeListCode', '', {
- _this: this
- }, res => {
- this.countryOptions = res.data.COUNTRY
- this.applyCountryOptions = res.data.COUNTRY
- this.regionOptions = res.data.REGION // 区域
- this.standStateOptions = res.data.BUSSSTATE
- this.energyKindOptions = res.data.ENERGYTYPES
- this.standGeneraOptions = res.data.BUSSBIGCLASS
- this.standSubclassOptions = res.data.BUSSFINECLASS
- this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
- this.standNatureOptions = res.data.SARPROPERTY // 标准性质
- this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
- this.standSystemOptions = res.data.TXLBBUSS // 标准体系
- this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
- this.categoryOptions = res.data.NYLXCLASS // 能源类型
- this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
- this.cysdOptions = res.data.WSCYSD // 我司参与深度
- this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
- this.txlbOptions = res.data.TXLBCLASS // 体系类别
- this.qcdwOptions = res.data.QCDW // 起草单位
- this.qcrOptions = res.data.QCRBUSS // 起草人
- this.nylxOptions = res.data.NYLXCLASS // 能源类型
- this.syrzOptions = res.data.SYRZCLASS // 适用认证
- this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
- this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
- this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
- this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
- this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
- this.setMap(this.standStateOptions)
- })
- this.busVsFunc()
- this.modelFunc()
+ if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
+ this.getDataAsync()
+ this.form = this.formSub
+ this.LXDList = this.LXDListSub
+ this.FSDList = this.FSDListSub
+ }
},
watch: {
form: {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index 313f54a84..6c0fcf011 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -31,6 +31,7 @@
:disabledState = "disabledState"
:opinionsShow2 = "true"
:verifySarStandard = "verifySarStandard"
+ @emitDataLoading="emitDataLoading"
@formCancel="formCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
>
@@ -250,9 +251,6 @@ export default {
bussFsSubUser2Name: [
{required: true, message: "请选择企标复审人", trigger: "change"}
],
- QCRBUSS: [
- {required: true, message: "请选择主起草人", trigger: "change"}
- ],
reviewResults: [
{required: true, message: "请选择复审结果", trigger: "change"}
],
@@ -363,6 +361,9 @@ export default {
this.LXDList = list6
this.FSDList = list7
},
+ emitDataLoading(boo){
+ this.dataLoading = boo
+ },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -404,10 +405,14 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
+ console.log(mes)
this.qbfsForm = mes.qbfsForm
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
- this.qbfsForm['id'] = bringData.id
+ this.qbfsForm['id'] = mes.qbfsForm.id
+ this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+ this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+ this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -459,14 +464,15 @@ export default {
LXD:"",
FSDName:"",
FSD:"",
- QCRBUSSID:"",
- QCRBUSS:"",
}
const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
this.qbfsForm = JSON.parse(JSON.stringify(json))
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id
+ this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+ this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+ this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -494,9 +500,18 @@ export default {
this.verifySarStandard = true
this.formKey++
this.$forceUpdate()
- this.dataLoading = false
})
},
+ filterObj(obj){
+ if(obj && obj !== ''){
+ if(obj instanceof Array){
+ return obj;
+ }else {
+ return obj.split(",")
+ }
+ }
+ return "";
+ },
handleTabs(name) {
this.active = name;
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
index 89c5f8291..4fb914b17 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
@@ -31,6 +31,7 @@
:disabledState = "disabledState"
:opinionsShow2 = "true"
:verifySarStandard = "verifySarStandard"
+ @emitDataLoading="emitDataLoading"
@formCancel="formCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
>
@@ -427,6 +428,9 @@ export default {
formChoiceZRRListCancel(type, title, id){
this.choiceZRRList(type, title, id)
},
+ emitDataLoading(boo){
+ this.dataLoading = boo
+ },
formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
this.qbfsForm = form
this.FBGBUSSFileList = list1
@@ -534,7 +538,6 @@ export default {
this.verifySarStandard = true
this.formKey++
this.$forceUpdate()
- this.dataLoading = false
})
},
handleTabs(name) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
index b0c545268..6df0d412f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
@@ -31,6 +31,7 @@
:disabledState = "disabledState"
:opinionsShow2 = "true"
:verifySarStandard = "verifySarStandard"
+ @emitDataLoading="emitDataLoading"
@formCancel="formCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
>
@@ -250,9 +251,6 @@ export default {
bussFsSubUser2Name: [
{required: true, message: "请选择企标复审人", trigger: "change"}
],
- QCRBUSS: [
- {required: true, message: "请选择主起草人", trigger: "change"}
- ],
reviewResults: [
{required: true, message: "请选择复审结果", trigger: "change"}
],
@@ -353,6 +351,9 @@ export default {
formChoiceZRRListCancel(type, title, id){
this.choiceZRRList(type, title, id)
},
+ emitDataLoading(boo){
+ this.dataLoading = boo
+ },
formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
this.qbfsForm = form
this.FBGBUSSFileList = list1
@@ -407,7 +408,10 @@ export default {
this.qbfsForm = mes.qbfsForm
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
- this.qbfsForm['id'] = bringData.id
+ this.qbfsForm['id'] = mes.qbfsForm.id
+ this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+ this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+ this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -459,14 +463,15 @@ export default {
LXD:"",
FSDName:"",
FSD:"",
- QCRBUSSID:"",
- QCRBUSS:"",
}
const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
this.qbfsForm = JSON.parse(JSON.stringify(json))
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id
+ this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+ this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+ this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -494,9 +499,18 @@ export default {
this.verifySarStandard = true
this.formKey++
this.$forceUpdate()
- this.dataLoading = false
})
},
+ filterObj(obj){
+ if(obj && obj !== ''){
+ if(obj instanceof Array){
+ return obj;
+ }else {
+ return obj.split(",")
+ }
+ }
+ return "";
+ },
handleTabs(name) {
this.active = name;
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
index 7d792b56c..63c705664 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
@@ -2,7 +2,7 @@