From 52c8386b34c51cbf062d90bb4b96419fff3fcbbf Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Wed, 10 Apr 2024 09:42:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=20=E5=9B=9E=E6=89=A7?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step3.vue       | 119 ++++++++++--------
 1 file changed, 69 insertions(+), 50 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 2b4069800..10867d424 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -176,13 +176,18 @@
                         </el-table-column>
                     </el-table-column>
                 </el-table>
-              <ReceiptDescription
-                  title="回执说明"
-                  isItem
-                  v-model="commentText3"
-                  prop="commentText3"
-                  :rules="{myProp: [{ required: true, message: '回执说明不能为空', trigger: 'blur' }]}"
-              ></ReceiptDescription>
+              <el-form ref="commentForm" :model="commentForm" :rules="commentFormRules">
+                <div class="title" style="height: 48px;line-height: 48px"><span class="requiredTag">*</span>回执说明</div>
+                <el-form-item prop="commentText3" label-width="0">
+                  <el-input
+                      type="textarea"
+                      :autosize="{ minRows: 3 }"
+                      resize="none"
+                      placeholder="请输入意见"
+                      v-model="commentForm.commentText3">
+                  </el-input>
+                </el-form-item>
+              </el-form>
             </div>
             <!--<el-collapse accordion>-->
             <!--    <el-collapse-item title="回执说明">-->
@@ -357,6 +362,10 @@
         name: "bzzqyjStep3",
         data() {
             return {
+                commentForm: {},
+                commentFormRules:{
+                  commentText3:[{required: true, message: '回执说明不能为空',trigger: 'blur'}]
+                },
                 standId: '',
                 modaltitle2: '',
                 addType: '',
@@ -611,7 +620,7 @@
                 _formData.append("taskIds", this.taskIds);
                 _formData.append("json", JSON.stringify({
                     form: json,
-                    commentText3: this.commentText3
+                    commentText3: this.commentForm.commentText3
                 }));
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false;
@@ -641,74 +650,78 @@
                 })
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.isSubmit = true
-                    this.saveLoading = true
-                    var json = this.json
-                    json.onlyKey = this.onlyKey
-                    json.commentText = this.commentText3
-                    json.info = []
-                    json.form = this.form
-                    json.department = this.$store.getters.userInfo.orgName
-                    console.log(json)
-                    this.$http.post('lawss/activiti/completeTask', {
+                this.$refs.commentForm.validate(valid => {
+                  if (valid){
+                    if (this.data.length < 1) {
+                      this.isSubmit = true
+                      this.saveLoading = true
+                      var json = this.json
+                      json.onlyKey = this.onlyKey
+                      json.commentText = this.commentForm.commentText3
+                      json.info = []
+                      json.form = this.form
+                      json.department = this.$store.getters.userInfo.orgName
+                      console.log(json)
+                      this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                      }, {}, res => {
                         if (res.success) {
-                            this.$message.success('提交成功')
-                            this.$router.push('/processCenter')
+                          this.$message.success('提交成功')
+                          this.$router.push('/processCenter')
                         }
                         this.isSubmit = false
                         this.saveLoading = false
-                    })
-                } else {
-                    var a = 0
-                    var b = 0
-                    // var c = 0
-                    for (let s1 = 0; s1 < this.data.length; s1++) {
+                      })
+                    } else {
+                      var a = 0
+                      var b = 0
+                      // var c = 0
+                      for (let s1 = 0; s1 < this.data.length; s1++) {
                         if (!this.data[s1].chapterNumber) {
-                            a++
+                          a++
                         }
                         if (!this.data[s1].chapterName) {
-                            b++
+                          b++
                         }
                         // if (!this.data[s1].commentText) {
                         //     c++
                         // }
-                    }
-                    if (a > 0) {
+                      }
+                      if (a > 0) {
                         this.$message.warning('请输入章节编号')
-                    } else if (b > 0) {
+                      } else if (b > 0) {
                         this.$message.warning('请输入章节名称')
-                    }
-                    // else if (c > 0) {
-                    //     this.$message.warning('请输入意见内容')
-                    // }
-                    else {
+                      }
+                          // else if (c > 0) {
+                          //     this.$message.warning('请输入意见内容')
+                      // }
+                      else {
                         this.isSubmit = true
                         this.saveLoading = true
                         var json = this.json
-                        json.commentText = this.commentText3
+                        json.commentText = this.commentForm.commentText3
                         json.info = this.data
                         json.form = this.form
                         json.department = this.$store.getters.userInfo.orgName
                         json.onlyKey = this.onlyKey
                         this.$http.post('lawss/activiti/completeTask', {
-                            json: JSON.stringify(json),
-                            taskId: this.taskIds,
-                            userId: this.$store.getters.userInfo.userId
+                          json: JSON.stringify(json),
+                          taskId: this.taskIds,
+                          userId: this.$store.getters.userInfo.userId
                         }, {}, res => {
-                            if (res.success) {
-                                this.$message.success('提交成功')
-                                this.$router.push('/processCenter')
-                            }
-                            this.isSubmit = false
-                            this.saveLoading = false
+                          if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
+                          }
+                          this.isSubmit = false
+                          this.saveLoading = false
                         })
+                      }
                     }
-                }
+                  }
+                })
             },
             getItemList (standId, fileType) { // 查询分解单条款数据
                 this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
@@ -739,7 +752,7 @@
                             this.acceptShow = false
                             this.submitShow = true
                         }
-                        this.commentText3 = data.commentText3 || ''
+                        this.commentForm.commentText3 = data.commentText3 || ''
                         this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
                         this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
                         this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
@@ -779,6 +792,12 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
 
+    .requiredTag{
+      color: #f56c6c;
+      margin-right: 4px;
+      font-size: 14px;
+    }
+
     .bzdyStep3 {
         /deep/.zTable_style {
             border-bottom: 1px solid #d1d1d1;