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

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -503,6 +503,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain: true,
     isTableForm: false,
     tableForm:{
       isInpuFocusShow: true, // 开启查询弹窗
@@ -751,28 +752,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: '计划数量',
-    field: 'planQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
-  },
-  
   {
     label: '最后更新时间',
     field: 'updateTime',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -857,6 +857,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '操作',
     field: 'action',
     isDetail: false,
+    hiddenInMain:true,
     isForm: false ,
     table: {
       width: 150,

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -28,6 +28,137 @@ const queryParams = {
  userDept.id = userDept.id.toString()
  const userDeptArray:any = [userDept]
  
+
+// 采购收货记录展示列
+const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    fixed: 'left',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '发货单号',
+    field: 'asnNumber',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    isSearch: true
+  },
+  {
+    label: '采购订单号',
+    field: 'poNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
+  {
+    label: '订单行',
+    field: 'poLine',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面
+    field: 'fromBatch',
+    sort: 'custom',
+    isForm:false,
+    isTableForm:false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
+    field: 'fromPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    tableForm: {
+      disabled: true,
+    },
+    isForm:false,
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+
+  },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  
+  
+]))
+
 /**
  * @returns {Array} 采购退货申请主表
  */
@@ -99,9 +230,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '采购收货记录', // 查询弹窗标题
-        isConcatDetailSchemas:true,
-        searchDetailSchemas: PurchasereceiptRecordDetail.allSchemas,
-        searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
+        searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
         searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
         searchCondition: [
         {
@@ -1454,4 +1583,5 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     isTableForm: true,
     isForm: true
   },
-]))
+]))
+