合并分支 'dev_20230216' 到 'master'
Dev 20230216 查看合并请求 laws-foton-slrs/foton-laws-system-front!34
This commit is contained in:
@@ -1171,9 +1171,9 @@
|
|||||||
methods: {
|
methods: {
|
||||||
reveseStatusChange(val){
|
reveseStatusChange(val){
|
||||||
if(val === '1'){
|
if(val === '1'){
|
||||||
this.form.standNum = this.maxStandnSn || ''
|
this.form.standNum = this.maxStandnSn
|
||||||
}else{
|
}else{
|
||||||
this.form.standNum = this.form.standSn || ''
|
this.form.standNum = this.form.standSn
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
standSortChange(val){
|
standSortChange(val){
|
||||||
|
|||||||
@@ -523,7 +523,7 @@
|
|||||||
clearable>
|
clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(opt,index) in standStateOptions"
|
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"
|
:key="index"
|
||||||
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
|
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -1011,7 +1011,7 @@
|
|||||||
clearable>
|
clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="opt in standStateOptions"
|
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"
|
:key="opt.value"
|
||||||
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
|
:value="opt.value === undefined ? '' :opt.value" :label="opt.label"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user