|
@@ -63,12 +63,14 @@
|
|
|
<div class="checkbox">
|
|
|
<p v-for="(item,index) in newEnclosure">
|
|
|
<el-checkbox v-model="form[item.path]">
|
|
|
- <span @click="multiple(item.path)" style="cursor: pointer">{{ item.name }}</span>
|
|
|
- <span
|
|
|
- class="text-color"
|
|
|
- v-for="i in item.value"
|
|
|
- >{{ i.Name | filterImgName }}</span>
|
|
|
</el-checkbox>
|
|
|
+ <span style="cursor: pointer">{{ item.name }}</span>
|
|
|
+ <el-button @click="multiple(item.path)" type="text">请选择</el-button>
|
|
|
+ <span
|
|
|
+ class="text-color"
|
|
|
+ v-for="i in item.value"
|
|
|
+ >{{ i.name | filterImgName }}</span>
|
|
|
+
|
|
|
</p>
|
|
|
</div>
|
|
|
|
|
@@ -313,12 +315,13 @@ export default {
|
|
|
});
|
|
|
return false
|
|
|
}
|
|
|
+
|
|
|
let arr = []
|
|
|
// dpSupplierId 供应商 dpManufacturerId 生产商 dpBrandId 品牌
|
|
|
// dpSpecificationId 型号 dpInsurerId 保险商 dpMaintainerId 维修商
|
|
|
this.multipleSelection.forEach(item => {
|
|
|
let id = item.id
|
|
|
- arr.push({ id })
|
|
|
+ arr.push({id})
|
|
|
})
|
|
|
|
|
|
let Id = {}
|
|
@@ -383,19 +386,19 @@ export default {
|
|
|
insuranceFile: file
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
// this.information 多选信息
|
|
|
let valuable = [], newValuable = []
|
|
|
- valuable = this.newEnclosure.filter(i => this.form[i.path] && i.value).forEach(({ code, value }) => newValuable[code] = value);
|
|
|
- // console.log( newValuable,'多选信息')
|
|
|
+
|
|
|
+ valuable = this.newEnclosure.filter(i => this.form[i.path] && i.value).forEach(({code, value}) => newValuable[code] = value);
|
|
|
+ console.log(newValuable, '多选信息', valuable)
|
|
|
+
|
|
|
if (this.radio === 1) { //组装数据,根据是覆盖该是增量,1是增量
|
|
|
// 1:单选数据
|
|
|
let arr1 = this.deepCopy(arr).map(item => ({
|
|
|
...Id,
|
|
|
...item,
|
|
|
- infos: { ...equipManufactor, ...supplyPurchase, ...operationMainte, ...insuranceDoc }
|
|
|
+ infos: {...equipManufactor, ...supplyPurchase, ...operationMainte, ...insuranceDoc}
|
|
|
}))
|
|
|
let arr2 = this.deepCopy(arr).map(item => ({
|
|
|
...item,
|