单位转换

src/components/Descriptions/src/Descriptions.vue

@@ -38,6 +38,7 @@ const props = defineProps({
     default: () => ({})
   }
 })
+const schema = ref(props.schema)
 
 const { getPrefixCls } = useDesign()
 
@@ -82,6 +83,20 @@ const showAll = () =>{
   isShow.value = !isShow.value
  
 }
+
+// 默认排序
+const updateSort = (val) => {
+  console.log(999,val)
+  val.forEach(item=>{
+    if(!item.sortDetailDefault){
+      item.sortDetailDefault = 999 // 默认999
+    }
+  })
+  val.sort((column1,column2)=>{
+    return column1.sortDetailDefault - column2.sortDetailDefault
+  })
+}
+updateSort(schema.value)
 </script>
 
 <template>

src/types/descriptions.d.ts

@@ -12,4 +12,5 @@ export interface DescriptionsSchema {
   valueFilter?: function // 展示的过滤函数
   slotFilter?:boolean // 插槽自定义内容
   dictType?: string // add by 星语：支持 dict 字典数据
+  sortDetailDefault?: string | number
 }

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -832,7 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -832,7 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -834,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1098,7 +1098,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -832,7 +832,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -834,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1099,7 +1099,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -17,11 +17,33 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isSearch: true,
     isForm: false,
+    sortTableDefault: 1,
     table: {
       width: 180,
       fixed: 'left'
     },
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm: false,
+    isSearch: true,
+    sortSearchDefault: 1000,
+    sortTableDefault: 2,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -54,54 +76,50 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
           isFormModel: true
         }], // 失去焦点校验参数
       }
-    }
-  },
-  {
-    label: '订单类型',
-    field: 'type',
-    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
-    dictClass: 'string',
-    isTable: true,
-    isSearch: true,
-    sort: 'custom',
-    table: {
-      width: 150
     },
+    sortTableDefault: 3,
   },
   {
-    label: '行类型',
-    field: 'poLineType',
+    label: '供应商名称',
+    field: 'supplierName',
+    dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
+    isForm: false,
     sort: 'custom',
+    sortTableDefault:4,
     table: {
       width: 150
     },
   },
   {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.PURCHASE_ORDER_STATUS,
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.PURCHASE_ORDER_TYPE,
     dictClass: 'string',
     isTable: true,
-    isForm:false,
     isSearch: true,
-    sortSearchDefault:1000,
     sort: 'custom',
+    sortTableDefault: 5,
     table: {
       width: 150
     },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
+  // {
+  //   label: '行类型',
+  //   field: 'poLineType',
+  //   isTable: false,
+  //   isSearch: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
+ 
   {
     label: '订单日期',
     field: 'orderDate',
-    isTable: true,
+    isTable: false,
     formatter: dateFormatter2,
     detail: {
       dateFormat: 'YYYY-MM-DD'
@@ -110,6 +128,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 6,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -134,6 +153,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    sortTableDefault: 7,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -144,6 +164,15 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '版本',
+    field: 'version',
+    sort: 'custom',
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
   {
     label: '税率',
     field: 'taxRate',
@@ -151,6 +180,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -162,52 +192,41 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '订单备注',
-    field: 'poRmks',
+    label: '支付周期',
+    field: 'paymentCycle',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
+    isForm: false,
     table: {
       width: 150
     },
   },
-
   {
-    label: '管理编号',
-    field: 'poContract',
+    label: '联系人姓名',
+    field: 'contactName',
     sort: 'custom',
-    isTable:true,
-    isForm:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '版本',
-    field: 'version',
+    label: '联系人电话',
+    field: 'contactPhone',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '当前阶段',
-    field: 'currentStage',
+    label: '联系人电子邮件',
+    field: 'contactEmail',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        style: {width:'100%'},
-        min: 0
-      }
-    },
-    isTableForm: false,
-    isForm: false,
-    isTable:false,
   },
   {
     label: '是否寄存订单',
@@ -219,7 +238,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isForm:false,
+    isForm: false,
     form: {
       component: 'Switch',
       value: 'TRUE',
@@ -230,49 +249,22 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
-    isTable: false,
+    label: '订单备注',
+    field: 'poRmks',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+    isTable: false,
     isForm:false,
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE',
-        disabled: true
-      }
-    },
-  },
-  {
-    label: '联系人姓名',
-    field: 'contactName',
-    sort: 'custom',
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '联系人电话',
-    field: 'contactPhone',
-    sort: 'custom',
-    isTable:false,
     table: {
       width: 150
     },
   },
