合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!34

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -1171,9 +1171,9 @@
         methods: {
             reveseStatusChange(val){
               if(val === '1'){
-                this.form.standNum = this.maxStandnSn || ''
+                this.form.standNum = this.maxStandnSn
               }else{
-                this.form.standNum = this.form.standSn || ''
+                this.form.standNum = this.form.standSn
               }
             },
             standSortChange(val){

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -523,7 +523,7 @@
                              clearable>
                     <el-option
                       v-for="(opt,index) in standStateOptions"
-                      :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国内标准'"
+                      :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国内标准' && modalshowtitle !== '新增国内标准'"
                       :key="index"
                       :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                     >

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1011,7 +1011,7 @@
                              clearable>
                     <el-option
                       v-for="opt in standStateOptions"
-                      :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑海外标准'"
+                      :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑海外标准' && modalshowtitle !== '新增海外标准'"
                       :key="opt.value"
                       :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                     >