diff --git a/src/App.vue b/src/App.vue index 6f9e8d55e..4765d5b4b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ - + - + - + - + - + - + - + @@ -679,7 +679,7 @@ > - - - - - - - - - + - + @@ -797,7 +797,7 @@ - + - + - + - - - + - + -
- - + - + - + - + @@ -923,20 +923,20 @@ - + - - - + - -
-

标准法规工程师

- +
@@ -1033,7 +1033,7 @@

责任工程师

- +
@@ -1044,7 +1044,7 @@

标准法规工程师

- +
@@ -1054,7 +1054,7 @@

标准法规部法规分析业务经理

- +
@@ -1065,8 +1065,7 @@
- - - - - - @@ -1249,7 +1248,7 @@ - @@ -1258,7 +1257,7 @@ - + - - - - 查询 - @@ -1362,7 +1361,7 @@ - + @@ -1381,21 +1380,21 @@
- -
- -
- - - - + - + - + - + - + - - + - + - + - + - + @@ -370,7 +380,7 @@ - - {{'手动查找'}} -
- - - {{'手动查找'}} - @@ -444,7 +454,7 @@
- --> - + - + @@ -500,7 +510,7 @@ - + @@ -512,7 +522,7 @@ - + @@ -546,7 +556,7 @@

标准起草人

- +
@@ -556,7 +566,7 @@

其他起草人

- +
@@ -566,7 +576,7 @@

标准起草人

- +
@@ -576,7 +586,7 @@

标准法规工程师/事业部标准化员

- +
@@ -586,7 +596,7 @@

各事业部标准化员(时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利),项目组各PMT/PAT

- +
@@ -596,7 +606,7 @@

标准起草人

- +
@@ -606,7 +616,7 @@

标准法规工程师

- +
@@ -616,7 +626,7 @@

总院项目总工、标准法规部高级经理/各事业部整车所产品经理、各事业部标准业务经理

- +
@@ -626,7 +636,7 @@ - + @@ -636,7 +646,7 @@

产品工程经理、技术管理中心主任/事业部技术中心主任、标准法规部高级经理

- +
@@ -646,7 +656,7 @@ - + @@ -656,7 +666,7 @@

总院项目经理/事业部研发副总裁

- +
@@ -666,7 +676,7 @@

标准法规工程师

- +
@@ -676,7 +686,7 @@ - + @@ -688,7 +698,7 @@
- - - - 清空 @@ -814,8 +824,8 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> - + @@ -859,8 +869,8 @@ - - + + @@ -876,21 +886,21 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ item.name }} - - - -
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 531523a04..95deef6a6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -25,7 +25,7 @@ - - + @@ -61,14 +61,14 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -87,14 +87,14 @@ - + - @@ -102,7 +102,7 @@ - -
- -
- -
- -
- - - - + - + - + - + - + - + - - + - + - + - + - + - + @@ -338,12 +338,12 @@ - - {{'手动查找'}} - - {{'手动查找'}} - - - + - + @@ -396,15 +396,15 @@ - - -
-
- --> - + - + @@ -500,7 +500,7 @@ - + @@ -512,7 +512,7 @@ - + @@ -546,7 +546,7 @@

标准起草人

- +
@@ -556,7 +556,7 @@

其他起草人

- +
@@ -566,7 +566,7 @@

标准起草人

- +
@@ -576,7 +576,7 @@

总院各中心兼职标准化员/各事业部标准化员

- +
@@ -586,7 +586,7 @@

张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师

- +
@@ -596,7 +596,7 @@

标准起草人

- +
@@ -606,7 +606,7 @@

标准法规工程师

- +
@@ -616,7 +616,7 @@

起草单位高级经理

- +
@@ -626,7 +626,7 @@

标准法规部高级经理

- +
@@ -636,7 +636,7 @@

起草单位中心主任

- +
@@ -646,7 +646,7 @@

总院技术委员会覆盖领域企业标准:专委会主任;总院技术委员会未覆盖领域企业标准:总院院长或总院主管副院长

- +
@@ -656,7 +656,7 @@

标准起草人

- +
@@ -666,7 +666,7 @@

标准法规工程师

