From ca3900e47435dfec987c5a671b72d4ecab10bbfa Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 23 Aug 2024 09:32:22 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=E8=80=83=E8=AF=84=20-=20=E8=80=83=E8=AF=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=80=83=E8=AF=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../branch_hazard_assessment/components/evaluation.vue          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
index a0eae46..65cc3e4 100644
--- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -185,6 +185,8 @@
           <tr :key="item.CONFIG_USER_ID">
             <td class="tbg">考评人员</td>
             <td>{{ item.USER_NAME }}</td>
+            <td class="tbg">考评时间</td>
+            <td>{{ item.CREATTIME ? item.CREATTIME : "暂未考评" }}</td>
             <td class="tbg">是否符合</td>
             <td>
               <span v-if="item.RESULT === 1">符合</span>

From f2bfc5f4c74afdbb32a2597f16434ec13394c706 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Fri, 23 Aug 2024 10:26:58 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E9=9A=90?=
 =?UTF-8?q?=E6=82=A3=E8=80=83=E8=AF=84=20-=20=E6=94=AF=E6=8C=81=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=AC=E4=BA=BA=E8=80=83=E8=AF=84=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluation.vue                 | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
index 65cc3e4..49734de 100644
--- a/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
+++ b/src/views/evaluation/branch_hazard_assessment/components/evaluation.vue
@@ -82,6 +82,19 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="searchForm.userIs == '1'">
+          <el-form-item label="本人考评时间">
+            <el-date-picker
+              v-model="searchForm.userIsDate"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 100%;"/>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getList">
@@ -154,6 +167,13 @@
           </template>
         </template>
       </el-table-column>
+      <el-table-column prop="userIsTime" label="本人考评时间" v-if="searchForm.userIsDate != undefined && searchForm.userIsDate != '' && searchForm.userIsDate[0]">
+        <template slot-scope="{row}">
+          <template>
+            <span>{{ row.userIsTime }}</span>
+          </template>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="400px">
         <template slot-scope="{row}">
           <el-button type="info" icon="el-icon-view" @click="fnViewHidden(row.HIDDEN_ID)">查看隐患详情</el-button>
