From d4d10752257b760feb38ccee99cf86dd9db9b8ec Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Mon, 18 Jul 2022 11:30:11 +0800 Subject: [PATCH 01/14] =?UTF-8?q?add:=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9Eloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/standQA/index.vue | 5 ++++- src/pages/regulatoryRepository/standQA/index2.vue | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index fca85967f..2c970c7ba 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -132,7 +132,7 @@ 取 消 - 提 交 + 提 交 @@ -586,6 +586,7 @@ export default { activeName: 'INLAND', activeType: 'INLAND', activestand: '', + isSubmit: false, activeQue: '', standType: 'INLAND', dialogVisible: false, @@ -1035,6 +1036,7 @@ export default { }, //提交问题 queSubmit(){ + this.isSubmit = true if(this.standType === 'OTHER'){ this.questionForm.standardId = this.questionForm.pubQue this.questionForm.standardName = this.questionForm.pubQue @@ -1049,6 +1051,7 @@ export default { _this: this }, res => { this.dialogVisible = false + this.isSubmit = false this.searchBtn() }, e => { diff --git a/src/pages/regulatoryRepository/standQA/index2.vue b/src/pages/regulatoryRepository/standQA/index2.vue index 1c0fe93f9..98105726e 100644 --- a/src/pages/regulatoryRepository/standQA/index2.vue +++ b/src/pages/regulatoryRepository/standQA/index2.vue @@ -320,7 +320,7 @@ 取 消 - 提 交 + 提 交 @@ -766,6 +766,7 @@ export default { {required: true, message: '请输入问题', trigger: 'blur'}, ], }, + queSubmitLading: false, questionSerach:{ classification: 'INLAND', standardName: '', //标准名称 @@ -1226,6 +1227,7 @@ export default { }, //提交问题 queSubmit(){ + this.queSubmitLading = true if(this.standType === 'OTHER'){ this.questionForm.standardId = this.questionForm.pubQue this.questionForm.standardName = this.questionForm.pubQue @@ -1260,15 +1262,18 @@ export default { this.standSearch2() break } + this.queSubmitLading = false this.queSearch() }, e => { }) }else{ + this.queSubmitLading = false return this.$message.warning('请输入问题') } }) }else{ + this.queSubmitLading = false this.$message.warning('请选择至少一条标准') } }, From cc72eaf82b9f0dcd3d98dbdda746bb7eb4dcdd71 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 18 Jul 2022 15:47:54 +0800 Subject: [PATCH 02/14] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?519=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86=E6=98=BE=E7=A4=BA?= =?UTF-8?q?null=20=E5=88=A0=E9=99=A4=E5=90=8E=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB=E8=BF=98=E6=98=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulatoryRepository/enterpriseStandardPlan/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index c07a26c1b..c13e6e906 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -841,8 +841,10 @@ const filterList = list.filter(s => s !== 'null'); this.addForm.esMatingRelations = filterList.join(","); }else if(val === 'null'){ - this.addForm.esMatingRelations = ""; + this.addForm.esMatingRelations = null; } + }else { + this.addForm.esMatingRelations = null } } }, From bc074aadaf245e61255e95101c30ff8dc5f7b919 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 18 Jul 2022 16:58:54 +0800 Subject: [PATCH 03/14] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?621=20=E4=BD=93=E7=B3=BB=E7=BB=93=E6=9E=84(=E6=8A=BD=E5=B1=89?= =?UTF-8?q?=E9=80=89=E6=8B=A9)=20=E5=BC=95=E7=94=A8=E6=A0=87=E5=87=86(?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE)=20=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86=E6=83=85=E5=86=B5?= =?UTF-8?q?(=E5=8D=95=E9=80=89=E6=A1=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index f522eb2fc..4afc9a301 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -427,6 +427,7 @@ export default { this.active = name; }, toggleComName(name) { + this.qbfsForm = {} this.comName = name; if(this.comName === 'merge'){ this.toggleType = '1' From eb4d3e64b100298b59a9f6657b19ec4ef2150bda Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:17:20 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056644=20=E3=80=90?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=20=E6=9F=A5=E7=9C=8B=E7=9A=84=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E5=BA=94=E8=AF=A5=E4=B8=8E=E5=88=86=E8=A7=A3=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E5=AD=97=E6=AE=B5=E7=9B=B8=E5=90=8C=20=E7=8E=B0?= =?UTF-8?q?=E5=9C=A8=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 315 +++++++++++++++--- 1 file changed, 268 insertions(+), 47 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 35d6483b3..47e71cef2 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -178,58 +178,113 @@ fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> - - - - - - - - + fixed="left" + width="60" + > + width="90" + label="条款号" + > - - - - - - - - + show-overflow-tooltip + prop="itemName" + min-width="300" + label="条款名称" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + 关闭 + + +
+
+ + {{ + standShowItemEO.itemsNum + }} +
+
+ + {{ + standShowItemEO.itemsName + }} +
+
+ + {{ + standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' + }} +
+
+ + + {{ + standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : '' + }} +
+ +
+ + {{ + standShowItemEO.xccssrq + }} +
+
+ + {{ + standShowItemEO.zccssrq + }} +
+
+ + {{ + standShowItemEO.applyArctic + }} +
+
+ + {{ + standShowItemEO.responsibleUnit + }} +
+
+ + + {{ standShowItemEO.dutyEngineer }} +
+
+ + + {{ standShowItemEO.comparedWithPrevious }} +
+ +
+ + + {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }} + + +
+ +
+ + + {{ standShowItemEO.complianceState }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ @@ -296,9 +465,61 @@ sarProStateListDatas: [], // 符合性项目列表数据 sarProStateTableHeight: null, standId: '', // 符合性项目id + showItemInfoModal: false, + standShowItemEO: {}, } }, methods: { + // ... + handleCommand(command) { + switch (command[1]) { + case '查看': + this.handlePreview(command[0]) + break + } + }, + // 分解单-查看 + handlePreview(item) { + this.standShowItemEO = item + this.showItemInfoModal = true + let fileList = [] + item.defaultFileList = [] + + + if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') { + this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0] + } + this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow + // 请求文件信息 + if (item.relevanceFile != null && item.relevanceFile !== '') { + let paramefile = item.relevanceFile + if (paramefile.charAt(paramefile.length - 1) === ',') { + paramefile = paramefile.substring(0, paramefile.length - 1) + } + this.$http.get('att/attFile/getMultiFileInfos', { + fileIds: paramefile + }, { + _this: this + }, res => { + fileList = res.data + if (fileList != null && fileList.length > 0) { + for (let i = 0; i < fileList.length; i++) { + let obj = {name: '', response: {}} + obj.name = fileList[i].oldFileName + obj.response.data = fileList[i] + item.defaultFileList.push(obj) + } + } + this.standShowItemEO = JSON.parse(JSON.stringify(item)) + if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') { + this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0] + } + // let selectNode = this.getTreeNameByid(this.standShowItemEO.responsibleUnit) + this.standShowItemEO.orgName = this.standShowItemEO.responsibleUnitShow + }, e => { + }) + } + }, risSubmit () { this.$http.postData('sarStandardComplianceAssessResult/sar-interpretation-national-standard/updateById', { standNumber: this.editData.standNumber, From d4f47dbe945eb519cb487632d2dc48403e47f5d6 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:38:17 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056641=20=E3=80=90?= =?UTF-8?q?=E6=BC=94=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=91=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9=20=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=80=81=E5=BA=93=E4=BB=80=E4=B9=88=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E8=BF=99=E5=B0=B1=E6=98=AF=E4=BB=80=E4=B9=88=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 48c7cac8e..bafe63da6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -181,13 +181,24 @@ - + + @@ -1731,7 +1742,8 @@ export default { countryOptions: [],//国家地区 standSortOptions: [], // 标准类别 standNatureOptions: [], // 标准性质 - standStateOptions: [], // 文本状态 + standStateOptions0: [], // 文本状态 - 国内 + standStateOptions1: [], // 文本状态 - 海外 standSystemOptions: [], // 标准体系 busVppsOptions: [], // 车系体系架构 busVppsChildOptions: [], // 车系体系架构子集合 @@ -3482,7 +3494,8 @@ export default { standOptions.push(item) } }) - this.standStateOptions = standOptions // 文本状态 + this.standStateOptions0 = standOptions // 文本状态 + this.standStateOptions1 = res.data.WBZTCLASS this.standSystemOptions = res.data.BZTXCLASS // 标准体系 this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 @@ -3497,7 +3510,8 @@ export default { this.gkglbmOptions = res.data.GKGLBM // 归口管理部门 this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度 this.txlbOptions = res.data.TXLBCLASS // 体系类别 - this.setMap(this.standStateOptions) + this.setMap(this.standStateOptions0) + this.setMap(this.standStateOptions1) this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { this.getTaskId() From c01d8d3d7078e02bb018322c10a8e85f678f8e9d Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:42:03 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056634=20=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E5=BA=93=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BA=A7=E5=93=81=E7=BA=BF=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E9=80=89=E9=A1=B9=E6=9C=89=E5=BE=88=E5=A4=9A=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 0797554c9..9ec8c786a 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -1387,7 +1387,7 @@ export default { }, //获取产品线数据 getProductData() { - this.$http.get("sarStandProjectLibrary/queryProjectManager", { + this.$http.get("sarStandProjectLibrary/queryProjectManagerXL", { current: 1, PageSize:100, }, { From cfdb77d301c333a9daec0fe6e8310a2073f5aca4 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Mon, 18 Jul 2022 17:45:19 +0800 Subject: [PATCH 07/14] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?619=20=E6=9D=A1=E6=AC=BE=E6=AF=94=E5=AF=B9=20=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=8B=AC=E5=8F=B7=E4=BA=86=20=E4=B8=8D=E6=B8=85=E6=A5=9A?= =?UTF-8?q?=E4=B8=BA=E5=95=A5=20v-html=20=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localTool/standContrast/pages/comparisonClauses.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/localTool/standContrast/pages/comparisonClauses.vue b/src/pages/localTool/standContrast/pages/comparisonClauses.vue index bc012a93b..d43bfe37b 100644 --- a/src/pages/localTool/standContrast/pages/comparisonClauses.vue +++ b/src/pages/localTool/standContrast/pages/comparisonClauses.vue @@ -56,8 +56,8 @@ -
- + +
@@ -110,8 +110,8 @@ - -
+
+ From 4d0b71a0775bdbcdb7de2c3db36368555bf58f35 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:49:52 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056616=20=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=8C=89=E9=92=AE=E5=A2=9E=E5=8A=A0loading,=E5=90=A6?= =?UTF-8?q?=E5=88=99=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=82=B9=E5=87=BB=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index b842f62d6..25d27956b 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -846,7 +846,7 @@ 取 消 - 提 交 + 提 交 @@ -1253,6 +1253,7 @@ export default { }, data(){ return{ + submitBtnLoading: false, aiKey:1, qiiKey:1, institutionId: this.$store.getters.userInfo.institutionId, @@ -1881,10 +1882,12 @@ export default { this.questionForm.fileList = this.fileList this.$refs['queForm'].validate((valid) => { if(valid){ + this.submitBtnLoading = true this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm }, { _this: this }, res => { + this.submitBtnLoading = false this.dialogVisible = false this.activeName = "myQue" this.activeType = this.standType @@ -1901,7 +1904,7 @@ export default { this.handleSelectForm.standName = '' this.handleSelectForm.numberName = '' }, e => { - + this.submitBtnLoading = false }) }else{ return this.$message.warning('请输入问题') From fd09cb12a4bc68838752060857a3492f63c57f14 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 17:56:01 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056449=20=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=AD=E5=BF=83-=E7=BB=93=E6=9E=84=E6=A0=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B9=8B=E5=90=8E=20=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=B7=A6=E4=BE=A7=E6=A0=91=E7=8A=B6?= =?UTF-8?q?=E5=9B=BE=E4=B8=A2=E5=A4=B1=20=E7=BC=96=E8=BE=91=E6=97=B6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/dataCenter/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 624b7616d..a7fd987fc 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -511,7 +511,7 @@ export default { update(data) { this.modalType = 2 this.productModal = true - this.productModelAdd = data + this.productModelAdd = JSON.parse(JSON.stringify(data)); // 取消所有的选中效果 this.productTitle = '编辑目录' // const newChild = { id: this.id++, label: 'testtest', children: [] }; From 0ee58b3e0c803963078d01c661ee0ef0292db036 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Mon, 18 Jul 2022 18:04:27 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056635=20=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E5=BA=93=E6=96=B0=E5=A2=9E=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=89=8B=E5=8A=A8=E6=9F=A5=E6=89=BE=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E4=B8=80=E4=B8=AA=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E6=98=BEnull=EF=BC=8C=E8=A7=81=E9=99=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/rectificationDatabase.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 9ec8c786a..34ea19738 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -883,7 +883,8 @@ export default { }else{ this.addForm.standId = this.standList[0].id this.addForm.standName = this.standList[0].standName - this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + '-' + this.standList[0].standYear + this.addForm.standSerialNumber = this.standList[0].standSort + '-' + this.standList[0].standNumber + this.addForm.standSerialNumber += this.standList[0].standYear ? '-' + this.standList[0].standYear : '' this.dialogTableVisible = false if(this.addForm.standName){ this.$refs.addForm.validateField('standName'); From 7bbfde7192e30814d3d00d85a1ad8c05c075e99a Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 18 Jul 2022 22:02:14 +0800 Subject: [PATCH 11/14] =?UTF-8?q?fix:=20=E5=9F=BA=E7=A1=80=E5=BA=93?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E5=B0=86?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5=E6=A0=87=E5=87=86=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E7=BA=B3=E5=85=A5=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 4 ++-- .../foreignStandardsAndRegulations/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d1b8e888e..026d30cd6 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1743,8 +1743,8 @@ - - + + diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 8b0537d45..727e5b383 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -577,8 +577,8 @@ - - + + From 7b912910713c6aeffb797da6082e3f614324b337 Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 18 Jul 2022 22:14:58 +0800 Subject: [PATCH 12/14] =?UTF-8?q?fix:=20=E9=AB=98=E7=BA=A7=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=E6=B8=85=E7=A9=BA=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 6 +++++- .../components/EnterpriseStandardDatabase.vue | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 026d30cd6..ffd993cd8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2477,7 +2477,6 @@ export default { GKDW: '', //归口管理部门 SSRQ: '',//实施日期 XCXSSRQ: ''//新车型实施日期 - , ZCCSSRQ: ''//在产车实施日期 , QCDW: ''//起草单位 , NYLX: ''//能源类型 @@ -3845,12 +3844,17 @@ export default { this.sarStandardsSearch.replacedPartStandNum = '' this.sarStandardsSearch.synopsis = '' this.sarStandardsSearch.category = '' + this.sarStandardsSearch.standYear = '' + this.sarStandardsSearch.standEnName = '' this.isAdvancedSearch = false // } else if (flag === 'standCommonlySearch') { this.sarStandardsSearch.standName = '' this.sarStandardsSearch.standNumber = '' this.pageChange(1) this.getDomesticStandardTable(this.sarStandardsSearch) + for (let key in this.advanceSearchMapping) { + this.advanceSearchMapping[key] = '' + } } else if (flag === 2) { // 标准条目搜索 this.standItemSearch.responsibleUnit = '' diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 577591917..891f555f5 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1402,12 +1402,12 @@ - + - + From acc56313a15297ce891f33612fb3ddce56014a2e Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 18 Jul 2022 22:35:30 +0800 Subject: [PATCH 13/14] =?UTF-8?q?fix:=E4=BC=81=E6=A0=87=E4=BD=93=E7=B3=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=8E=BB=E6=8E=89=E6=88=91=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E8=8A=82=E7=82=B9=E7=9A=84=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 891f555f5..8fc0aa784 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -25,7 +25,7 @@ {{ node.label }} - + Date: Mon, 18 Jul 2022 22:55:19 +0800 Subject: [PATCH 14/14] =?UTF-8?q?fix:=20=E6=B8=85=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=B8=AD=E7=9A=84=E9=99=84=E4=BB=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=B8=A6=E6=B0=B4=E5=8D=B0=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/details.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index eb149c751..385e9fd5f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -35,12 +35,6 @@ class="icon-download" v-btn-permission="''" /> -

-