|
|
|
|
@ -366,7 +366,7 @@
|
|
|
|
|
</el-row>
|
|
|
|
|
</div>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="form.instrumentType == 2 && form.isCustomMode == 1" label="模式组合" required label-width="120px">
|
|
|
|
|
<el-form-item v-if="form.instrumentType == 2 && form.modeType == 'MaskCustom' && form.instrumentModel=='WL200'" label="模式组合" required label-width="120px">
|
|
|
|
|
<el-button type="primary" @click="addCombine">添加</el-button>
|
|
|
|
|
<div v-for="(item,index) of combineData">
|
|
|
|
|
<el-divider content-position="left">组合{{index+1}}</el-divider>
|
|
|
|
|
@ -426,7 +426,7 @@
|
|
|
|
|
<div style="position: relative; left: 30px">
|
|
|
|
|
<i class="little-red-heart2 el-icon-star-on"></i>
|
|
|
|
|
</div>
|
|
|
|
|
<el-select v-model="form.technologyArrayMode" placeholder="请选择技术" clearable multiple style="width: 240px">
|
|
|
|
|
<el-select v-model="form.technologyArrayMode" placeholder="请选择技术" @change="technologyUpdata" clearable multiple style="width: 240px">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in dict.type.instrument_technology"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
@ -481,7 +481,7 @@ export default {
|
|
|
|
|
instrumentType: 2,
|
|
|
|
|
instrumentModel: 'WL200',
|
|
|
|
|
modeName: null,
|
|
|
|
|
isCustomMode:0,
|
|
|
|
|
isCustomMode:1,
|
|
|
|
|
modeType: null,
|
|
|
|
|
modeClass: null,
|
|
|
|
|
status: null,
|
|
|
|
|
@ -607,6 +607,9 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
return false
|
|
|
|
|
},
|
|
|
|
|
technologyUpdata(){
|
|
|
|
|
this.$forceUpdate()
|
|
|
|
|
},
|
|
|
|
|
getCombineList(){
|
|
|
|
|
listModeAll(this.combineModeQueryParams).then(response => {
|
|
|
|
|
this.combineModeList = response.data;
|
|
|
|
|
@ -668,7 +671,7 @@ export default {
|
|
|
|
|
updateBy: null,
|
|
|
|
|
updateTime: null,
|
|
|
|
|
remark: null,
|
|
|
|
|
technologyArrayMode: null,
|
|
|
|
|
technologyArrayMode: [],
|
|
|
|
|
technologyInfo: null,
|
|
|
|
|
effectContent: null,
|
|
|
|
|
};
|
|
|
|
|
@ -735,7 +738,6 @@ export default {
|
|
|
|
|
this.combineData = this.form.combineData;
|
|
|
|
|
// 组合查询数据剔除自身
|
|
|
|
|
this.combineModeList = this.combineModeList.filter(x => x.id != id);
|
|
|
|
|
console.log('组合数据=>',this.combineModeList)
|
|
|
|
|
// 使用技术
|
|
|
|
|
if(this.form.technologyInfo) {
|
|
|
|
|
this.form.technologyArrayMode = this.form.technologyInfo.split(",");
|
|
|
|
|
@ -845,7 +847,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 使用技术
|
|
|
|
|
if(this.form.technologyArray.length > 0) {
|
|
|
|
|
if(this.form.technologyArrayMode.length > 0) {
|
|
|
|
|
this.form.technologyInfo = this.form.technologyArrayMode.join(",");
|
|
|
|
|
}
|
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
|
|