From 9576e5a89a0babec107093b9b636d53def0cf0d1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 5 Jul 2024 15:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue    |   1 +
 .../supplierdeliverBasicForm.vue              |   3 +
 .../supplierdeliverRequestMain.data.ts        | 132 +++++++++++++-----
 3 files changed, 101 insertions(+), 35 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index af8cab620..44fca3917 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -505,6 +505,7 @@ const emit = defineEmits([
   'tableSelectionDelete',
   'extendedButtonsClick',
   'formSelectChange',
+  'inputNumberChange',
   'tableSortChange',
   'selectCallback',
   'handleTableSelect',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index b89fe91d3..1cd66176e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -262,6 +262,9 @@ const getSearchTableData = async (number,formField,searchField)=>{
     newRow['poLine'] = row['poLine']
     newRow['orderQty'] = row['orderQty']
     newRow['uom'] = row['uom']
+    newRow['planQty'] = row['planQty']
+    newRow['shippedQty'] = row['shippedQty']
+    newRow['qty'] = row['planQty'] - row['shippedQty']
     tableData.value.push(newRow)
     itemCodes.push(row['itemCode'])
   })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 5fe4e1352..f25c37716 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -691,26 +691,24 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '申请发货数量',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    tableForm: {
-      disabled: true
-    }
-  },
-  {
-    label: '供应商批次',
-    field: 'supplierBatch',
-    sort: 'custom',
-    table: {
-      width: 150
+    sortTableDefault:2,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
     },
     tableForm: {
-      disabled: false
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
   {
@@ -739,6 +737,70 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       valueFormat: 'x',
     }
   },
+  {
+    label: '供应商批次',
+    field: 'supplierBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: false
+    }
+  },
+  {
+    label: '发货批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计划数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6
+    },
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '已发货数量',
+    field: 'shippedQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'InputNumber',
+      precision: 6
+    },
+    sortTableDefault:4,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  
   
   // {
   //   label: '替代批次',
@@ -811,27 +873,27 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
-  {
-    label: '发货数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:2,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      }
-    },
-    tableForm: {
-      type: 'InputNumber',
-      min: 1,
-      precision: 6
-    }
-  },
+  // {
+  //   label: '发货数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   sortTableDefault:2,
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     }
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
   {
     label: '订单数量',
     field: 'orderQty',