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

src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts

@@ -7,14 +7,23 @@ import * as BomApi from "@/api/wms/bom";
  * @returns {Array} 制品返修记录主表
  */
 export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150,
+      fixed: 'left'
+    },
+    isSearch: true
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 150
-    },
-    isSearch: true
+    }
   },
   {
     label: '车间代码',
@@ -155,16 +164,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150,
-      fixed: 'left'
-    },
-    isSearch: true
-  },
+
   {
     label: '业务类型',
     field: 'businessType',
@@ -368,6 +368,14 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '成品库位代码',
+    field: 'fgFromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   {
     label: '批次',
     field: 'batch',

src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue

@@ -211,6 +211,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['batch'] = val[0]['batch']
         row['uom'] = val[0]['uom']
         row['inventoryStatus'] = val[0]['inventoryStatus']
+        row['fgFromLocationCode'] = val[0]['locationCode']
       } else if(formField == 'productionLineCode'){
         row['productionLineCode'] = val[0]['code']
       } else if(formField == 'workStationCode'){
@@ -242,6 +243,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
       setV['batch'] = val[0]['batch']
       setV['uom'] = val[0]['uom']
       setV['inventoryStatus'] = val[0]['inventoryStatus']
+      setV['fgFromLocationCode'] = val[0]['locationCode']
       // setV['fromLocationCode'] = val[0]['locationCode']
     } else if(formField == 'productionLineCode'){
       setV['productionLineCode'] = val[0]['code']

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -549,6 +549,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: 'Bom来源库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '工序代码',
     field: 'processCode',
@@ -586,6 +597,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '包装号',
     field: 'packingNumber',
@@ -595,7 +617,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     },
     tableForm:{
       isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装号',
+      searchListPlaceholder: '请选择物料',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
@@ -610,7 +632,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true,
-        searchListPlaceholder: '请选择包装号',
+        searchListPlaceholder: '请选择物料',
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
@@ -624,8 +646,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '成品库位代码',
+    field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
@@ -635,8 +657,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -646,8 +668,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
@@ -656,6 +678,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true
     }
   },
+
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -685,17 +708,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
+
   {
     label: '备注',
     field: 'remark',