From 935f7d6c9e964a1c493d4b84a4f00094ea8de57b Mon Sep 17 00:00:00 2001
From: zhangqihang <zhangqihang>
Date: Tue, 20 Feb 2024 14:27:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/request/keyprojects.js                    |  4 +-
 src/views/keyprojects/hidden/index.vue        |  5 --
 .../keyprojects/inspection/hidden_view.vue    | 14 ++++-
 src/views/keyprojects/inspection/index.vue    |  5 --
 src/views/keyprojects/outsourced/add.vue      | 62 +++----------------
 src/views/keyprojects/outsourced/index.vue    | 35 +++++------
 src/views/keyprojects/outsourced/view.vue     | 25 ++------
 .../keyprojects/personnelmanagement/index.vue | 11 ++--
 src/views/keyprojects/punish/index.vue        |  5 --
 9 files changed, 47 insertions(+), 119 deletions(-)

diff --git a/src/request/keyprojects.js b/src/request/keyprojects.js
index a26cbf6..bfcd5d8 100644
--- a/src/request/keyprojects.js
+++ b/src/request/keyprojects.js
@@ -36,8 +36,8 @@ export const setOutsourcedGoEdit = (params) =>
   post("/outsourced/goEdit", params); // 重点工程修改获取
 export const setOutsourcedDelete = (params) =>
   post("/outsourced/delete", params); // 重点工程修改获取
-export const getOutsourcedJie = (params) => post("/outsourced/jie", params); // 结束工程
-export const getOutsourcedStart = (params) => post("/outsourced/start", params); // 结束工程
+export const getOutsourcedUpdateState = (params) =>
+  post("/outsourced/updateState", params); // 结束工程
 
 export const getKeyprojectcheckList = (params) =>
   post("/keyprojectcheck/list", params); // 安全环保检查列表
diff --git a/src/views/keyprojects/hidden/index.vue b/src/views/keyprojects/hidden/index.vue
index 36fdcd2..bf71380 100644
--- a/src/views/keyprojects/hidden/index.vue
+++ b/src/views/keyprojects/hidden/index.vue
@@ -46,11 +46,6 @@
             <span v-else>{{ row.DEPARTMENT_NAME }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="MANAGE_CORPS_NAME"
-          label="监理单位"
-          width="250"
-        />
         <el-table-column
           prop="UNITS_PIC_NAME"
           label="相关方单位负责人"
diff --git a/src/views/keyprojects/inspection/hidden_view.vue b/src/views/keyprojects/inspection/hidden_view.vue
index d386e55..d5df6a0 100644
--- a/src/views/keyprojects/inspection/hidden_view.vue
+++ b/src/views/keyprojects/inspection/hidden_view.vue
@@ -5,7 +5,16 @@
         <el-divider content-position="left">检查信息</el-divider>
         <el-descriptions border>
           <el-descriptions-item label="隐患照片	">
-            {{ data.info.INSPECTION_CATEGORY }}
+            <img
+              v-viewer
+              v-for="item in data.hiddenImgs"
+              :key="item.IMGFILES_ID"
+              :src="VITE_FILE_URL + item.FILEPATH"
+              alt=""
+              width="100"
+              height="100"
+              class="ml-10"
+            />
           </el-descriptions-item>
           <el-descriptions-item label="隐患描述">
             {{ data.info.HIDDENDESCR }}
@@ -53,10 +62,12 @@
 import { getKeyprojectcheckFindHidden } from "@/request/keyprojects";
 import { reactive } from "vue";
 import { useRoute } from "vue-router";
+const VITE_FILE_URL = import.meta.env.VITE_FILE_URL;
 
 const route = useRoute();
 const data = reactive({
   info: {},
+  hiddenImgs: [],
 });
 
 const fnGetData = async () => {
@@ -64,6 +75,7 @@ const fnGetData = async () => {
     HIDDEN_ID: route.query.HIDDEN_ID,
   });
   data.info = resData.pd;
+  data.hiddenImgs = resData.pd.hiddenImgs;
 };
 fnGetData();
 </script>
