From 297a3808807fa11391dd4733a9344dff53e598aa Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sat, 27 Apr 2024 23:12:25 +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

---
 .../qualityAndSafety/hiddenDangerLibrary.vue  |  2 +-
 .../projectFront/aiAnalysis/warningList.vue   |  2 +-
 .../laborManage/personRegisterDetails.vue     | 16 ++---
 .../safeManage/v2/checkStandingBook.vue       | 65 +++++++++++++------
 4 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue b/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
index 5c112bfb..1b8f5849 100644
--- a/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
+++ b/src/views/companyAdmin/qualityAndSafety/hiddenDangerLibrary.vue
@@ -409,7 +409,7 @@
           </el-form-item>
           <!-- 扣分数 -->
         <el-form-item label="扣分" prop="deductScore">
-            <el-input-number v-model="dialogdata.deductScore" :min="0" ></el-input-number>
+            <el-input-number v-model="dialogdata.deductScore" :min="0" :max="100"></el-input-number>
           </el-form-item>
          <!-- 备注 -->
           <el-form-item :label="$t('message.safeMangeCheck.remark')">
diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue
index 25aea700..a2b871a5 100644
--- a/src/views/projectFront/aiAnalysis/warningList.vue
+++ b/src/views/projectFront/aiAnalysis/warningList.vue
@@ -139,7 +139,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="扣分" prop="deductScore" v-if="addEditForm.handleResult != 2">
-           <el-input-number v-model="addEditForm.deductScore" :min="0" :placeholder="'请输入'"></el-input-number>
+           <el-input-number v-model="addEditForm.deductScore" :min="0" :max="100" :placeholder="'请输入'"></el-input-number>
           </el-form-item>
           <div class="dialog-footer" v-if="!isDetail">
             <el-button class="cancleBtn" icon="el-icon-circle-close" size="medium" @click="recordShow = false">取消 </el-button>
diff --git a/src/views/projectFront/laborManage/personRegisterDetails.vue b/src/views/projectFront/laborManage/personRegisterDetails.vue
index 2d6e4d36..01ac3898 100644
--- a/src/views/projectFront/laborManage/personRegisterDetails.vue
+++ b/src/views/projectFront/laborManage/personRegisterDetails.vue
@@ -3440,14 +3440,14 @@ export default {
       //type == 1 证书   2 体检报告 3 保险  4 合同  5 基本信息  6 详细信息
       let data = JSON.parse(JSON.stringify(this.originalData));
       // console.log('取消',index,this.physicalsList)
-
+      console.log(data,111222)
       if (type == 1) {
         //获取证书附件
         if (this.isNew == true) {
           this.certificateList.splice(index, 1)
         } else {
-          if (data.certificateList.length > 0) {
-            data.certificateList.forEach((item) => {
+          if (data.workerInfo.certificateList) {
+            JSON.parse(data.workerInfo.certificateList).forEach((item) => {
               item.certificateState = false; //设置可编辑状态
               if (item.photoUrl) {
                 let arr = item.photoUrl.split("*");
@@ -3473,21 +3473,21 @@ export default {
         }
       } else if (type == 4) {
         //获取合同照片
-        if (data.contractList.length > 0) {
-          let arr = data.contractList[0]
-            ? data.contractList[0].imageUrl.split(",")
+        if (data.workerInfo.contractList) {
+          let arr = JSON.parse(data.contractList)[0]
+            ? JSON.parse(data.contractList)[0].imageUrl.split(",")
             : "";
           let fileList = [];
           arr.forEach((item) => {
             let valArr = item.split("*");
             fileList.push({ name: valArr[0], url: valArr[1] });
           });
-          data.contractList[0].fileList = fileList;
+          JSON.parse(data.contractList)[0].fileList = fileList;
         } else {
           data.contractList = [];
         }
         this.pactInfoStatus = false;
-        this.contractList = data.contractList; //合同信息
+        this.contractList = JSON.parse(data.contractList); //合同信息
       } else if (type == 5) {
         this.workerInfo = this.originalData.workerInfo;
         this.getWorkerInfo();
diff --git a/src/views/projectFront/safeManage/v2/checkStandingBook.vue b/src/views/projectFront/safeManage/v2/checkStandingBook.vue
index ac6e35ae..83089657 100644
--- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue
+++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue
@@ -964,6 +964,27 @@
               >
               </el-input>
             </el-form-item>
+            <!-- 整改单位 -->
+            <el-form-item
+              v-if="formData.status == 2"
+              :label="$t('message.safeMangeCheck.changeCompany')"
+              props="enterpriseSn"
+              required
+            >
+              <el-select
+                v-model="formData.enterpriseSn"
+                :placeholder="$t('message.safeMangeCheck.pleaseChoose')"
+                @change="enterpriseChange"
+              >
+                <el-option
+                  v-for="(item, index) in subcontractList"
+                  :key="index"
+                  :label="item.enterpriseName"
+                  :value="item.enterpriseSn"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <!-- 整改责任人 -->
             <el-form-item
               v-if="formData.status == 2"
@@ -989,24 +1010,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <!-- 整改单位 -->
-            <el-form-item
-              v-if="formData.status == 2"
-              :label="$t('message.safeMangeCheck.changeCompany')"
-            >
-              <el-select
-                v-model="formData.enterpriseSn"
-                :placeholder="$t('message.safeMangeCheck.pleaseChoose')"
-              >
-                <el-option
-                  v-for="(item, index) in subcontractList"
-                  :key="index"
-                  :label="item.enterpriseName"
-                  :value="item.enterpriseSn"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
             <!-- 要求完成时间 -->
             <el-form-item
               v-if="formData.status == 2"
@@ -1285,6 +1288,15 @@ export default {
             trigger: "change",
           },
         ],
+        enterpriseSn: [
+          {
+            // 请选择整改单位
+            required: true,
+            message:
+              this.$t("message.safeMangeCheck.pleaseChoose"),
+            trigger: "change",
+          },
+        ],
         changeUser: [
           {
             // 请选择整改责任人
@@ -1298,7 +1310,8 @@ export default {
           },
         ],
       },
-      checkProjectIdList: []
+      checkProjectIdList: [],
+      enterpriseId: ""
     };
   },
   created() {
@@ -1311,7 +1324,6 @@ export default {
     this.getInspectTypeList();
     this.getinspectHiddenDangerLibraryList();
     this.getEnterprise();
-    this.getPeopleList();
     this.getPositionList();
   },
   mounted() {
@@ -1336,6 +1348,18 @@ export default {
     },
   },
   methods: {
+    // 整改单位切换
+    enterpriseChange(){
+      this.formData.enterpriseSn
+      if(this.formData.enterpriseSn){
+        let findItem = this.subcontractList.find(item => {
+          return item.enterpriseSn == this.formData.enterpriseSn
+        })
+        console.log(findItem)
+        this.enterpriseId = findItem.id
+        this.getPeopleList();
+      }
+    },
     //获取新增弹窗--  检查部位下拉
     getPositionList() {
       let data = {
@@ -1534,6 +1558,7 @@ export default {
     getPeopleList() {
       let data = {
         projectSn: this.projectSn,
+        enterpriseId: this.enterpriseId
       };
       getProjectChilderSystemUserListApi(data).then((res) => {
         if (res.code == 200) {