+
   {
-    label: '联系人电子邮件',
-    field: 'contactEmail',
+    label: '管理编号',
+    field: 'poContract',
     sort: 'custom',
-    isTable:false,
+    isTable:true,
+    isForm:false,
     table: {
       width: 150
     },
@@ -294,20 +286,52 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+
+  {
+    label: '数据来源区分',
+    field: 'dataSource',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable: false,
+    form: {
+    }
+  },
+  // {
+  //   label: '当前阶段',
+  //   field: 'currentStage',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       style: {width:'100%'},
+  //       min: 0
+  //     }
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  //   isTable:false,
+  // },
   {
     label: '创建者',
     field: 'creator',
     sort: 'custom',
     isForm: false,
-    isTable:false,
+    isTable: true,
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
   },
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:false,
+    isTable:true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -335,48 +359,17 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
   },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    isForm: false,
-    isTable:false,
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    isTable: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    isForm: false,
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '备注',
-    field: 'remark',
-    isTable: false,
-    table: {
-      width: 150
-    },
-  },
+  
+  // {
+  //   label: '备注',
+  //   field: 'remark',
+  //   isTable: false,
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     field: 'action',
@@ -432,33 +425,20 @@ export const PurchaseMainRules = reactive({
  * @returns {Array} 采购订单子表
  */
 export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    isTableForm: false,
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
   {
     label: '行号',
     field: 'lineNumber',
     table: {
       width: 150
     },
+    hiddenInMain: true,
     tableForm:{
       disabled:true,
       isSearchList: true, // 开启查询弹窗
     }
   },
   {
-    label: '物料代码',
+    label: '品番',
     field: 'itemCode',
     isSearch: true,
     table: {
@@ -527,29 +507,18 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
- {
-    label: '计量单位',
-    field: 'uom',
-    sort: 'custom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+  {
+    label: '行类型',
+    field: 'poLineType',
     isTable: true,
-    isTableForm:true,
-    form:{
-      componentProps: {
-        disabled:true
-      }
-    },
-    tableForm:{
-      disabled: true,
-      type:'Select',
-    },
+    isSearch: false,
+    sort: 'custom',
     table: {
       width: 150
     },
- },
+  },
   {
-    label: '订单数量',
+    label: '采购订单数量',
     field: 'orderQty',
     table: {
       width: 150
@@ -557,78 +526,86 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       component: 'InputNumber',
       componentProps: {
-        disabled:false,
+        disabled: false,
         min: 1,
         precision: 6
       }
     },
     tableForm: {
-      disabled:false,
-      hidden:false,
+      disabled: false,
+      hidden: false,
       type: 'InputNumber',
       min: 1,
       precision: 6
     },
   },
   {
-    label: '默认收货库区',
-    field: 'defaultAreaCode',
+    label: '采购标包数量',
+    field: 'purchaseStdQty',
     table: {
       width: 150
     },
     form: {
+      component: 'InputNumber',
       componentProps: {
-        disabled: true
+        disabled: false,
+        min: 1,
+        precision: 6
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    hiddenInMain: true,
+    tableForm: {
+      disabled: false,
+      hidden: false,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    },
   },
   {
-    label: '库区描述',
-    field: 'areaDescription',
-    table: {
-      width: 150
-    },
+    label: '采购计量单位',
+    field: 'purchaseStdUom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
     form: {
       componentProps: {
         disabled: true
       }
     },
-    isTableForm: false,
-    isForm: false,
-    isTable: true,
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
+      width: 150
+    },
   },
-  // {
-  //   label: 'ERP库位',
-  //   field: 'erpLocationCode',
-  //   dictType : DICT_TYPE.ERP_LOCATION,
-  //   dictClass: 'string',
-  //   table: {
-  //     width: 150
-  //   },
-  //   hiddenInMain:true,
-  //   isTableForm: false,
-  //   isForm: false,
-  // },
   {
-    label: '项目代码',
-    field: 'projectCode',
+    label: '转换率',
+    field: 'convertRate',
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      }
+    },
+    hiddenInMain: true,
     table: {
       width: 150
     },
-    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '包装数量',
-    field: 'packQty',
-    hiddenInMain:true,
+    label: t('ts.单价'),
+    field: 'singlePrice',
     table: {
       width: 150
     },
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -637,25 +614,29 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '包装规格',
-    hiddenInMain:true,
-    field: 'packUnit',
-    // dictType: DICT_TYPE.PACK_UNIT,
-    // dictClass: 'string',
-    isTable: true,
+    label: '金额',
+    field: 'amount',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
     isTableForm: false,
-    isForm: false,
+    isForm: false
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
-    hiddenInMain:true,
+    label: '库存标包数量',
+    field: 'packQty',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -669,13 +650,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
+    label: '库存标包规格',
+    hiddenInMain: true,
+    field: 'packUnit',
+    // dictType: DICT_TYPE.PACK_UNIT,
+    // dictClass: 'string',
     isTable: true,
-    hiddenInMain:true,
     table: {
       width: 150
     },
@@ -683,42 +665,60 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
   },
   {
-    label: '转换率',
-    field: 'convertRate',
+    label: '库存计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 0
+        disabled: true
       }
     },
-    hiddenInMain:true,
-     table: {
+    tableForm: {
+      disabled: true,
+      type: 'Select',
+    },
+    table: {
       width: 150
     },
+  },
+
+  {
+    label: '默认收货库区',
+    field: 'defaultAreaCode',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
+    isTable: false,
   },
   // {
-  //   label: t('ts.已计划数量'),
-  //   field: 'plannedQty',
+  //   label: 'ERP库位',
+  //   field: 'erpLocationCode',
+  //   dictType : DICT_TYPE.ERP_LOCATION,
+  //   dictClass: 'string',
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:true,
-  //   form: {
-  //     component: 'InputNumber',
-  //     componentProps: {
-  //       min: 1,
-  //       precision: 6
-  //     },
-  //     value: 1
-  //   },
   //   isTableForm: false,
   //   isForm: false,
+  //   isTable: false,
   // },
   {
-    label: t('ts.已发货数量'),
-    field: 'shippedQty',
+    label: t('ts.已计划数量'),
+    field: 'plannedPurchaseQty',
     table: {
       width: 150
     },
@@ -734,13 +734,31 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
+  {
+    label: t('ts.已发货数量'),
+    field: 'shippedPurchaseQty',
+    table: {
+      width: 150
+    },
+    hiddenInMain: true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      },
+      value: 1
+    },
+    isTableForm: false,
+    isForm: false,
+  },
   {
     label: t('ts.已收货数量'),
-    field: 'receivedQty',
+    field: 'receivedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 0,
@@ -754,11 +772,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: t('ts.已退货数量'),
-    field: 'returnedQty',
+    field: 'returnedPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 0,
@@ -772,11 +790,11 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: t('ts.已上架数量'),
-    field: 'putawayQty',
+    field: 'putawayPurchaseQty',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
       component: 'InputNumber',
       value: 1,
@@ -788,30 +806,44 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false
   },
