Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -112,12 +112,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
   nextTick(() => {
     if (type == 'tableForm') {
       if (formField == 'itemCode') {
-        let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
-        if(itemCodes.length>0){
-          itemCodes = itemCodes.map(item=>(item['itemCode']))
-          message.warning(`物料${itemCodes.join(',')}已经存在`)
-        }
-        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']))
+        val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['inventoryStatus']==item['inventoryStatus']))
         if(val.length==0) return
         val.forEach(item=>{
           const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -483,15 +483,15 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '批次',
-    field: 'batch',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '包装代码',
-    field: 'packingNumber',
+    label: '包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -506,7 +506,16 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '数量',
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@@ -586,7 +586,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTable: false
   },
   {
-    label: '数量',
+    label: '收货数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts

@@ -523,7 +523,25 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '数量',
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: false,
+  },
+  {
+    label: '退货数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -425,15 +425,17 @@ export const IssueRequestMain = useCrudSchemas(
         }
       }
     },
-    // {
-    //   label: '备注',
-    //   field: 'remark',
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    //   isTable: false
-    // },
+    {
+      label: '备注',
+      field: 'remark',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isForm: false,
+      isTable: true,
+      isDetail: true
+    },
     // {
     //   label: '使用在途库',
     //   field: 'useOnTheWayLocation',

src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@@ -205,7 +205,9 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isForm: false,
+    isTable: true,
+    isDetail: true
   },
   {
     label: '到库位代码',