重点工程 - 重点工程强制结束bug修复

src/views/keyprojects/outsourced/components/list.vue

@@ -159,7 +159,7 @@
           <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-show="del" v-if="0 === row.IS_CORP_TYPE" 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.OUTSOURCED_ID)">强制结束</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>
@@ -228,16 +228,7 @@
       highlight-current-row
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip>
+
-        <template slot-scope="{row}">
-          {{ row.OUTSOURCED_NAME ? row.OUTSOURCED_NAME : row.AIOUTSOURCED_NAME }}
-        </template>
-      </el-table-column>
-      <el-table-column label="隐患来源" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ sourceState[row.SOURCE] }}
-        </template>
-      </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述" show-overflow-tooltip />
       <el-table-column label="隐患发现人" show-overflow-tooltip>
         <template slot-scope="{row}">
@@ -246,14 +237,7 @@
       </el-table-column>
       <el-table-column prop="CREATTIME" label="隐患发现时间" show-overflow-tooltip />
       <el-table-column prop="RECTIFICATIONOR_NAME" label="隐患整改人" show-overflow-tooltip />
-      <el-table-column prop="RECTIFICATIONTIME" label="整改时间" show-overflow-tooltip />
       <el-table-column prop="CREATOR_NAME" label="隐患验收人" show-overflow-tooltip />
-      <el-table-column prop="CHECKTIME" label="验收时间" show-overflow-tooltip />
-      <el-table-column label="隐患状态">
-        <template slot-scope="{row}">
-          {{ state[row.STATE] }}
-        </template>
-      </el-table-column>
       <el-table-column label="是否处罚">
         <template slot-scope="{row}">
           {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
@@ -277,32 +261,11 @@
       highlight-current-row
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ row.OUTSOURCED_NAME ? row.OUTSOURCED_NAME : row.AIOUTSOURCED_NAME }}
-        </template>
-      </el-table-column>
-      <el-table-column label="隐患来源" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ sourceState[row.SOURCE] }}
-        </template>
-      </el-table-column>
       <el-table-column prop="HIDDENDESCR" label="隐患描述" show-overflow-tooltip />
-      <el-table-column label="隐患发现人" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ row.CREATOR_NAME || row.CREATOR_NAMES }}
-        </template>
-      </el-table-column>
       <el-table-column prop="CREATTIME" label="隐患发现时间" show-overflow-tooltip />
       <el-table-column prop="RECTIFICATIONOR_NAME" label="隐患整改人" show-overflow-tooltip />
       <el-table-column prop="RECTIFICATIONTIME" label="整改时间" show-overflow-tooltip />
       <el-table-column prop="CREATOR_NAME" label="隐患验收人" show-overflow-tooltip />
-      <el-table-column prop="CHECKTIME" label="验收时间" show-overflow-tooltip />
-      <el-table-column label="隐患状态">
-        <template slot-scope="{row}">
-          {{ state[row.STATE] }}
-        </template>
-      </el-table-column>
       <el-table-column label="是否处罚">
         <template slot-scope="{row}">
           {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
@@ -327,11 +290,7 @@
       highlight-current-row
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip />
-      <el-table-column prop="REASON" label="处罚原因" show-overflow-tooltip />
       <el-table-column prop="CREATOR_NAME" label="下发人" show-overflow-tooltip />
-      <el-table-column prop="UNITS_NAME" label="被处罚单位" show-overflow-tooltip />
-      <el-table-column prop="PERSON_NAME" label="被处罚人" show-overflow-tooltip />
       <el-table-column label="是否处罚">
         <template slot-scope="{row}">
           {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
@@ -355,7 +314,6 @@
       highlight-current-row
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip />
       <el-table-column prop="REASON" label="处罚原因" show-overflow-tooltip />
       <el-table-column prop="CREATOR_NAME" label="下发人" show-overflow-tooltip />
       <el-table-column prop="UNITS_NAME" label="被处罚单位" show-overflow-tooltip />
@@ -686,15 +644,28 @@ export default {
         type: 'warning'
       })
       }
-      requestFN(
+      // ---
-        '/outsourced/forceDelete',
+      this.$confirm('确定要删除所有关联吗?', {
-        {OUTSOURCED_ID: this.selectOID}
+        confirmButtonText: '确定',
-      ).then((data) => {
+        cancelButtonText: '取消',
-        this.dialogPreDeleteShow = false
+        type: 'warning'
-        this.selectOID = ''
+      }).then(() => {
-      }).catch((e) => {
+        requestFN(
-        this.selectOID = ''
+          '/outsourced/forceDelete',
+          {OUTSOURCED_ID: this.selectOID}
+        ).then((data) => {
+          this.dialogPreDeleteShow = false
+          this.selectOID = ''
+          this.getList()
+          this.$forceUpdate()
+        }).catch((e) => {
+          this.selectOID = ''
+        })
+
+      }).catch(() => {
       })
+      // ---
+
     },
     getUnitsList() {
       requestFN(