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" >接收任务 - + - + + 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(); } } 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