From a4049c3e38fb32249c1eb9e83c0fd270ded1ad9a Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Mon, 19 Jul 2021 15:58:58 +0800 Subject: [PATCH 01/13] =?UTF-8?q?fix:=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=97=A0=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 1 + .../pages/technologyInvolveProject.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 887a57d07..38125f7aa 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -293,6 +293,7 @@ export default { this.sarProject.country = '' this.sarProject.standCode='' this.sarProject.standName = '' + this.sarProject.standNumber='' this.queryStandAndLaws() }, // 外层清空条件查询 handleProjectCompliance (row) { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index daf87f17a..cbdf615b8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -264,6 +264,7 @@ name: "technologyInvolveProject", this.sarProject.country = '' this.sarProject.standCode='' this.sarProject.standName = '' + this.sarProject.standNumber='' this.queryStandAndLaws() }, // 外层清空条件查询 handleProjectCompliance (row) { From b4581b973392bfc9dc11c44e82f6ba48c280401d Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Mon, 19 Jul 2021 16:34:05 +0800 Subject: [PATCH 02/13] =?UTF-8?q?fix:=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=B0=E9=87=8F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/mechanismManage/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index a5be0b950..beb4d7667 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -264,6 +264,7 @@ export default { item.NameList = NameList }) this.data = res.data + this.total = res.data.length }) }, pageChange (page) { From 0898e5c590c0c65f3135cc01f0f60c2379a4a07e Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 19 Jul 2021 16:49:17 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attributeCustom/components/stand.vue | 8 +- .../config/pages/attributeCustom/index.vue | 4 +- .../page/listOfCountries.vue | 10 +- .../page/listOther.vue | 8 +- .../page/listProject.vue | 10 +- .../pages/addEdit.vue | 123 +++++++++++++----- .../pages/details.vue | 6 +- .../pages/otherAddEit.vue | 79 +++++++++-- .../pages/projectAddEit.vue | 79 +++++++++-- 9 files changed, 255 insertions(+), 72 deletions(-) diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index ecdc08ebb..364112bcc 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -2,8 +2,8 @@ - @@ -126,7 +126,7 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> { this.sarAccessListDatas = res.data.records; + this.sarAccessListDatas.forEach(item => { + this.$set(item,'relateFile','') + }) 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 2bcab6947..403e5e87a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -108,7 +108,7 @@ }} - @@ -117,14 +117,14 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - @@ -118,14 +118,14 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - +

+ prop="issueTime" + align="center" + width="180px" + label="英文名称"> + prop="issueTime" + align="center" + width="180px" + label="适用车型"> + prop="issueTime" + align="center" + width="180px" + label="能源类型"> + prop="issueTime" + sortable + align="center" + width="210px" + label="标准实施日期"> + + + + + + + + + + + + + + @@ -484,7 +537,7 @@ export default { type: '', relateFile: '', remark: '', // 清单说明 - applicationScope: '' //适用领域 + // applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 @@ -525,7 +578,7 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 - applicationScope: '', //适用区域 + // applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 applyArctic: '', // 能源种类 @@ -790,6 +843,7 @@ export default { uploadBackSuccess (res, file, fileList) { if (res.ok) { this.fileInfoList = fileList + console.log(this.fileInfoList) this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.$message.success('上传成功') } else { @@ -1122,7 +1176,7 @@ export default { let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') + // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] @@ -1130,6 +1184,7 @@ export default { relateFile.push(item.id) }) sarAccessEO.relateFile = relateFile.join(',') + console.log(sarAccessEO.relateFile) } if (!sarAccessEO.id) { // 新增 @@ -1140,10 +1195,15 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('新增成功') this.isNext = true this.$router.push({ - name: 'AccessStandardsAndRegulations' + name: 'AccessStandardsAndRegulations', + query: { + relateFile: sarAccessEO.relateFile + } }) + console.log(sarAccessEO) } }, e => { }) @@ -1154,6 +1214,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' @@ -1376,8 +1437,8 @@ export default { this.sarAccessInfoList.push(nowstandinfo) this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number this.number++ - this.isSubmit = false this.$message.success('添加成功') + this.isSubmit = false } else { this.sarAccessInfoList.map((item, index) => { if (item.uuid === nowstandinfo.uuid) { @@ -1678,7 +1739,7 @@ export default { this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') - this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') + // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.id = accessRow.id this.sarAccessEO.remark = accessRow.remark || '' @@ -1768,4 +1829,4 @@ export default { margin: 2px; } } - \ No newline at end of file + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 644a3cbf6..ff7774729 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -26,13 +26,13 @@ title="下载" @click="downloadFile(item.id)" class="icon-download" - v-btn-permission="'E5QPKLR9CFVXTV64N32C'" + v-btn-permission="''" />

@@ -452,6 +452,7 @@ export default { }, // 请求上传的文件信息 getFileInfo() { + console.log(this.sarAccessEO) this.$http.get("att/attFile/getMultiFileInfos", { fileIds: this.sarAccessEO.relateFile }, { @@ -564,6 +565,7 @@ export default { mounted() { this.$nextTick(() => { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); + console.log(accessRow) this.pageId = accessRow.id this.sarAccessEO = accessRow; this.selectInfobyAccid(); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index aece23601..e2308f462 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -13,7 +13,7 @@ - +

+ align="center" + width="180px" + label="英文名称"> + + + + + align="center" + width="210px" + label="标准实施日期"> + + + + + width="180px" + align="center" + label="适用产品线"> + + + + + +