From a0ca4397db6f5fea538e26c4021d8e294c763c47 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 9 May 2024 20:17:15 +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/components/header.vue                     |   4 +-
 src/components/userChange.vue                 |  51 ++++-
 .../companyAdmin/basicSafeSetup/checkItem.vue |   5 +-
 .../projectFront/inspecPoint/inspection.vue   | 190 ++++++++----------
 .../projectFront/inspecPoint/selfInspect.vue  |   1 +
 .../laborManage/personAuditAg.vue             |   4 +-
 .../laborManage/personDetails.vue             |  11 +
 .../personModule/administration.vue           |  18 +-
 .../progressManagementAg/progressApproval.vue |   2 +
 .../quality/businessModule/checkPoint.vue     |   3 +
 .../projectFront/quality/inspectionLedger.vue | 137 ++++++++-----
 .../projectFront/quality/v2/subTasklist.vue   |  12 +-
 .../safeSame/inspectionLedger.vue             |  78 ++++---
 .../projectFront/safeSame/v2/subTasklist.vue  |  12 +-
 .../deviceCentral/deviceCentral.vue           |   6 +
 15 files changed, 330 insertions(+), 204 deletions(-)

diff --git a/src/components/header.vue b/src/components/header.vue
index dad65c66..dc5c0b71 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -52,9 +52,9 @@
         >>{{ item.name }}</span
       >
     </div>
-    <!-- <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
+    <div class="title_near flex" v-if="![1,2].includes($store.state.userInfo.accountType)">
       <userChange></userChange>
-    </div> -->
+    </div>
     <div class="title_near-tow flex" v-if="![11,1,2].includes($store.state.userInfo.accountType)">
       <div class="divider-line"></div>
       <centerChange></centerChange>
diff --git a/src/components/userChange.vue b/src/components/userChange.vue
index 6c90a69e..6e6722b7 100644
--- a/src/components/userChange.vue
+++ b/src/components/userChange.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="header-btn">
+  <div class="header-btn" v-show="isShowGroup">
     <el-popover
       placement="bottom"
       trigger="hover"
@@ -131,6 +131,7 @@
 </template>
 <script>
 import { getGroupListApi } from "@/assets/js/api/loginSign.js";
