From f494e3b9fe0acc788a13058f30ef41b0026459da Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 24 May 2024 21:42:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                            |   8 +-
 .../projectFront/inspecPoint/inspection.vue   |  18 ++-
 .../projectFront/inspecPoint/selfInspect.vue  |  58 +++++---
 .../projectFront/inspectRoute/routeManage.vue | 138 ++++++++++++------
 .../laborManage/personDetails.vue             |  12 +-
 5 files changed, 149 insertions(+), 85 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 2b2d9a6f..5c007c90 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -50,10 +50,10 @@ export default new Vuex.Store({
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
     // FILEURL:'http://182.90.224.237:51234/image/',
-    UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
-    FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
-    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
+    // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
+    // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
+    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
+    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
     WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
     // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
     // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
diff --git a/src/views/projectFront/inspecPoint/inspection.vue b/src/views/projectFront/inspecPoint/inspection.vue
index fe21ad0f..9a9510fd 100644
--- a/src/views/projectFront/inspecPoint/inspection.vue
+++ b/src/views/projectFront/inspecPoint/inspection.vue
@@ -68,14 +68,14 @@
           ></el-table-column>
           <el-table-column
             prop="inspectUserNames"
-            label="检查人员"
+            label="责任人"
             align="center"
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="noticeUserNames"
             label="通知人"
             align="center"
-          ></el-table-column>
+          ></el-table-column> -->
 
           <el-table-column prop="qrCode" label="二维码" align="center">
             <template slot-scope="{ row }">
@@ -278,7 +278,7 @@
               </el-option>
             </el-select>
           </el-form-item> -->
-          <el-form-item label="巡检记录通知人员：" prop="noticeUserIds">
+          <!-- <el-form-item label="巡检记录通知人员：" prop="noticeUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -297,7 +297,6 @@
             </el-select>
           </el-form-item>
           <el-form-item label="巡检时间范围：" prop="startTime">
-            <!-- 开始日期 结束日期 -->
             <el-date-picker
               :disabled="cardDialogTitle == '详情'"
               style="width: 320px"
@@ -321,7 +320,6 @@
               :controls="false"
             >
             </el-input-number>
-            <!-- 检查频次  选择单位 -->
             <el-select
               :disabled="cardDialogTitle == '详情'"
               class="smallInput"
@@ -337,7 +335,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <!-- 
           <el-form-item label="经度：" prop="longitude">
             <el-input v-model="cardForm.longitude"></el-input>
@@ -951,7 +949,7 @@ export default {
           data.createUserName = this.$store.state.userInfo.account;
           data.inspectUserIds = data.inspectUserIds.join(",");
           data.enterpriseId = data.enterpriseId.join(",");
-          data.noticeUserIds = data.noticeUserIds.join(",");
+          // data.noticeUserIds = data.noticeUserIds.join(",");
           data.template = JSON.stringify(formTemplate);
           if (this.cardDialogTitle == "新建巡检点") {
             addPointApi(data).then((res) => {
@@ -1099,4 +1097,8 @@ export default {
 ::v-deep .el-tag {
   max-width: 200px;
 }
+// 图片预览的关闭按钮
+::v-deep .el-image-viewer__btn.el-image-viewer__close{
+  color: white;
+}
 </style>
diff --git a/src/views/projectFront/inspecPoint/selfInspect.vue b/src/views/projectFront/inspecPoint/selfInspect.vue
index 6dde48d9..e0be6488 100644
--- a/src/views/projectFront/inspecPoint/selfInspect.vue
+++ b/src/views/projectFront/inspecPoint/selfInspect.vue
@@ -580,30 +580,40 @@ export default {
     },
     // 查询
     getPointList() {
-      let data = new FormData(); //new出来的对象
-      data.append("queryStr", this.queryStr);
-      data.append("projectSn", this.$store.state.projectSn);
-      data.append("pageNo", this.pageNo);
-      data.append("pageSize", this.pageSize);
-      data.append(
-        "checkingPointName",
-        this.searchForm.checkingPointName
-          ? this.searchForm.checkingPointName
-          : ""
-      );
-      data.append(
-        "status",
-        this.searchForm.status ? this.searchForm.status : ""
-      );
-      data.append(
-        "queryEndTime",
-        this.searchForm.queryEndTime ? this.searchForm.queryEndTime : ""
-      );
-      data.append(
-        "queryStartTime",
-        this.searchForm.queryStartTime ? this.searchForm.queryStartTime : ""
-      );
-      getCheckPointApi(data).then((res) => {
+      // let data = new FormData(); //new出来的对象
+      // data.append("queryStr", this.queryStr);
+      // data.append("projectSn", this.$store.state.projectSn);
+      // data.append("pageNo", this.pageNo);
+      // data.append("pageSize", this.pageSize);
+      // data.append(
+      //   "checkingPointName",
+      //   this.searchForm.checkingPointName
+      //     ? this.searchForm.checkingPointName
+      //     : ""
+      // );
+      // data.append(
+      //   "status",
+      //   this.searchForm.status ? this.searchForm.status : ""
+      // );
+      // data.append(
+      //   "queryEndTime",
+      //   this.searchForm.queryEndTime ? this.searchForm.queryEndTime : ""
+      // );
+      // data.append(
+      //   "queryStartTime",
+      //   this.searchForm.queryStartTime ? this.searchForm.queryStartTime : ""
+      // );
+      let requestData = {
+        queryStr: this.queryStr,
+        projectSn: this.$store.state.projectSn,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        checkingPointName: this.searchForm.checkingPointName ? this.searchForm.checkingPointName: "",
+        status: this.searchForm.status ? this.searchForm.status : "",
+        queryEndTime: this.searchForm.queryEndTime ? this.searchForm.queryEndTime : "",
+        queryStartTime: this.searchForm.queryStartTime ? this.searchForm.queryStartTime : ""
+      }
+      getCheckPointApi(requestData).then((res) => {
         console.log("res111111111", res);
         this.tableData = res.result.records;
         this.total = Number(res.result.total);
diff --git a/src/views/projectFront/inspectRoute/routeManage.vue b/src/views/projectFront/inspectRoute/routeManage.vue
index f6e24a7c..b84dc17c 100644
--- a/src/views/projectFront/inspectRoute/routeManage.vue
+++ b/src/views/projectFront/inspectRoute/routeManage.vue
@@ -145,7 +145,7 @@
               style="width: 100%"
             ></el-input>
           </el-form-item>
-          <el-form-item label="区域名称：" prop="qualityRegionId">
+          <!-- <el-form-item label="区域名称：" prop="qualityRegionId">
             <el-select
               style="width: 100%"
               :disabled="cardDialogTitle == '详情'"
@@ -163,8 +163,8 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
-          <el-form-item label="企业名称：" prop="enterpriseId">
+          </el-form-item> -->
+          <el-form-item label="分包单位：" prop="enterpriseId">
             <el-select
               style="width: 100%"
               :disabled="cardDialogTitle == '详情'"
@@ -241,7 +241,7 @@
           <el-form-item label="检查频次：" prop="frequencyNum">
             <el-input-number
               style="width: 47%"
-              :disabled="cardDialogTitle == '详情'"
+              :disabled="true"
               v-model="cardForm.frequencyNum"
               :min="1"
               :controls="false"
@@ -268,7 +268,7 @@
           <div class="route-manage-title">
             <span>巡检路线</span>
           </div>
-          <vue-scroll style="height: 80%; margin-top: 10px">
+          <vue-scroll style="height: 300px; margin-top: 10px">
             <div class="route-manage-list">
               <el-form
                 size="medium"
@@ -609,7 +609,10 @@ import {
   getCheckPointApi,
   routeTaskDeleteApi,
 } from "@/assets/js/api/insect.js";
-import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
+import {
+  getProjectChilderSystemUserListApi,
+  getEnterpriseInfoListApi,
+} from "@/assets/js/api/configManage.js";
 import dynamicForms from "./components/dynamicForms/index.vue";
 // import QRCode from "qrcodejs2";
 var mouseTool;
@@ -631,8 +634,9 @@ export default {
         sort: [
           {
             required: true,
-            message: "请输入",
+            message: "请输入正整数数字",
             trigger: "blur",
+            pattern: /^\d+$/
           },
         ],
         checkingPointId: [
@@ -665,9 +669,9 @@ export default {
       cardForm: {
         routeName: "",
         position: "",
-        qualityRegionId: "", // 区域ID
+        // qualityRegionId: "", // 区域ID
         enterpriseId: "", // 责任企业
-        inspectUserIds: "", //检查人
+        inspectUserIds: [], //检查人
         noticeUserIds: "", //通知人
         startTime: "",
         endTime: "",
@@ -689,9 +693,9 @@ export default {
         position: [
           { required: true, message: "请输入巡检位置", trigger: "blur" },
         ],
-        qualityRegionId: [
-          { required: true, message: "请选择", trigger: "change" },
-        ],
+        // qualityRegionId: [
+        //   { required: true, message: "请选择", trigger: "change" },
+        // ],
         enterpriseId: [
           { required: true, message: "请选择", trigger: "change" },
         ],
@@ -731,8 +735,18 @@ export default {
     this.getRouteList();
     this.getPointAreaFn();
     this.getPointList();
+    this.getUpdateUnitListFn();
   },
   methods: {
+    // 获取分包单位列表
+    getUpdateUnitListFn() {
+      getEnterpriseInfoListApi({ projectSn: this.projectSn }).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.enterpriseList = res.result;
+        }
+      });
+    },
     recordDetail(row) {
       this.recordRowObj = row;
       this.detailsShow = true;
@@ -821,19 +835,20 @@ export default {
             this.cardForm.noticeUserIds =
               this.cardForm.noticeUserIds.split(",");
           }
-          let findItem = this.pointAreaList.find((item) => {
-            return item.id == this.cardForm.qualityRegionId;
-          });
-          if (findItem) {
-            this.areaData = findItem;
-            this.chargerList = findItem.systemUsers;
-            this.enterpriseList = findItem.enterpriseInfos;
-          }
+          // let findItem = this.pointAreaList.find((item) => {
+          //   return item.id == this.cardForm.qualityRegionId;
+          // });
+          // if (findItem) {
+          //   this.areaData = findItem;
+          //   this.chargerList = findItem.systemUsers;
+          //   this.enterpriseList = findItem.enterpriseInfos;
+          // }
           this.$nextTick(() => {
             this.$refs.cardForm.clearValidate();
             this.$refs.routeForm.clearValidate();
           });
           this.getAccountList();
+          this.getUpdatePersonListFn();
         }
       });
     },
@@ -845,33 +860,65 @@ export default {
     },
     //切换 整改人
     changeDutyId(value) {
-      console.log(this.cardForm, 777888);
+      console.log(value);
+      console.log(this.cardForm, 666777);
+      console.log(this.chargerList, 888999);
       if (this.cardForm.enterpriseId.length > 0) {
-        this.chargerList = this.areaData.systemUsers.filter((item) => {
-          return this.cardForm.enterpriseId.includes(item.enterpriseId);
-        });
         let shouldHavePersonIdList = this.chargerList.map((item) => {
           if (this.cardForm.enterpriseId.includes(item.enterpriseId)) {
             return item.userId;
           }
         });
-        if (this.cardForm.inspectUserIds) {
-          const newArr = this.cardForm.inspectUserIds.filter((item) =>
-            shouldHavePersonIdList.includes(item)
-          );
-          this.cardForm.inspectUserIds = newArr;
-        }
+        const newArr = this.cardForm.inspectUserIds.filter((item) =>
+          shouldHavePersonIdList.includes(item)
+        );
+        this.cardForm.inspectUserIds = newArr;
       } else {
-        this.chargerList = this.areaData.systemUsers;
-        this.cardForm.inspectUserIds = "";
+        this.form.inspectUserIds = [];
       }
+      this.getUpdatePersonListFn();
     },
+    // 获取整改人列表
+    getUpdatePersonListFn() {
+      let data = {
+        projectSn: this.projectSn,
+        enterpriseId: this.cardForm.enterpriseId ? this.cardForm.enterpriseId.join(",") : "",
+      };
+      getProjectChilderSystemUserListApi(data).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.chargerList = res.result;
+        }
+      });
+    },
+    // changeDutyId(value) {
+    //   console.log(this.cardForm, 777888);
+    //   if (this.cardForm.enterpriseId.length > 0) {
+    //     this.chargerList = this.areaData.systemUsers.filter((item) => {
+    //       return this.cardForm.enterpriseId.includes(item.enterpriseId);
+    //     });
+    //     let shouldHavePersonIdList = this.chargerList.map((item) => {
+    //       if (this.cardForm.enterpriseId.includes(item.enterpriseId)) {
+    //         return item.userId;
+    //       }
+    //     });
+    //     if (this.cardForm.inspectUserIds) {
+    //       const newArr = this.cardForm.inspectUserIds.filter((item) =>
+    //         shouldHavePersonIdList.includes(item)
+    //       );
+    //       this.cardForm.inspectUserIds = newArr;
+    //     }
+    //   } else {
+    //     this.chargerList = this.areaData.systemUsers;
+    //     this.cardForm.inspectUserIds = "";
+    //   }
+    // },
     updateArea() {
       let findItem = this.pointAreaList.find((item) => {
         return item.id == this.cardForm.qualityRegionId;
       });
       this.cardForm.enterpriseId = "";
-      this.cardForm.inspectUserIds = "";
+      this.cardForm.inspectUserIds = [];
       console.log(findItem, 777888);
       if (findItem) {
         this.areaData = findItem;
@@ -1025,6 +1072,7 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
+        routeName: this.searchForm.routeName
       };
       routeCheckPageApi(data).then((res) => {
         console.log("----巡检点列表", res);
@@ -1064,14 +1112,14 @@ export default {
       if (this.cardForm.noticeUserIds) {
         this.cardForm.noticeUserIds = this.cardForm.noticeUserIds.split(",");
       }
-      let findItem = this.pointAreaList.find((item) => {
-        return item.id == this.cardForm.qualityRegionId;
-      });
-      if (findItem) {
-        this.areaData = findItem;
-        this.chargerList = findItem.systemUsers;
-        this.enterpriseList = findItem.enterpriseInfos;
-      }
+      // let findItem = this.pointAreaList.find((item) => {
+      //   return item.id == this.cardForm.qualityRegionId;
+      // });
+      // if (findItem) {
+      //   this.areaData = findItem;
+      //   this.chargerList = findItem.systemUsers;
+      //   this.enterpriseList = findItem.enterpriseInfos;
+      // }
       this.getAccountList();
     },
     // 新增
@@ -1089,7 +1137,7 @@ export default {
       this.cardDialogTitle = "新建巡检路线";
       this.areaData = {};
       this.chargerList = [];
-      this.enterpriseList = [];
+      // this.enterpriseList = [];
       this.resetForm();
       this.$nextTick(() => {
         this.$refs.cardForm.clearValidate();
@@ -1242,9 +1290,9 @@ export default {
       this.cardForm = {
         routeName: "",
         position: "",
-        qualityRegionId: "", // 区域ID
+        // qualityRegionId: "", // 区域ID
         enterpriseId: "", // 责任企业
-        inspectUserIds: "", //检查人
+        inspectUserIds: [], //检查人
         noticeUserIds: "", //通知人
         startTime: "",
         endTime: "",
@@ -1364,7 +1412,7 @@ export default {
     .add-route {
       width: 203px;
       height: 32px;
-      margin: 0 auto;
+      margin: 8px auto;
       display: flex;
       align-items: center;
       justify-content: center;
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index 5d843998..61fd091d 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -1008,7 +1008,8 @@
           </div>
           <div id="pact" class="table">
             <div class="pageTitle">
-              {{ $t("message.laborMange.contractInfo") }}
+              <!-- {{ $t("message.laborMange.contractInfo") }} -->
+              劳动合同
               <el-button
                 type="text"
                 @click="editPactInfo"
@@ -1679,7 +1680,8 @@
           </div>
           <div id="insurance" class="table">
             <div class="pageTitle">
-              {{ $t("message.laborMange.insuranceInfo") }}
+              <!-- {{ $t("message.laborMange.insuranceInfo") }} -->
+              工伤保险
               <el-button
                 type="text"
                 @click="addTableInfo(3)"
@@ -2192,7 +2194,8 @@
           :class="activeClass == 2 ? 'checkedClass' : ''"
           @click="getActiveClass(2)"
         >
-          {{ $t("message.laborMange.contractInfo") }}
+          <!-- {{ $t("message.laborMange.contractInfo") }} -->
+          劳动合同
         </div>
         <div
           :class="activeClass == 3 ? 'checkedClass' : ''"
@@ -2210,7 +2213,8 @@
           :class="activeClass == 5 ? 'checkedClass' : ''"
           @click="getActiveClass(5)"
         >
-          {{ $t("message.laborMange.insuranceInfo") }}
+          <!-- {{ $t("message.laborMange.insuranceInfo") }} -->
+          工伤保险
         </div>
         <div
           :class="activeClass == 6 ? 'checkedClass' : ''"