diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index ba0dfdad9..73450e5bc 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,11 +88,11 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, - { - title: '零部件编号申请', - path: '/partCodeApply', - menuId: '' - }, + // { + // title: '零部件编号申请', + // path: '/partCodeApply', + // menuId: '' + // }, { title: '标准法规工作组数据统计', path: '/dataStatisComments', diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue index 7dbe3eecf..92b82bc75 100644 --- a/src/components/personalCenter/index.vue +++ b/src/components/personalCenter/index.vue @@ -37,7 +37,7 @@ export default { }, methods: { toHome () { - this.$router.push('/home') + this.$router.push('/home1') }, // 获取当前时间 getTime () { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 2166ae91f..e4b8d0b87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -156,6 +156,7 @@
@@ -309,6 +310,8 @@ this.json = data this.form.model = data.model this.form.modelName = data.modelName + this.form.fileName = data.fileName || '' + this.form.fileId = data.fileId || '' }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 1c962674b..a590d8ece 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -92,7 +92,7 @@ label="文件" align="center"> @@ -183,6 +183,7 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 529ac6782..b55d1e585 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -87,7 +87,7 @@ label="文件" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 6bbd01b4f..953b1085a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -87,7 +87,7 @@ label="文件" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index af250d1cb..2efa1dc5c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -87,7 +87,7 @@ label="文件" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 889c9514d..7339115b3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -87,7 +87,7 @@ label="文件" align="center"> diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 5716eb580..039a1e43d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -406,7 +406,6 @@ export default { }, // 保存按钮 handleSave() { - this.isSubmit = true let zqa = new Map(); for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 71d89ca6a..6ef3f73c2 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -232,6 +232,7 @@ import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' import {uploadFile} from '@/api/unqualProcess.js'; import {inboundLiaisonDetail, completeTask, saveTaskForPub} from "@/api/process" +import listOfCountries from "@/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries"; export default { name: "wfhxzgStep4", @@ -307,11 +308,11 @@ export default { }, getFormFieldList (item) { this.$nextTick(() => { - let listJSON = JSON.parse(JSON.stringify(item.responUserInfo.info)) + let listJSON = JSON.parse(JSON.stringify(item.responUserList)) if (listJSON.length !== undefined) { - this.dataList = listJSON + this.dataList = listJSON[0].standardInfoList } else { - this.dataList = [listJSON] + this.dataList = [listJSON][0].standardInfoList } this.dataList.forEach(item => { if (item.fileText.length !== 0) { @@ -427,8 +428,8 @@ export default { _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ // roleForm: this.roleForm, - responUserInfo: { - info: this.dataList.splice(-1, 1) + responUserList: { + standardInfoList: this.dataList }, commentText: this.commentText })) diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue index 4fb363ee1..191afc273 100644 --- a/src/pages/regulatoryRepository/partCodeApply/index.vue +++ b/src/pages/regulatoryRepository/partCodeApply/index.vue @@ -1,10 +1,86 @@