根据采购入库同步修改返厂入库bug

applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/storageDetailsCreateCom.vue

@@ -6,7 +6,7 @@
 */
 <template>
   <div class="storageDetails-create">
-    <dee-dialog :dialog-visible="dialogVisibleDetails" title="返厂入库明细编辑" width="90%" @handleClose="handleClose">
+    <dee-dialog v-if="dialogVisibleDetails" :dialog-visible="dialogVisibleDetails" title="采购入库申请创建" width="90%" @handleClose="handleClose">
       <dee-form
         ref="form"
         :form="form"
@@ -242,7 +242,8 @@ export default {
       },
       extMaterialId: '',
       parentId: null,
-      operateType: null
+      operateType: null,
+      parentRowId: ''
     }
   },
   computed: {
@@ -322,7 +323,7 @@ export default {
         delete row.id
         this.form = JSON.parse(JSON.stringify(row))
         this.$set(this.form, 'supplier', row.extDxSipplierId)
-        this.$set(this.form, 'withProductMaterial', Array.isArray(row.withProductMaterial) ? row.withProductMaterial : row.withProductMaterial && row.withProductMaterial.split(';') || '')
+        this.$set(this.form, 'withProductMaterial', Array.isArray(row.withProductMaterial) ? row.withProductMaterial : row.withProductMaterial && row.withProductMaterial.split(';') || [])
         this.resetMaterial(row.extMaterial ? row.extMaterial.resCode : '')
         this.changeMaterial(row.extMaterial ? row.extMaterial.resCode : '')
         this.$set(this.form, 'resCode', '')
@@ -341,17 +342,17 @@ export default {
       row.billType === 'AirEquipment' && this.$set(this.form, 'reqAmount', 1)
       this.$set(this.form, 'resCode', row.extMaterial && row.extMaterial.resCode || row.resCode || '')
       this.$set(this.form, 'resName', row.extMaterial && row.extMaterial.resName || row.resName || '')
-      this.$set(this.form, 'reqUnit', row.extMaterial && row.extMaterial.extUnit.unitName || row.reqUnit || '')
+      this.$set(this.form, 'reqUnit', row.extMaterial && row.extMaterial.extUnit && row.extMaterial.extUnit.unitName || row.reqUnit || '')
       this.$set(this.form, 'modelNo', row.extMaterial && row.extMaterial.modelNo || row.modelNo || '')
       this.$set(this.form, 'extMaterialId', row.extMaterialId || '')
       this.$set(this.form, 'supplier', row.extDxSipplier && row.extDxSipplier.supplierFullName || row.supplier || '')
-      this.$set(this.form, 'withProductMaterial', Array.isArray(row.withProductMaterial) ? row.withProductMaterial : row.withProductMaterial && row.withProductMaterial.split(';') || '')
+      this.$set(this.form, 'withProductMaterial', Array.isArray(row.withProductMaterial) ? row.withProductMaterial : row.withProductMaterial && row.withProductMaterial.split(';') || [])
       this.resetMaterial(row.extMaterial ? row.extMaterial.resCode : row.resCode || '')
       this.changeMaterial(row.extMaterial ? row.extMaterial.resCode : row.resCode || '')
     },
     handleClose() {
       this.dialogVisibleDetails = false
-      this.form = {}
+      // this.form = {}
     },
     getBasicData() {
       const v = this.basicData
@@ -1856,14 +1857,14 @@ export default {
       // 带出物料相关默认值
       const SELECT_MATERIAL = this.material.find((item) => item.resCode === v)
       if (SELECT_MATERIAL) {
-        this.form.modelNo = SELECT_MATERIAL.modelNo || ''
-        this.form.techSpec = SELECT_MATERIAL.techSpec || ''
-        this.form.spec = SELECT_MATERIAL.spec || ''
-        this.form.supplyStatus = SELECT_MATERIAL.supplyStatus || ''
-        this.form.reqUnit = SELECT_MATERIAL.extUnit.unitName || ''
-        this.form.resName = SELECT_MATERIAL.resName || ''
-        this.form.extMaterial = SELECT_MATERIAL
-        this.extMaterialId = SELECT_MATERIAL.id || ''
+        this.$set(this.form, 'modelNo', SELECT_MATERIAL.modelNo || '')
+        this.$set(this.form, 'techSpec', SELECT_MATERIAL.techSpec || '')
+        this.$set(this.form, 'spec', SELECT_MATERIAL.spec || '')
+        this.$set(this.form, 'supplyStatus', SELECT_MATERIAL.supplyStatus || '')
+        this.$set(this.form, 'reqUnit', SELECT_MATERIAL.extUnit && SELECT_MATERIAL.extUnit.unitName || '')
+        this.$set(this.form, 'resName', SELECT_MATERIAL.resName)
+        this.$set(this.form, 'extMaterial', SELECT_MATERIAL)
+        // this.extMaterialId = SELECT_MATERIAL.id || ''
         this.extUnitId = SELECT_MATERIAL.extUnitId || ''
       }
     },
@@ -1989,7 +1990,7 @@ export default {
             'operator': 'MODIFY',
             'subTypeName': 'InStorageRecallItem',
             'rowId': this.form.id || this.generateUUID(),
-            'parentId': this.form.parentId ? this.form.parentId : this.parentId,
+            'parentId': this.isChild ? this.parentId || this.form.parentId : null,
             'parentRowId': this.parentRowId,
             'extMaterialId': this.extMaterialId ? this.extMaterialId : this.form.extMaterialId,
             'extMaterialIdType': 'ExtDxProcessMaterial',

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

@@ -30,10 +30,10 @@
         <dee-tools v-if="!isSignApproval" :tools="tools" mode="normal" />
       </div> -->
     </dee-up-table>
-    <span style="position: absolute;top: calc(100% - 70px);left: calc(50% - 70px);}">
+    <div class="btns">
       <el-button type="primary" class="searchBtn" @click="submit">确认</el-button>
-      <el-button type="primary" class="searchBtn" @click="cancel">取消</el-button>
-    </span>
+      <el-button type="info" class="searchBtn" @click="cancel">取消</el-button>
+    </div>
     <storage-details ref="storageDetailsCreatOrEdit" :basic-data="detailsPropData" @addTableData="addTableData" />
     <import-file ref="importFile" :param="importParam" @refreshTable="searchInStorageRequestItem" @saveAndImport="saveAndImport" />
   </div>
@@ -320,6 +320,8 @@ export default {
               {
                 operation: '编辑',
                 handleClick: (row, index) => {
+                  this.$set(this.form, 'operator', 'MODIFY')
+                  this.$set(this.detailsPropData, 'operator', 'MODIFY')
                   this.$refs.storageDetailsCreatOrEdit.handleOpen('MODIFY', this.detailsPropData, row)
                 },
                 icon: '/icons/components/new/edit.png',
@@ -544,25 +546,26 @@ export default {
         'pageSize': 9999,
         'searchItems': {
           'children': [],
-          'items': [{
-            'fieldName': 'reqStatus',
-            'operator': 'IN',
-            'value': [
-              'Apply',
-              'PartAudit'
-            ]
-          },
-          {
-            'fieldName': 'subTypeName',
-            'operator': 'EQ',
-            'value': 'InStorageRecall'
-          },
-          {
-            'fieldName': 'id',
-            'operator': 'EQ',
-            // 'value': this.$route.query.id
-            'value': this.basicData.id
-          }
+          'items': [
+          //   {
+          //   'fieldName': 'reqStatus',
+          //   'operator': 'IN',
+          //   'value': [
+          //     'Apply',
+          //     'PartAudit'
+          //   ]
+          // },
+            {
+              'fieldName': 'subTypeName',
+              'operator': 'EQ',
+              'value': 'InStorageRecall'
+            },
+            {
+              'fieldName': 'id',
+              'operator': 'EQ',
+              // 'value': this.$route.query.id
+              'value': this.basicData.id
+            }
           ],
           'operator': 'AND'
         },
@@ -797,7 +800,7 @@ export default {
       if (tableDataItem.operateType === 'MODIFY') {
         for (const item of tableData) {
           // 父类修改
-          if (item.id === tableDataItem.id) {
+          if ((item.id === tableDataItem.id) && tableDataItem.isRoot) {
             tableData.splice(tableData.indexOf(item), 1, tableDataItem)
             break
           }
@@ -833,7 +836,7 @@ export default {
           })
         }
       })
-      const isVirtualHasChild = tableData.find(item => item.isVirtual && (!item.children || !item.children.length || item.children && !(item.children.find(child => child.operator !== 'REMOVE'))))
+      const isVirtualHasChild = tableData.find(item => item.isVirtual && item.operator !== 'REMOVE' && (!item.children || !item.children.length || item.children && !(item.children.find(child => child.operator !== 'REMOVE'))))
       if (isVirtualHasChild) return this.$utils.showMessageWarning('父件为虚拟件时，必须添加子件！')
       const paramOperator = this.newDataImportResId ? 'MODIFY' : this.operator
       const param = {
@@ -844,7 +847,7 @@ export default {
         'extDxProductAreaIdType': 'ExtDxProductArea',
         'extDxSipplierIdType': 'ExtDxSipplier',
         'subTypeName': 'InStorageRecall',
-        'reqStatus': 'Apply',
+        'reqStatus': this.form.id ? this.form.reqStatus : 'Apply',
         'extDxProductAreaId': this.form.extDxProductAreaId,
         'extDxSipplierId': this.form.extDxSipplierId,
         'materialTypeId': this.form.materialTypeId,
@@ -854,11 +857,12 @@ export default {
         param.id = this.newDataImportResId || this.form.id
       }
       post('/InventoryRequest/batch/recursionAdd', param).then(res => {
-        this.$utils.showMessageSuccess('保存成功')
         if (saveAndImport === 'saveAndImport') {
           this.$refs.importFile.upLoadExcel(res.items.id, newData)
+          this.form = this.$utils.deepClone(res.items)
         } else {
           this.cancel()
+          this.$utils.showMessageSuccess('保存成功')
         }
       }).catch((err) => {
         console.log(err)
@@ -896,8 +900,18 @@ export default {
 </script>
 <style lang='scss'>
 .purchasingWarehousing-newOrEdit{
-  .dee-up-table {
-    height: 300px;
+  .btns{
+    margin-top: 20px;
+    display: flex;
+    justify-content: center;
+    .searchBtn{
+      width: 80px;
+      height: 32px;
+      line-height: 1;
+      padding: 9px 15px;
+      font-size: 12px;
+      border-radius: 1px;
+    }
   }
 }
 </style>