diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
index ab57da038..e56515f05 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
@@ -174,7 +174,7 @@
>
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
@@ -268,9 +277,8 @@
:disabled="true"
>
-
-
+
+
{
+ 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/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
index fe8b4420b..c2e011d4c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
@@ -268,9 +268,9 @@
:disabled="true"
>
-
+
+ v-model="form.CYCD" placeholder="" :disabled="disabledState">
@@ -225,6 +226,56 @@ export default {
jgUserId: '',
bussFsSubUser2:'',
bussFsSubUser2Name:'',
+ // 基础信息
+ country:[],
+ // 基础信息
+ standSort: '',
+ standCode: '',
+ standYear: '',
+ standName: '',
+ standEnName: '',
+ textStatusBuss: '',
+ issueTime: '',
+ putTime: '',
+ FZRQBUSS: '',
+ FSRQBUSS: '',
+ // 过程稿件
+ FBGBUSS: '',
+ FBGBUSSName: '',
+ BZSMBUSS: '',
+ BZSMBUSSName: '',
+ LSBBBUSS: '',
+ LSBBBUSSName: '',
+ QTWJBUSS: '',
+ QTWJBUSSName: '',
+ // 适用范围
+ QCDW: '',
+ QCRBUSS: '',
+ WJSCRYBUSS: this.$store.getters.userInfo.userId,
+ WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+ SYCXCLASS: '',
+ NYLXCLASS: '',
+ SYCPXCLASS: '',
+ TXLBBUSS: '',
+ VPPSBMBUSS: '',
+ VPPSCNBUSS: '',
+ KCVPPSBMBUSS: '',
+ KCVPPSCNBUSS: '',
+ CYCVPPSBMBUSS: '',
+ CYCVPPSCNBUSS: '',
+ DYBXHBUSS: '',
+ DYMCBUSS: '',
+ // 关联信息
+ DTQBBHBUSS: '',
+ BDTQBBHBUSS: '',
+ XGJLBUSS: '',
+ XGLC: '',
+ GLWJBUSS: '',
+ GLWJBUSSName: '',
+ XCSJBUSS: '',
+ CBCD:'',
+ CYBZ:'',
+ YYBZ:'',
},
roleForm: {
jgUser: ""
@@ -342,6 +393,7 @@ export default {
this.choiceZRRList(type, title, id)
},
formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
+ console.log(form)
this.qbfsForm = form
this.FBGBUSSFileList = list1
this.LSBBBUSSFileList = list2
@@ -351,6 +403,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,
@@ -396,6 +451,9 @@ export default {
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);
@@ -444,10 +502,14 @@ export default {
FSD:"",
}
const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
+ console.log(json)
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);
@@ -457,9 +519,14 @@ export default {
this.verifySarStandard = true
this.formKey++
this.$forceUpdate()
- this.dataLoading = false
})
},
+ filterObj(obj){
+ if(obj && obj !== ''){
+ return obj.split(",")
+ }
+ return "";
+ },
handleTabs(name) {
this.active = name;
},