diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 64706c03e..3953c3414 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -609,6 +609,7 @@ export default { this.addOrEdit = 'add' this.attributeTitle = '新增' this.showInfoModal = true + this.attributeEO = {} this.$nextTick(() => { this.$refs['attributeEO'].resetFields() }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue new file mode 100644 index 000000000..d3c60b37a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -0,0 +1,392 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 8864b3131..a391d8d4e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -131,20 +131,20 @@ @@ -822,14 +822,14 @@ export default { code: "", //标准号 standName: "", //标准名称 issueTime: "", //发布日期 - XCXSSRQ: "", //新车型实施日期 - ZCCSSRQ: "", //在产车实施日期 + xcxssrqgj: "", //新车型实施日期 + zccssrqgj: "", //在产车实施日期 textStatus: "", //文本状态 id: "" }] }, choiceForm: {}, //选择标准清单列表 - // countryOptions: [], //适用区域下拉框数据 + countryOptions: [], //国家地区 standStateOptions: [], standardTypeOptions: [ { @@ -963,7 +963,22 @@ export default { }, { _this: this }, res => { - this.sarAccessListDatas = res.data.records; + let arr = res.data.records; + //国家地区字段转换 + arr.forEach(item => { + if (item.countryArea !== null || item.countryArea !== "") { + let k = (item.countryArea || "").split(',') + for (let i in this.countryOptions) { + for (let m = 0; m < k.length; m++) { + if (this.countryOptions[i].value === k[m]) { + k[m] = this.countryOptions[i].label + } + item.countryAreaShow = k.join(',') + } + } + } + }) + this.sarAccessListDatas = arr; this.total = res.data.total; }, e => { }); @@ -1292,15 +1307,14 @@ export default { } this.dataList = res.data.records; this.dataList.forEach(item => { - if (item.xcxssrqgj === null){ - this.$set(item, "XCXSSRQ", ''); - this.$set(item, "ZCCSSRQ", ''); - }else{ - this.$set(item, "XCXSSRQ", item.xcxssrqgj); - this.$set(item, "ZCCSSRQ", item.zccssrqgj); - } + if(item.xcxssrqgj === 'undefined'){ + item.xcxssrqgj = '' + } + if(item.zccssrqgj === 'undefined'){ + item.zccssrqgj = '' + } }) - this.listForm.dataList = res.data.records; + this.listForm.dataList = this.dataList; let formId = []; this.dataList.map(item => { formId.push(item.id); @@ -1402,7 +1416,7 @@ export default { _this: this }, res => { this.energyKindOptions = res.data.ENERGYTYPES //适用车型 - this.countryOptions = res.data.COUNTRY; + this.countryOptions = res.data.COUNTRY; //国家/地区 this.standStateOptions = res.data.WBZTCLASS; // 文本状态 this.setMap(this.standStateOptions); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index ebb987a99..7a3180554 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1488,7 +1488,7 @@ ] , issueTime: [ - { required: false, message: '请选择标准发布日期', trigger: 'change' } + { required: true, message: '请选择标准发布日期', trigger: 'change' } ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 4ab71a53d..1e730c950 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1163,7 +1163,7 @@ export default { { required: true, message: '请选择文本状态', trigger: 'change' } ], issueTime: [ - { required: false, message: '请选择标准发布日期', trigger: 'change' } + { required: true, message: '请选择标准发布日期', trigger: 'change' } ], qcdw: [ { required: true, message: '请选择起草单位', trigger: 'change' } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index e59a2bec0..6f79d2566 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -228,6 +228,9 @@ oldData: [], data: [], commentText: '', + oldText : '', + newText : '', + reason : '' , taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, roleRow: {}, @@ -284,6 +287,9 @@ chapterNumber : '章条编号', chapterName : '章节名称', commentText: '修改意见内容(包括理由或依据)', + oldText : '修改前', + newText : '修改后', + reason : '修改理由', department: '提出部门', responUserName: '提出人', stateText: '处理意见' diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 47fbb736a..a974c66a6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -415,8 +415,8 @@ export default { name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'FOREIGN_STAND' - // pageType: item.standType + '_STAND' + // pageType: 'FOREIGN_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') @@ -483,6 +483,9 @@ export default { }, // 提交按钮 handleSubmit() { + this.dataList.forEach(item =>{ + item.standId = item.standSerialNumber + }) let json = { prcCreateUser: this.$store.getters.userInfo.userId, prcCreateUserName: this.$store.getters.userInfo.userName, @@ -502,7 +505,6 @@ export default { type: '8' } startProcess(paramsInfo).then(res => { - console.log(res) this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 7337160b7..7f5b9561e 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -361,7 +361,6 @@ export default { // 选择勾选项的集合 handleSelectionChange(value) { this.multipleSelection = value - console.log(value) }, handleTabs(name) { this.active = name @@ -487,8 +486,8 @@ export default { name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'FOREIGN_STAND' - // pageType: item.standType + '_STAND' + // pageType: 'FOREIGN_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 0ee390f14..cec18bcd1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -398,8 +398,8 @@ export default { name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'FOREIGN_STAND' - // pageType: item.standType + '_STAND' + // pageType: 'FOREIGN_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index 9dacab355..1e94a8294 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -397,8 +397,8 @@ export default { name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'FOREIGN_STAND' - // pageType: item.standType + '_STAND' + // pageType: 'FOREIGN_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 6ac35d94c..19ce38b54 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -325,8 +325,8 @@ export default { name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'FOREIGN_STAND' - // pageType: item.standType + '_STAND' + // pageType: 'FOREIGN_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 2f8411f01..61c5784cd 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -180,8 +180,6 @@ export default { row.taskInfo = 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) { @@ -219,8 +217,14 @@ export default { }else{ this.toProcessDetail('xmpg2Step1-2',row) } - }else if(prcType === '9'){ + //标准解读流程 + } else if (prcType === '8') { + this.toProcessDetail('wfhxzgStep5',row) + } else if(prcType === '9'){ this.toProcessDetail('bzjdStep1-6',row) + //标准调研流程 + }else if(prcType === '2'){ + this.toProcessDetail('bzdyStep1-9',row) } } else { this.$message.warning('当前流程未全部办理完成,无法查看') diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index b66fc9787..e2a4a8fdc 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2816,7 +2816,7 @@ export default { roundButton: true, type: 'warning' }).then(() => { - this.$http.delete("sarResource/ts-resource", { + this.$http.put("sarResource/ts-resource/delResourceById", { resourceId: data.id }, res => { }, e => { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index d2758415a..928a2148f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -2082,7 +2082,7 @@ export default { roundButton: true, type: 'warning' }).then(() => { - this.$http.delete("sarResource/ts-resource", { + this.$http.put("sarResource/ts-resource/delResourceById", { resourceId: data.id }, res => { }, e => { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 1acacbe00..9a4e7820a 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -2552,7 +2552,7 @@ export default { roundButton: true, type: 'warning' }).then(() => { - this.$http.delete("sarResource/ts-resource", { + this.$http.put("sarResource/ts-resource/delResourceById", { resourceId: data.id }, res => { }, e => { diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 216fe4e16..23a60ebce 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -775,7 +775,19 @@ - + + @@ -973,10 +985,10 @@ + :label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')"> @@ -1126,6 +1138,7 @@ export default { modalShowFlag2: false, // drawer开关 modalShowFlag3: false, // drawer开关 modalShowFlag4: false, // drawer开关 + modalShowFlagBuss: false, // drawer开关 url:'', urlChild:'', drawerTitle: '', //drawer标题 @@ -1151,6 +1164,7 @@ export default { key1:2, key2:3, key3:4, + keyBuss:5, nodeKey: 'id', defaultCheckedKeys: [], nodeKeyCode: 'code', @@ -1302,6 +1316,7 @@ export default { // 国家/地区 countryOptions: [], standSystemOptions: [], // 标准体系 + standSystemBussOptions: [], // 企标体系 busVppsOptions: [], // 车系体系架构 busVppsChildOptions: [], // 车系体系架构子集合 modelOptions: [], // 模块体系架构 @@ -1390,11 +1405,19 @@ export default { // 国内外标准 const inlandList = data['INLAND_STAND'] || [] const foreignList = data['FOREIGN_STAND'] || [] + const bussList = data['BUSS'] || [] const foreignFilterList = foreignList.filter ( item => item.attrField === 'GXHBQ' || item.attrField === 'ZBJBD' || item.attrField === 'KWJ' || item.attrField === 'TXLB'); - this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList); + const bussFilterList = bussList.filter ( item => item.attrField !== 'QCDW' && item.attrField !== 'XGLC'); + this.formFieldListStandData = this.formFieldListStandData.concat(inlandList).concat(foreignFilterList).concat(bussFilterList); + console.log(this.formFieldListStandData) } }, e => {}) }, + choiceZRRTxlbBuss (type, title, id) { + this.drawerTitle = title + this.modalShowFlagBuss = true + this.keyBuss++ + }, choiceZRR1 (type, title, id) { this.drawerTitle = title this.modalShowFlag1 = true @@ -1427,6 +1450,17 @@ export default { this.urlChild="sarModelTree/childByList" this.key3++ }, + popoverBuss (checkedIds, checkedData,isShow,isLoadChild,topId) { + if(checkedData) { + if(checkedData.length > 0){ + this.standForm.TXLBBUSS = checkedData.map(item => item.menuName).join(",") + }else { + this.standForm.TXLBBUSS = checkedData.menuName + } + } + this.modalShowFlagBuss = false + this.$forceUpdate() + }, popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { if(checkedData.length > 0){ @@ -1784,7 +1818,7 @@ export default { const formFieldList = this.formFieldListStandData const sarStandAttrObj = {} formFieldList.forEach((item) => { - const attrField = item.attrField.toLowerCase(); + const attrField = this.selectIndex === 'INLAND_STAND' ? item.attrField.toLowerCase() : item.attrField; const value = nowStandForm[attrField] // 时间格式处理 if (item.attrType === 'DATE_PICKER' && value) { @@ -1963,20 +1997,8 @@ export default { }); } } else { - if (this.$hasPermission("AMFQKB2GCPSJ5YVPPHG6")) { routername = "OtherBussStandardDetails"; pagetype = "BUSINESS_STAND "; - // this.judgeBussRole(item) - // if (this.bussRoleFlag === false) { - // this.$message.error('当前角色无权限查看此信息') - // } else { - // } - } else { - this.$message({ - message: "无权访问", - type: "warning" - }); - } } // 详情跳到新页 if (routername !== "") { @@ -2419,6 +2441,7 @@ export default { this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.standSystemBussOptions = res.data.TXLBBUSS // 企标体系 this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档,产品类别对应标准属性中的“适用车型” this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 diff --git a/src/router/index.js b/src/router/index.js index cb6fc9cd6..5669438e8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -799,6 +799,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep1-9', + name: 'bzdyStep1-9', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzjdStep1', name: 'bzjdStep1',