+ 
+ 
   {
-    label: t('ts.单价'),
-    field: 'singlePrice',
+    label: '库区描述',
+    field: 'areaDescription',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain: true,
     form: {
-      component: 'InputNumber',
       componentProps: {
-        min: 1,
-        precision: 6
+        disabled: true
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
+
   {
-    label: '金额',
-    field: 'amount',
+    label: '项目代码',
+    field: 'projectCode',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTableForm: false,
+    isForm: false,
+    isTable: false,
+  },
+ 
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
     hiddenInMain:true,
+    table: {
+      width: 150
+    },
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -820,33 +852,23 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isTableForm: false,
-    isForm: false
+    isForm: false,
+    isTable: false,
   },
   {
-    label: '是否可用',
-    field: 'available',
-    dictType: DICT_TYPE.TRUE_FALSE,
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    hiddenInMain:true,
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm:{
-      type:'Select',
-      default: 'TRUE',
-      inactiveValue: 'FALSE',
-      activeValue: 'TRUE'
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
+    isTableForm: false,
+    isForm: false,
   },
+  
   {
     label: '超收百分比',
     field: 'overReceivingPercent',
@@ -867,53 +889,19 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    isTable: true,
-    isTableForm: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    table: {
-      width: 180
-    },
-    hiddenInMain:false,
-    isForm: false,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:false,
-    isForm: false,
-  },
   // {
-  //   label: '最后更新时间',
-  //   field: 'updateTime',
-  //   isTableForm: false,
+  //   label: '创建时间',
+  //   field: 'createTime',
   //   isTable: true,
-  //   hiddenInMain:false,
+  //   isTableForm: false,
   //   formatter: dateFormatter,
   //   detail: {
   //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
   //   },
   //   table: {
-  //     width: 150
+  //     width: 180
   //   },
+  //   hiddenInMain:false,
   //   isForm: false,
   //   form: {
   //     component: 'DatePicker',
@@ -926,23 +914,14 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //   }
   // },
   // {
-  //   label: '最后更新者',
-  //   field: 'updater',
+  //   label: '创建者',
+  //   field: 'creator',
   //   isTableForm: false,
   //   table: {
   //     width: 150
   //   },
   //   hiddenInMain:false,
   //   isForm: false,
-  //   // form: {
-  //   //   component: 'DatePicker',
-  //   //   componentProps: {
-  //   //     style: {width:'100%'},
-  //   //     type: 'datetime',
-  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //   //     valueFormat: 'x',
-  //   //   }
-  //   // }
   // },
   {
     label: '备注',
@@ -951,6 +930,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '操作',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -64,6 +64,7 @@
   <!-- 详情 -->
   <Detail
     ref="detailRef"
+    :isShowPackNumber="true"
     :annexTable="[
       {
         label: '质检明细',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts

@@ -16,8 +16,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true
   },
   {
-    label: '申请单号',
-    field: 'requestNumber',
+    label: '发货单号',
+    field: 'asnNumber',
     sort: 'custom',
     table: {
       width: 180
@@ -33,13 +33,14 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '发货单号',
-    field: 'asnNumber',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     table: {
       width: 180
     },
-    isSearch: true
+    isSearch: true,
+    isTable:false
   },
   {
     label: '供应商代码',
@@ -50,6 +51,15 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '供应商名称',
+    field: 'supplierName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true
+  },
   {
     label: '联系人姓名',
     field: 'contactName',
@@ -57,6 +67,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '联系人电话',
@@ -65,6 +76,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '联系人电子邮件',
@@ -73,6 +85,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '从仓库代码',
@@ -81,6 +94,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到仓库代码',
@@ -89,6 +103,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '到月台代码',
@@ -97,6 +112,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '时间窗口',
@@ -105,6 +121,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '计划到货时间',
@@ -133,6 +150,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '运输方式',
@@ -142,6 +160,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '车牌号',
@@ -150,6 +169,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
   },
   {
     label: '出库事务类型',
@@ -158,6 +178,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '入库事务类型',
@@ -166,6 +188,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '执行时间',
@@ -186,6 +210,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail:false
   },
   {
     label: '生效日期',
@@ -207,6 +233,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -227,6 +254,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '截止时间',
@@ -247,6 +276,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         valueFormat: 'x',
       }
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '部门',
@@ -255,17 +286,20 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
     },
+    isDetail: false
   },
   {
     label: '业务类型',
@@ -274,6 +308,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '备注',
@@ -282,6 +318,8 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
+    isDetail: false
   },
   {
     label: '创建时间',
@@ -311,6 +349,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault: 1000,
   },
   {
     label: '创建者',
@@ -319,6 +358,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault: 1000,
   },
   {
     label: '是否可用',
@@ -330,6 +370,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isDetail: false
   },
   {
     label: '操作',
@@ -403,9 +444,10 @@ export const SupplierdeliverRecordMainRules = reactive({
  */
 export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '单据号',
+    field: 'number',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -427,37 +469,24 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '订单数量',
-    field: 'orderQty',
+    label: '品番',
+    field: 'itemCode',
+    sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        disabled: true,
-        min: 0,
-        precision: 6
-      }
-    },
-    tableForm: {
-      disabled: true,
-      type: 'InputNumber',
-      min: 0,
-      precision: 6
-    }
   },
   {
-    label: '物料代码',
-    field: 'itemCode',
+    label: '品名',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '数量',
-    field: 'qty',
+    label: '供应商发货数量',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
       width: 150
@@ -467,8 +496,19 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '供应商发货计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '库存数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -478,8 +518,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装规格',
-    field: 'packUnit',
+    label: '库存记录单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -488,9 +529,8 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '包装名称',
-    field: 'packName',
-    dictClass: 'string',
+    label: '转换率',
+    field: 'convertRate',
     isTable: true,
     sort: 'custom',
     table: {
@@ -498,23 +538,39 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '供应商计量数量',
-    field: 'supplierQty',
+    label: '从包装号',
+    field: 'fromPackingNumber',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable:false,
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
+    hiddenInMain: true,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '从批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '批次',
+    field: 'toBatch',
+    sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
@@ -533,7 +589,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -554,7 +610,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
@@ -575,91 +631,100 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width: '100%'},
+        style: { width: '100%' },
         type: 'date',
         dateFormat: 'YYYY-MM-DD',
         valueFormat: 'x',
       }
     },
   },
-  
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '包装数量',
+    field: 'packQty',
     sort: 'custom',
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
+    form: {
+      component: 'InputNumber',
+    }
   },
   {
-    label: '到库位代码',
-    field: 'toLocationCode',
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从库位组代码',
-    field: 'fromLocationGroupCode',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '到库位组代码',
-    field: 'toLocationGroupCode',
+    label: '到库位代码',
+    field: 'toLocationCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
   {
-    label: '从库区代码',
-    field: 'fromAreaCode',
+    label: '从库位组代码',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '到库区代码',
-    field: 'toAreaCode',
+    label: '到库位组代码',
+    field: 'toLocationGroupCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
   {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
+    label: '从库区代码',
+    field: 'fromAreaCode',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
   {
-    label: '到货主代码',
-    field: 'toOwnerCode',
+    label: '到库区代码',
+    field: 'toAreaCode',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
 
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
@@ -668,103 +733,22 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料描述2',
     field: 'itemDesc2',
     sort: 'custom',
+    hiddenInMain: true,
+    isTable: false,
     table: {
       width: 150
     },
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    hiddenInMain:true,
-    table: {
-      width: 180
-    },
-  },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    hiddenInMain: true,
     table: {
       width: 150
     },
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
-  },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  // {
-  //   label: '最后操作时间',
-  //   field: 'updateTime',
-  //   formatter: dateFormatter,
-  //   detail: {
-  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-  //   },
-  //   sort: 'custom',
-  //   table: {
-  //     width: 180
-  //   },
-  //   form: {
-  //     component: 'DatePicker',
-  //     componentProps: {
-  //       type: 'datetime',
-  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-  //       valueFormat: 'x',
-  //     }
-  //   },
-  // },
-  // {
-  //   label: '最后操作人',
-  //   field: 'updater',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
+ 
   {
     label: '操作',
     hiddenInMain:true,

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -218,7 +218,9 @@ import supplierdeliverBasicForm from './supplierdeliverBasicForm.vue'
 import labelForm from './labelForm.vue'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import Decimal from "decimal.js"  // 具体文件中引入
 const { loadStart, loadDone } = usePageLoading()
+import { cloneDeep } from 'lodash-es'
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
 
@@ -681,6 +683,7 @@ const buttonTableClick = async (val, row) => {
               // await getDetailList()
               count.value++
               await getGenerateLabelList(row)
+
               formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
             }
           })
@@ -719,6 +722,11 @@ const getGenerateLabelList = async (row) => {
       item.boxPackaging = item.boxPackaging ? item.boxPackaging : []
       item.packUnitInitOptions = item.boxPackaging
       item.secondPackUnitInitOptions = item.palletPackaging || []
+      if (!Decimal(item.convertRate) || Decimal(item.convertRate) == 1) {
+        item.balanceQty = item.qty
+      } else {
+        item.balanceQty =  parseFloat(Decimal(item.qty).mul(Decimal(item.convertRate)).toNumber().toFixed(5))
+      }
       let obj = item?.boxPackaging[0]
       if (obj) {
         item.packUnit = obj.packUnit
@@ -778,7 +786,7 @@ const footButtonClick = async (val) => {
       message.warning('托的包装数量要大于箱的包装数量,请修改')
       return
     }
-    const data = JSON.parse(JSON.stringify(detatableData1.value))
+    const data = cloneDeep(detatableData1.value)
     labelFormRef.value.openLabel(data)
   } else if (val == 'close') {
     formLabelRef.value.dialogVisible = false
@@ -790,6 +798,11 @@ const formSelectChangeLabel = (field, val, row) => {
     let obj = row.boxPackaging.find((item) => item.packUnit == val)
     if (obj) {
       row.packQty = obj.packQty
+      if (!Decimal(row.convertRate) || Decimal(row.convertRate) == 1) {
+        row.purchaseStdQty = row.packQty
+      } else {
+        row.purchaseStdQty = parseFloat(Decimal(parseFloat(row.packQty)).div(Decimal(parseFloat(row.convertRate))).toNumber().toFixed(5))
+      }
       // 如果没有数量可以输入
       if (!row.packQty) {
         SupplierdeliverRequestDetailLabel.allSchemas.tableFormColumns.forEach(item => {
@@ -1164,6 +1177,7 @@ const submitFormLabel = async (list) => {
     const data = {
       subList: list
     }
+    console.log(33,data)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     labelFormRef.value.isLoading = true
     await SupplierdeliverRequestMainApi.genLabel(data)

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -154,15 +154,15 @@
       </el-table-column>
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
-      <el-table-column label="数量" width="150" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="150" prop="uom" align="center">
+      <el-table-column label="库存数量" width="150" prop="balanceQty" align="center" />
+      <el-table-column label="库存计量单位" width="150" prop="uom" align="center">
         <template #default="scope"> {{ uomLabel(scope.row) }}</template>
       </el-table-column>
       <!-- <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
       <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
       <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" /> -->
-      <el-table-column label="箱规格" width="200" prop="packUnit" align="center" />
-      <el-table-column label="箱数量" width="200" prop="packQty" align="center" />
+      <el-table-column label="包装规格" width="200" prop="packUnit" align="center" />
+      <el-table-column label="库存标包数量" width="200" prop="packQty" align="center" />
     </el-table>
     <el-pagination
       v-show="tableData.length > 10"
@@ -230,9 +230,9 @@ const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息和箱信息是否都存在
   if (row.secondPackUnit && row.secondPackQty && row.packUnit && row.packQty) {
     // 总共需要多少箱
-    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.allXiangQty = Math.ceil(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     // 放满的多少箱
-    row.manXiangQty = Math.floor(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.manXiangQty = Math.floor(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     // 托数量/箱数量  一托可以放几箱
     row.otherNumber = Math.floor(parseFloat(row.secondPackQty) / parseFloat(row.packQty))
     // 数量%托数量  获取总共几托
@@ -245,9 +245,9 @@ const expandChange = (row: any, expandedRows: any[]) => {
     console.log(11, row.tuoInManNumber)
     // 数量除以托数量获取余数
     row.lastNumber =
-      parseFloat(row.qty) >= parseFloat(row.tuoInManNumber)
-        ? accuracyFun.subtract(parseFloat(row.qty), parseFloat(row.tuoInManNumber))
-        : parseFloat(row.qty)
+      parseFloat(row.balanceQty) >= parseFloat(row.tuoInManNumber)
+        ? accuracyFun.subtract(parseFloat(row.balanceQty), parseFloat(row.tuoInManNumber))
+        : parseFloat(row.balanceQty)
     // 循环托
     row.packageList = []
     for (let i = 0; i < row.allTuoQty; i++) {
@@ -314,7 +314,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
   // 只有箱规格
   if (!row.secondPackUnit && row.packUnit && row.packQty) {
     // 数量%每箱数量  获取总共几箱
-    row.allXiangQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+    row.allXiangQty = Math.ceil(parseFloat(row.balanceQty) / parseFloat(row.packQty))
     row.packageList = []
     row.allTuoQty = ''
     row.allTuoQty1 = 1
@@ -325,7 +325,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
       row.packageList[i] = {
         id: oneId.value,
         // xPoNumber: i + 1,
-        qtyOne: row.qty,
+        qtyOne: row.balanceQty,
         isTuo: 0 //无托
       }
     }
@@ -338,7 +338,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
           // xPoNumber: j + 1
         }
         // 数量除以箱数量获取余数
-        cur.lastNumber = parseFloat(row.qty) % parseFloat(row.packQty)
+        cur.lastNumber = parseFloat(row.balanceQty) % parseFloat(row.packQty)
         // 如果有余数
         if (cur.lastNumber) {
           // 最后一条信息直接展示余数的信息
@@ -407,16 +407,14 @@ const submitForm = () => {
         )
         // item.allNumber += parseFloat(cur.qtyOne) || 0
       })
-      console.log(111, item.allNumber)
-      console.log(222, parseFloat(item.qty))
-      return item.allNumber != parseFloat(item.qty)
+      return item.allNumber != parseFloat(item.balanceQty)
     })
     console.log(222, obj)
     // return
     // const isBol = arr.some((item) => item == false)
     if (obj) {
       message.warning(
-        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.qty}】`
+        `物料【${obj.itemCode}】,批次【${obj.batch}】,${obj.packageList.length}托的总和数量【${obj.allNumber}】不等于发货总数量【${obj.balanceQty}】`
       )
       return
     }

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -913,7 +913,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
     },
 
     {
-      label: '供应商计量数量',
+      label: '供应商发货数量',
       field: 'supplierQty',
       sort: 'custom',
       table: {

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -834,7 +834,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     sortTableDefault:16,
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierQty',
     sort: 'custom',
     table: {

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts

@@ -1098,7 +1098,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '供应商计量数量',
+    label: '供应商发货数量',
     field: 'supplierPackQty',
     sort: 'custom',
     table: {