From e6a28e3a331f51e8a0fbfbdb7453b118c7a37c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Wed, 15 Nov 2023 11:54:01 +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=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 20 +++++----
 .../supplierdeliverRequestMain.data.ts        | 43 +++++++++++++------
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 3a33fb5e5..531476f8d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -77,6 +77,7 @@
 
 <script setup lang="ts">
 import download from '@/utils/download'
+import { getAccessToken } from '@/utils/auth'
 import { SupplierdeliverRequestMain,SupplierdeliverRequestMainRules,SupplierdeliverRequestDetail,SupplierdeliverRequestDetailRules } from './supplierdeliverRequestMain.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
@@ -104,14 +105,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
-      row['itemCode'] = val[0]['code']
-      row['poNumber'] = val[0]['number']
-      row['poLine'] = val[0]['lineNumber']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      setV['supplierCode'] = val[0]['code']
-      setV['ppNumber'] = val[0]['number']
       formRef.setValues(setV)
     }
   })
@@ -121,9 +117,6 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
   nextTick(() => {
     const setV = {}
     setV[formField] = val[0][searchField]
-    setV['itemCode'] = val[0]['code']
-    setV['poNumber'] = val[0]['number']
-    setV['poLine'] = val[0]['lineNumber']
     formRef.setValues(setV)
   })
 }
@@ -192,6 +185,7 @@ const butttondata = (row) => {
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
         defaultButtons.mainListEditBtn({hasPermi:'wms:supplierdeliver-request-main:update'}), // 编辑
         defaultButtons.mainListDeleteBtn({hasPermi:'wms:supplierdeliver-request-main:delete'}), // 删除
+        defaultButtons.mainListPointBtn(null), // 打印
     ]
 }
 
@@ -213,6 +207,8 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.id)
+  } else if (val == 'point') { // 打印
+    handlePoint(row.id)
   }
 }
 
@@ -258,6 +254,14 @@ const handleExport = async () => {
   }
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken())
+console.log(src)
+// 打印
+const handlePoint = async (id) => {
+ window.open(src.value+'&id='+id)
+}
+
 /**
   * tableForm方法
 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 6d4a1b0d9..e9d0aea7d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -459,15 +459,15 @@ export const SupplierdeliverRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
-  fromWarehouseCode: [
-    { required: true, message: '请输入从仓库代码', trigger: 'blur' }
-  ],
-  toWarehouseCode: [
-    { required: true, message: '请输入到仓库代码', trigger: 'blur' }
-  ],
-  toDockCode: [
-    { required: true, message: '请输入到月台代码', trigger: 'change' }
-  ],
+  // fromWarehouseCode: [
+  //   { required: true, message: '请输入从仓库代码', trigger: 'blur' }
+  // ],
+  // toWarehouseCode: [
+  //   { required: true, message: '请输入到仓库代码', trigger: 'blur' }
+  // ],
+  // toDockCode: [
+  //   { required: true, message: '请输入到月台代码', trigger: 'change' }
+  // ],
   planArriveTime: [
     { required: true, message: '请输入计划到货时间', trigger: 'blur' }
   ],
@@ -486,9 +486,9 @@ export const SupplierdeliverRequestMainRules = reactive({
   directCreateRecord: [
     { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' }
   ],
-  businessType: [
-    { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ],
+  // businessType: [
+  //   { required: true, message: '请输入业务类型', trigger: 'blur' }
+  // ],
 })
 
 /**
@@ -531,7 +531,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '到货日期',
-    field: 'produceDate',
+    field: 'arriveDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -549,10 +549,15 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
   },
   {
     label: '生产日期',
-    field: 'expireDate',
+    field: 'produceDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -570,6 +575,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
   },
   {
     label: '过期日期',
@@ -591,6 +601,11 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         valueFormat: 'x',
       }
     },
+    tableForm: {
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
+    }
   },
   {
     label: '订单号',