@@ -267,7 +287,8 @@ export default {
         DEPARTMENT_ID: null,
         STATE: '',
         hiddendescr: '',
-        userIs: ''
+        userIs: '',
+        userIsDate : []
       },
       evaluationDialog: {
         visible: false,
@@ -325,6 +346,7 @@ export default {
       this.searchForm.STATE = ''
       this.searchForm.hiddendescr = ''
       this.searchForm.userIs = ''
+      this.searchForm.userIsDate = ''
       this.getList()
     },
     // 获取列表
@@ -336,6 +358,8 @@ export default {
           ...this.searchForm,
           START_TIME: this.searchForm.dates && this.searchForm.dates[0],
           END_TIME: this.searchForm.dates && this.searchForm.dates[1],
+          USER_IS_START_TIME: this.searchForm.userIsDate && this.searchForm.userIsDate[0],
+          USER_IS_END_TIME: this.searchForm.userIsDate && this.searchForm.userIsDate[1],
           CORPINFO_ID: this.$parent.CORPINFO_ID,
           EVALUATIONCONFIG_ID: this.$parent.EVALUATIONCONFIG_ID,
           TYPE: this.$parent.TYPE

From 5243b81f4c4d45818c554e0828fe760aee2a057e Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Thu, 29 Aug 2024 15:50:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=B8=AD=E5=8F=B0=20-=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=91=E7=AE=A1=E7=AB=AF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=AD=E5=8F=B0=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=E5=88=86=E5=85=AC=E5=8F=B8=E4=BA=BA=E5=91=98=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98;=20=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=94=A8=E6=88=B7=E6=97=B6=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/group/centerUserInfo/index.vue | 12 ++++++------
 src/views/system/group/userCenter/index.vue     | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/system/group/centerUserInfo/index.vue b/src/views/system/group/centerUserInfo/index.vue
index e17264a..325eb6f 100644
--- a/src/views/system/group/centerUserInfo/index.vue
+++ b/src/views/system/group/centerUserInfo/index.vue
@@ -308,12 +308,12 @@ export default {
           {required: true, message: '角色不能为空', trigger: 'blur'}
         ],
         USERNAME: [
-          {required: true, message: '用户名不能为空', trigger: 'blur'},
-          {
-            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
-            message: '用户名需使用手机号码格式'
-          },
-          {validator: hasUser, trigger: 'blur'}
+          {required: true, message: '用户名不能为空', trigger: 'blur'}
+        // ,{
+        //     pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+        //     message: '用户名需使用手机号码格式'
+        //   },
+        //   {validator: hasUser, trigger: 'blur'}
         ],
         NAME: [
           {required: true, message: '姓名不能为空', trigger: 'blur'},
diff --git a/src/views/system/group/userCenter/index.vue b/src/views/system/group/userCenter/index.vue
index 8bcebea..cf14c79 100644
--- a/src/views/system/group/userCenter/index.vue
+++ b/src/views/system/group/userCenter/index.vue
@@ -276,12 +276,12 @@ export default {
           { required: true, message: '角色不能为空', trigger: 'blur' }
         ],
         USERNAME: [
-          { required: true, message: '用户名不能为空', trigger: 'blur' },
-          {
-            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
-            message: '用户名需使用手机号码格式'
-          },
-          { validator: hasUser, trigger: 'blur' }
+          { required: true, message: '用户名不能为空', trigger: 'blur' }
+          // ,{
+          //   pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+          //   message: '用户名需使用手机号码格式'
+          // },
+          // { validator: hasUser, trigger: 'blur' }
         ],
         NAME: [
           { required: true, message: '姓名不能为空', trigger: 'blur' },
@@ -465,7 +465,7 @@ export default {
           CARD_TYPE_NAME: '身份证',
           NATION: row.NATION_NAME || '',
           SEX: row.SEX === '0' ? '男' : '女',
-          USER_TYPE: '1',
+          USER_TYPE: '0',
           ISDELETE: row.ISDELETE != null ? row.ISDELETE : "0"
         }
       ).then((data) => {

From 82300f3b956ba0fc6011555982203c50d65af066 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Tue, 3 Sep 2024 16:58:46 +0800
Subject: [PATCH 4/7] =?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=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsourced/components/list.vue            | 218 +++++++++++++++++-
 1 file changed, 217 insertions(+), 1 deletion(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 2ee236b..aa848f7 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -154,11 +154,12 @@
           <span>({{ row.VIDEO_ONLINE_COUNT }})</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="400">
+      <el-table-column label="操作" align="center" width="500">
         <template slot-scope="{row}">
           <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-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>
@@ -183,6 +184,193 @@
         <el-button v-print="'#printTest'" type="primary">打 印</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogPreDeleteShow" title="强制结束" width="80%" class="top-dialog">
+      <p>待确认的安全环保检查</p>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="inspectList"
+      :row-key="getRowKeyInsp"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    > 
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="INSPECTION_PLACE" label="检查场所" show-overflow-tooltip />
+      <el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" show-overflow-tooltip />
+      <el-table-column prop="INSPECTION_USERS" label="检查人" show-overflow-tooltip />
+      <el-table-column prop="PERSON_NAME" label="被检查人" show-overflow-tooltip />
+      <el-table-column label="检查时间" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{ row.INSPECTION_TIME_START }}-{{ row.INSPECTION_TIME_END }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="HIDDEN_COUNT" label="检查隐患数" />
+    </el-table>
+    <p>待整改隐患</p>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="zgList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      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" ?"否":"处罚人未处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <p>待验收隐患</p>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="ysList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      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" ?"否":"处罚人未处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+      <p>待处罚</p>
+
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="cfList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      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" ?"否":"处罚人未处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+      <p>待反馈处罚</p>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="fkList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      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="处罚处理状态" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{ row.HANDLED === "0" ? "待处理" : "已处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogPreDeleteShow = false">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -221,6 +409,7 @@ export default {
       STATE: '',
       varList: [],
       dialogFormShow: false,
+      dialogPreDeleteShow: false,
       pd: [],
       unitsList: [],
       corpList: [],
@@ -228,6 +417,12 @@ export default {
       groupCorpList: [],
       treeDataInspectDept: [],
       treeDeptOptions: [],
+      inspectList:[],// 带确认安全环保检查
+      zgList:[],// 待整改隐患
+      ysList:[],// 待验收隐患
+      cfList:[],// 待处罚
+      fkList:[],// 待反馈处罚
+      aiList:[],// AI报警
       defaultProps: {
         value: 'id',
         children: 'nodes',
@@ -280,6 +475,12 @@ export default {
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
+    getRowKeyInsp(row) {
+      return row.KEYPROJECTCHECK_ID
+    },
+    getRowKeyCf(row) {
+      return row.HIDDEN_ID
+    },
     // 搜索
     getQuery() {
       this.$refs.multipleTable.clearSelection()
@@ -459,6 +660,21 @@ export default {
       }).catch(() => {
       })
     },
+    handlePreForceDelete(id){
+      this.dialogPreDeleteShow = true
+      requestFN(
+        '/outsourced/preForceDelete',
+        { OUTSOURCED_ID: id }
+      ).then((data) => {
+        this.inspectList = data.inspectList // 待确认的安全环保检查
+        this.zgList = data.zgList  // 需整改的隐患
+        this.ysList = data.ysList  // 需验收的隐患
+        this.cfList = data.cfList  // 待处罚
+        this.fkList = data.fkList  // 待反馈的处罚
+        this.aiList = data.aiList  // 关联的AI报警
+      }).catch((e) => {
+      })
+    },
     getUnitsList() {
       requestFN(
         '/units/listAll',

From d6f59a120519e84403dc4ebbc85e73c868fae37b Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 4 Sep 2024 16:21:08 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-=20?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=BC=BA=E5=88=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsourced/components/list.vue            | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index aa848f7..b751390 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -368,6 +368,7 @@
     </el-table>
 
       <div slot="footer" class="dialog-footer">
+        <el-button @click="forceDelete" type="danger" icon="el-icon-delete">强制删除并结束</el-button>
         <el-button @click="dialogPreDeleteShow = false">关 闭</el-button>
       </div>
     </el-dialog>
@@ -423,6 +424,7 @@ export default {
       cfList:[],// 待处罚
       fkList:[],// 待反馈处罚
       aiList:[],// AI报警
+      selectOID: '',
       defaultProps: {
         value: 'id',
         children: 'nodes',
@@ -672,9 +674,28 @@ export default {
         this.cfList = data.cfList  // 待处罚
         this.fkList = data.fkList  // 待反馈的处罚
         this.aiList = data.aiList  // 关联的AI报警
+        this.selectOID = id
       }).catch((e) => {
       })
     },
+    // 全部删除接口
+    forceDelete(){
+      if (!this.selectOID) {
+        this.$message('请勿重复点击', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+      }
+      requestFN(
+        '/outsourced/forceDelete',
+        {OUTSOURCED_ID: this.selectOID}
+      ).then((data) => {
+        this.dialogPreDeleteShow = false
+        this.selectOID = ''
+      }).catch((e) => {
+        this.selectOID = ''
+      })
+    },
     getUnitsList() {
       requestFN(
         '/units/listAll',

From e156a96acc9e9e6dd060b6f6e8bc9bfeaa3f9c02 Mon Sep 17 00:00:00 2001
From: water_xu <x17149@gmail.com>
Date: Wed, 4 Sep 2024 19:58:16 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20-=20?=
 =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=BC=BA=E5=88=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsourced/components/list.vue            | 75 ++++++-------------
 1 file changed, 23 insertions(+), 52 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index b751390..cac9113 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/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',
-        {OUTSOURCED_ID: this.selectOID}
-      ).then((data) => {
-        this.dialogPreDeleteShow = false
-        this.selectOID = ''
-      }).catch((e) => {
-        this.selectOID = ''
+      // ---
+      this.$confirm('确定要删除所有关联吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/outsourced/forceDelete',
+          {OUTSOURCED_ID: this.selectOID}
+        ).then((data) => {
+          this.dialogPreDeleteShow = false
+          this.selectOID = ''
+          this.getList()
+          this.$forceUpdate()
+        }).catch((e) => {
+          this.selectOID = ''
+        })
+
+      }).catch(() => {
       })
+      // ---
+
     },
     getUnitsList() {
       requestFN(

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 7/7] =?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(() => {