diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index 611f46333..f21179876 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -43,6 +43,7 @@ :class="{'disabled': disabled}" multiple drag + :show-file-list="showUploadlist" :on-success="uploadSuccess" :before-upload="beforeUpload" diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 8f5a892f1..ba0dfdad9 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,6 +88,16 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, + { + title: '零部件编号申请', + path: '/partCodeApply', + menuId: '' + }, + { + title: '标准法规工作组数据统计', + path: '/dataStatisComments', + menuId: '' + }, { title: '海外标准法规', path: '/foreignStandardsAndRegulations', 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/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index 90f130c65..f90bc40ff 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -375,6 +375,7 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { + console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue index 83bf7cf4c..2bd14237f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue @@ -1,13 +1,463 @@ - diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index a5b265b96..f7be9ed8a 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -178,9 +178,10 @@ export default { let row = {...this.detailData[index]} row.taskIds = row.id row.taskInfo = row.name - console.log(row.name) row.tabsName = this.$route.query.tabsName let prcType = this.detailData[index].prcType // 流程类型 + console.log(prcType) + console.log(row.taskInfo); // 判断当前流程是否已全部办理完成 this.detailData.map(item => { if (!item.endTime) { @@ -213,7 +214,7 @@ export default { } }else if(prcType === '6'){ //标准项目合规评估 项目维度 - if(row.taskInfo === '标准法规部领导审核'){ + if(row.taskInfo === '标准法规部部长审批'){ this.toProcessDetail('xmpg2Step1-12',row) }else{ this.toProcessDetail('xmpg2Step1-2',row) diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue new file mode 100644 index 000000000..3ada7755b --- /dev/null +++ b/src/pages/regulatoryRepository/dataStatis/index.vue @@ -0,0 +1,13 @@ + + + + + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 377f873c3..ffaa965d6 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -10,7 +10,7 @@
- 产品平台: {{ localProEO.projectPlatfor }} + 产品平台1: {{ localProEO.projectPlatfor }} 项目编号: {{ localProEO.projectNumber }} diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue new file mode 100644 index 000000000..99f1834be --- /dev/null +++ b/src/pages/regulatoryRepository/partCodeApply/index.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 445de500b..3b70f1a4a 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -103,8 +103,8 @@ align="center" :label="$t('m.issueTime')"> @@ -973,7 +973,7 @@ option.title = '监管类型' option.index = 12 break - case 'CYSDXX': + case 'WSCYSD': option.title = '我司参与深度' option.index = 13 break @@ -1003,6 +1003,7 @@ }) } this.searchOriginOptions = this.searchOptions + console.log(this.searchOriginOptions) this.saveAllSortOptions = res.data.STANDCLASSIFY this.saveAllFineOptions = res.data.BUSSFINECLASSSHOW this.lawssStateOptions = res.data.LAWSSTATE // 文本状态数组 @@ -1027,20 +1028,20 @@ filterOptions.standSort = originOptions.standSort filterOptions.standSort.index = 1 // 标准状态 - filterOptions.standState = originOptions.standState - filterOptions.standState.title = '标准状态' - filterOptions.standState.index = 2 + // filterOptions.standState = originOptions.standState + // filterOptions.standState.title = '标准状态' + // filterOptions.standState.index = 2 // 我司参与状态 filterOptions.CYSD = originOptions.CYSD filterOptions.CYSD.title = '我司参与深度' - filterOptions.CYSD.index = 3 + filterOptions.CYSD.index = 2 // 监管类型 - filterOptions.ZRLX = originOptions.ZRLX - filterOptions.ZRLX.title = '监管类型' - filterOptions.ZRLX.index = 4 + // filterOptions.ZRLX = originOptions.ZRLX + // filterOptions.ZRLX.title = '监管类型' + // filterOptions.ZRLX.index = 4 // 适用车辆类型 filterOptions.CLLX = originOptions.CLLX - filterOptions.CLLX.index = 5 + filterOptions.CLLX.index = 3 // 采标程度 // filterOptions.CBCD = originOptions.CBCD // filterOptions.CBCD.index = 6 @@ -1322,7 +1323,7 @@ return 'bussBigClass' case 'ACCESSTYPE': return 'ZRLX' - case 'CYSDXX': + case 'WSCYSD': return 'CYSD' default: return key diff --git a/src/router/index.js b/src/router/index.js index 590a4b6f0..010ac773b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1097,6 +1097,30 @@ const routes = [ menuId: 'A59EFAQ7AC' } }, + //零部件编号申请 + { + path: '/partCodeApply', + name: 'partCodeApply', + component: () => + import('@/pages/regulatoryRepository/partCodeApply/index'), + meta: { + requireAuth: true, + title: '零部件编号申请', + menuId: '' + } + }, + //标准法规工作组数据统计 + { + path: '/dataStatisComments', + name: 'dataStatisComments', + component: () => + import('@/pages/regulatoryRepository/dataStatis/index'), + meta: { + requireAuth: true, + title: '标准法规工作组数据统计', + menuId: '' + } + }, // 标准征求意见 { path: '/standardForComments', diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index d2960cf5d..8571d2d34 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,7 +6,7 @@ // 服务器地址 // const devIp = '10.96.10.171' // const devInterfacePORT = '9999' -const devIp = '10.96.170.156' +const devIp = 'localhost' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -31,7 +31,7 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 const prodIp = '62.234.136.153' -const prodInterfacePORT = '8038' +const prodInterfacePORT = '8033' // 判断环境