From dece466f89a869d14692339b7255993fcfa4cf07 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 6 Sep 2024 15:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98=E5=90=8E=E5=86=8D=E5=8F=91=E5=B8=83=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20=20HL-5848?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionJob/index.vue           | 13 +++++++++++++
 src/views/qms/inspectionQ2/inspectionQ2.data.ts |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue
index 0cecf6f33..7be97e488 100644
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@@ -238,6 +238,15 @@ const isShowMainButton3 = (row) => {
   }
 }
 
+// 根据状态返回该按钮是否显示
+const isShowMainButton2 = (row, val) => {
+  if (val.indexOf(row.isStaging) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 根据状态返回该按钮是否显示
 const isShowMainButton1 = (row, val) => {
   if (val.indexOf(row.status) > -1) {
@@ -269,6 +278,10 @@ const butttondata = (row) => {
       hide: isShowMainButton(row, ['1', '2']),
       hasPermi: 'qms:inspection-job-main:execute'
     }), // 执行
+    defaultButtons.mainListOrderPubBtn({
+      hide: isShowMainButton2(row, ['TRUE']),
+      hasPermi: 'qms:inspection-job-main:execute'
+    }), // 发布
     defaultButtons.mainListPackageBtn(null), // 包装
     defaultButtons.mainListPlanCheckQualityReportBtn({
       hide: isShowMainButton3(row)
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 898bb7f94..91802924c 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -329,7 +329,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '整灯物料代码',
+      label: '整灯/分总成物料代码',
       field: 'lightItemCode',
       sort: 'custom',
       table: {
@@ -372,7 +372,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '整灯物料名称',
+      label: '整灯/分总成物料名称',
       field: 'lightItemName',
       sort: 'custom',
       dictClass: 'string',
@@ -454,7 +454,7 @@ export const Q2 = useCrudSchemas(
       }
     },
     {
-      label: '标准成本价格',
+      label: '销售价格',
       field: 'standardCostPrice',
       sort: 'custom',
       isSearch: false,