From 6bbc412cda29146dc7e042a84e9de5acc5e0291e Mon Sep 17 00:00:00 2001
From: cjp <3096114695@qq.com>
Date: Mon, 29 Apr 2024 23:43:21 +0800
Subject: [PATCH] 23:43

---
 src/assets/i18n/langs/cn/quality.js           |  3 +-
 .../configManage/personnelAccess.vue          |  4 +-
 .../quality/businessModule/checkPoint.vue     | 43 ++++++++++++++-----
 .../projectFront/quality/inspectionLedger.vue | 21 +++++----
 4 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/assets/i18n/langs/cn/quality.js b/src/assets/i18n/langs/cn/quality.js
index 74704e7c..4f58f6dc 100644
--- a/src/assets/i18n/langs/cn/quality.js
+++ b/src/assets/i18n/langs/cn/quality.js
@@ -3,7 +3,8 @@ export default {
     regionName: '区域名称',
     coding: '编码',
     unit:'单位',
-    rectificationPeople: '整改人',
+    rectificationPeople: '责任人',
+    rectificationWork: '整改单位',
     personLiable:'责任人',
     personWork:'责任单位',
     notifier: '通知人',
diff --git a/src/views/projectFront/configManage/personnelAccess.vue b/src/views/projectFront/configManage/personnelAccess.vue
index 1f4ed2e9..5c4f3aa0 100644
--- a/src/views/projectFront/configManage/personnelAccess.vue
+++ b/src/views/projectFront/configManage/personnelAccess.vue
@@ -57,14 +57,14 @@
             $t("message.videoManage.add")
           }}</el-button>
           <!--          筛选 -->
-          <el-dropdown class="screen" size="medium" @command="handleCommand">
+          <!-- <el-dropdown class="screen" size="medium" @command="handleCommand">
             <el-button type="success" plain>  
               {{$t("message.videoManage.screen")}}
             </el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item v-for="(item) in screen" :key="item.id" :command="item.id">{{item.name}}</el-dropdown-item>
             </el-dropdown-menu>
-          </el-dropdown>
+          </el-dropdown> -->
           
         </el-form-item>
       </el-form>
diff --git a/src/views/projectFront/quality/businessModule/checkPoint.vue b/src/views/projectFront/quality/businessModule/checkPoint.vue
index 0c2e1351..52915cd4 100644
--- a/src/views/projectFront/quality/businessModule/checkPoint.vue
+++ b/src/views/projectFront/quality/businessModule/checkPoint.vue
@@ -28,7 +28,7 @@
           align="center"
 
           prop="enterpriseName"
-          label="整改单位"
+          label="责任单位"
         >
         </el-table-column>
         <el-table-column
@@ -79,7 +79,7 @@
       width="666px"
     >
       <div class="dialog_content">
-        <el-form ref="form" :model="form" label-width="80px" size="medium">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="medium">
           <el-form-item
             :label="$t('message.quality.regionName')"
             prop="regionName"
@@ -99,11 +99,13 @@
               :disabled="dialogType == 2"
             ></el-input>
           </el-form-item>
-          <!-- 整改单位 -->
-          <el-form-item label="整改单位">
+          <!-- 责任单位 -->
+          <el-form-item 
+            label="责任单位" 
+            prop="dutyId"
+          >
             <el-select
               v-model="form.dutyId"
-              filterable
               multiple 
               @change="changeDutyId"
               :placeholder="$t('message.quality.pleaseSelect')"
@@ -120,11 +122,12 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!-- 整改人 start -->
-          <el-form-item label="整改人">
+          <!-- 责任人 start -->
+          <el-form-item label="责任人" 
+            prop="personId"
+          >
             <el-select
               v-model="form.personId"
-              filterable
               multiple
               :placeholder="$t('message.quality.pleaseSelect')"
               style="width: 100%"
@@ -243,9 +246,21 @@ export default {
         intendanceIds: [],
         intendanceNames: '',
         remark: '',
-        enterpriseName:''
+        enterpriseName:'',
       },
-      showList: []
+      showList: [],
+      rules: {
+        dutyId:[{
+          required: true,
+          message:'请输入责任单位',
+          trigger: 'change'
+        }],
+        personId:[{
+            required: true,
+            message:'请输入责任人',
+            trigger: 'change'
+        }]
+      }
     }
   },
   created() {
@@ -279,6 +294,10 @@ export default {
       this.editDialog = true
       this.title ='新增区域'
       this.dialogType = 1
+      this.$nextTick(()=>{
+        this.$refs['form'].clearValidate()
+      })
+      
     },
     //切换 整改人
     changeDutyId(value) {
@@ -388,6 +407,8 @@ export default {
         if (valid) {
           let data = {
             dutyName: this.form.dutyName,
+            dutyId: this.form.dutyId,
+            personId: this.form.personId,
             // intendanceIds: this.form.intendanceIds.join(','),
             intendanceNames: this.form.intendanceNames,
             regionName: this.form.regionName,
@@ -469,7 +490,7 @@ export default {
 
     close() {
       this.$nextTick(() => {
-        this.$refs.form.clearValidate()
+        this.$refs['form'].clearValidate()
       })
     }
   }
diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue
index 69279ba5..2a797b7c 100644
--- a/src/views/projectFront/quality/inspectionLedger.vue
+++ b/src/views/projectFront/quality/inspectionLedger.vue
@@ -967,7 +967,7 @@
                   ref="cascaderAddr2"
                 ></el-cascader>
               </el-form-item>
-              <el-form-item
+              <!-- <el-form-item
                 label="分部工程"
                 prop="subsectionId"
                 :disabled="type == 'detail'"
@@ -1016,7 +1016,7 @@
                   v-model="addForm2.floor"
                 >
                 </el-input>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="事件描述" prop="addedDescription">
                 <el-input
                   :disabled="type == 'detail'"
@@ -1611,7 +1611,7 @@
                 </el-col>
               </el-row>
               <div>
-                <el-row :gutter="20">
+                <!-- <el-row :gutter="20">
                   <el-col :span="12">
                     <div class="grid-content">
                       <span class="label">分部工程：</span>
@@ -1628,7 +1628,7 @@
                       </span>
                     </div>
                   </el-col>
-                </el-row>
+                </el-row> -->
                 <el-row :gutter="20" v-show="detailData.recordType == 1">
                   <el-col :span="12">
                     <div class="grid-content">
@@ -1767,14 +1767,14 @@
               </el-row>
 
               <el-row :gutter="20">
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                   <div class="grid-content">
                     <span class="label">巡检楼层：</span>
                     <span class="value">
                       {{ detailData.floor }}
                     </span>
                   </div>
-                </el-col>
+                </el-col> -->
                 <el-col :span="12">
                   <div class="grid-content">
                     <span class="label" style="line-height: 25px"
@@ -2593,7 +2593,7 @@ export default {
     },
 
     //新增按钮
-    addBtn(type) {
+    addBtn(type) {  
       console.log(type)
       if (type == 1) {
         this.type = 'detail'
@@ -3165,8 +3165,11 @@ export default {
       this.fileList2 = []
       this.fileList3 = []
       this.fileList4 = []
-      this.$refs.addForm1.resetFields() //清除所有验证
-      this.$refs.addForm2.resetFields() //清除所有验证
+      $nextTick(()=>{
+        this.$refs.addForm1.resetFields() //清除所有验证
+        this.$refs.addForm2.resetFields() //清除所有验证
+      })
+      
       this.hideUpload = false
       if (this.recordType == 1) {
         this.addForm1 = {