采购入库新增子产品

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/index.vue

@@ -17,7 +17,14 @@
       @on-cancel="cancel"
     />
     <div class="sub-title"> 采购入库申请明细 </div>
-    <dee-table :data="tableData" :columns="columns" :options="optionsTree" :index-row="{ title: '序号', width: '70' }">
+    <dee-table
+      ref="treeTable"
+      :key="symbolKey"
+      :data="tableData"
+      :columns="columns"
+      :options="optionsTree"
+      :index-row="{ title: '序号', width: '70' , align: 'center'}"
+    >
       <div slot="header" class="table-title-wrap">
         <dee-tools :tools="tools" mode="normal" />
       </div>
@@ -235,9 +242,8 @@ export default {
         }
       ],
       optionsTree: {
-        'row-key': 'rowId', // value值需为可以标识该对象唯一的值
-        'lazy': false,
-        'tree-props': { children: 'children', hasChildren: 'hasChildren' }
+        rowKey: 'rowId',
+        'tree-props': { children: 'children' }
       },
       columns: [
         {
@@ -253,7 +259,6 @@ export default {
                 },
                 icon: '/icons/components/new/add.png',
                 showFun: (row) => {
-                  console.log('row', row)
                   const value = row.extMaterial ? row.extMaterial.resType2.typeName : ''
                   if (!row.isRoot || value !== '外购成品') {
                     return false
@@ -326,7 +331,7 @@ export default {
         },
         {
           title: '编码', key: 'typeCode', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
-            const value = row.extMaterial ? row.extMaterial.resCode : row.resCode
+            const value = row.resCode ? row.resCode : row.extMaterial ? row.extMaterial.resCode : ''
             return value
           }
         },
@@ -334,7 +339,7 @@ export default {
         { title: '架次', key: 'sorties', headerAlign: 'center' },
         {
           title: '计量单位', key: 'unitName', headerAlign: 'center', formatter: (row, column, cellValue, index) => {
-            const value = row.extMaterial ? row.extMaterial.extUnit.unitName : row.reqUnit
+            const value = row.reqUnit ? row.reqUnit : row.extMaterial ? row.extMaterial.extUnit.unitName : ''
             return value
           }
         },
@@ -374,7 +379,9 @@ export default {
       ],
       tableData: [],
       tableParam: [],
-      operator: null
+      operator: null,
+      addData: {},
+      symbolKey: ''
     }
   },
   computed: {
@@ -597,18 +604,17 @@ export default {
             ...item,
             operator: 'NO_CHANGE',
             rowId: item.id,
-            hasChildren: item.children.length > 0,
+            // hasChildren: item.children.length > 0,
             children: item.children && item.children.map(child => {
               return {
                 ...child,
-                operator: 'NO_CHANGE',
-                hasChildren: false
+                operator: 'NO_CHANGE'
+                // hasChildren: false
               }
             })
           }
         })
-
-        console.log('res.items', data)
+        console.log('res.items', { ...data[0] })
         if (data.length > 0) {
           this.formData[0].data.forEach(item => {
             item.component.disabled = true
@@ -621,65 +627,52 @@ export default {
     },
     // 组装表格数据
     addTableData(formData) {
+      const tableData = Array.from(this.tableData)
+      this.tableData = []
+      console.log('ffff', { ...formData })
+      this.addData = formData
       console.log('formData', formData)
       const tableDataItem = {
         ...formData,
-        // subEquipment: formData.materialTypeName,
-        // extMaterial: {
-        //   resType2: {
-        //     typeCode: formData.materialTypeName,
-        //     typeName: formData.materialTypeName
-        //   }
-        // },
-        // purchaseUnit: { unitName: formData.reqUnit },
-        // extDxSipplier: {
-        //   supplierFullName: formData.supplier
-        // },
-        // inventory: {
-        //   applyUserName: formData.supplier
-        // },
-        // storageZone: {
-        //   extname: formData.storageZone
-        // },
         children: []
       }
       // 根据父子关系添加数据
       if (tableDataItem.operateType === 'ADD') {
-        for (let i = 0; i < this.tableData.length; i++) {
-          const item = this.tableData[i]
+        for (let i = 0; i < tableData.length; i++) {
+          const item = tableData[i]
           if (item.rowId === tableDataItem.parentRowId) {
-            if (!item.hasChildren) {
-              item.children = []
-            }
-            tableDataItem.hasChildren = false
+            // item.hasChildren = true
             item.children.push(tableDataItem)
-            item.hasChildren = true
             break
           }
         }
       }
       if (tableDataItem.operateType === 'MODIFY') {
-        for (const item of this.tableData) {
+        for (const item of tableData) {
           // 父类修改
           if (item.id === tableDataItem.id) {
             // console.log('item', tableDataItem)
-            this.tableData.splice(this.tableData.indexOf(item), 1, tableDataItem)
+            tableData.splice(tableData.indexOf(item), 1, tableDataItem)
             break
           }
           // 子类修改
           for (const child of item.children) {
             if (child.id === tableDataItem.id) {
-              this.tableData[this.tableData.indexOf(item)].children.splice(item.children.indexOf(child), 1, tableDataItem)
+              tableData[tableData.indexOf(item)].children.splice(item.children.indexOf(child), 1, tableDataItem)
               break
             }
           }
         }
       }
       if (tableDataItem.operateType === 'NEW') {
-        this.tableData.push(tableDataItem)
+        tableData.push(tableDataItem)
       }
-
-      console.log('this.tableData', this.tableData)
+      console.log('tableData', tableData)
+      tableData.forEach(item => {
+        this.tableData.push(item)
+      })
+      this.symbolKey = Symbol(new Date().toString())
+      console.log('this.symbolKey', this.symbolKey)
     },
     submit() {
       const tableData = this.tableData.slice()
@@ -689,7 +682,7 @@ export default {
             delete tableData[i][key]
           }
         }
-        if (obj.hasChildren) {
+        if (obj.children.length > 0) {
           obj.children.forEach((child, j) => {
             for (const ckey in child) {
               if (ckey === 'storageZone') {