+import { getComapnyStatisticsSupplierListApi } from "@/assets/js/api/company/project";
 export default {
   data() {
     return {
@@ -146,6 +147,8 @@ export default {
       selectedProjectSn: "",
       expandKey: [],
       selectFirst: 0,
+      isShowGroup: false,
+      selectGroupFirst: 0
     };
   },
   created() {
@@ -158,9 +161,55 @@ export default {
       this.selectedProjectSn = this.$store.state.projectSn;
       this.expandKey = [this.selectedProjectSn];
     }
+    this.loadData();
   },
   mounted() {},
   methods: {
+    // 获取是否只有一个企业一个项目，只有一个企业一个项目时隐藏
+    loadData() {
+      let that = this;
+      let sn = this.$store.state.userInfo.headquartersSn;
+      let projectType = 1; // 展示项目列表
+      // if (this.$store.state.userInfo.addProjectType == 1) {
+      //   projectType = 0; // 不展示项目列表
+      // }
+      getComapnyStatisticsSupplierListApi({
+        sn: sn,
+        projectType: projectType,
+      }).then((res) => {
+        console.log(res,666555444)
+        if(res.result && res.result.companyList){
+          if(res.result.companyList.length > 1){
+            that.isShowGroup = true;
+          } else {
+            if(res.result.companyList.length == 1){
+              that.selectShowGroup(res.result.companyList[0])
+            } else {
+              that.isShowGroup = false;
+            }
+          }
+        }
+      });
+    },
+    // 选中组织中的项目级
+    selectShowGroup(obj) {
+      console.log(obj, "111222333");
+      if (!obj) return;
+      if (obj.list && obj.list.length > 0) {
+        obj.list.map((item) => {
+          this.selectShowGroup(item);
+        });
+      } else {
+        if (this.selectGroupFirst === 0) {
+          // 加判断是为了在循环中只选中第一个
+          this.isShowGroup = false;
+        } else {
+          this.isShowGroup = true;
+        }
+        // this.setTreeActive();
+        this.selectGroupFirst = 1;
+      }
+    },
     // 处理组织架构树形数据
     filterTreeData(tree) {
       tree.forEach((node) => {
diff --git a/src/views/companyAdmin/basicSafeSetup/checkItem.vue b/src/views/companyAdmin/basicSafeSetup/checkItem.vue
index 3485fb75..3dd621a8 100644
--- a/src/views/companyAdmin/basicSafeSetup/checkItem.vue
+++ b/src/views/companyAdmin/basicSafeSetup/checkItem.vue
@@ -471,10 +471,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="扣分" prop="deductScore">
-            <el-input
-              placeholder="请输入"
-              v-model="dialogdata.deductScore"
-            ></el-input>
+            <el-input-number style="width: 100%;" v-model="dialogdata.deductScore" placeholder="请输入" :min="0" :max="100"></el-input-number>
           </el-form-item>
         </el-form>
         <div class="dialog-footer">
diff --git a/src/views/projectFront/inspecPoint/inspection.vue b/src/views/projectFront/inspecPoint/inspection.vue
index 600dff5a..60b63791 100644
--- a/src/views/projectFront/inspecPoint/inspection.vue
+++ b/src/views/projectFront/inspecPoint/inspection.vue
@@ -216,7 +216,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-           <el-form-item label="责任人：" prop="inspectUserIds">
+          <el-form-item label="责任人：" prop="inspectUserIds">
             <el-select
               :disabled="cardDialogTitle == '详情'"
               collapse-tags
@@ -393,10 +393,10 @@ import {
   addPointApi,
   deletePointApi,
   editPointApi,
-  pointAreaApi
+  pointAreaApi,
 } from "@/assets/js/api/insect.js";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
-import dynamicForms from "./components/dynamicForms/index.vue"
+import dynamicForms from "./components/dynamicForms/index.vue";
 // import QRCode from "qrcodejs2";
 var mouseTool;
 var mouseTool;
@@ -409,7 +409,7 @@ export default {
       enterpriseList: [],
       pickerOptions: {
         disabledDate(time) {
-          return time.getTime() < Date.now() - 1 * 24 * 3600 * 1000
+          return time.getTime() < Date.now() - 1 * 24 * 3600 * 1000;
         },
       },
       searchForm: {
@@ -434,7 +434,7 @@ export default {
         standArea: 100, //范围
         latitude: "", //纬度
         longitude: "", //经度
-        addr: "",//地图区域
+        addr: "", //地图区域
       },
       qrCode: "",
       cardDialog: false,
@@ -449,9 +449,7 @@ export default {
         qualityRegionId: [
           { required: true, message: "请选择", trigger: "blur" },
         ],
-        enterpriseId: [
-          { required: true, message: "请选择", trigger: "blur" },
-        ],
+        enterpriseId: [{ required: true, message: "请选择", trigger: "blur" }],
         inspectUserIds: [
           { required: true, message: "请输入检查人员", trigger: "blur" },
         ],
@@ -464,13 +462,8 @@ export default {
         frequencyNum: [
           { required: true, message: "请输入巡检频次", trigger: "blur" },
         ],
-        standArea: [
-          { required: true, message: "请选择", trigger: "blur" },
-        ],
-        addr: [
-          { required: true, message: "请选择区域", trigger: "change" },
-        ],
-
+        standArea: [{ required: true, message: "请选择", trigger: "blur" }],
+        addr: [{ required: true, message: "请选择区域", trigger: "change" }],
       },
       checkDaterange: [],
       frequencyType: ["次", "次/日", "次/周", "次/月", "次/年"],
@@ -482,7 +475,7 @@ export default {
       formData: [], // 存储动态表单数据
       isAdding: true,
       pointAreaList: [],
-      areaData: {}
+      areaData: {},
     };
   },
   mounted() {
@@ -491,19 +484,19 @@ export default {
     this.getPointAreaFn();
   },
   methods: {
-     //切换 整改人
-     changeDutyId(value) {
-      console.log(this.cardForm,777888)
+    //切换 整改人
+    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)
-        })
+        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){
+        if (this.cardForm.inspectUserIds) {
           const newArr = this.cardForm.inspectUserIds.filter((item) =>
             shouldHavePersonIdList.includes(item)
           );
@@ -514,63 +507,57 @@ export default {
         this.cardForm.inspectUserIds = "";
       }
     },
-    updateArea(){
-      let findItem = this.pointAreaList.find(item => {
-        return item.id == this.cardForm.qualityRegionId
-      })
+    updateArea() {
+      let findItem = this.pointAreaList.find((item) => {
+        return item.id == this.cardForm.qualityRegionId;
+      });
       this.cardForm.enterpriseId = "";
       this.cardForm.inspectUserIds = "";
-      console.log(findItem,777888)
-      if(findItem){
+      console.log(findItem, 777888);
+      if (findItem) {
         this.areaData = findItem;
         this.chargerList = findItem.systemUsers;
         this.enterpriseList = findItem.enterpriseInfos;
       }
     },
     // 获取区域列表
-    getPointAreaFn(){
+    getPointAreaFn() {
       let requestData = {
-        projectSn: this.projectSn
-      }
-      pointAreaApi(requestData).then(res => {
-        console.log(res)
+        projectSn: this.projectSn,
+      };
+      pointAreaApi(requestData).then((res) => {
+        console.log(res);
         this.pointAreaList = res.result;
-      })
+      });
     },
     //查看详情
     deilBtn(obj) {
-      this.isAdding = false
-      this.cardDialogTitle = '详情'
-      this.cardDialog = true
-      this.cardForm = JSON.parse(JSON.stringify(obj))
+      this.isAdding = false;
+      this.cardDialogTitle = "详情";
+      this.cardDialog = true;
+      this.cardForm = JSON.parse(JSON.stringify(obj));
       if (obj.startTime && obj.endTime) {
-        this.checkDaterange = [
-          new Date(obj.startTime),
-          new Date(obj.endTime)
-        ];
+        this.checkDaterange = [new Date(obj.startTime), new Date(obj.endTime)];
       } else {
         this.checkDaterange = [];
       }
       this.formData.splice(0); // 清空数组
-      JSON.parse(obj.template).forEach(item => {
+      JSON.parse(obj.template).forEach((item) => {
         this.formData.push(item); // 添加新的数据到数组中
       });
       if (this.cardForm.inspectUserIds) {
-        this.cardForm.inspectUserIds =
-          this.cardForm.inspectUserIds.split(',')
+        this.cardForm.inspectUserIds = this.cardForm.inspectUserIds.split(",");
       }
       if (this.cardForm.enterpriseId) {
-        this.cardForm.enterpriseId =
-          this.cardForm.enterpriseId.split(',')
+        this.cardForm.enterpriseId = this.cardForm.enterpriseId.split(",");
       }
       if (this.cardForm.noticeUserIds) {
-        this.cardForm.noticeUserIds =
-          this.cardForm.noticeUserIds.split(',')
+        this.cardForm.noticeUserIds = this.cardForm.noticeUserIds.split(",");
       }
-      let findItem = this.pointAreaList.find(item => {
-        return item.id == this.cardForm.qualityRegionId
-      })
-      if(findItem){
+      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;
@@ -634,12 +621,12 @@ export default {
       this.map.on("click", (e) => {
         console.log(
           "您在 [ " +
-          e.lnglat.getLng() +
-          "," +
-          e.lnglat.getLat() +
-          " ] 的位置单击了地图！"
-        );;
-        this.cardForm.latitude = e.lnglat.getLat()
+            e.lnglat.getLng() +
+            "," +
+            e.lnglat.getLat() +
+            " ] 的位置单击了地图！"
+        );
+        this.cardForm.latitude = e.lnglat.getLat();
         this.cardForm.longitude = e.lnglat.getLng();
 
         this.locationList = [];
@@ -667,7 +654,6 @@ export default {
       console.log("select", e);
       this.placeSearch.setCity(e.poi.adcode);
       this.placeSearch.search(e.poi.name);
-
     },
     //清空地图
     clearFn() {
@@ -783,7 +769,7 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         projectSn: this.projectSn,
-        checkingPointName: this.searchForm.checkingPointName
+        checkingPointName: this.searchForm.checkingPointName,
       };
       getPointListApi(data).then((res) => {
         console.log("----巡检点列表", res);
@@ -798,41 +784,35 @@ export default {
       this.getPointList();
     },
     editBtn(obj) {
-      console.log('编辑的信息', obj);
-      this.cardDialog = true
-      this.isAdding = true
-      this.cardForm = JSON.parse(JSON.stringify(obj))
-      this.cardDialogTitle = '编辑巡检点'
+      console.log("编辑的信息", obj);
+      this.cardDialog = true;
+      this.isAdding = true;
+      this.cardForm = JSON.parse(JSON.stringify(obj));
+      this.cardDialogTitle = "编辑巡检点";
       // this.checkDaterange[0] = this.cardForm.startTime
       // this.checkDaterange[1] = this.cardForm.endTime
       if (obj.startTime && obj.endTime) {
-        this.checkDaterange = [
-          new Date(obj.startTime),
-          new Date(obj.endTime)
-        ];
+        this.checkDaterange = [new Date(obj.startTime), new Date(obj.endTime)];
       } else {
         this.checkDaterange = [];
       }
       this.formData.splice(0); // 清空数组
-      JSON.parse(obj.template).forEach(item => {
+      JSON.parse(obj.template).forEach((item) => {
         this.formData.push(item); // 添加新的数据到数组中
       });
       if (this.cardForm.inspectUserIds) {
-        this.cardForm.inspectUserIds =
-          this.cardForm.inspectUserIds.split(',')
+        this.cardForm.inspectUserIds = this.cardForm.inspectUserIds.split(",");
       }
       if (this.cardForm.enterpriseId) {
-        this.cardForm.enterpriseId =
-          this.cardForm.enterpriseId.split(',')
+        this.cardForm.enterpriseId = this.cardForm.enterpriseId.split(",");
       }
       if (this.cardForm.noticeUserIds) {
-        this.cardForm.noticeUserIds =
-          this.cardForm.noticeUserIds.split(',')
+        this.cardForm.noticeUserIds = this.cardForm.noticeUserIds.split(",");
       }
-      let findItem = this.pointAreaList.find(item => {
-        return item.id == this.cardForm.qualityRegionId
-      })
-      if(findItem){
+      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;
@@ -845,18 +825,22 @@ export default {
     // 新增
     toAdd() {
       this.cardDialog = true;
-      this.isAdding = true
-      this.formData.splice(0)
+      this.isAdding = true;
+      this.formData.splice(0);
       this.formData.push({
-        title: '表单标题',
-        name: '',
+        title: "表单标题",
+        name: "",
         isRequired: true,
-        value: ''
-      })
-      this.checkDaterange = []
-      this.cardDialogTitle = '新建巡检点'
+        value: "",
+      });
+      this.checkDaterange = [];
+      this.cardDialogTitle = "新建巡检点";
+      this.areaData = {};
+      this.chargerList = [];
+      this.enterpriseList = [];
       this.$nextTick(() => {
         this.initMap();
+        this.$refs.cardForm.clearValidate();
       });
       this.getAccountList();
     },
@@ -930,15 +914,15 @@ export default {
           formTemplate = this.$refs.dynamicFormsRef.dynamicFroms;
 
           // 新增
-          let data = {...this.cardForm};
+          let data = { ...this.cardForm };
           data.projectSn = this.$store.state.projectSn;
           data.createUserId = this.$store.state.userInfo.userId;
           data.createUserName = this.$store.state.userInfo.account;
-          data.inspectUserIds = data.inspectUserIds.join(',');
-          data.enterpriseId = data.enterpriseId.join(',');
-          data.noticeUserIds = data.noticeUserIds.join(',');
+          data.inspectUserIds = data.inspectUserIds.join(",");
+          data.enterpriseId = data.enterpriseId.join(",");
+          data.noticeUserIds = data.noticeUserIds.join(",");
           data.template = JSON.stringify(formTemplate);
-          if (this.cardDialogTitle == '新建巡检点') {
+          if (this.cardDialogTitle == "新建巡检点") {
             addPointApi(data).then((res) => {
               console.log("新增", res);
               if (res.code == 200) {
@@ -973,13 +957,13 @@ export default {
             //       }
             //     });
             //   }, 500);
-          } else if (this.cardDialogTitle == '编辑巡检点') {
+          } else if (this.cardDialogTitle == "编辑巡检点") {
             editPointApi(data).then((res) => {
               if (res.success) {
-                this.$message.success(res.message)
-                this.getPointList()
+                this.$message.success(res.message);
+                this.getPointList();
               }
-            })
+            });
           }
           this.cardDialog = false;
         }
@@ -1009,11 +993,11 @@ export default {
       this.$refs.cardForm.clearValidate();
       this.cardForm.startTime = "";
       this.cardForm.endTime = "";
-      console.log(this.cardForm,777888)
+      console.log(this.cardForm, 777888);
     },
     refresh() {
-      this.searchForm = {}
-      this.getPointList()
+      this.searchForm = {};
+      this.getPointList();
     },
   },
 };
@@ -1052,4 +1036,4 @@ export default {
   font-size: 16px;
   line-height: 56px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/projectFront/inspecPoint/selfInspect.vue b/src/views/projectFront/inspecPoint/selfInspect.vue
index 6409c043..d7323c07 100644
--- a/src/views/projectFront/inspecPoint/selfInspect.vue
+++ b/src/views/projectFront/inspecPoint/selfInspect.vue
@@ -274,6 +274,7 @@
               v-if="imgSrc"
               style="width: 150px; height: 100px"
               :src="$store.state.FILEURL + imgSrc"
+              :preview="$store.state.FILEURL + imgSrc"
               alt=""
             />
           </el-form-item>
diff --git a/src/views/projectFront/laborManage/personAuditAg.vue b/src/views/projectFront/laborManage/personAuditAg.vue
index 0b97483a..75a08b96 100644
--- a/src/views/projectFront/laborManage/personAuditAg.vue
+++ b/src/views/projectFront/laborManage/personAuditAg.vue
@@ -115,14 +115,14 @@
             <template slot-scope="scope">
               <div class="flex3" style="padding-left: 20px">
                 <img
-                  :src="$store.state.FILEURL + scope.row.idCardBigPhotoUrl"
+                  :src="$store.state.FILEURL + scope.row.fieldAcquisitionUrl"
                   style="
                     width: 52px;
                     height: 72px;
                     margin: 0px 15px;
                     cursor: pointer;
                   "
-                  @click="handlePreview(scope.row.idCardBigPhotoUrl)"
+                  @click="handlePreview(scope.row.fieldAcquisitionUrl)"
                 />
                 <div>
                   <div class="workerName" @click="showDetail(scope.row)">
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index 93ab8076..bd733a04 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -3239,6 +3239,9 @@ export default {
           this.cropperEditTitle = "现场采集照裁剪"
         } else if(type == 8){
           this.cropperEditTitle = "身份证头像裁剪"
+        } else if([4,5,6,7].includes(type)){
+          let url = this.$http.defaults.baseURL + 'xmgl/upload/getRenameFile?fileUrl=' + this.fileUrl + itemUrl + '&fileName=' + itemName
+          window.location.href = url;
         }
         if(this.basicInfoStatus){
           this.dialogVisible = true;
@@ -3293,6 +3296,10 @@ export default {
             );
             return;
           }
+          if (this.contractList[0].contractType == "") {
+            this.$message.error("请选择签订合同类型");
+            return;
+          }
           addContractApi(this.contractList[0]).then((res) => {
             if (res.code == 200) {
               this.$message.success(this.$t("message.laborMange.saveSuccess"));
@@ -3311,6 +3318,10 @@ export default {
             );
             return;
           }
+          if (this.contractList[0].contractType == "") {
+            this.$message.error("请选择签订合同类型");
+            return;
+          }
           editContractApi(this.contractList[0]).then((res) => {
             if (res.code == 200) {
               this.$message.success(this.$t("message.laborMange.editSuccess"));
diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue
index a838629d..489fb6fd 100644
--- a/src/views/projectFront/laborManage/personModule/administration.vue
+++ b/src/views/projectFront/laborManage/personModule/administration.vue
@@ -2613,7 +2613,7 @@ export default {
       });
     },
     //获取 部门 列表
-    getDepartmentList() {
+    getDepartmentList(type) {
       let data = {
         enterpriseId: this.checkedId,
         projectSn: this.projectSn,
@@ -2622,7 +2622,8 @@ export default {
       getDepartmentInfoList(data).then((res) => {
         console.log("部门列表数据=====：", res);
         if (res.code == 200) {
-          this.checkedTeamId = 0;
+          // this.checkedTeamId = 0;
+          this.checkedTeamId = type !== 1 ? 0 : this.checkedTeamId;
           this.teamListData = res.result;
           this.getTableData();
         }
@@ -2662,7 +2663,7 @@ export default {
                 this.$message.success(res.message);
                 this.addDepartmentDialog = false;
                 this.resetForm(formName);
-                this.getDepartmentList();
+                this.getDepartmentList(1);
               }
             });
           } else {
@@ -2670,7 +2671,7 @@ export default {
               if (res.code == 200) {
                 this.$message.success(res.message);
                 this.addDepartmentDialog = false;
-                this.getDepartmentList();
+                this.getDepartmentList(1);
                 this.resetForm(formName);
               }
             });
@@ -2771,7 +2772,7 @@ export default {
                 message: this.$t("message.laborMange.deleteSuccess"),
               });
               this.departmentForm.departmentName = ""; //部门名称
-              this.getDepartmentList();
+              this.getDepartmentList(1);
             }
           });
         })
@@ -2974,6 +2975,7 @@ export default {
               if (res.code == 200) {
                 this.$message.success(this.$t("message.laborMange.addSuccess"));
                 this.addPersonDialog = false;
+                this.getDepartmentList(1);
                 this.resetForm(formName);
                 this.getTableData();
               }
@@ -3005,7 +3007,7 @@ export default {
                 this.$message.success(
                   this.$t("message.laborMange.modifySuccess")
                 );
-                this.getDepartmentList();
+                this.getDepartmentList(1);
                 this.addPersonDialog = false;
                 this.resetForm(formName);
                 this.examinationFile = []; //体检报告
@@ -3173,7 +3175,7 @@ export default {
                 this.page > 1 && this.tableListData.length == 1
                   ? this.page - 1
                   : this.page;
-              this.getDepartmentList();
+              this.getDepartmentList(1);
             }
           });
         })
@@ -3561,7 +3563,7 @@ export default {
                 this.$t("message.laborMange.mobileSuccess")
               );
               this.page = 1;
-              this.getDepartmentList();
+              this.getDepartmentList(1);
               this.resetForm(formName);
             }
           });
diff --git a/src/views/projectFront/progressManagementAg/progressApproval.vue b/src/views/projectFront/progressManagementAg/progressApproval.vue
index 8c330ff5..1dca580b 100644
--- a/src/views/projectFront/progressManagementAg/progressApproval.vue
+++ b/src/views/projectFront/progressManagementAg/progressApproval.vue
@@ -86,6 +86,7 @@
             prop="feedbackContent"
             align="center"
             label="反馈内容"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column prop="image" align="center" label="上传图片">
             <template slot-scope="scope">
@@ -113,6 +114,7 @@
             prop="delayEventReason"
             align="center"
             label="延期误工原因"
+            show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             prop="delayEventType"
diff --git a/src/views/projectFront/quality/businessModule/checkPoint.vue b/src/views/projectFront/quality/businessModule/checkPoint.vue
index 1496b5d3..a3e1006d 100644
--- a/src/views/projectFront/quality/businessModule/checkPoint.vue
+++ b/src/views/projectFront/quality/businessModule/checkPoint.vue
@@ -417,6 +417,9 @@ export default {
       this.title = "编辑区域";
       this.dialogType = 2;
       this.editDialog = true;
+      this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
     },
     //新增下级---按钮
     newJuniorBtn(value) {
diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue
index 1f22b6ad..6c8d26b1 100644
--- a/src/views/projectFront/quality/inspectionLedger.vue
+++ b/src/views/projectFront/quality/inspectionLedger.vue
@@ -250,8 +250,10 @@
                 : ""
             }}
           </el-button>
-          <span style="color: #94979E;" v-else>已撤回</span>
-          <span class="tableStatus" v-show="scope.row.overTime == true && scope.row.status != 6"
+          <span style="color: #94979e" v-else>已撤回</span>
+          <span
+            class="tableStatus"
+            v-show="scope.row.overTime == true && scope.row.status != 6"
             >超期</span
           >
           <div>{{ scope.row.changeLimitTime }}</div>
@@ -1569,7 +1571,9 @@
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">分包单位：</span>
-                    <span class="value">{{ detailData.enterpriseName }}</span>
+                    <span class="value" :title="detailData.enterpriseName">{{
+                      detailData.enterpriseName
+                    }}</span>
                   </div>
                 </el-col>
               </el-row>
@@ -1793,7 +1797,7 @@
                 <el-col :span="12" v-show="detailData.recordType == 1">
                   <div class="grid-content">
                     <span class="label" style="margin-left: -14px"
-                      >整改人：</span
+                      >责任人：</span
                     >
                     <span class="value" style="margin-left: 25px">{{
                       detailData.changeName
@@ -1862,17 +1866,6 @@
                     </span>
                   </div>
                 </el-col>
-              </el-row>
-              <el-row :gutter="20">
-                <el-col :span="12" v-show="detailData.recordType == 2">
-                  <div class="grid-content">
-                    <span class="label">排查分类：</span>
-                    <span class="value" :title="detailData.dangerItemContent">{{
-                      detailData.dangerItemContent
-                    }}</span>
-                  </div>
-                </el-col>
-
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">现场照片：</span>
@@ -1892,6 +1885,16 @@
                   </div>
                 </el-col>
               </el-row>
+              <el-row :gutter="20">
+                <el-col :span="12" v-show="detailData.recordType == 2">
+                  <div class="grid-content">
+                    <span class="label">排查分类：</span>
+                    <span class="value" :title="detailData.dangerItemContent">{{
+                      detailData.dangerItemContent
+                    }}</span>
+                  </div>
+                </el-col>
+              </el-row>
               <el-row :gutter="20"> </el-row>
 
               <!-- <el-row :gutter="20">
@@ -1916,7 +1919,7 @@
                     <p class="grid-content">
                       <span class="label">{{
                         item.type == 1
-                          ? "整改人："
+                          ? "责任人："
                           : item.type == 2
                           ? "复查人："
                           : item.type == 3
@@ -2162,7 +2165,7 @@ import {
   selectRectifyRecordListApi,
   addQualityRectifyRecordApi,
   deleteRectifyRecordListApi,
-  backRectifyRecordListApi
+  backRectifyRecordListApi,
 } from "@/assets/js/api/quality.js";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js";
 import { VueCropper } from "vue-cropper";
@@ -2383,12 +2386,13 @@ export default {
         })
         .catch(() => {});
     },
-    editRow(obj){ // 编辑撤回数据(重新提交)
-      console.log(obj,777)
+    editRow(obj) {
+      // 编辑撤回数据(重新提交)
+      console.log(obj, 777);
       this.addTitle = "编辑";
       this.recordType = obj.recordType;
-      if(obj.recordType == 1){
-        this.addForm1 = {...obj};
+      if (obj.recordType == 1) {
+        this.addForm1 = { ...obj };
         let arr = obj.imageUrl.split(",");
         let fileArr = obj.fileUrl.split(",");
         let showImgUrl = [];
@@ -2411,8 +2415,8 @@ export default {
         });
         this.fileList1 = showImgUrl;
         this.fileList2 = showFileUrl;
-      } else if(obj.recordType == 2){
-        this.addForm2 = {...obj};
+      } else if (obj.recordType == 2) {
+        this.addForm2 = { ...obj };
         let arr = obj.imageUrl.split(",");
         let fileArr = obj.fileUrl.split(",");
         let showImgUrl = [];
@@ -2437,7 +2441,7 @@ export default {
         this.fileList2 = showFileUrl;
       }
       // 逻辑结束
-      console.log(this.addForm1,'我的我的我的')
+      console.log(this.addForm1, "我的我的我的");
       this.getPositionList();
       this.getDescribeClassifyList();
       this.getPeopleList();
@@ -2462,7 +2466,7 @@ export default {
       this.addDialog = true;
       this.$nextTick(() => {
         this.editChangeRegion();
-      })
+      });
     },
     deleteQuestion(obj) {
       console.log("删除", obj);
@@ -2765,10 +2769,19 @@ export default {
     },
     changeRegion(val) {
       // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
-        if(this.$refs["formRegion1"].getCheckedNodes().length == 0){
-          this.subcontractList = [];
-          return;
+      if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
+        if (this.recordType == 1) {
+          this.addForm1.enterpriseSn = "";
+          this.addForm1.enterpriseName = "";
+          this.addForm1.changeId = "";
+        } else {
+          this.addForm2.enterpriseSn = "";
+          this.addForm2.enterpriseName = "";
         }
+        this.subcontractList = [];
+        this.crewUpdateList = [];
+        return;
+      }
       if (this.recordType == 1) {
         this.addForm1.enterpriseSn = "";
         this.addForm1.enterpriseName = "";
@@ -2817,6 +2830,7 @@ export default {
           this.addForm1.notifyPerson
         );
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       } else if (this.recordType == 2) {
         this.addForm2.enterpriseSn = "";
         this.addForm2.enterpriseName = "";
@@ -2836,25 +2850,38 @@ export default {
         // }
         this.addForm2.regionName = text;
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       }
       this.addForm1.inspectManId = this.checkPointList;
     },
     editChangeRegion() {
       // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
-        if(this.$refs["formRegion1"].getCheckedNodes().length == 0){
-          this.subcontractList = [];
-          return;
+      if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
+        if (this.recordType == 1) {
+          this.addForm1.enterpriseSn = "";
+          this.addForm1.enterpriseName = "";
+          this.addForm1.changeId = "";
+        } else {
+          this.addForm2.enterpriseSn = "";
+          this.addForm2.enterpriseName = "";
         }
+        this.subcontractList = [];
+        this.crewUpdateList = [];
+        return;
+      }
       if (this.recordType == 1) {
         let pathLabels =
           this.$refs["formRegion1"].getCheckedNodes()[0].pathLabels;
         let data = this.$refs["formRegion1"].getCheckedNodes()[0].data;
         this.areaData = data;
         const newArr = [];
-        console.log(this.areaData,777999333)
-        if(this.areaData.systemUsers){
+        console.log(this.areaData, 777999333);
+        if (this.areaData.systemUsers) {
           this.areaData.systemUsers.filter((item) => {
-            if (item.userId && item.enterpriseId == this.addForm1.enterpriseId) {
+            if (
+              item.userId &&
+              item.enterpriseId == this.addForm1.enterpriseId
+            ) {
               newArr.push(item);
             }
           });
@@ -2895,6 +2922,7 @@ export default {
           this.addForm1.notifyPerson
         );
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       } else if (this.recordType == 2) {
         let pathLabels =
           this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels;
@@ -2912,6 +2940,7 @@ export default {
         // }
         this.addForm2.regionName = text;
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       }
       this.addForm1.inspectManId = this.checkPointList;
     },
@@ -3172,7 +3201,7 @@ export default {
         }
       });
     },
-    //获取整改人
+    //获取责任人
     getPeopleUpdateList() {
       let data = {
         projectSn: this.projectSn,
@@ -3214,7 +3243,7 @@ export default {
               return item;
             })
             .join("/");
-            console.log(this.addForm1.dangerItemContent,'我的的的的')
+          console.log(this.addForm1.dangerItemContent, "我的的的的");
           // pathLabels[0].pathLabels[0] +
           // pathLabels[0].pathLabels[1] +
           // pathLabels[0].pathLabels[2];
@@ -3282,8 +3311,8 @@ export default {
       this.getPeopleList();
       // this.getPeopleUpdateList();
       const newArr = [];
-      console.log(this.areaData,777999333)
-      if(this.areaData.systemUsers){
+      console.log(this.areaData, 777999333);
+      if (this.areaData.systemUsers) {
         this.areaData.systemUsers.filter((item) => {
           if (item.userId && item.enterpriseId == this.unitEnterpriseId) {
             newArr.push(item);
@@ -3641,15 +3670,17 @@ export default {
           let data = {};
           if (this.recordType == 1) {
             data = JSON.parse(JSON.stringify(this.addForm1));
-            if(Array.isArray(data.regionId)){
+            if (Array.isArray(data.regionId)) {
               data.regionId =
                 this.addForm1.regionId.length > 1
                   ? this.addForm1.regionId[this.addForm1.regionId.length - 1]
                   : this.addForm1.regionId[0];
             }
-            if(Array.isArray(data.dangerItemId)){
+            if (Array.isArray(data.dangerItemId)) {
               data.dangerItemId =
-                this.addForm1.dangerItemId[this.addForm1.dangerItemId.length - 1];
+                this.addForm1.dangerItemId[
+                  this.addForm1.dangerItemId.length - 1
+                ];
               data.dangerTypeId = this.addForm1.dangerItemId[0];
             }
             let pointArr = [];
@@ -3675,7 +3706,7 @@ export default {
             console.log("data=============", this.addForm1.notifyPerson);
             console.log("data=============", imgUrl);
             console.log("data=============", fileUrl);
-            if(this.addForm1.notifyPerson){
+            if (this.addForm1.notifyPerson) {
               data.notifyPerson = this.addForm1.notifyPerson.join(",");
             }
             data.imageUrl = imgUrl.join(",");
@@ -3685,16 +3716,18 @@ export default {
             }
           } else {
             data = JSON.parse(JSON.stringify(this.addForm2));
-            if(Array.isArray(data.regionId)){
-            data.regionId =
-              this.addForm2.regionId.length > 1
-                ? this.addForm2.regionId[this.addForm2.regionId.length - 1]
-                : this.addForm2.regionId[0];
+            if (Array.isArray(data.regionId)) {
+              data.regionId =
+                this.addForm2.regionId.length > 1
+                  ? this.addForm2.regionId[this.addForm2.regionId.length - 1]
+                  : this.addForm2.regionId[0];
             }
-            if(Array.isArray(data.dangerItemId)){
-            data.dangerItemId =
-              this.addForm2.dangerItemId[this.addForm2.dangerItemId.length - 1];
-            data.dangerTypeId = this.addForm2.dangerItemId[0];
+            if (Array.isArray(data.dangerItemId)) {
+              data.dangerItemId =
+                this.addForm2.dangerItemId[
+                  this.addForm2.dangerItemId.length - 1
+                ];
+              data.dangerTypeId = this.addForm2.dangerItemId[0];
             }
             // data.regionId = this.addForm2.regionId
             //   ? this.addForm2.regionId.pop()
@@ -3755,7 +3788,7 @@ export default {
     },
 
     close() {
-      if(this.addTitle == '编辑') return;
+      if (this.addTitle == "编辑") return;
       // this.mapUrl = ''
       this.fileList1 = [];
       this.fileList2 = [];
diff --git a/src/views/projectFront/quality/v2/subTasklist.vue b/src/views/projectFront/quality/v2/subTasklist.vue
index f334b668..f4e1f02e 100644
--- a/src/views/projectFront/quality/v2/subTasklist.vue
+++ b/src/views/projectFront/quality/v2/subTasklist.vue
@@ -76,9 +76,9 @@
           </template>
         </el-table-column>
         <!-- 操作 -->
-        <el-table-column :label="$t('message.safeMangeCheck.operate')">
+        <el-table-column align="center" :label="$t('message.safeMangeCheck.operate')">
           <template slot-scope="scope">
-            <div class="tableBtns">
+            <div class="operation-style">
               <div @click="detailsPoint(scope.row)" class="operationText">
                 <i
                   class="el-icon-tickets"
@@ -226,4 +226,12 @@ export default {
     background-color: #7cd3de;
   }
 }
+.operation-style {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .operationText:not(:last-child) {
+    margin-right: 10px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue
index f9b2ca9b..44160698 100644
--- a/src/views/projectFront/safeSame/inspectionLedger.vue
+++ b/src/views/projectFront/safeSame/inspectionLedger.vue
@@ -1558,7 +1558,7 @@
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">分包单位：</span>
-                    <span class="value">{{ detailData.enterpriseName }}</span>
+                    <span class="value" :title="detailData.enterpriseName">{{ detailData.enterpriseName }}</span>
                   </div>
                 </el-col>
               </el-row>
@@ -1782,7 +1782,7 @@
                 <el-col :span="12" v-show="detailData.recordType == 1">
                   <div class="grid-content">
                     <span class="label" style="margin-left: -14px"
-                      >整改人：</span
+                      >责任人：</span
                     >
                     <span class="value" style="margin-left: 25px">{{
                       detailData.changeName
@@ -1851,6 +1851,25 @@
                     </span>
                   </div>
                 </el-col>
+
+<el-col :span="12">
+  <div class="grid-content">
+    <span class="label">现场照片：</span>
+    <span class="value" style="cursor: pointer;">
+      <el-image
+        v-for="(item, index) in parseImage2(
+          detailData.imageUrl
+        )"
+        :key="index"
+        style="width: 100px; height: 100px; margin-right: 10px"
+        :src="item"
+        :preview-src-list="parseImage2(item.fileUrl)"
+        @click="openImg(item)"
+      >
+      </el-image>
+    </span>
+  </div>
+</el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12" v-show="detailData.recordType == 2">
@@ -1861,25 +1880,6 @@
                     }}</span>
                   </div>
                 </el-col>
-
-                <el-col :span="12">
-                  <div class="grid-content">
-                    <span class="label">现场照片：</span>
-                    <span class="value" style="cursor: pointer;">
-                      <el-image
-                        v-for="(item, index) in parseImage2(
-                          detailData.imageUrl
-                        )"
-                        :key="index"
-                        style="width: 100px; height: 100px; margin-right: 10px"
-                        :src="item"
-                        :preview-src-list="parseImage2(item.fileUrl)"
-                        @click="openImg(item)"
-                      >
-                      </el-image>
-                    </span>
-                  </div>
-                </el-col>
               </el-row>
               <el-row :gutter="20"> </el-row>
 
@@ -1905,7 +1905,7 @@
                     <p class="grid-content">
                       <span class="label">{{
                         item.type == 1
-                          ? "整改人："
+                          ? "责任人："
                           : item.type == 2
                           ? "复查人："
                           : item.type == 3
@@ -2729,10 +2729,19 @@ export default {
     changeRegion(val) {
       console.log(val,666777)
       // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
-      if(this.$refs["formRegion1"].getCheckedNodes().length == 0){
-          this.subcontractList = [];
-          return;
+      if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
+        if (this.recordType == 1) {
+          this.addForm1.enterpriseSn = "";
+          this.addForm1.enterpriseName = "";
+          this.addForm1.changeId = "";
+        } else {
+          this.addForm2.enterpriseSn = "";
+          this.addForm2.enterpriseName = "";
         }
+        this.subcontractList = [];
+        this.crewUpdateList = [];
+        return;
+      }
       if (this.recordType == 1) {
         this.addForm1.enterpriseSn = "";
         this.addForm1.enterpriseName = "";
@@ -2781,6 +2790,7 @@ export default {
           this.addForm1.notifyPerson
         );
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       } else if (this.recordType == 2) {
         this.addForm2.enterpriseSn = "";
         this.addForm2.enterpriseName = "";
@@ -2800,15 +2810,25 @@ export default {
         // }
         this.addForm2.regionName = text;
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       }
       this.addForm1.inspectManId = this.checkPointList;
     },
     editChangeRegion() {
       // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
-      if(this.$refs["formRegion1"].getCheckedNodes().length == 0){
-          this.subcontractList = [];
-          return;
+      if (this.$refs["formRegion1"].getCheckedNodes().length == 0) {
+        if (this.recordType == 1) {
+          this.addForm1.enterpriseSn = "";
+          this.addForm1.enterpriseName = "";
+          this.addForm1.changeId = "";
+        } else {
+          this.addForm2.enterpriseSn = "";
+          this.addForm2.enterpriseName = "";
         }
+        this.subcontractList = [];
+        this.crewUpdateList = [];
+        return;
+      }
       if (this.recordType == 1) {
         let pathLabels =
           this.$refs["formRegion1"].getCheckedNodes()[0].pathLabels;
@@ -2859,6 +2879,7 @@ export default {
           this.addForm1.notifyPerson
         );
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       } else if (this.recordType == 2) {
         let pathLabels =
           this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels;
@@ -2876,6 +2897,7 @@ export default {
         // }
         this.addForm2.regionName = text;
         this.subcontractList = data.enterpriseInfos;
+        this.crewUpdateList = [];
       }
       this.addForm1.inspectManId = this.checkPointList;
     },
diff --git a/src/views/projectFront/safeSame/v2/subTasklist.vue b/src/views/projectFront/safeSame/v2/subTasklist.vue
index 4699deef..c984e11e 100644
--- a/src/views/projectFront/safeSame/v2/subTasklist.vue
+++ b/src/views/projectFront/safeSame/v2/subTasklist.vue
@@ -76,9 +76,9 @@
           </template>
         </el-table-column>
         <!-- 操作 -->
-        <el-table-column :label="$t('message.safeMangeCheck.operate')">
+        <el-table-column align="center" :label="$t('message.safeMangeCheck.operate')">
           <template slot-scope="scope">
-            <div class="tableBtns">
+            <div class="operation-style">
               <div @click="detailsPoint(scope.row)" class="operationText">
                 <i
                   class="el-icon-tickets"
@@ -226,4 +226,12 @@ export default {
     background-color: #7cd3de;
   }
 }
+.operation-style {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .operationText:not(:last-child) {
+    margin-right: 10px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
index c64c8d15..75a9b659 100644
--- a/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
+++ b/src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
@@ -209,6 +209,12 @@ export default {
       this.title = '编辑'
       this.dialogShow = true
       this.addEditForm = JSON.parse(JSON.stringify(obj))
+      let findIndex = this.workerList.findIndex(item => {
+        return item.id == this.addEditForm.workerInfoId
+      })
+      if(findIndex == -1){
+        this.addEditForm.workerInfoId = "";
+      }
     },
     submit() {
       let params = JSON.parse(JSON.stringify(this.addEditForm))