Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into hella_online_20240803

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()

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: '申请时间',

src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts

@@ -801,9 +801,63 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
           isSearch: true,
           isMainValue: false
         },{
-          key: 'businessTypeCode',
+          key: 'type',
-          value: 'UnplannedReceipt',
+          value: 'ZZBZ',
-          action: '==',
+          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
         }