diff --git a/src/views/keyprojects/inspection/index.vue b/src/views/keyprojects/inspection/index.vue
index 3204217..70b1ece 100644
--- a/src/views/keyprojects/inspection/index.vue
+++ b/src/views/keyprojects/inspection/index.vue
@@ -46,11 +46,6 @@
             <span v-else>{{ row.DEPARTMENT_NAME }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="MANAGE_CORPS_NAME"
-          label="监理单位"
-          width="200"
-        />
         <el-table-column
           prop="UNITS_PIC_NAME"
           label="相关方单位负责人"
diff --git a/src/views/keyprojects/outsourced/add.vue b/src/views/keyprojects/outsourced/add.vue
index c04af9f..0434cf2 100644
--- a/src/views/keyprojects/outsourced/add.vue
+++ b/src/views/keyprojects/outsourced/add.vue
@@ -65,6 +65,7 @@
             <el-select
               v-model="data.form.UNITS_ID"
               clearable
+              filterable
               placeholder="请选择相关方"
               @change="fnGetUnitUser('', '')"
             >
@@ -82,6 +83,7 @@
             <el-select
               v-model="data.form.UNITS_PIC"
               clearable
+              filterable
               placeholder="请选择人员"
               @change="fnSelectUnitsUser($event)"
             >
@@ -103,65 +105,14 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="监理单位名称">
-            <el-select
-              v-model="data.form.MANAGE_NAME"
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in data.mangeList"
-                :key="item.CORPINFO_ID"
-                :label="item.CORP_NAME"
-                :value="item.CORPINFO_ID"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="监理单位工程负责人">
-            <el-input v-model="data.form.MANAGE_PIC" placeholder="请输入内容" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="监理单位负责人手机">
-            <el-input
-              v-model="data.form.MANAGE_PHONE"
-              placeholder="请输入内容"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="集团单位">
-            <el-select
-              v-model="data.form.GROUP_UNIT"
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in data.groupCorpList"
-                :key="item.CORPINFO_ID"
-                :label="item.CORP_NAME"
-                :value="item.CORPINFO_ID"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="状态" prop="STATE">
-            <el-select v-model="data.form.STATE" placeholder="请选择">
-              <el-option label="待开始" value="0" />
+            <el-select v-model="data.form.STATE" placeholder="请选择" disabled>
+              <el-option label="未开工" value="0" />
               <el-option label="进行中" value="1" />
               <el-option label="已结束" value="2" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否发送短信">
-            <el-select v-model="data.form.IS_SMS" placeholder="请选择">
-              <el-option label="是" value="0" />
-              <el-option label="否" value="1" />
+              <el-option label="开工申请中" value="-1" />
+              <el-option label="结束申请中" value="-2" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -303,6 +254,7 @@ const rules = {
 
 const data = reactive({
   form: {
+    STATE: "0",
     acceptanceList: [
       {
         id: Math.random(),
diff --git a/src/views/keyprojects/outsourced/index.vue b/src/views/keyprojects/outsourced/index.vue
index 38bce01..545ae11 100644
--- a/src/views/keyprojects/outsourced/index.vue
+++ b/src/views/keyprojects/outsourced/index.vue
@@ -87,12 +87,13 @@
             <span v-else>{{ row.DEPARTMENT_NAME }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="MANAGE_CORPS_NAME" label="监理单位" />
         <el-table-column prop="STATE" label="状态">
           <template v-slot="{ row }">
-            <span v-if="row.STATE === '0'">未开始</span>
+            <span v-if="row.STATE === '0'">未开工</span>
             <span v-if="row.STATE === '1'">进行中</span>
             <span v-if="row.STATE === '2'">已结束</span>
+            <span v-if="row.STATE === '-1'">开工申请中</span>
+            <span v-if="row.STATE === '-2'">结束申请中</span>
           </template>
         </el-table-column>
         <el-table-column prop="CREATOR" label="创建人" />
@@ -117,19 +118,19 @@
               type="primary"
               text
               link
-              v-if="row.STATE === '1'"
+              v-if="row.STATE === '-2'"
               @click="fnHandleJie(row.OUTSOURCED_ID)"
             >
-              结束
+              结束审批
             </el-button>
             <el-button
               type="primary"
               text
               link
-              v-if="row.STATE === '0'"
+              v-if="row.STATE === '-1'"
               @click="fnHandleStart(row.OUTSOURCED_ID)"
             >
-              审批
+              开工审批
             </el-button>
             <el-button
               type="primary"
@@ -184,8 +185,7 @@ import {
   getOutsourcedList,
   getUnitsListAll,
   setOutsourcedDelete,
-  getOutsourcedJie,
-  getOutsourcedStart,
+  getOutsourcedUpdateState,
 } from "@/request/keyprojects.js";
 import { reactive } from "vue";
 import router from "@/router";
@@ -221,22 +221,17 @@ const fnHandleJie = async (OUTSOURCED_ID) => {
   await ElMessageBox.confirm("确定要结束吗？", {
     type: "warning",
   });
-  const resData = await getOutsourcedJie({ OUTSOURCED_ID });
-  if (resData.code === "0") {
-    ElMessage.success("操作成功");
-  } else {
-    ElMessage.warning(resData.message);
-  }
+  await getOutsourcedUpdateState({ OUTSOURCED_ID, STATE: "2" });
+  ElMessage.success("已结束");
   fnGetData();
 };
 
 const fnHandleStart = async (OUTSOURCED_ID) => {
-  const resData = await getOutsourcedStart({ OUTSOURCED_ID });
-  if (resData.code === "0") {
-    ElMessage.success("审批成功");
-  } else {
-    ElMessage.warning(resData.message);
-  }
+  await ElMessageBox.confirm("确定要开工吗？", {
+    type: "warning",
+  });
+  await getOutsourcedUpdateState({ OUTSOURCED_ID, STATE: "1" });
+  ElMessage.success("已开工");
   fnGetData();
 };
 </script>
diff --git a/src/views/keyprojects/outsourced/view.vue b/src/views/keyprojects/outsourced/view.vue
index b649080..4395be6 100644
--- a/src/views/keyprojects/outsourced/view.vue
+++ b/src/views/keyprojects/outsourced/view.vue
@@ -35,20 +35,14 @@
           <el-descriptions-item label="企业辖区部门" :span="2">
             {{ data.info.INVOLVING_CORPS_DEPART_NAME }}
           </el-descriptions-item>
-          <el-descriptions-item label="集团单位" :span="2">
-            {{ data.info.GROUP_UNIT_NAME }}
-          </el-descriptions-item>
           <el-descriptions-item label="计划工期" :span="2">
             {{ data.info.STARTTIME }} 至 {{ data.info.ENDTIME }}
           </el-descriptions-item>
-          <el-descriptions-item label="施工相关方" :span="2">
-            {{ data.info.UNITS_NAME }}
-          </el-descriptions-item>
-          <el-descriptions-item label="合同号">
+          <el-descriptions-item label="合同号" :span="2">
             {{ data.info.CONTRACT_NUM }}
           </el-descriptions-item>
-          <el-descriptions-item label="监理单位名称">
-            {{ data.info.MANAGE_CORPS_NAME }}
+          <el-descriptions-item label="施工相关方" :span="2">
+            {{ data.info.UNITS_NAME }}
           </el-descriptions-item>
           <el-descriptions-item label="相关方单位工程负责人">
             {{ data.info.UNITS_PIC_NAME }}
@@ -56,19 +50,12 @@
           <el-descriptions-item label="相关方单位负责人手机">
             {{ data.info.UNITS_PHONE }}
           </el-descriptions-item>
-          <el-descriptions-item label="监理单位工程负责人">
-            {{ data.info.MANAGE_PIC }}
-          </el-descriptions-item>
-          <el-descriptions-item label="监理单位负责人手机">
-            {{ data.info.MANAGE_PHONE }}
-          </el-descriptions-item>
-          <el-descriptions-item label="是否发送短信">
-            {{ data.info.IS_SMS === "0" ? "是" : "否" }}
-          </el-descriptions-item>
           <el-descriptions-item label="状态">
-            <span v-if="data.info.STATE === '0'">未开始</span>
+            <span v-if="data.info.STATE === '0'">未开工</span>
             <span v-if="data.info.STATE === '1'">进行中</span>
             <span v-if="data.info.STATE === '2'">已结束</span>
+            <span v-if="data.info.STATE === '-1'">开工申请中</span>
+            <span v-if="data.info.STATE === '-2'">结束申请中</span>
           </el-descriptions-item>
         </el-descriptions>
         <el-divider content-position="left">处罚相关</el-divider>
diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index 43666f5..c301200 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -148,12 +148,9 @@ const data = reactive({
 });
 
 const resetPwd = async (PERSONNELMANAGEMENT_ID, NAME) => {
-  await ElMessageBox.confirm(
-    "是否将[" + NAME + "]的密码重置为 666666 吗?",
-    {
-      type: "warning",
-    }
-  );
+  await ElMessageBox.confirm("是否将[" + NAME + "]的密码重置为 666666 吗?", {
+    type: "warning",
+  });
   await setPersonnelmanagementResetPwd({ PERSONNELMANAGEMENT_ID });
   ElMessage.success("重置成功");
 };
@@ -200,7 +197,7 @@ const fnGoEdit = async (id) => {
 
 const fnResetPaginationTransfer = () => {
   fnGetData(searchForm);
-  tableRef.value.clearSelection()
+  tableRef.value.clearSelection();
 };
 
 const fnAdd = () => {
diff --git a/src/views/keyprojects/punish/index.vue b/src/views/keyprojects/punish/index.vue
index a61d1f4..815987f 100644
--- a/src/views/keyprojects/punish/index.vue
+++ b/src/views/keyprojects/punish/index.vue
@@ -46,11 +46,6 @@
             <span v-else>{{ row.DEPARTMENT_NAME }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="MANAGE_CORPS_NAME"
-          label="监理单位"
-          width="200"
-        />
         <el-table-column
           prop="UNITS_PIC_NAME"
           label="相关方单位负责人"