From a8e1957f65458e79d7cc1e97bcecd4adfa134e90 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 14:09:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86(=E5=8F=91?= =?UTF-8?q?=E5=B8=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbrk/common/formEditListFb.vue | 13 +++++++++-- .../pages/creatProcess/qbrk/step13.vue | 22 +++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 5a53cc1bb..0a8fed67a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -7,7 +7,7 @@ - + - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 6be699889..c8bb9102e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -45,6 +45,8 @@ @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" @formChoiceZRR5 = "formChoiceZRR5" + @standSortChange = "standSortChange" + @reveseStatusChange = 'reveseStatusChange' />
@@ -1118,6 +1120,7 @@ syrzOptions:[],//适用认证下拉框 data: [], // 标准列表数据 ListForm: {}, // 新增数据 + maxStandnSn:"", // 最大順序號 } }, watch:{ @@ -1166,6 +1169,16 @@ }, }, methods: { + reveseStatusChange(val){ + if(val === '1'){ + this.form.standNum = this.maxStandnSn + }else{ + this.form.standNum = this.form.standSn + } + }, + standSortChange(val){ + this.form.standCode = val + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }, checkedRoleTransfer (data) { this.isSubmit = true this.saveLoading = true @@ -1266,6 +1279,7 @@ this.fileType = fileType this.fileUpload(fileType) } + this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, modelProp(row,index){ console.log(row) @@ -2853,6 +2867,13 @@ }, e => { }) }, + getMaxStandnSn(){ + this.$http.get('lawss/sarBussionessStand/selectMaxStandnSn', '', { + _this: this + }, res => { + this.maxStandnSn = res.data + }) + } }, mounted () { // this.getTaskId() @@ -2894,6 +2915,7 @@ } this.busVsFunc() this.modelFunc() + this.getMaxStandnSn(); } } From 17b1856f734744c81f529c7c031fc119ab8e7303 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 14:26:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=89=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 5033e3cf7..5813929e4 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -929,7 +929,7 @@ accept=".ZIP, .zip" :before-upload="beginImportFile" :on-success="importFileSuccess" - :show-file-list="false" + :show-file-list="true" >
@@ -4471,6 +4471,11 @@ export default { }, // 点击导入标准 addImportModal(flag) { + if(this.selectSarMenu.id === undefined){ + this.importFailed = true; + this.importForm.content = '请选择需要导入的目录' + return + } this.importModalshowflag = true this.showUploadlist = true this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId From 02d4775cb2ce5df28a2a739c0dd8153de53faf15 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 4 Apr 2023 14:40:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ProcessFooter=E7=BB=84=E4=BB=B6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E6=8E=A5=E6=94=B6=E4=BB=BB=E5=8A=A1=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/components/ProcessFooter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index d00e6488e..3af8662b4 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -104,7 +104,7 @@ icon="el-icon-check" @click="handleReceive" :loading="submitLoading" - v-if="showReceive" + v-if="false" >接收任务