From a7de992867c7c0484c2ac252bc31d54b6d893b0a Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Mon, 5 Feb 2024 16:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRecordMain.data.ts         |  21 ++++
 .../supplierdeliverRequestMain/index.vue      | 102 +-----------------
 .../supplierdeliverRequestMain/point.vue      |   6 +-
 .../supplierdeliverRequestMain.data.ts        |  23 ++++
 4 files changed, 53 insertions(+), 99 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index 5b3aa2a3d..d7471ca2e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -463,6 +463,27 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    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',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index ccb447b40..cda77e7ab 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -37,10 +37,7 @@
         </el-button>
       </template>
       <template #action="{ row }">
-        <ButtonBase
-          :Butttondata="butttondata(row)"
-          @button-base-click="buttonTableClick($event, row)"
-        />
+        <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -91,20 +88,7 @@
 
   <!-- 打印 -->
   <point ref="pointRef" :detailListTableColumns="detailListTableColumns" />
-  <!-- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="60%">
-    <Table :columns="detailListTableColumns" :data="detatableData.tableList" :loading="detatableData.loading" :pagination="{
-      total: detatableData.total
-    }" v-model:pageSize="detatableData.pageSize" v-model:currentPage="detatableData.currentPage"
-      v-model:sort="detatableData.sort">
-      <template #batch="{ row }">
-        <el-input v-model="row.batch">{{ row.batch }}</el-input>
-      </template>
-    </Table>
-    <el-button @click="closeDialog">关闭</el-button>
-    <el-button @click="genLabel()">生成标签</el-button>
-
-    <el-button @click="print">打印</el-button>
-  </el-dialog> -->
+ 
 </template>
 
 <script setup lang="ts">
@@ -121,8 +105,6 @@ import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequest
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import point from '@/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue'
-// import * as PackageApi from '@/api/wms/package'
-// import * as BarbasicApi from '@/api/wms/barbasic'
 
 // 供应商发货申请
 defineOptions({ name: 'SupplierdeliverRequestMain' })
@@ -151,6 +133,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         row['poNumber'] = val[0]['poNumber']
         row['itemCode'] = val[0]['itemCode']
         row['poLine'] = val[0]['poLine']
+        row['orderQty'] = val[0]['orderQty']
         row['uom'] = val[0]['uom']
       }
     } else {
@@ -158,10 +141,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       setV[formField] = val[0][searchField]
       if(formField == 'ppNumber'){
         // 清空子表数据
-        tableData.value = [] // 重置明细数据
+        tableData.value = []
       }
       if(formField == 'supplierCode'){
-        //console.log("supplierCode:",val[0])
         setV['contactName'] = val[0]['contacts']
         setV['contactPhone'] = val[0]['phone']
         setV['contactEmail'] = val[0]['email']
@@ -561,82 +543,6 @@ const labelPrint = async (row) => {
 }
 
 const print = async () => {
-  //向包装表里插入数据
-  //   const packageArray:any= ref([])
-  //   let packageObject = {
-  //     itemCode: '',
-  //     itemName: '',
-  //     itemDesc1: '',
-  //     itemDesc2: '',
-  //     batch: '',
-  //     altBatch: '',
-  //     produceDate: '',
-  //     validityDays: '',
-  //     expireDate: '',
-  //     uom: '',
-  //     qty: '',
-  //     altUom: '',
-  //     altQty: '',
-  //     convertRate: '',
-  //     packQty: '',
-  //     packUnit: '',
-  //     toWarehouseCode: '',
-  //     toDockCode: '',
-  //     toLocationCode: '',
-  //     supplierCode: '',
-  //     supplierItemCode: '',
-  //     poNumber: '',
-  //     poLine: '',
-  //     rpNumber: '',
-  //     asnNumber: '',
-  //   }
-  //   //获取主表数据
-  //  await  SupplierdeliverRequestMainApi.getSupplierdeliverRequestMainPage({
-  //     number: detatableData.tableList[0].number
-  //   }).then(res => {
-  //     detatableData.tableList.forEach(item => {
-  //       packageObject.itemCode=item.itemCode
-  //       packageObject.itemName=item.itemName
-  //       packageObject.itemDesc1=item.itemDesc1
-  //       packageObject.itemDesc2=item.itemDesc2
-  //       packageObject.batch=item.batch
-  //       packageObject.altBatch=item.altBatch
-  //       packageObject.produceDate=item.produceDate
-  //       packageObject.expireDate=item.expireDate
-  //       packageObject.uom=item.uom
-  //       packageObject.qty=item.qty
-  //       packageObject.packQty=item.packQty
-  //       packageObject.packUnit=item.packUnit
-  //       packageObject.convertRate=item.convertRate
-  //       packageObject.poNumber=item.poNumber
-  //       packageObject.poLine=item.poLine
-  //       packageObject.supplierCode=res.list[0].supplierCode
-  //       packageObject.rpNumber=res.list[0].ppNumber
-  //       packageArray.value.push(packageObject)
-  //     })
-  //   })
-  //   const barBasicArray:any =ref([])
-  //   let barBasicObject = {
-  //     type: '',
-  //     template: '',
-  //     status: '',
-  //     relateNumber: '',
-  //     barcodeString: '',
-  //     printTimes: '',
-  //     lastPrintTime: '',
-  //     lastPrintUserId: '',
-  //     lastPrintUserName: '',
-  //   }
-  //   // 获取返回的包装号更新标签表
-  //   await PackageApi.createPackage(JSON.parse(JSON.stringify(packageArray.value))).then(res => {
-  //     res.list.forEach(item => {
-  //       barBasicObject.type = 'PurchaseLabel'
-  //       barBasicObject.relateNumber = item.number
-  //       barBasicObject.status = 'NEW'
-  //       barBasicArray.value.push(barBasicObject)
-  //     })
-  //   })
-  //   await BarbasicApi.createBarbasic(JSON.parse(JSON.stringify(barBasicArray.value)))
   window.open(src.value + '&number=' + detatableData.tableList[0].number)
 }
 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue
index 45b1dd04a..d9278bfa2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/point.vue
@@ -78,7 +78,11 @@ const genLabel = async () => {
     tableObject.loading = false
     // 刷新列表
     await getList()
-  } catch { }
+  } catch { 
+    tableObject.loading = false
+  } finally{
+    tableObject.loading = false
+  }
 }
 
 // 获得表格的各种操作
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index d76c6b37f..3e3b67d80 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -576,6 +576,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -585,6 +586,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    isTableForm: false,
     tableForm: {
       type: 'FormDateTime',
       dateFormat: 'YYYY-MM-DD HH:mm:ss',
@@ -713,6 +715,27 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '订单数量',
+    field: 'orderQty',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        min: 0,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled: true,
+      type: 'InputNumber',
+      min: 0,
+      precision: 6
+    }
+  },
   {
     label: '包装数量',
     field: 'packQty',