diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d991f2dac..1ce3a071e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -252,7 +252,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index c89b69426..0c8c81b6c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -333,13 +333,12 @@ this.saveLoading = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) - _formData.append('pId', this.pId) _formData.append('json', JSON.stringify({ form: this.form, roleForm: this.roleForm, commentText: this.commentText, itemList: this.itemList, - sarType: this.sarType + standInData: this.sarType })) saveTaskForPub(_formData).then(res => { this.saveLoading = false @@ -394,14 +393,19 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + console.log(data); + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data - var arr = [] - arr = JSON.parse(data.itemList) + let arr + if (typeof(data.itemList) === 'string') { + arr = JSON.parse(data.itemList) + } else { + arr = data.itemList + } arr.forEach(item => { item.zxUserId = '' item.zxUserIdName = '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index e953869f4..6151086e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -288,6 +288,7 @@ { + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e => { + this.saveLoading = false + }) + }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { @@ -558,11 +576,12 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + console.log(data); + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data let itemList if (typeof (data.itemList) == 'string') { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 6b90b2415..68fabb96b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -378,11 +378,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 834bc18af..f71fe132b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -378,11 +378,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 67a6dabe4..a9b831392 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -377,11 +377,11 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.itemsNum = data.itemsNum - this.form.itemsName = data.itemsName - this.form.itemsNum1 = data.itemsNum1 - this.form.itemsName1 = data.itemsName1 - this.sarType = data.standInData + this.form.itemsNum = data.itemsNum || data.form.itemsNum + this.form.itemsName = data.itemsName || data.form.itemsName + this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1 + this.form.itemsName1 = data.itemsName1 || data.form.itemsName1 + this.sarType = data.standInData || data.sarType this.json = data this.itemList = data.itemList this.loading = false diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index bdbc16be0..4ef370645 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -30,6 +30,20 @@ 海外标准入库 + + + + + + + + { }) @@ -1073,6 +1090,7 @@ this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { + this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 352131b8a..eaf8c0817 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -30,6 +30,20 @@ 海外标准入库 + + + + + + + + { + this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 0804ddc82..895b38f72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -263,7 +263,6 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data - console.log(data); }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index b5642945f..ba084d8ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -317,7 +317,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.cid = data.cid this.form.endTime = data.endTime this.form.cname = data.cname diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 686e52b43..bdcf60207 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -64,7 +64,7 @@ export default { continue; } else if (entity.id === "63e05705d0c8013162caa34f9fe52865") { list.push({ - label: "项目类清单", + label: "车辆类型清单", name: "listProject" }); continue; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue index d45f42401..50f1509bf 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue @@ -4,11 +4,20 @@
- - + + + + - diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index ac931a8aa..b08eac349 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -10,8 +10,20 @@ - - + + + +

@@ -88,11 +100,7 @@ @click="clearSearchLaws">清空 - - - 高级查询 - - + 高级查询 @@ -118,6 +126,36 @@ size="small" clearable/> + + + + + + + + + + 查询 @@ -176,6 +214,16 @@ {{ scope.row.standName }} + + + + { - this.sarAccessInfoSearchList = res.data.list - this.sarAccessInfoSearchList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + ' ' + item.standNumber - } else { - item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear - } - if (item.attrInfoMap === null) { - this.$set(item, 'zccssrqgj', '') - this.$set(item, 'xcxssrqgj', '') - this.$set(item, 'ssrq', '') - 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.ZCCSSRQ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) - this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) - 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.count - }, e => { - }) - }, - selectLawsStands () { - if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.standType = 'INLAND' - this.pageInfo() - } else { - this.sarAccessInfoSearch.standType = 'FOREIGN' - this.pageInfo() - } - }, - /** 高级查询查询按钮*/ - selectPage() { - StandardsInfoPage(this.sarAccessInfo).then(res =>{ - this.sarAccessInfoSearchList = res.data.list - this.sarAccessInfoSearchList.forEach(item => { - if (item.standYear === null) { - item.standNumber = item.standSortShow + ' ' + item.standNumber - } else { - item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear - } - if (item.attrInfoMap === null) { - this.$set(item, 'zccssrqgj', '') - this.$set(item, 'xcxssrqgj', '') - this.$set(item, 'ssrq', '') - 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.ZCCSSRQ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) - this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) - 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 => { - }) - }, - selectBtn() { - if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { - this.sarAccessInfoSearch.standType = 'INLAND' - this.selectPage() - } else { - this.sarAccessInfoSearch.standType = 'FOREIGN' - this.selectPage() - } - }, - // 数据搜索table判断checked状态 - selectable (row) { - return row.isRelateAccess === '1' - }, - // 数据搜索 table select事件 - sarAccessInfoSearchSelect (val) { - this.selectedAccInfoSearchList = val - this.selectedAccInfoSearchList.forEach(item => { - if (item.attrInfoMap === null) { - this.$set(item, 'zccssrqgj', '') - this.$set(item, 'xcxssrqgj', '') - this.$set(item, 'ssrq', '') - 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.ZCCSSRQ) - this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) - this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) - 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 => { + // 字段转化 + changeText(val) { + val.forEach(item => { // 责任部门转换 if (item.zrbm !== null || item.zrbm !== "") { let k = (item.zrbm || "").split(',') @@ -1473,8 +1315,114 @@ export default { } } } + // 适用认证转换 + if (item.syrz !== null) { + let k = (item.syrz || "").split(',') + for (let i in this.syrzOptions) { + for (let m = 0; m< k.length; m++) { + if (this.syrzOptions[i].value === k[m]) { + k[m] = this.syrzOptions[i].label + } + item.syrz = k.join(',') + } + } + } }) }, + // 字段添加 + addWord(item) { + if (item.attrInfoMap === null) { + this.$set(item, 'zccssrqgj', '') + this.$set(item, 'xcxssrqgj', '') + this.$set(item, 'ssrq', '') + this.$set(item, 'syrz', '') + 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.ZCCSSRQ) + this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) + this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) + this.$set(item, 'syrz', item.attrInfoMap.SYRZ) + 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) + } + }, + // 查询数据搜索 table 数据 + pageInfo() { + StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.addWord(item) + }) + this.changeText(this.sarAccessInfoSearchList) + this.drawerTotal = res.data.count + }, e => { + }) + }, + selectLawsStands () { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.standType = 'INLAND' + this.pageInfo() + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + this.pageInfo() + } + }, + /** 高级查询查询按钮*/ + selectPage() { + StandardsInfoPage(this.sarAccessInfo).then(res =>{ + this.sarAccessInfoSearchList = res.data.list + this.sarAccessInfoSearchList.forEach(item => { + if (item.standYear === null) { + item.standNumber = item.standSortShow + ' ' + item.standNumber + } else { + item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear + } + this.addWord(item) + }) + this.changeText(this.sarAccessInfoSearchList) + this.drawerTotal = res.data.list.length + }, e => { + }) + }, + selectBtn() { + if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { + this.sarAccessInfoSearch.standType = 'INLAND' + this.selectPage() + } else { + this.sarAccessInfoSearch.standType = 'FOREIGN' + this.selectPage() + } + }, + // 数据搜索table判断checked状态 + selectable (row) { + return row.isRelateAccess === '1' + }, + // 数据搜索 table select事件 + sarAccessInfoSearchSelect (val) { + this.selectedAccInfoSearchList = val + this.selectedAccInfoSearchList.forEach(item => { + this.addWord(item) + }) + this.changeText(this.selectedAccInfoSearchList) + }, // 数据搜索 清单类型 table select事件 accessSarTypeSelect (selectData) { this.accessSarTypeList = selectData @@ -1721,46 +1669,6 @@ export default { this.isSubmit = false this.$refs['addEntryForm'].resetFields() }, - /** - * 赋值内容到入库标准抽屉内 - * item 清单行数据 - */ - copyStandDrawer (item) { - this.sarStandardsInfoEO.accessType = item.accessType - this.sarStandardsInfoEO.standNumber = item.code // 标准编号 - this.sarStandardsInfoEO.standName = item.name // 中文名称 - this.sarStandardsInfoEO.standEnName = item.enName // 英文名称 - this.sarStandardsInfoEO.lawsNumber = item.code // 标准编号 - this.sarStandardsInfoEO.lawsName = item.name // 中文名称 - this.sarStandardsInfoEO.lawsEnName = item.enName // 英文名称 - this.sarStandardsInfoEO.synopsis = item.synopsis - this.sarStandardsInfoEO.XCXSSRQ = item.newPutTime // 新车型实施日期（文本） - this.sarStandardsInfoEO.XCXSSRQXM = item.newPutTextTime // 新车型实施日期（项目） - this.sarStandardsInfoEO.ZCCSSRQ = item.prodPutTime // 在产车实施日期（文本） - this.sarStandardsInfoEO.ZCCSSRQXM = item.prodPutTextTime // 在产车实施日期（项目） - this.sarStandardsInfoEO.EOPSSRQ = item.eopPutTime // EOP实施日期（文本） - this.sarStandardsInfoEO.EOPSSRQXM = item.eopPutTextTime // EOP实施日期（项目） - this.sarStandardsInfoEO.ZRBMName = item.ZRBMName || item.zrbmname // 责任部门 - this.sarStandardsInfoEO.ZRBM = item.ZRBM || item.zrbm // 责任部门 - this.sarStandardsInfoEO.XGBMName = item.XGBMName || item.xgbmname // 相关部门 - this.sarStandardsInfoEO.XGBM = item.XGBM || item.xgbm // 相关部门 - this.sarStandardsInfoEO.FOName = item.FOName || item.foname // FO - this.sarStandardsInfoEO.FO = item.FO || item.fo // FO - this.sarStandardsInfoEO.XMPGJS = item.proEssessUserId // 项目评估人员 - this.sarStandardsInfoEO.XMPGJSName = item.proEssessUser // 项目评估人员 - this.sarStandardsInfoEO.standNature = item.natureId // 标准性质 - this.sarStandardsInfoEO.NRDBZFGQD = this.sarAccessEO.countryArea // 国家地区 - this.sarStandardsInfoEO.CLLX = item.applyArctic ? item.applyArctic.split(',') : [] - this.sarStandardsInfoEO.YQLX = item.askType - this.sarStandardsInfoEO.GXHBQ = item.GXHBQ ? item.GXHBQ.split(',') : [] - this.sarStandardsInfoEO.ZRLX = item.askNature ? item.askNature.split(',') : [] - if (this.sarStandardsInfoEO.accessType === 'INLAND_STAND') { - this.sarStandardsInfoEO.countryArea = 'CN' - } else { - this.sarStandardsInfoEO.countryArea = '' - } - this.uuid = item.uuid - }, /** * 获取新增弹框的表单 */ @@ -1972,10 +1880,6 @@ export default { setMap(data){ data.forEach(item => { this.$set(this.textStatusMap, item.value, item.label) - this.$set(this.typeApplicableMap, item.value, item.label) - this.$set(this.nylxMap, item.value, item.label) - this.$set(this.zrbmMap, item.value, item.label) - this.$set(this.sycpxMap, item.value, item.label) }) }, // 点击上传的文件进行下载 @@ -2027,10 +1931,6 @@ export default { this.textStatusOptions = res.data.WBZTCLASS this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.setMap(this.textStatusOptions) - this.setMap(this.zrbmOptions) - this.setMap(this.categoryOptions) - this.setMap(this.sycpxOptions) - this.setMap(this.energyKindOptions) this.getGzzOption() }, e => { }) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 7eace579f..fcddc5ce9 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3014,52 +3014,59 @@ export default { }, // 表格排序 sortChange (sortObj) { + console.log(sortObj.column.order+"======"+sortObj.column.property) console.log(sortObj, '升降序') if (sortObj.column.order !== 'normal') { - switch (sortObj.prop) { + this.nowOrder = '' + this.orderBy = '' + switch (sortObj.column.property) { case 'issueTime' : // 后台联调 - if(sortObj.order === null) { - this.nowOrderBy = '' - } else { - this.nowOrderBy = '1' - } - break; - case 'xcxssrq' : - // 后台联调 - if(sortObj.order === null) { - this.nowOrderBy = '' - } else { - this.nowOrderBy = '2' + this.orderBy = 1; + this.nowOrder = sortObj.column.order + if (this.nowOrder === 'ascending') { + this.nowOrder = 2 + } else if (this.nowOrder === 'descending') { + this.nowOrder = 1 } - break; - case 'zccssrq' : - // 后台联调 - if(sortObj.order === null) { - this.nowOrderBy = '' - } else { - this.nowOrderBy = '3' + break + case 'XCXSSRQ' : + this.orderBy = 2; + this.nowOrder = sortObj.column.order + if (this.nowOrder === 'ascending') { + this.nowOrder = 2 + } else if (this.nowOrder === 'descending') { + this.nowOrder = 1 } - break; - case 'textStatus' : - // 后台联调 - if(sortObj.order === null) { - this.nowOrderBy = '' - } else { - this.nowOrderBy = '4' - } - break; - } - switch (sortObj.order) { - case 'ascending' : - this.nowOrder = '2' - break; - case 'descending' : - this.nowOrder = '1' - break; - default: - this.nowOrder = '' - break; + break + case 'ZCCSSRQ' : + this.orderBy = 3; + this.nowOrder = sortObj.column.order + if (this.nowOrder === 'ascending') { + this.nowOrder = 2 + } else if (this.nowOrder === 'descending') { + this.nowOrder = 1 + } + break + case 'textStatus' : + this.orderBy = 5; + this.nowOrder = sortObj.column.order + if (this.nowOrder === 'ascending') { + this.nowOrder = 2 + } else if (this.nowOrder === 'descending') { + this.nowOrder = 1 + } + break + case 'SSRQ' : + this.orderBy = 6; + this.nowOrder = sortObj.column.order + if (this.nowOrder === 'ascending') { + this.nowOrder = 2 + } else if (this.nowOrder === 'descending') { + this.nowOrder = 1 + } + break + } } this.getDomesticStandardTable(this.tableFlag) @@ -3492,8 +3499,8 @@ export default { } // 排序 + formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder - formData.nowOrderBy = this.nowOrderBy // formData.orderBy = this.orderBy console.log(this.selectSarMenu.id) // 处理我的收藏和个性化标签传参 diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index b8055e223..80470a2e3 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3093,7 +3093,7 @@ export default { }, // 表格排序 sortChange (sortObj) { - console.log(sortObj.column+"======"+sortObj.column.property+"======"+sortObj.column.order); + if (sortObj.column.order !== 'normal') { this.nowOrder = '' this.orderBy = '' diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f960e38f1..cc2b2a429 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -230,6 +230,7 @@
+ 更多
@@ -283,6 +284,20 @@ }" @confirm="isTreeOk" > + +
+
+
+
+
+
+
+ 关闭 +
+
@@ -298,6 +313,9 @@ name: 'StandardSearch', data () { return { + itermsConditionsTitle1: '', + itermsConditionsTitle2: '', + itermsConditionsFlag: false, visibleOrgTable: false, // 分享选人 orgTableVal: '', orgTableValName: '', @@ -401,6 +419,14 @@ } }, methods: { + checkItems (item) { + this.itermsConditionsFlag = true + this.itermsConditionsTitle1 = item.textContent + this.itermsConditionsTitle2 = item.textItems + }, + itermsConditionsClose () { + this.itermsConditionsFlag = false + }, // 跳转 toPage (item) { // 国内外----两个值 @@ -2504,6 +2530,14 @@