提交

src/views/projectFront/quality/businessModule/checkPoint.vue

@@ -446,6 +446,9 @@ export default {
       this.editDialog = true;
       this.title = this.$t("message.quality.newJunior");
       this.dialogType = 3;
+      this.$nextTick(() => {
+        this.$refs["form"].clearValidate();
+      });
     },
     // 获取整改单位列表
     getUpdateUnitListFn() {

src/views/projectFront/quality/inspectionLedger.vue

@@ -2455,7 +2455,7 @@ export default {
       this.getPositionList();
       this.getDescribeClassifyList();
       this.getPeopleList();
-      this.getReviewPeopleList();
+      // this.getReviewPeopleList();
       this.getPeopleUpdateList();
       this.getRoutineInspect();
       this.rectifyRecordList = [];
@@ -2825,6 +2825,7 @@ export default {
           this.addForm1.changeId = "";
         }
         this.addForm1.regionName = text;
+        this.getReviewPeopleList(this.addForm1.regionId);
         // console.log(data.intendanceIds.split(','))
         // console.log(text)
         if (data.intendanceIds && data.intendanceIds.split(",") > 0) {
@@ -2864,6 +2865,7 @@ export default {
         //   this.addForm2.changeId = Number(data.dutyId)
         // }
         this.addForm2.regionName = text;
+        this.getReviewPeopleList(this.addForm2.regionId);
         this.subcontractList = data.enterpriseInfos;
         this.crewUpdateList = [];
       }
@@ -2922,6 +2924,7 @@ export default {
           this.addForm1.changeId = data.dutyId;
         }
         this.addForm1.regionName = text;
+        this.getReviewPeopleList(this.addForm1.regionId);
         // console.log(data.intendanceIds.split(','))
         // console.log(text)
         if (data.intendanceIds && data.intendanceIds.split(",") > 0) {
@@ -2959,6 +2962,7 @@ export default {
         //   this.addForm2.changeId = Number(data.dutyId)
         // }
         this.addForm2.regionName = text;
+        this.getReviewPeopleList(this.addForm2.regionId);
         this.subcontractList = data.enterpriseInfos;
         this.crewUpdateList = [];
       }
@@ -3135,7 +3139,7 @@ export default {
       this.getPositionList();
       this.getDescribeClassifyList();
       this.getPeopleList();
-      this.getReviewPeopleList();
+      // this.getReviewPeopleList();
       // this.getPeopleUpdateList();
       this.getRoutineInspect();
       this.close();
@@ -3146,6 +3150,7 @@ export default {
     getPositionList() {
       let data = {
         projectSn: this.projectSn,
+        notSupervisingUnit: 1,
       };
       getQualityRegionListApi(data).then((res) => {
         console.log("res=================", res);
@@ -3199,10 +3204,13 @@ export default {
     },
 
     //获取去整改人 通知人 检查人 核查人下拉
-    getReviewPeopleList() {
+    getReviewPeopleList(regionId) {
       let data = {
         projectSn: this.projectSn,
-        enterpriseTypeId: 7,
+        // enterpriseTypeId: 7,
+        qualityRegionId: regionId[0].toString(),
+        qualityRegionBindType: 2,
+        isSupervisingRoleName: 1,
       };
       getProjectChilderSystemUserListApi(data).then((res) => {
         if (res.code == 200) {

src/views/projectFront/safeSame/inspectionLedger.vue

@@ -2878,6 +2878,7 @@ export default {
           this.addForm1.changeId = data.dutyId;
         }
         this.addForm1.regionName = text;
+        this.getReviewPeopleList(this.addForm1.regionId);
         // console.log(data.intendanceIds.split(','))
         // console.log(text)
         if (data.intendanceIds && data.intendanceIds.split(",") > 0) {
@@ -2915,6 +2916,7 @@ export default {
         //   this.addForm2.changeId = Number(data.dutyId)
         // }
         this.addForm2.regionName = text;
+        this.getReviewPeopleList(this.addForm2.regionId);
         this.subcontractList = data.enterpriseInfos;
         this.crewUpdateList = [];
       }
@@ -3159,7 +3161,7 @@ export default {
     getReviewPeopleList(regionId) {
       let data = {
         projectSn: this.projectSn,
-        enterpriseTypeId: 7,
+        // enterpriseTypeId: 7,
         qualityRegionId: regionId[0].toString(),
         qualityRegionBindType: 2,
         isSupervisingRoleName: 1,

src/views/projectFront/specialWork/blindPlugWork.vue

@@ -266,6 +266,7 @@
                             </el-form-item>
                             <el-form-item label="安全技术交底：" :label-width="formLabelWidthDetail">
                                 <div class="img-show">
+                                <!-- {{ workDetail.safetyAndTechnologyDisclosure }} contentType -->
                                     <el-image
                                         v-for="(item, index) in workDetail.safetyAndTechnologyDisclosure"
                                         :key="index"