From e78cd3a73d259ffeb640545002bcf644d33babb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Fri, 23 Feb 2024 14:20:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=8F=90=E7=A4=BA=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C=E5=BA=94=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=B8=8D=E7=84=B6=E7=9C=8B=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E5=BF=85=E5=A1=AB=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JExpandTable.vue               | 82 +++++++++++++------
 .../ProjectComplianceEvaluationProcess.vue    |  5 +-
 2 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/components/JExpandTable.vue b/src/components/JExpandTable.vue
index 8b00c628..70f8db0f 100644
--- a/src/components/JExpandTable.vue
+++ b/src/components/JExpandTable.vue
@@ -2,10 +2,13 @@
   <a-table
     v-bind="$attrs"
     v-on="$listeners"
+    :row-key="rowKey"
     :bordered="bordered"
     :scroll="{x: '100%'}"
     :row-class-name="lineCanExpand"
     :columns="columns"
+    :expandedRowKeys.sync="expandedRowKeys"
+    :pagination="ipagination"
     :data-source="dataSource">
     <!-- 如果插槽是作用域插槽，将作用域插槽的props包装成对象传递给slot -->
     <template v-for="(_, slotName) in $scopedSlots" :slot="slotName" slot-scope="text, record, index">
@@ -26,7 +29,7 @@
       <template v-if="formIsDepend">
         <template v-for="(value, key) in extraForm">
           <template v-if="record[formIsDepend] === key">
-            <a-form-model :key="key" :model="record" :rules="value.rules" :ref="`ruleForm${index}`">
+            <a-form-model :key="key" :model="record" :rules="value.rules" :ref="`ruleForm${record[rowKey]}`">
               <a-form-model-item v-for="form in value.formArr"
                                  :key="form.dbFieldName"
                                  :labelCol="labelCol"
@@ -235,6 +238,27 @@ export default {
       type: [String, Number],
       required: false,
       default: null
+    },
+    // 表格行数据的主键
+    rowKey: {
+      type: String,
+      required: false,
+      default: 'id'
+    },
+    // 分页参数
+    pagination: {
+      type: [Boolean, Object],
+      required: false,
+      default: false
+    }
+  },
+  watch: {
+    pagination: {
+      handler (val) {
+        this.ipagination = Object.assign({}, val)
+      },
+      deep: true,
+      immediate: true
     }
   },
   data () {
@@ -246,25 +270,25 @@ export default {
         sm: 16
       },
       // 本系统限制可以上传的文件格式
-      canUploadType: 'pdf,docx,doc,xlsx,xls,ppt,pptx,rar,zip,jpg,jpeg,png,avi,wmv,mov,rm,mp4,cad'
+      canUploadType: 'pdf,docx,doc,xlsx,xls,ppt,pptx,rar,zip,jpg,jpeg,png,avi,wmv,mov,rm,mp4,cad',
+      ipagination: {},
+      expandedRowKeys: []
     }
   },
   methods: {
     submit () {
+      console.log(this.rowKey)
       const arr = []
       for (const i in this.dataSource) {
         if (this.$refs[`ruleForm${i}`] && this.$refs[`ruleForm${i}`][0]) {
           this.$refs[`ruleForm${i}`][0].validate(valid => {
-            arr[i] = valid
+            arr[i] = { valid, rowKey: this.dataSource[i][this.rowKey], index: i }
           })
         } else {
-          // arr[i] = false
           // 表单都没有渲染，说明没有展开过，也就是未填状态
           if (this.formIsDepend) {
             if (this.dataSource[i][this.formIsDepend]) {
               // 需要依赖某个字段，获取当前行该字段时，扩展表单是否有必填项
-              // console.log(this.dataSource[i])
-              // console.log(this.extraForm[this.dataSource[i][this.formIsDepend]])
               const currRowExtraFormFormArr = this.extraForm[this.dataSource[i][this.formIsDepend]].formArr
               const currRowExtraFormRules = this.extraForm[this.dataSource[i][this.formIsDepend]].rules
               let isHaveRequired = false
@@ -274,24 +298,18 @@ export default {
                   isHaveRequired = true
                 }
               }
-              // for (const item in currRowExtraFormRules) {
-              //   if (currRowExtraFormRules[item].required === true) {
-              //     // 有任意一个字段有必填,但没有内容
-              //     isHaveRequired = true
-              //   }
-              // }
               if (isHaveRequired) {
                 // 任意一个字段有必填，她又没展开过，校验不通过
-                arr[i] = false
+                arr[i] = { valid: false, rowKey: this.dataSource[i][this.rowKey], index: i }
               } else {
-                arr[i] = true
+                arr[i] = { valid: true, rowKey: this.dataSource[i][this.rowKey], index: i }
               }
             } else if (this.lineCanExpandField && this.dataSource[i][this.lineCanExpandField] !== this.lineCanExpandValue) {
               // 如果这行数据本身不需要填写
-              arr[i] = true
+              arr[i] = { valid: true, rowKey: this.dataSource[i][this.rowKey], index: i }
             } else {
               // 依赖的字段都没有填
-              arr[i] = false
+              arr[i] = { valid: false, rowKey: this.dataSource[i][this.rowKey], index: i }
             }
           } else {
             // 没有依赖的字段
@@ -302,23 +320,35 @@ export default {
                 isHaveRequired = true
               }
             }
-            // for (const item in this.extraForm.rules) {
-            //   if (this.extraForm.rules[item].required === true) {
-            //     // 有任意一个字段有必填
-            //     isHaveRequired = true
-            //   }
-            // }
             if (isHaveRequired) {
               // 任意一个字段有必填，她又没展开过，校验不通过
-              arr[i] = false
+              arr[i] = { valid: false, rowKey: this.dataSource[i][this.rowKey], index: i }
             } else {
-              arr[i] = true
+              arr[i] = { valid: true, rowKey: this.dataSource[i][this.rowKey], index: i }
             }
           }
         }
       }