- +
@@ -678,7 +678,7 @@
- - - - 清空 @@ -804,8 +804,8 @@ @pageChange="pageChangeReplace" @pageSizeChange="pageSizeChangeReplace"> - + @@ -849,8 +849,8 @@ - - + + @@ -866,28 +866,28 @@
@@ -1214,6 +1215,8 @@ } }] }, + ccc:false, + disabledXX:!!this.$route.query.disabledXX, bpnId: this.$route.query.bpnId, fileList: [], FBGBUSSFileList: [], @@ -1244,7 +1247,7 @@ pageSize: this.$store.getters.userInfo.configContent, unit: '', esName: '', - planStatus: '0,3', + planStatus: '0,3,6', reviseStatus: '', }, tableData: { @@ -1785,18 +1788,18 @@ }else if(this.userType === 'QCRBUSS'){ this.form.QCRBUSSID=idList; this.form.QCRBUSS=nameList; + if(data && data.length > 0){ + console.log(data) + const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",") + const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",") + this.form.QCDWID = institutionIdList + this.form.QCDW = institutionNameList + } }else if(this.userType === 'bzUserId'){ this.roleForm.bzUserId = idList this.roleForm.bzUserName = nameList } - if(data !== undefined && data && data.length > 0){ - const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",") - const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",") - this.form.QCDWID = institutionIdList - this.form.QCDW = institutionNameList - } - this.modalShowRoleFlag = false }, unique(newArr) { @@ -1857,6 +1860,7 @@ }, getTaskId () { if(this.$route.query.bpnId){ + this.ccc = true queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { @@ -1872,6 +1876,7 @@ this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.roleForm = mes.roleForm this.commentText = mes.commentText + this.ccc = false }) }else { this.form.XCSJBUSS = this.dateFormatter() @@ -1962,6 +1967,14 @@ } return data }, + filterStringDate(data){ + if(data === undefined || data === null || data === '' || data === 'null'){ + return "" + }else { + data = data.toString() + } + return data + }, handleProcessStandardNext(status) { switch (status) { // 新增 @@ -1993,11 +2006,11 @@ // 引用标准 this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations) // 起草人带入 - this.form.QCRBUSS = this.filterDate(this.standardCheckedList[0].drafterName) - this.form.QCRBUSSID = this.filterDate(this.standardCheckedList[0].drafter) + this.form.QCRBUSS = this.filterStringDate(this.standardCheckedList[0].drafterName) + this.form.QCRBUSSID = this.filterStringDate(this.standardCheckedList[0].drafter) // 起草部门带入 - this.form.QCDW = this.filterDate(this.standardCheckedList[0].unitName) - this.form.QCDWID = this.filterDate(this.standardCheckedList[0].unit) + this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName) + this.form.QCDWID = this.filterStringDate(this.standardCheckedList[0].unit) this.form.TXLBBUSS = this.filterDate(this.standardCheckedList[0].tsJsonName) this.form.menuId = this.filterDate(this.standardCheckedList[0].tsJson) this.form.treeType = 'sarMs' @@ -2378,6 +2391,7 @@ // 代替政策编号确定 replaceLawsNumModelBt () { let textArr = [] + let textArr2 = [] if (typeof this.value === 'string') { if (this.value) { @@ -2390,11 +2404,16 @@ type: 'warning' }) } - if (this.selectedListRep.length + textArr.length > 20) { + if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) { return this.$message({ message: '标准最多选择20项', type: 'warning' }) + }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){ + return this.$message({ + message: '标准最多选择1项', + type: 'warning' + }) } this.selectedListRep.map((item) => { let texts = '' @@ -2409,6 +2428,8 @@ } textArr.push(texts) textArr = [...new Set(textArr)] + textArr2.push(item.standNumber) + textArr2 = [...new Set(textArr2)] this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') @@ -2416,6 +2437,7 @@ if(this.replaceLawType === 'DTQBBHBUSS'){ let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') this.form.DTQBBHBUSS = this.filterSetData(arr1) + this.form.standNum = this.filterSetData(textArr2.join(',')) }else if(this.replaceLawType === 'CYBZ'){ let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') this.form.CYBZ = this.filterSetData(arr1) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 1647257d6..1c27298d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -1897,6 +1897,7 @@ // 代替政策编号确定 replaceLawsNumModelBt () { let textArr = [] + let textArr2 = [] if (typeof this.value === 'string') { if (this.value) { @@ -1909,11 +1910,16 @@ type: 'warning' }) } - if (this.selectedListRep.length + textArr.length > 20) { + if ( this.form.reviseStatus === '1' && this.selectedListRep.length + textArr.length > 20) { return this.$message({ message: '标准最多选择20项', type: 'warning' }) + }else if(this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1){ + return this.$message({ + message: '标准最多选择1项', + type: 'warning' + }) } this.selectedListRep.map((item) => { let texts = '' @@ -1928,13 +1934,22 @@ } textArr.push(texts) textArr = [...new Set(textArr)] + textArr2.push(item.standNumber) + textArr2 = [...new Set(textArr2)] this.replaceLawsNumModel = false }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段,先手动输入,然后再手动查找,点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ - let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - this.form.DTQBBHBUSS = this.filterSetData(arr1) + if(this.form.reviseStatus === '1'){ + let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(arr1) + this.form.standNum = this.filterSetData(textArr2.join(',')) + }else if(this.form.reviseStatus === '2'){ + let arr1 = textArr.join(',') + this.form.DTQBBHBUSS = this.filterSetData(arr1) + this.form.standNum = this.filterSetData(textArr2.join(',')) + } }else if(this.replaceLawType === 'CYBZ'){ let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') this.form.CYBZ = this.filterSetData(arr1) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index b84238721..55ecd7834 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -626,11 +626,13 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 4a13e5943..22145f398 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -22,6 +22,15 @@ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index ef7a2600f..e6c2483d2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -36,6 +36,15 @@ clearable >
+ + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 7d3410827..89dc03251 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -36,6 +36,15 @@ clearable >
+ + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index 0c4b4a652..a5d1b92c9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -36,6 +36,15 @@ clearable >
+ + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index f7d0fb5b7..8af764c60 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -43,7 +43,7 @@ > - @@ -292,6 +315,9 @@ {{ scope.row.XCXSSRQ }} + {{ + scope.row.XCXSSRQ + }} {{ scope.row.XCXSSRQ }} @@ -308,6 +334,9 @@ {{ scope.row.ZCCSSRQ }} + {{ + scope.row.ZCCSSRQ + }} {{ scope.row.ZCCSSRQ }} @@ -329,6 +358,9 @@ {{ textStatusMap[scope.row.textStatus] }} + {{ + textStatusMap[scope.row.textStatus] + }} {{ textStatusMap[scope.row.textStatus] }} diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 2a9d1ff43..0797554c9 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -442,7 +442,7 @@ - + @@ -469,7 +469,7 @@ diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 1c0fe93f9..9cbcb0e2a 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -3,6 +3,16 @@
+ + + + + @@ -24,243 +34,46 @@
- - -
-
- 暂无数据 -
-
-
- - - -
-
- -
-
- 暂无数据 -
-
-
- - - -
-
- -
-
- 暂无数据 -
-
-
- - - -
-
- -
-
- 暂无数据 -
-
-
- - - -
-
-
+ + + + + + + + + + +
+ + +
+ +
+ +
+ +
+
@@ -766,13 +604,37 @@ export default { {required: true, message: '请输入问题', trigger: 'blur'}, ], }, + classificationOption: [ + { + value: 'INLAND', + label: '国内标准' + }, + { + value: 'FOREIGN', + label: '海外标准' + }, + { + value: 'BUSINESS_STAND', + label: '企业标准' + }, + { + value: 'OTHER', + label: '公共问题' + } + ], + tableData: [], + tableLoading: false, + tableTotal: 0, questionSerach:{ classification: 'INLAND', standardName: '', //标准名称 standardEncdoing: '', //标准编号 problemDescription: '', //关键词/问题描述 + page: 1, + pageSize: this.$store.getters.userInfo.configContent, }, answerList: [], + answerListDrawer: false, answer: '', standList: [], standIdList: [], @@ -781,33 +643,9 @@ export default { } }, mounted(){ - if(this.$route.query.queId){ - this.questionSerach.standardName = this.$route.query.standName - this.questionSerach.classification = this.$route.query.standType - this.activeName = this.$route.query.standType - this.standSearch() - }else{ - switch (this.standType){ - case 'INLAND': - this.standSearch2() - break - case 'FOREIGN': - this.activeName = 'FOREIGN' - this.questionSerach.classification = 'FOREIGN' - this.standSearch2() - break - case 'BUSINESS_STAND': - this.activeName = 'BUSINESS_STAND' - this.questionSerach.classification = 'BUSINESS_STAND' - this.standSearch2() - break - case 'OTHER': - this.activeName = 'OTHER' - this.questionSerach.classification = 'OTHER' - this.standSearch2() - break - } - } + this.questionSerach.standardName = this.$route.query.standName + this.questionSerach.classification = this.$route.query.standType + this.searchBtn() // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { _this: this, @@ -820,6 +658,34 @@ export default { }); }, methods:{ + formatClassification(e){ + for (let i=0; i { + this.answerListDrawer = true + this.answerList = res.data + }, e => { + }) + }, refreshStandMap(){ this.standMap = new Map() this.standList.forEach(item=>{ @@ -1029,9 +895,6 @@ export default { this.questionSerach.standardEncdoing = '' this.standSearch() }, - standClick(){ - this.queSearch() - }, questionClick(){ sessionStorage.setItem('queId', this.activeQue) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ @@ -1086,19 +949,22 @@ export default { standardEncdoing: '', //标准编号 questioner: this.$store.getters.userInfo.userId, //提问人 problemDescription: '', //关键词/问题描述 + page:1, + pageSize:this.$store.getters.userInfo.configContent, } - this.standSearch2() + this.searchBtn() }, searchBtn(){ - this.questionSerach.classification = this.activeType this.questionSerach.questioner = '' - this.$http.get('lawss/AskQuestions/retrieve',{ + this.tableLoading = true + this.$http.postData('lawss/AskQuestions/list',{ ...this.questionSerach },{ _this: this }, res => { - this.standList = res.data - this.refreshStandMap() + this.tableData = res.data.records + this.tableTotal = res.total + this.tableLoading = false }) }, //问题查询 @@ -1113,31 +979,7 @@ export default { this.questionsList = res.data }) }, - //回答查询 - ansSearch(){ - this.$http.get('lawss/AskQuestions/getReplyDetails',{ - classification: this.questionSerach.classification, - answerer: this.$store.getters.userInfo.userId, - }, { - _this: this, - }, res => { - - }) - }, //查询提问标准 - standSearch(){ - this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{ - _this: this - }, res =>{ - this.standList = res.data - this.refreshStandMap() - if(this.$route.query.queId){ - this.activestand = this.standList[0].standardId - this.queSearch() - } - }, e => { - }) - }, standSearch2(){ let qId = this.$route.query.standId let queNumber = 0 @@ -1240,27 +1082,7 @@ export default { _this: this }, res => { this.dialogVisible = false - switch (this.standType){ - case 'INLAND': - this.standSearch2() - break - case 'FOREIGN': - this.activeName = 'FOREIGN' - this.questionSerach.classification = 'FOREIGN' - this.standSearch2() - break - case 'BUSINESS_STAND': - this.activeName = 'BUSINESS_STAND' - this.questionSerach.classification = 'BUSINESS_STAND' - this.standSearch2() - break - case 'OTHER': - this.activeName = 'OTHER' - this.questionSerach.classification = 'OTHER' - this.standSearch2() - break - } - this.queSearch() + this.searchBtn() }, e => { }) diff --git a/src/pages/regulatoryRepository/standQA/index2.vue b/src/pages/regulatoryRepository/standQA/index2.vue new file mode 100644 index 000000000..1c0fe93f9 --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/index2.vue @@ -0,0 +1,1385 @@ + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 717077a88..aa922feaf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -14,6 +14,42 @@ const routes = [ title: '动态跳转', } }, + { + path: '/release2', + name: 'Release2', + component: resolve => require(['@/pages/home2/components/release2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '国内外标准法规入库', + } + }, + { + path: '/releaseUs2', + name: 'ReleaseUs2', + component: resolve => require(['@/pages/home2/components/releaseUs2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '在研标准法规入库', + } + }, + { + path: '/releaseBuss2', + name: 'ReleaseBuss2', + component: resolve => require(['@/pages/home2/components/releaseBuss2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '企业标准发布', + } + }, + { + path: '/releaseQA2', + name: 'ReleaseQA2', + component: resolve => require(['@/pages/home2/components/releaseQA2/index.vue'], resolve), + meta: { + requireAuth: true, + title: '标准问答', + } + }, { path: '/blankPage', name: 'blankPage',