From e913d8f9cea5d31e0391a387d1e680bfd2f94639 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Wed, 31 Jul 2024 16:04:42 +0800
Subject: [PATCH] =?UTF-8?q?WMS=20=E2=80=94=E2=80=94>=20bug=20=20=20WMS=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=9F=A5=E7=9C=8B=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceipt/purchasereceiptJobMain/index.vue | 11 ++++++++++-
 .../purchasereceiptJobMain.data.ts                   |  4 ++--
 .../purchasereceiptRecordMain/index.vue              | 12 +++++++++++-
 .../purchasereceiptRecordMain.data.ts                |  2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
index 995534815..82c5ebc84 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
@@ -206,6 +206,15 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+// 根据收货来源判断该按钮是否显示
+const isShowSourceTypeButton = (row) => {
+  if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -227,7 +236,7 @@ const butttondata = (row,$index) => {
       hasPermi: 'wms:purchasereceipt-job-main:refusal',
       link: true // 文本展现按钮
     },
-    defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
index 972e3bf55..3ca5061c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts
@@ -86,12 +86,12 @@ export const PurchasereceiptJobMain = useCrudSchemas(
         width: 150
       },
       form: {
+        value: 'ASN_ExternalReceipt',
         componentProps: {
           disabled: true
         }
       },
-      isSearch: false,
-      sortTableDefault: 5
+      isSearch: true,
     },
     {
       label: '运输方式',
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
index 16f684f64..2906ac00e 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue
@@ -164,6 +164,15 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+// 根据收货来源判断该按钮是否显示
+const isShowSourceTypeButton = (row) => {
+  if (row.sourceType == 'EDI' || row.sourceType == 'ASN_ExternalReceipt') {
+    return true
+  } else {
+    return false
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -173,7 +182,8 @@ const butttondata = (row,$index) => {
   return [
    defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
    defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
-   defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
+   //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告
   ]
 }
 
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index c66ae154a..fdb884f3d 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -124,12 +124,12 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     form: {
+      value: 'ASN_ExternalReceipt',
       componentProps: {
         disabled: true
       }
     },
     isSearch: false,
-    isTable:false
   },
   {
     label: '车牌号',