diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index 243e6163e..0e7bcbdb5 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -70,7 +70,7 @@ size="mini" class="common-button-primary" @click="handleSave" - :loading="submitLoading" + :loading="saveLoading" v-if="showSave"> 保存 @@ -80,7 +80,7 @@ size="small" class="common-button-danger" @click="beforeBack" - :loading="submitLoading" + :loading="isSubmitBack" v-if="showBack"> {{ backBTNText }} @@ -111,6 +111,15 @@ :loading="submitLoading" v-if="showAffirm" >确认 + 不备案 @@ -188,6 +197,10 @@ export default { type: Boolean, default: false }, + showRecord:{ + type: Boolean, + default: false + }, showAffirm: { type: Boolean, default: false @@ -206,6 +219,11 @@ export default { type: Boolean, default: false }, + //不备案按钮Loading + recordLoading:{ + type: Boolean, + default: false + }, // 提交按钮loading submitLoading: { type: Boolean, @@ -221,7 +239,7 @@ export default { type: Boolean, default: false }, - // 保存按钮loading + // 退回按钮loading isSubmitBack: { type: Boolean, default: false @@ -255,6 +273,9 @@ export default { type: Boolean, default: false }, + backBTNTexts: { + type: String + }, submitBTNText: { type: String } @@ -285,6 +306,9 @@ export default { handleSubmit2() { this.$emit('submit2') }, + handleRecord(){ + this.$emit('record') + }, handleSubmit() { this.$emit('submit') }, @@ -384,7 +408,7 @@ export default { }, // 退回按钮文字 backBTNText() { - return this.approval ? '驳回' : '退回' + return this.backBTNTexts ? this.backBTNTexts : this.approval ? '驳回' : '退回' }, userId() { return this.userInfo.userId @@ -402,7 +426,7 @@ export default { text-align: right; background: #fff; z-index: 999; - padding: 0; + padding: 0 10px 0 0; .footer-line { height: 1px; box-shadow: 0 -1px 2px 0px #e8e8e8; diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue new file mode 100644 index 000000000..9d714ddac --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -0,0 +1,816 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue new file mode 100644 index 000000000..861f77827 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -0,0 +1,441 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue new file mode 100644 index 000000000..bbcb9c090 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -0,0 +1,503 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue new file mode 100644 index 000000000..9e1605eea --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -0,0 +1,453 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue new file mode 100644 index 000000000..2afd920d9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -0,0 +1,477 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue new file mode 100644 index 000000000..b82f77cb2 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -0,0 +1,506 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue new file mode 100644 index 000000000..c3dc1c60a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -0,0 +1,455 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue new file mode 100644 index 000000000..0ae0c1ae0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -0,0 +1,372 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue new file mode 100644 index 000000000..949394dbc --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -0,0 +1,401 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue new file mode 100644 index 000000000..074766923 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -0,0 +1,376 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue new file mode 100644 index 000000000..0ddce9d3b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -0,0 +1,370 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 7264af330..84017256c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -494,7 +494,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName if (data.form) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index da2503594..6be10951f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -730,7 +730,7 @@ v-model="form.glwjName" clearable > -
+
{ + if(res && res.data){ + const bringData = res.data + bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0' + bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0' - const json = Object.assign(bringData, bringData.attrInfoCaseMap); - this.form = JSON.parse(JSON.stringify(json)) + const json = Object.assign(bringData, bringData.attrInfoCaseMap); + this.form = JSON.parse(JSON.stringify(json)) - this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] - this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] - this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] - this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] - this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] - this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] - this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] - this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] - this.defaultCheckedKeys = [this.form.standSystem]; - this.defaultCheckedKeys1 = [this.form.cycvppsbm]; - this.defaultCheckedKeys2 = [this.form.kccvppsbm]; - this.defaultCheckedKeys3 = [this.form.dybxh]; - this.key++ - this.key1++ - this.key2++ - this.key3++ - this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' - this.form.prcNum = this.prcNum - this.form.prcName = this.prcName - this.form['id'] = bringData.id - this.standardDrawer = false - this.verifySarStandard = true - this.busVsFunc() - this.modelFunc() - this.$forceUpdate() - - console.log("this.form",this.form); - // 遍历对象初始化文件信息 - for(const p in this.form) { - if (typeof (this.form[p]) != "function") { - this.initializeFileList(p,this.form[p]); + this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : [] + this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : [] + this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : [] + this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm.split(',') : [] + this.form.syrz = JSON.parse(JSON.stringify(json)).syrz && JSON.parse(JSON.stringify(json)).syrz !== '[]' ? JSON.parse(JSON.stringify(json)).syrz.split(',') : [] + this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx.split(',') : [] + this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx.split(',') : [] + this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx.split(',') : [] + this.defaultCheckedKeys = [this.form.standSystem]; + this.defaultCheckedKeys1 = [this.form.cycvppsbm]; + this.defaultCheckedKeys2 = [this.form.kccvppsbm]; + this.defaultCheckedKeys3 = [this.form.dybxh]; + this.key++ + this.key1++ + this.key2++ + this.key3++ + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : '' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = bringData.id + this.standardDrawer = false + this.verifySarStandard = true + this.busVsFunc() + this.modelFunc() + this.$forceUpdate() } - } + // 遍历对象初始化文件信息 + for(const p in this.form) { + if (typeof (this.form[p ]) != "function") { + this.initializeFileList(p,this.form[p]); + } + } + console.log("res",res); + }) } else if (this.standardCheckedList.length > 1) { this.$message.warning('最多可以带入一条标准信息') @@ -1890,7 +1895,6 @@ this.getFileList(value,this.kwjFileList); break; case 'jdwj': - debugger this.getFileList(value,this.jdwjFileList); break; case 'bpg': @@ -1899,6 +1903,9 @@ case 'zqyjg': this.getFileList(value,this.zqyjgFileList); break; + case 'glwj': + this.getFileList(value,this.glwjFileList); + break; default: ; } },getFileList(fileIds,defaultFileList){ @@ -1909,7 +1916,7 @@ }, { _this: this }, res => { - debugger + let fileList = res.data if (fileList != null && fileList.length > 0) { for (let i = 0; i < fileList.length; i++) { @@ -2365,7 +2372,6 @@ // this.form.zbjbdName += response.data.name+','; // } - switch (this.fileType){ case 'fbgbjbd': this.FBGBJBDFileList=fileList; @@ -2454,6 +2460,7 @@ break; case 'jdwj': this.fileList=this.jdwjFileList + break; case 'kwj': this.fileList=this.kwjFileList break; @@ -2623,34 +2630,34 @@ //拼接文件名和id 提交到流程Activity this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",") - this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.response.data.name).join(",") + this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",") this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",") - this.form.xgdName=this.xgdFileList.map(item => item.response.data.name).join(",") + this.form.xgdName=this.xgdFileList.map(item => item.name).join(",") this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",") - this.form.bpgName=this.bpgFileList.map(item => item.response.data.name).join(",") + this.form.bpgName=this.bpgFileList.map(item => item.name).join(",") this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",") - this.form.ssgName=this.ssgFileList.map(item => item.response.data.name).join(",") + this.form.ssgName=this.ssgFileList.map(item => item.name).join(",") this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",") - this.form.zqyjgName=this.zqyjgFileList.map(item => item.response.data.name).join(",") + this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",") this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",") - this.form.jdwjName=this.jdwjFileList.map(item => item.response.data.name).join(",") + this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",") this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") - this.form.kwjName=this.kwjFileList.map(item => item.response.data.name).join(",") + this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") - this.form.caName=this.caFileList.map(item => item.response.data.name).join(",") + this.form.caName=this.caFileList.map(item => item.name).join(",") this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",") - this.form.zbjbdName=this.zbjbdFileList.map(item => item.response.data.name).join(",") + this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",") this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",") - this.form.glwjName=this.glwjFileList.map(item => item.response.data.name).join(",") + this.form.glwjName=this.glwjFileList.map(item => item.name).join(",") }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index a2b44f516..b9ef47549 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -215,84 +215,164 @@
- - - -
- {{ form.xgdName }} -
-
- - - -
-
- -
- {{ form.fbgbjbdName }} -
-
- - - -
-
- -
- {{ form.zbjbdName }} -
-
- - - -
-
- -
- {{ form.ssgName }} -
-
- - - -
-
- -
- {{ form.caName }} -
-
- - - -
-
-
- - -
- {{ form.kwjName }} -
-
- - - -
-
- -
- {{ form.jdwjName }} -
-
- - - -
-
- -
- {{ form.bpgName }} -
-
- - - -
-
- -
- {{ form.zqyjgName }} -
-
- - - -
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+
+ + +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+ +
+ {{value.name}} +
+
+ - - +
+
+
+
@@ -470,9 +550,9 @@ -
- {{ form.glwjName }} -
+
+ {{value.name}} +
- -
@@ -692,7 +772,22 @@ name: "bzrkStep2", data () { return { - // 调整处理人抽屉状态 + xgdFileMap: [], + fbgbjbdFileMap: [], + bpgFileMap: [], + ssgFileMap: [], + zqyjgFileMap: [], + jdwjFileMap: [], + kwjFileMap: [], + glwjFileMap: [], + caFileMap: [], + zbjbdFileMap: [], + + + + + + // 调整处理人抽屉状态 drawerModal: false, drawerTitle: '', nodeList: [], @@ -895,7 +990,6 @@ if(fileType === 'fbgbjbd'){ if(this.fbgbjbdFileId.search(',')){ this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); } window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId }else if(fileType === 'xgd'){ @@ -979,6 +1073,16 @@ this.detailData = res }, e => {}) }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(var i=0;i { inboundLiaisonDetail({ @@ -987,6 +1091,8 @@ }).then(res => { if (res) { const processForm = JSON.parse(res.mesg) + + console.log("processFrom",processForm) this.xgdFileId = processForm.xgd this.fbgbjbdFileId = processForm.fbgbjbd this.bpgFileId = processForm.bpg @@ -998,8 +1104,27 @@ this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd this.getFormFieldList(processForm) - console.log(processForm); - console.log("processForm"); + + this.xgdFileMap=this.assemble(processForm.xgd,processForm.xgdName); + + this.fbgbjbdFileMap=this.assemble(processForm.fbgbjbd,processForm.fbgbjbdName); + // fbgbjbdFileMap: {}, + this.bpgFileMap=this.assemble(processForm.bpg,processForm.bpgName); + // bpgFileMap: {}, + this.ssgFileMap=this.assemble(processForm.ssg,processForm.ssgName); + // ssgFileMap: {}, + this.zqyjgFileMap=this.assemble(processForm.zqyjg,processForm.zqyjgName); + // zqyjgFileMap: {}, + this.jdwjFileMap=this.assemble(processForm.jdwj,processForm.jdwjName); + // jdwjFileMap: {}, + this.kwjFileMap=this.assemble(processForm.kwj,processForm.kwjName); + // kwjFileMap: {}, + this.glwjFileMap=this.assemble(processForm.glwj,processForm.glwjName); + // glwjFileMap: {}, + this.caFileMap=this.assemble(processForm.ca,processForm.caName); + // caFileMap: {}, + this.zbjbdFileMap=this.assemble(processForm.zbjbd,processForm.zbjbdName); + // zbjbdFileMap: {}, } }).catch(e => { @@ -1013,7 +1138,6 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.form.standSystem] - console.log(this.defaultCheckedKeys) this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] @@ -1082,7 +1206,6 @@ }, { _this: this }, res => { - console.log(res); if (res.success) { if(this.formTongGuo.approvalOpinion === '1'){ this.$message.warning("驳回成功") diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index c30de6592..4ade29c0d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -472,8 +472,8 @@ -
- {{ form.glwjName }} +
+ {{value.name}}
- - @@ -973,12 +973,9 @@ export default { }, e => {}) }, assemble(ids,names){ - console.log("name",names) - console.log("id",ids) let list= new Array(); let idArray=ids.split(','); let nameArray=names.split(','); - console.log("idarray",idArray); for(var i=0;i { @@ -1044,8 +1039,7 @@ export default { getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) - console.log("this.form"); - console.log(this.form); + console.log("this.form",this.form); this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 8dc9a84ff..95668c70b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -968,8 +968,17 @@ v-model="form.glwjName" clearable > -
- {{ form.glwjName }} +
+ + + + 查看已上传的文件 +
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue new file mode 100644 index 000000000..8448aa369 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue new file mode 100644 index 000000000..0f07d0d97 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -0,0 +1,419 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue new file mode 100644 index 000000000..e666ae495 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -0,0 +1,241 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue new file mode 100644 index 000000000..e23460f88 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -0,0 +1,700 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue new file mode 100644 index 000000000..c1ebc0c98 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue @@ -0,0 +1,678 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue new file mode 100644 index 000000000..1258d603e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue @@ -0,0 +1,678 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue new file mode 100644 index 000000000..974623f69 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -0,0 +1,697 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue new file mode 100644 index 000000000..36ed24bb5 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -0,0 +1,514 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 8b0ca992d..ff1ebb8a0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -757,6 +757,8 @@ export default { @import '~@/assets/styles/style'; .xmqdqr-step1 { + position: relative; + height: 100%; .myForm { /deep/ .el-form-item__content { line-height: 10px; @@ -771,18 +773,12 @@ export default { padding: 0 20px 0; } } - - position: relative; - height: 100%; - .fileClass { cursor: pointer; } - .fileClass:hover { color: #0c91e5; } - .headerTabs { height: 52px; display: flex; @@ -805,14 +801,12 @@ export default { background: #E6A23C; } } - .content { display: flex; flex-direction: column; justify-content: space-between; height: calc(~'100% - 103px'); overflow: auto; - .tableTitle { margin-bottom: 10px; height: 30px; diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue new file mode 100644 index 000000000..baf107b3c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue @@ -0,0 +1,904 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue index bb568704b..f91509233 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step1.vue @@ -1,18 +1,805 @@ @@ -20,7 +807,62 @@ diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step2.vue b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue new file mode 100644 index 000000000..0c294ddad --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step2.vue @@ -0,0 +1,434 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue new file mode 100644 index 000000000..b9581e109 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue @@ -0,0 +1,409 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue index 797f86fb4..fc0833f3b 100644 --- a/src/pages/processCenter/pages/creatProcess/zchh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zchh/step1.vue @@ -1,26 +1,634 @@ diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue new file mode 100644 index 000000000..33a994a10 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue @@ -0,0 +1,474 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue new file mode 100644 index 000000000..464d47d12 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue @@ -0,0 +1,881 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue index 9e0ed0d71..5945f997e 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step1.vue @@ -1,26 +1,846 @@ diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue new file mode 100644 index 000000000..9e9db0d96 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue new file mode 100644 index 000000000..8c06f1d46 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue new file mode 100644 index 000000000..7dea65683 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index aad48f6ee..af4c10e45 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -142,9 +142,9 @@
- + -
+
@@ -157,9 +157,9 @@
- + -
+
@@ -174,7 +174,7 @@ -
+
@@ -187,6 +187,81 @@
+ + +
+
+
+ +
+
+
外部署名推荐审批流程
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
加入标准化协会信息提报流程
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
参与外部标准制修订信息提报流程
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
外部标准化协会入会流程
+
+
+
+
+
+
+ + +
+
+
+ +
+
+
外部标准化协会参会流程
+
+
+
+
+
+
@@ -345,42 +420,54 @@ export default { name:'xmqdqrStep1' }) break - case '12': - // 赵开耀的流程 - this.$router.push({ - name: 'zhaokaiyaoStep1' - }) - break - case '13': - // 严逸舟的流程 - this.$router.push({ - name: 'yanyizhouStep1' - }) - break - case '14': - // 张宇欢的流程 - this.$router.push({ - name: 'zhangyuhuanStep1' - }) - break - case '15': + case '17': //政策课题入会流程 this.$router.push({ name: 'zcrhStep1' }) break - case '16': + case '18': //政策课题参会流程 this.$router.push({ name: 'zcchStep1' }) break - case '17': + case '19': //政策课题会后流程 this.$router.push({ name: 'zchhStep1' }) break + case '16': + //外部署名推荐审批流程 + this.$router.push({ + name: 'wbsmStep1' + }) + break + case '15': + //加入标准化协会信息提报流程 + this.$router.push({ + name: 'jrbzhxhStep1' + }) + break + case '14': + //参与外部标准制修订信息提报流程 + this.$router.push({ + name: 'cywbbzzxdStep1' + }) + break + // 外部标准化协会入会流程 + case '20': + this.$router.push({ + name: 'bzrhStep1' + }) + break + // 外部标准化协会参会流程 + case '21': + this.$router.push({ + name: 'bzchStep1' + }) + break } }, checkPermission(permissionIdArray) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 6c76b6aad..6b6f87bfc 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -869,6 +869,260 @@ export default { }) } break + case '15': + //加入标准化协会信息备案流程 + if (row.taskInfo === '填写入会信息') { + this.$router.push({ + name: 'jrbzhxhStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规工程师审核'){ + this.$router.push({ + name: 'jrbzhxhStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '标准法规部部长批准'){ + this.$router.push({ + name: 'jrbzhxhStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + // 外部标准化协会入会流程 + case '20': + if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') { + this.$router.push({ + name: 'bzrhStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '入会代表填写入会信息表') { + this.$router.push({ + name: 'bzrhStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '入会人员所在部门负责人审核') { + this.$router.push({ + name: 'bzrhStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总修订') { + this.$router.push({ + name: 'bzrhStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规部主管领导审核') { + this.$router.push({ + name: 'bzrhStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '费用管理部门会签') { + this.$router.push({ + name: 'bzrhStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '技术委员会常务副主任/总院院长审定') { + this.$router.push({ + name: 'bzrhStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总修订完毕'){ + this.$router.push({ + name: 'bzrhStep6', + query:{ + taskInfo: row.taskInfo, + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + case '18': + if (row.taskInfo === '法规认证部副部长批准') { + this.$router.push({ + name: 'zcchStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '公司副总批准') { + this.$router.push({ + name: 'zcchStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '修订参会信息') { + this.$router.push({ + name: 'zcchStep1-1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + // 政策参会流程 + case '19': + if (row.taskInfo === '申请人填写表单') { + this.$router.push({ + name: 'zchhStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '审核员批准') { + this.$router.push({ + name: 'zchhStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '申请人修订申请信息') { + this.$router.push({ + name: 'zchhStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break + // 政策会后流程 + case '21': + if (row.taskInfo === '技术委员会分委会主任/入会代表所在中心主任提名入会代表') { + this.$router.push({ + name: 'bzchStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzchStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzchStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '') { + this.$router.push({ + name: 'bzchStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 1673f66fb..21d8ebce5 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -389,6 +389,16 @@ export default { } }) break + case '20': + this.$router.push({ + name: 'bzrhStep1', + query: { + type: '20', + processName: '外部标准化协会入会流程', + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index a31e4927d..4f74016e4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -988,6 +988,42 @@ const routes = [ title: '政策课题入会流程' } }, + { + path: '/zcrhStep2', + name: 'zcrhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step2.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, + { + path: '/zcrhStep3', + name: 'zcrhStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step3.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, + { + path: '/zcrhStep4', + name: 'zcrhStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step4.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, + { + path: '/zcrhStep1-1', + name: 'zcrhStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue'), + meta: { + requireAuth: true, + title: '政策课题入会流程' + } + }, { path: '/zcchStep1', name: 'zcchStep1', @@ -997,6 +1033,33 @@ const routes = [ title: '政策课题参会流程' } }, + { + path: '/zcchStep2', + name: 'zcchStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step2.vue'), + meta: { + requireAuth: true, + title: '政策课题参会流程' + } + }, + { + path: '/zcchStep3', + name: 'zcchStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step3.vue'), + meta: { + requireAuth: true, + title: '政策课题参会流程' + } + }, + { + path: '/zcchStep1-1', + name: 'zcchStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/zcch/step1-1.vue'), + meta: { + requireAuth: true, + title: '政策课题参会流程' + } + }, { path: '/zchhStep1', name: 'zchhStep1', @@ -1005,7 +1068,199 @@ const routes = [ requireAuth: true, title: '政策课题会后流程' } - } + }, + { + path: '/zchhStep2', + name: 'zchhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/zchh/step2.vue'), + meta: { + requireAuth: true, + title: '政策课题会后流程' + } + }, + { + path: '/wbsmStep1', + name: 'wbsmStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step1.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/wbsmStep2', + name: 'wbsmStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/wbsm/step2.vue'), + meta: { + requireAuth: true, + title: '外部署名推荐审批流程' + } + }, + { + path: '/cywbbzzxdStep1', + name: 'cywbbzzxdStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, + { + path: '/cywbbzzxdStep2', + name: 'cywbbzzxdStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, + { + path: '/cywbbzzxdStep3', + name: 'cywbbzzxdStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue'), + meta: { + requireAuth: true, + title: '参与外部标准制修订信息提报流程' + } + }, + { + path: '/jrbzhxhStep1', + name: 'jrbzhxhStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + { + path: '/jrbzhxhStep3', + name: 'jrbzhxhStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + { + path: '/jrbzhxhStep4', + name: 'jrbzhxhStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + { + path: '/jrbzhxhStep2', + name: 'jrbzhxhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue'), + meta: { + requireAuth: true, + title: '加入标准化协会信息提报流程' + } + }, + // 外部标准化协会入会流程 + { + path: '/bzrhStep1', + name: 'bzrhStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程(流程发起)' + } + }, + { + path: '/bzrhStep2', + name: 'bzrhStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程(选择代表)' + } + }, + { + path: '/bzrhStep3', + name: 'bzrhStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程(入选代表填写信息)' + } + }, + { + path: '/bzrhStep4', + name: 'bzrhStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程(责任负责人审批)' + } + }, + { + path: '/bzrhStep5', + name: 'bzrhStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程(修订)' + } + }, + { + path: '/bzrhStep6', + name: 'bzrhStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会入会流程(审批)' + } + }, + + // 外部标准化协会参会流程 + { + path: '/bzchStep1', + name: 'bzchStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程(流程发起)' + } + }, + { + path: '/bzchStep2', + name: 'bzchStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程(选择入会代表)' + } + }, + { + path: '/bzchStep3', + name: 'bzchStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程(入会人确认)' + } + }, + { + path: '/bzchStep4', + name: 'bzchStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程(审批)' + } + }, + { + path: '/bzchStep5', + name: 'bzchStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue'), + meta: { + requireAuth: true, + title: '外部标准化协会参会流程(修订)' + } + }, ] }, // 本地工具 @@ -1188,7 +1443,7 @@ const routes = [ requireAuth: true, title: '技术要求清单管理' } - } + }, ] }, // 标准法规库 diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 5d43f6adf..3d38d1c7b 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,9 +6,9 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.10.248' -const devIp = '62.234.136.153' -const devInterfacePORT = '8033' +const devIp = '192.168.10.50' +// const devIp = '62.234.136.153' +const devInterfacePORT = '9999' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' // 配置 前端服务 @@ -37,8 +37,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -const prodIp = '10.100.5.117' -const prodInterfacePORT = '4202' +const prodIp = '62.234.136.153' +const prodInterfacePORT = '8033' +// const prodIp = 'slrs.foton.com.cn' +// const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp