From ab2c1e9e49e2ece4d780ea8f09a4cab2a5473aee Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 12 Apr 2024 10:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=BF=E6=8E=A5=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspection/inspectionJob/addForm.vue | 10 ++++++----
 src/views/qms/inspection/inspectionJob/index.vue   |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index a7b6837fd..86f69f56c 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -296,7 +296,7 @@
                     </el-col>
                     <el-col
                       :span="12"
-                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 1"
+                      v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '1'"
                     >
                       <el-form-item label="选定集" required>
                         <el-select
@@ -537,7 +537,8 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
   formType.value = type
   if (row) {
     data.value = JSON.parse(JSON.stringify(row))
-    console.log(data.value)
+    console.log(data.value)// 发起承接
+      await InspectionJobMainApi.acceptInspectionJobMain(row.id)
     let list = []
     list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
     data.value.packageList = await InspectionJobMainApi.getInspectionJobPackageList(row.id)
@@ -644,7 +645,7 @@ const handleTabsEdit = (targetName: TabPaneName | undefined, action: 'remove' |
   }
 }
 /** 修改名称时间 */
-const buttonBaseClick1 = (val) => {
+const buttonBaseClick1 =async (val) => {
   // 保存
   if (val == 'save') {
     if (!nameRef.value) return
@@ -692,13 +693,14 @@ const buttonBaseClick1 = (val) => {
     dialogVisibleName.value = false
   }
 }
-const buttonBaseClick = (val) => {
+const buttonBaseClick =async(val) => {
   // 保存
   if (val == 'save') {
     submitForm()
   }
   // 关闭
   else if (val == 'close') {
+     await InspectionJobMainApi.abandonInspectionJobMain(data.value.id)
     dialogVisible.value = false
   }
 }
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 0413a48aa..680aa7eb7 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -161,10 +161,10 @@
   // 列表-操作按钮
   const butttondata = (row) => {
     return [
-      defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接
+      // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:accept'}), // 承接
       defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'qms:inspection-job-main:close'}), // 关闭
-      defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
-      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
+      // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2']),hasPermi:'qms:inspection-job-main:abandon'}), // 放弃
+      defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['1','2']),hasPermi:'qms:inspection-job-main:execute'}), // 执行
       defaultButtons.mainListPackageBtn(null), // 包装
     ]
   }