diff --git a/src/assets/images/shangqi/img/logo4.png b/src/assets/images/shangqi/img/logo4.png new file mode 100644 index 000000000..735b23c00 Binary files /dev/null and b/src/assets/images/shangqi/img/logo4.png differ diff --git a/src/assets/images/shangqi/img/none-file.png b/src/assets/images/shangqi/img/none-file.png new file mode 100644 index 000000000..4964ad315 Binary files /dev/null and b/src/assets/images/shangqi/img/none-file.png differ diff --git a/src/assets/images/shangqi/img/tree-add.png b/src/assets/images/shangqi/img/tree-add.png new file mode 100644 index 000000000..d0aa3f83e Binary files /dev/null and b/src/assets/images/shangqi/img/tree-add.png differ diff --git a/src/assets/images/shangqi/img/tree-show.png b/src/assets/images/shangqi/img/tree-show.png new file mode 100644 index 000000000..20be364dc Binary files /dev/null and b/src/assets/images/shangqi/img/tree-show.png differ diff --git a/src/assets/images/shangqi/img/tree-sub.png b/src/assets/images/shangqi/img/tree-sub.png new file mode 100644 index 000000000..65cdf3989 Binary files /dev/null and b/src/assets/images/shangqi/img/tree-sub.png differ diff --git a/src/assets/images/shangqi/img/tree.png b/src/assets/images/shangqi/img/tree.png new file mode 100644 index 000000000..f79bba76b Binary files /dev/null and b/src/assets/images/shangqi/img/tree.png differ diff --git a/src/assets/images/shangqi/sideBar/newside-bar-bg1.png b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png new file mode 100644 index 000000000..a66bc8bdf Binary files /dev/null and b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png differ diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2e85d241d..5f429c122 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -434,7 +434,7 @@ export default { }, computed: { logo () { - return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png') + return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png') }, ...mapGetters(['getDynamicTotal', 'isCollapse']) }, @@ -458,7 +458,7 @@ export default { overflow-y: auto; user-select: none; box-sizing: border-box; - background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat; + background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat; background-size: 100% 100%; &:not(.is-collapse) { width: 212px; diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 783a6a8dc..6f7caa83e 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -163,33 +163,46 @@ }, //表格中操作列删除操作弹窗 deleteLink (row) { + this.$confirm('此操作将删除该链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.$http.delete('sarUrl/tsUrl/delete', { - id: row.id + id: row.id }, { - _this: this, - loading: 'Loading' + _this: this, + loading: 'Loading' }, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = [] - for (let a = 0; a < this.linkList.length; a++) { - if (this.linkList[a].id === row.id) { - this.linkList.splice(a, 1) - } - } - this.linkList.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - arr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) + if (res.ok) { + this.$message.success('删除成功') + let arr = [] + for (let a = 0; a < this.linkList.length; a++) { + if (this.linkList[a].id === row.id) { + this.linkList.splice(a, 1) + } } + this.linkList.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); + }, //头部删除按钮 deleteAllLink() { @@ -202,28 +215,39 @@ this.$message.warning('请选择要删除的链接') } else { this.modalRole = true + this.$confirm('此操作将删除链接, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { this.$http.delete('sarUrl/tsUrl/deleteBatch', { - ids: this.ids + ids: this.ids }, {}, res => { - if (res.ok) { - this.$message.success('删除成功') - let arr = this.linkList.filter(items => { - if (!this.ids.includes(items.id)) return items; - }) - let newArr = [] - arr.forEach((item, index) => { - let json = {} - json.id = item.id - json.orderBy = index + 1 - newArr.push(json) - }) - this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { - this.getLink() - }) - }else { - this.$message.warning(res.message) - } + if (res.ok) { + this.$message.success('删除成功') + let arr = this.linkList.filter(items => { + if (!this.ids.includes(items.id)) return items; + }) + let newArr = [] + arr.forEach((item, index) => { + let json = {} + json.id = item.id + json.orderBy = index + 1 + newArr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => { + this.getLink() + }) + }else { + this.$message.warning(res.message) + } }) + }).catch(() => { + this.$message({ + type: 'info', + message: '已取消删除' + }); + }); } }, //弹窗关闭操作 diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index e3853293a..d30c6b433 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -147,7 +147,8 @@ }, sarStandardsInfoRules: { name: [ - { required: true, message: '请输入岗位名称', trigger: 'blur' } + { required: true, message: '请输入岗位名称', trigger: 'blur' }, + { min: 0, max: 100, message: '长度应不超过100个字符', trigger: 'blur' } ] }, modalRole: false, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 4a5b94f9d..c00a70b96 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -65,14 +65,14 @@ - 标准分解单 + + + + +

- 标准分解单 + + + + + + @@ -404,27 +404,23 @@ show-overflow-tooltip prop="itemsNum" label="条款号" - width="150" > @@ -433,28 +429,28 @@ + prop="XCXSSRQ" + label="新车型实施日期(文本)" + width="180"> + + + label="责任部门"> + label="责任工程师"> + label="符合性状态"> + label="合规性分析"> @@ -392,6 +397,7 @@ saveLoading: false, // 基础信息form表单 form: { + id: '', itemsNum: '', itemsName: '', standId: '', @@ -570,7 +576,7 @@ this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { - infoId: this.form.id, + infoId: this.form.standId, page: 1, pageSize: 9999 }, { @@ -621,46 +627,25 @@ }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ - choiceZRR (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) - this.type = type - this.drawerTitle = title - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, - saveUserInfo () { - if (this.type === 'deptUserId') { - this.roleForm.deptUserId = this.roleRow.id - this.roleForm.deptUserIdName = this.roleRow.name + saveUserInfo (data) { + if (this.type === 0) { + this.roleForm.deptUserId = data[0].id + this.roleForm.deptUserIdName = data[0].name + } else if (this.type === 1) { + this.itemList[this.zrIndex].zrUserId = data[0].id + this.itemList[this.zrIndex].zrUserIdName = data[0].name + } else { + this.itemList.forEach( item => { + this.zrIdList.forEach( items => { + if (item.id === items) { + item.zrUserId = data[0].id + item.zrUserIdName = data[0].name + } + }) + }) } this.modalshowflag = false }, - cancleUserInfo () { - this.modalshowflag = false - }, - drawerCheck (data) { - var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree.getCheckedNodes()[0] - } - }, - drawerCheck2 (data) { - var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()); - if(getlist.length == 1) { - this.roleRow = getlist[0] - }else { - this.$refs.tree2.setCheckedKeys([data.id]); - this.roleRow = this.$refs.tree2.getCheckedNodes()[0] - } - }, handleSelectionChange (val) { this.zrIdList = [] val.forEach( item => { @@ -668,51 +653,30 @@ }) }, choiceZRRS (row, type, index) { + this.type = type if (type === 1) { - this.nodeList2 = [] - this.zrIndex= index + this.drawerTitle = '选择责任人' + this.nodeList = [] + this.zrIndex = index this.zrType = type - this.nodeList2.push(row) - this.modalshowflag2 = true - } else { + this.nodeList.push(row) + this.modalshowflag = true + } else if (type === 2) { // 批量 if (this.zrIdList.length > 0) { this.zrType = type - this.nodeList2 = [] - this.modalshowflag2 = true + this.nodeList = [] + this.modalshowflag = true + this.drawerTitle = '批量选择责任人' } else { this.$message.warning('请选择要编辑的数据') } - } - }, - saveUserInfo2 () { - var idList = '' - var nameList = '' - this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => { - if (nameList.length > 0) { - nameList += ',' - idList += ',' - } - idList += item.id - nameList += item.name - }) - if (this.zrType == 1) { - this.itemList[this.zrIndex].zrUserId = idList - this.itemList[this.zrIndex].zrUserIdName = nameList } else { - this.itemList.forEach( item => { - this.zrIdList.forEach( items => { - if (item.id === items) { - item.zrUserId = idList - item.zrUserIdName = nameList - } - }) - }) + this.nodeList = [] + this.nodeList.push(row) + this.drawerTitle = '选择标准法规部部长' + this.modalshowflag = true } - this.modalshowflag2 = false - }, - cancleUserInfo2 () { - this.modalshowflag2 = false }, handleTabs(name) { this.active = name @@ -766,7 +730,6 @@ } }, mounted () { - this.getTree() this.sarStandCompareHis() this.sarStandCompareHis2() this.tableHeight = $('.content').height() - 44 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c7ada11bb..a752a4237 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -554,11 +554,9 @@ :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + + + @@ -963,7 +961,13 @@ :visible.sync="modalShowFlag" :wrapperClosable="false" size="800px"> + + item.id).join(",") this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",") @@ -1680,6 +1695,7 @@ this.modalShowFlag = false }, cancelUserInfo () { + this.filterText = '' this.modalShowFlag = false }, drawerCheck (data) { @@ -2082,8 +2098,6 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // 流程保存之后，应该流转至草稿页面 - this.$router.push({path:'/processCenter?tabsName=TaskDraft'}) // this.bpnId = res.result }).catch(e => { this.saveLoading = false @@ -2175,7 +2189,8 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.qcdwOption = res.data.QCDW // 体系类别 - this.setMap(this.standStateOptions) + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 + this.setMap(this.standStateOptions) }) this.busVsFunc() this.modelFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 6bbadff45..8119b4907 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -328,14 +328,11 @@ - - - + + + + + - + + + @@ -795,6 +792,7 @@ export default { standStateOptions: [], // 文本状态 standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 + gkglbmOptions: [], // 归口管理部门 categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 @@ -1054,6 +1052,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.key++ }) this.busVsFunc() diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 74c328123..72d26af15 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -534,11 +534,9 @@ :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> - + + + @@ -709,7 +707,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('dtbjh'),config.attrName = '代替标准号'" + @click="selectLaws('yybj'),config.attrName = '引用标准'" >{{'手动查找'}} @@ -737,7 +735,7 @@ class="common-button-primary" size="mini" style="position:absolute;top: 10px;right: 0;" - @click="selectLaws('byybj'),config.attrName = '代替标准号'" + @click="selectLaws('byybj'),config.attrName = '被引用标准'" >{{'手动查找'}} @@ -1225,6 +1223,7 @@ export default { modelOptions: [], // 模块体系架构 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 + gkglbmOptions: [], // 归口管理部门 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 wssmrOptions: [], // 我司署名人 @@ -1750,6 +1749,7 @@ export default { this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.treeStatus = true this.key++ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index e62214175..cd985bbda 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -42,13 +42,11 @@ - - + - + + + + + - - - - + - - - - + - - - - - - - - - - + + + + + + + + + + + - - - + + + + + + + +
{{ form.glwjName }} @@ -492,22 +502,22 @@ clearable > - - - - - - + + + + + + + + + + + + + + + +
@@ -771,12 +781,14 @@ standSystemOptions: [], // 标准体系 applyArcticOptions: [], // 适用车型 categoryOptions: [], // 能源类型 + gkglbmOptions: [], // 归口管理部门 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 txlbOptions: [], // 体系类别 + qcdwOption: [], // 起草单位 data: [], // 标准列表数据 ListForm: {}, // 新增数据 user1: '', @@ -860,6 +872,11 @@ this.glwjFileId = processForm.glwj this.caFileId = processForm.ca this.zbjbdFileId = processForm.zbjbd + this.form.standYear = processForm.standYear + this.form.standSystem = processForm.standSystem + this.form.kccvppsbm = processForm.kccvppsbm + this.form.cycvppsbm = processForm.cycvppsbm + this.form.dybxh = processForm.dybxh this.getFormFieldList(processForm) } }).catch(e => { @@ -958,6 +975,8 @@ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.qcdwOption = res.data.QCDW // 体系类别 + this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 }) } } diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 2e9643307..a68ddea6e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -127,7 +127,7 @@ - 查看 + 查看 diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 647a5fd38..d1bdadf80 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -127,7 +127,7 @@ - 查看 + 查看 diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index c6302ea23..b28ec60cb 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -124,7 +124,7 @@ - { this.sarAccessListDatas = res.data.records + this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total }, e => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 36b0a7b56..1340cb86d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -266,6 +266,7 @@ export default { //分页查询 searchSarAccess() { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { + current: 1, page: 1, pageSize: this.pageSize, ...this.sarSarAccessEOSearch, @@ -274,6 +275,7 @@ export default { _this: this }, res => { this.sarAccessListDatas = res.data.records; + this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total; }, e => { }); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index d90958400..9cb9ccc1f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -267,7 +267,7 @@ export default { //分页查询 searchSarAccess() { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { - page: this.page, + page: 1, pageSize: this.pageSize, ...this.sarSarAccessEOSearch, sortKey: 2 @@ -275,6 +275,7 @@ export default { _this: this }, res => { this.sarAccessListDatas = res.data.records; + this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total }, e => { }); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index f001bac6b..8d81c22bc 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1168,19 +1168,19 @@ export default { this.selectedAccInfoSearchList.map(item => { let addList; addList = this.sarAccessInfoList.findIndex(items => { - return items.id == item.id - }) + return items.id == item.id + }) if(addList > -1){ - this.$message.warning('请勿添加重复数据') - this.$refs.accessTypeSelect.clearSelection() - this.$refs.entryTable.clearSelection() - this.$refs.searchTable.clearSelection() - } else{ - this.sarAccessInfoList.push(item) - this.$refs.accessTypeSelect.clearSelection() - this.$refs.entryTable.clearSelection() - this.$refs.searchTable.clearSelection() - } + this.$message.warning('请勿添加重复数据') + // this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } else{ + this.sarAccessInfoList.push(item) + // this.$refs.accessTypeSelect.clearSelection() + this.$refs.entryTable.clearSelection() + this.$refs.searchTable.clearSelection() + } }) } else { this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') @@ -1329,12 +1329,16 @@ export default { _this: this, loading: 'loadData' }, res => { - if (res.ok) { - this.$message.success('新增成功') - this.isNext = true - this.$router.push({ - name: 'AccessStandardsAndRegulations' - }) + if (this.sarAccessInfoList.length !== 0) { + if (res.ok) { + this.$message.success('新增成功') + this.isNext = true + this.$router.push({ + name: 'AccessStandardsAndRegulations' + }) + } + } else { + this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') } }, e => { }) @@ -1363,6 +1367,7 @@ export default { selectLawsStands () { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' + this.sarAccessInfoSearch.standType = '' } else { this.sarAccessInfoSearch.standType = 'FOREIGN' } @@ -1374,16 +1379,29 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) - this.$set(item, 'nylx', item.attrInfoMap.NYLX) - this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) - this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) - this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) - this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) - this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + this.$set(item, 'typeApplicable', '') + this.$set(item, 'nylx', '') + this.$set(item, 'zrbm', '') + this.$set(item, 'cycvppsbm', '') + this.$set(item, 'cycvppscn', '') + this.$set(item, 'kccvppsbm', '') + this.$set(item, 'kccvppscn', '') + }else { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + } }) this.drawerTotal = res.data.list.length }, e => { @@ -1403,16 +1421,29 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) - this.$set(item, 'nylx', item.attrInfoMap.NYLX) - this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) - this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) - this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) - this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) - this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + this.$set(item, 'typeApplicable', '') + this.$set(item, 'nylx', '') + this.$set(item, 'zrbm', '') + this.$set(item, 'cycvppsbm', '') + this.$set(item, 'cycvppscn', '') + this.$set(item, 'kccvppsbm', '') + this.$set(item, 'kccvppscn', '') + }else { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + } }) this.drawerTotal = res.data.list.length }, e => { @@ -1426,16 +1457,29 @@ export default { sarAccessInfoSearchSelect (val) { this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList.forEach(item => { - this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) - this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) - this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) - this.$set(item, 'nylx', item.attrInfoMap.NYLX) - this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) - this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) - this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) - this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) - this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + this.$set(item, 'typeApplicable', '') + this.$set(item, 'nylx', '') + this.$set(item, 'zrbm', '') + this.$set(item, 'cycvppsbm', '') + this.$set(item, 'cycvppscn', '') + this.$set(item, 'kccvppsbm', '') + this.$set(item, 'kccvppscn', '') + }else { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + } }) this.selectedAccInfoSearchList.forEach(item => { // 责任部门转换 @@ -1834,7 +1878,7 @@ export default { }, // 点击查看 handlePreview (data) { - let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails' + let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails' let routeUrl = this.$router.resolve({ name: routerName, params: { @@ -1947,6 +1991,29 @@ export default { } else { item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'sycpx', '') + this.$set(item, 'typeApplicable', '') + this.$set(item, 'nylx', '') + this.$set(item, 'zrbm', '') + this.$set(item, 'cycvppsbm', '') + this.$set(item, 'cycvppscn', '') + this.$set(item, 'kccvppsbm', '') + this.$set(item, 'kccvppscn', '') + }else { + this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ) + this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) + this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) + this.$set(item, 'nylx', item.attrInfoMap.NYLX) + this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) + this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) + this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) + this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) + this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) + } }) }, e => { }) @@ -2020,8 +2087,8 @@ export default { this.sarAccessEO.remark = accessRow.remark || '' this.sarAccessEO.relateFile = accessRow.relateFile this.sarAccessInfoSearch.validFlag = 0 - this.getFileInfo() this.getData() + this.getFileInfo() this.selectLawsStands() }) } else { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 08ec91a6c..df8f46aec 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -346,7 +346,7 @@ width="210px" label="卡车VPPS中文名称"> - + @@ -396,6 +402,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 提交 + 取消 +
+ +