From 03f3f7638955fb0232b3e91dc5bb0a84b0666c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 13 Aug 2021 10:56:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1.vue | 7 +- .../pages/details.vue | 1 - .../pages/details.vue | 367 ++++++++++++++---- 3 files changed, 285 insertions(+), 90 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 7923603a6..296f65bc7 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -445,7 +445,7 @@ export default { }, //获取项目数据 getProjectData() { - this.$http.get("sarStandProjectLibrary/queryProject", { + this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", { ...this.projectSearch }, { _this: this @@ -520,12 +520,7 @@ export default { { _this: this }, res => { - if (!res.data.length) { - this.dataList = [] - this.$message.warning("请选择带有分解单的标准"); - } else { this.listForm.breakdownList = res.data; - } }); }, //标准的多选框改变 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 6ee8ff256..9527ef9ca 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -501,7 +501,6 @@ export default { } }) }, e => { - }); }, selectInfoMore() { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 2c68a966a..03148760b 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -39,7 +39,7 @@
- 调取 + 调取 批量删除 +
+
+
+ + +
+
+ + + + + + + + + + + 查询 + + + + 清空 + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ 取消 +
+ + +
@@ -204,16 +339,15 @@ 查询 + type="primary" + size="mini" + class="common-button-primary" + @click="search">查询 清空 + class="common-button-default" + size="mini" + @click="clearSearch">清空 @@ -221,24 +355,24 @@
+ type="selection" + width="55" + align="center"> + prop="code" + label="标准号"> + + + + { - 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 => { }) From 468e4277040a65e94797833a63d328b1ec1076a1 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 13 Aug 2021 15:35:08 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 202d2da13..d8d250d4a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -215,7 +215,7 @@ From 7b2ed4a19f4373131d2bd7626f96a3fe57abe4c0 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 13 Aug 2021 16:17:48 +0800 Subject: [PATCH 6/7] commit --- .../searchCenter/pages/standardSearch.vue | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f960e38f1..ddcd569ab 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) { // 国内外----两个值 @@ -2526,11 +2552,21 @@ color: red; } .AllBoxTitle { + position: relative; overflow: hidden; text-overflow:ellipsis; white-space: nowrap; line-height: 20px; margin-bottom: 10px; + .more { + cursor: pointer; + position: absolute; + right: 5px; + color: #C0C4CC; + } + .more:hover { + color: #3391CE; + } .typetext { height: 20px; line-height: 20px; From b96b6c487c0717a9dd84ed6feb29d51a70ebf28a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 13 Aug 2021 16:33:57 +0800 Subject: [PATCH 7/7] feat: There is no way the red !important --- src/pages/searchCenter/pages/standardSearch.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index ddcd569ab..ee9ce00ec 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -2530,6 +2530,9 @@