From 8e0fea9f30e82936cbb8f6a0f5c98cc30304aa3a Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 5 Sep 2024 09:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-=20?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=BB=93=E6=9D=9F=E9=87=8D=E7=82=B9=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B(=E4=B8=8D=E5=88=A0=E9=99=A4=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=85=B3=E8=81=94)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsourced/components/list.vue            | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index cac9113..169f1e2 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -159,7 +159,8 @@
           <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.OUTSOURCED_ID)">查看</el-button>
           <el-button v-if="row.CREATOR==userInfoUserId && row.STATE==-1" type="success" icon="el-icon-view" size="mini" @click="handleState(row.OUTSOURCED_ID)">开工审批</el-button>
           <el-button v-if="row.CREATOR==userInfoUserId && row.STATE==-2" type="success" icon="el-icon-view" size="mini" @click="handleJie(row.OUTSOURCED_ID)">结束审批</el-button>
-          <el-button v-if="1 == row.STATE" type="danger" icon="el-icon-delete" size="mini" @click="handlePreForceDelete(row.OUTSOURCED_ID)">强制结束</el-button>
+          <el-button v-if="1 == row.STATE" type="danger" icon="el-icon-delete" size="mini" @click="handlePreForceDelete(row)">强制结束</el-button>
+          <el-button v-if="2 == row.STATE" type="success" icon="el-icon-view" size="mini" @click="handlePreForceDelete(row)">查看关联</el-button>
           <el-button v-show="edit" v-if="0 === row.IS_CORP_TYPE" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.OUTSOURCED_ID)">编辑</el-button>
           <el-button v-show="del" v-if="0 === row.IS_CORP_TYPE" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.OUTSOURCED_ID)">删除</el-button>
         </template>
@@ -326,7 +327,7 @@
     </el-table>
 
       <div slot="footer" class="dialog-footer">
-        <el-button @click="forceDelete" type="danger" icon="el-icon-delete">强制删除并结束</el-button>
+        <el-button v-if="selectOSTATE == 1" @click="forceJie" type="danger" icon="el-icon-delete">强制结束</el-button>
         <el-button @click="dialogPreDeleteShow = false">关 闭</el-button>
       </div>
     </el-dialog>
@@ -383,6 +384,7 @@ export default {
       fkList:[],// 待反馈处罚
       aiList:[],// AI报警
       selectOID: '',
+      selectOSTATE:'',
       defaultProps: {
         value: 'id',
         children: 'nodes',
@@ -620,11 +622,11 @@ export default {
       }).catch(() => {
       })
     },
-    handlePreForceDelete(id){
+    handlePreForceDelete(row){
       this.dialogPreDeleteShow = true
       requestFN(
         '/outsourced/preForceDelete',
-        { OUTSOURCED_ID: id }
+        { OUTSOURCED_ID: row.OUTSOURCED_ID }
       ).then((data) => {
         this.inspectList = data.inspectList // 待确认的安全环保检查
         this.zgList = data.zgList  // 需整改的隐患
@@ -632,12 +634,14 @@ export default {
         this.cfList = data.cfList  // 待处罚
         this.fkList = data.fkList  // 待反馈的处罚
         this.aiList = data.aiList  // 关联的AI报警
-        this.selectOID = id
+        this.selectOID = row.OUTSOURCED_ID
+        this.selectOSTATE = row.STATE
       }).catch((e) => {
       })
+
     },
     // 全部删除接口
-    forceDelete(){
+    forceJie(){
       if (!this.selectOID) {
         this.$message('请勿重复点击', {
         confirmButtonText: '确定',
@@ -645,21 +649,23 @@ export default {
       })
       }
       // ---
-      this.$confirm('确定要删除所有关联吗?', {
+      this.$confirm('确定要结束该重点工程吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         requestFN(
-          '/outsourced/forceDelete',
+          '/outsourced/forceJie',
           {OUTSOURCED_ID: this.selectOID}
         ).then((data) => {
           this.dialogPreDeleteShow = false
           this.selectOID = ''
+          this.selectOSTATE = ''
           this.getList()
           this.$forceUpdate()
         }).catch((e) => {
           this.selectOID = ''
+          this.selectOSTATE = ''
         })
 
       }).catch(() => {