From ecc1a9d4e79f57355a81ae23ea5c74cd202ec77f Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Sun, 26 Mar 2023 13:04:43 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c83239325..f21d8b437 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1957,6 +1957,11 @@ this.checkIsOnly() } }, + 'form.standName' : { + handler: function() { + this.checkIsOnly() + } + }, 'form.standNumber' : { handler: function() { this.checkIsOnly() @@ -2129,10 +2134,11 @@ } if (this.form.standInData === '0') { standType = 'INLAND' - if(this.form.standSort && this.form.standNumber && this.form.standYear){ + if(this.form.standSort && this.form.standNumber && this.form.standYear && this.form.standName){ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName: this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { @@ -2146,10 +2152,11 @@ } } else { standType = 'FOREIGN' - if(this.form.standSort && this.form.standNumber){ + if(this.form.standSort && this.form.standNumber && this.form.standName){ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName: this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { @@ -3680,6 +3687,7 @@ this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName: this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { From 4c114237a7299169ef3af6844d258441d63faffe Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Sun, 26 Mar 2023 16:00:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index f21d8b437..b29432904 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2499,6 +2499,7 @@ handleProcessStandardNext(status) { this.submitType = status switch (status) { + // 新增 case 1: this.gdType = '新增' @@ -2507,8 +2508,8 @@ this.standardDrawer = false this.verifySarStandard = true // this.clearFormData(this.form) - this.clearFormData() - this.clearFileListData() + // this.clearFormData() + // this.clearFileListData() break // 带入（确认） case 2: From 302cbbf78bebb30928efc935c3196f73584e9ec8 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Mon, 27 Mar 2023 15:52:33 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b29432904..950ee8137 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -2399,13 +2399,13 @@ // 基础信息 // standInData: '0', // 标准来源 standInData: this.form.standInData, // 标准来源 - standSort: '', // 标准类别 - country: '', // 国家 - standSystem: '', // 标准体系 - standNumber: '', // 标准编号 - standNature: '', // 标准性质 - standEnName: '', // 英文名称 - standName: '', // 中文名称 + standSort: this.form.standSort, // 标准类别 + country: this.form.country, // 国家 + standSystem: this.form.standSystem, // 标准体系 + standNumber: this.form.standNumber, // 标准编号 + standNature: this.form.standNature, // 标准性质 + standEnName: this.form.standEnName, // 英文名称 + standName: this.form.standName, // 中文名称 signFlag: '1', // 是否需要会签 textStatus: '', // 文本状态 standYear: '', // 标准年份 @@ -2508,8 +2508,8 @@ this.standardDrawer = false this.verifySarStandard = true // this.clearFormData(this.form) - // this.clearFormData() - // this.clearFileListData() + this.clearFormData() + this.clearFileListData() break // 带入（确认） case 2: @@ -3673,7 +3673,6 @@ }, handleSubmit() { - // this.form.country=this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { this.$refs['userForm'].validate((valid) => { From 8b830a175abcea13c2e9bb6e294db113597cffa2 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 28 Mar 2023 09:48:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=E4=BF=AE=E8=AE=A2=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 788a59439..d0963cd1d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2922,6 +2922,7 @@ export default { this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', { standType: standType, standSort: this.form.standSort, + standName:this.form.standName, standNumber: this.form.standNumber, standYear: this.form.standYear, }, { @@ -2953,7 +2954,7 @@ export default { this.saveLoading = false }) } else { - this.$message.warning('标准号重复') + this.$message.warning(res.message) return } }) From 1b90893b3ae6ee6f4010fbd0f4246c75bf834244 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 29 Mar 2023 19:58:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8F=9C=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6832560ed..777a03bb5 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4466,7 +4466,7 @@ export default { addImportModal(flag) { this.importModalshowflag = true this.showUploadlist = true - this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile' + this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id }, // 二级菜单新建，编辑，删除 clickDropMenu(name, treeNode) { From 1333399574eb06d6ac2bb4af1f60612afc7291b9 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 30 Mar 2023 15:38:44 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 777a03bb5..9157a1b35 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -286,6 +286,9 @@ 移动标准 + 模板下载 +
@@ -2646,6 +2649,10 @@ export default { this.replaceLawsNumForm.pageSize = pageSize this.getReplaceLawsNumRow() }, + // 模板下载 + handlemoudel(){ + window.open('/api/lawss/sarBussionessStand/exportTemplateFile?fileName=企业标准导入模板') + }, getResetLawsNumRow () { this.replaceLawsNumForm = { standCode: '', // 标准编号 From 72242c89f10e40dbcbd50954917a235e1643d17b Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 31 Mar 2023 09:26:17 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 9157a1b35..5033e3cf7 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4473,7 +4473,7 @@ export default { addImportModal(flag) { this.importModalshowflag = true this.showUploadlist = true - this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId }, // 二级菜单新建，编辑，删除 clickDropMenu(name, treeNode) {