From 866dc6882c32ba75cf1275922a2803e08f39c02a Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Mon, 19 Aug 2024 18:57:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5264=20?=
 =?UTF-8?q?=20=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E9=80=80=E5=BA=93=20?=
 =?UTF-8?q?=E5=A4=8D=E6=B5=8B=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparepartReturnRecordMain.data.ts         |  2 +-
 .../sparepartReturnRequestMain.data.ts        | 62 +++++++++++++++++--
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
index 32c7b00bf..660fbb2e3 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts
@@ -42,7 +42,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isSearch: true
+    isSearch: false
   },
   {
     label: '申请时间',
diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
index 761dbda4f..62fe54e2d 100644
--- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts
@@ -801,12 +801,66 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           isSearch: true,
           isMainValue: false
         },{
-          key: 'businessTypeCode',
-          value: 'UnplannedReceipt',
-          action: '==',
+          key: 'type',
+          value: 'ZZBZ',
+          action: '!=',
           isSearch: true,
           isMainValue: false
-          }
+        },{
+          key: 'type',
+          value: 'WGJ',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'Q&J',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'PRHC',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'ONBZ',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'DZYH',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'CCP',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'BCP',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'QJ',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        },{
+          key: 'type',
+          value: 'YCL',
+          action: '!=',
+          isSearch: true,
+          isMainValue: false
+        }
           ],
         verificationParams: [{
           key: 'code',

From f465a2fbeebd2c540cd8e921013864e1552fceb0 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Mon, 19 Aug 2024 19:05:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?HL-5445=E6=A0=B9=E6=8D=AEasnNumber=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/index.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index a4d7aaa94..16c5c260d 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -238,6 +238,14 @@ const isShowMainButton = (row, val) => {
   }
 }
 
+const isShowMainButton3 = (row) => {
+  if (row.asnNumber) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 根据状态返回该按钮是否显示
 const isShowMainButton2 = (row, val) => {
   if (val.indexOf(row.isStaging) > -1) {
@@ -283,7 +291,9 @@ const butttondata = (row) => {
       hasPermi: 'qms:inspection-job-main:execute'
     }), // 发布
     defaultButtons.mainListPackageBtn(null), // 包装
-    defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告
+    defaultButtons.mainListPlanCheckQualityReportBtn({
+      hide: isShowMainButton3(row)
+    }) // 查看质检报告
   ]
 }
 const listTableRef = ref()