From a7096a05c15b47c38e9c469af3f00925faee24f6 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 26 Dec 2023 18:59:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2,=E4=BB=BB=E5=8A=A1=E8=BD=AC?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taskCareOf/table/ProcessInfo.vue             |  1 +
 .../modules/MainDrafterCollectBaseInfo.vue       | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
index d99d1331..110e654e 100644
--- a/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
+++ b/src/views/personalCenter/taskCareOf/table/ProcessInfo.vue
@@ -176,6 +176,7 @@ export default {
         }
       ],
       url: {
+        // todo数据源还未确认
         list: '/laws/taskTransfer/queryProcessDB'
       },
       // 每个流程不显示待办按钮的节点nodeId
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
index 1c30251a..46ee762f 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
@@ -125,7 +125,7 @@ export default {
                 title={this.dataSource[index].reason} placeholder={this.$t('pleaseEnter')}
                 onChange={ e => {
                   e.target.value = e.target.value.trim()
-                  this.dataSource[index].reason = (e.target.value.replace(/[^0-9-]/g, '')).trim()
+                  this.dataSource[index].reason = e.target.value.trim()
                 } }
               />,
               attrs: {}
@@ -146,7 +146,12 @@ export default {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
       // 给表格赋值,在线编辑不知道要怎么赋值？
-      this.dataSource = data.advices
+      this.dataSource = data.advices.map(item => {
+        return {
+          ...item,
+          handleAdvice: item.handleAdvice ? item.handleAdvice : undefined
+        }
+      })
       // 给表单赋值
       this.$nextTick(() => {
         this.$refs.baseInfoForm.initData(data)
@@ -164,15 +169,16 @@ export default {
     getDataValidate () {
       let hasErr = false
       for (const item of this.dataSource) {
-        // 不采纳，部分采纳必填理由
-        if ((item.handlingSuggestion === 2 || item.handlingSuggestion === 3) && !item.deductionScoreReason) {
+        // 处理意见必填，不采纳，部分采纳必填理由
+        if (!item.handleAdvice || ((item.handleAdvice === 2 || item.handleAdvice === 3) && !item.reason)) {
+          console.log(item.handleAdvice)
           hasErr = true
           break
         }
       }
       let data = {} // 需要返回的数据
       if (hasErr) {
-        this.$message.warning(this.$t('workCenter.enStandardRevision.pleaseEnterAllMarkItem'))
+        this.$message.warning(this.$t('pleaseCompleteTableInfo'))
         data = false
       } else {
         data.advices = this.dataSource