-      console.log(arr)
-      if (arr.includes(false)) {
+      if (arr.some(tt => !tt.valid)) {
+        const errorRows = arr.filter(tt => !tt.valid)
+        const errorIndex = errorRows.map(tt => tt.index)
+        const firstIndex = errorRows[0].index
+        const firstPage = parseInt((Number(firstIndex) + 1) / this.ipagination.pageSize) + 1
+        this.ipagination.current = firstPage
+        this.$nextTick(() => {
+          this.expandedRowKeys = [...this.expandedRowKeys, ...errorRows.map(tt => tt.rowKey)]
+          let timer = setTimeout(() => {
+            this.$nextTick(() => {
+              errorIndex.forEach(index => {
+                if (this.$refs[`ruleForm${index}`] && this.$refs[`ruleForm${index}`][0]) {
+                  this.$refs[`ruleForm${index}`][0].validate()
+                }
+              })
+            })
+            clearTimeout(timer)
+            timer = null
+          }, 100)
+        })
         return false
       } else {
         return true
diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
index 14aa50f5..a6e9723b 100644
--- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
+++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue
@@ -1222,7 +1222,7 @@ export default {
      * @param record
      * @param index
      */
-    handleEvaluationFeedBackChange (value, record, index) {
+    handleEvaluationFeedBackChange (value, record) {
       record.evaluationFeedback = value
       // 处理变化之后清空之前的数据
       const extraFormKeys = Object.keys(this.extraForm)
@@ -1236,7 +1236,6 @@ export default {
       for (const fieldName of deleteField) {
         delete record[fieldName]
       }
-      this.$set(this.dataSource, index, record)
     },
     dealFormData () {
       let formData = {}, basicTaskInfoDTO = {}, flag = true
@@ -1526,7 +1525,7 @@ export default {
         obj.props.disabled = true
       }
       return obj
-    },
+    }
 
   },
   beforeRouteLeave (to, form, next) {