git合并问题处理

src/components/business_space/dialogs/list/firm.vue

@@ -2,7 +2,7 @@
     firm 厂商
 -->
 <template>
-  <el-dialog title="选择型号" :visible.sync="dialog.firm" width="900px">
+  <el-dialog title="选择生产厂家/品牌/型号" :visible.sync="dialog.firm" width="900px">
     <div>
       <div id="firm">
         <div class="title-search query-form" style="padding: 10px;margin-bottom: 10px;">
@@ -60,7 +60,7 @@ import myPagination from "@/components/common/myPagination";
 import paramDetails from "@/components/business_space/dialogs/list/paramDetails"
 import { getSpecList, getBrandList, getManufacturerList } from "@/api/scan/request"
 
-    export default {
+export default {
   components: {
     myPagination,
     paramDetails

src/components/ledger/handsontables/device.vue

@@ -715,7 +715,7 @@ export default {
         },
         // 更新
         handleUpdataTable(changeData, source) {
-            if (!this.onlyRead) {
+            if (!this.onlyRead && source != 'ObserveChanges.change') {
                 if (changeData) {
                     let trimmedArr = this.trimmedRows();
                     let param = handsonUtils.getParam(changeData, source, this.hot, trimmedArr);
@@ -1138,13 +1138,19 @@ export default {
                 }
                 this.firmName = firm //批量维护dialog显示对象的字段
             } else {  //如果是表格操作
-                tools.setDataForKey(this.tableData[this.row], "DPManufacturerID", data.venderId)
-                tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Brand", data.brand)
+                tools.setDataForKey(this.tableData[this.row], "DPManufacturerID", data.venderId)//生产商ID
+                tools.setDataForKey(this.tableData[this.row], "DPBrandID", data.brandId)//品牌ID
+                tools.setDataForKey(this.tableData[this.row], "DPSpecificationID", data.specificationId)//型号ID
+                tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Manufacturer", data.venderName)
+                tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Brand", data.brandName)
                 tools.setDataForKey(this.tableData[this.row], "LedgerParam.EquipManufactor.Specification", data.name)
                 this.handleUpdataTable(
                     [
                         [this.row, "DPManufacturerID", null, data.venderId],
-                        [this.row, "LedgerParam.EquipManufactor.Brand", null, data.brand],
+                        [this.row, "DPBrandID", null, data.brandId],
+                        [this.row, "DPSpecificationID", null, data.specificationId],
+                        [this.row, "LedgerParam.EquipManufactor.Manufacturer", null, data.venderName],
+                        [this.row, "LedgerParam.EquipManufactor.Brand", null, data.brandName],
                         [this.row, "LedgerParam.EquipManufactor.Specification", null, data.name]
                     ],
                     "edit"