企标复审流程-批准节点-驳回时审批意见必填

src/pages/processCenter/pages/creatProcess/qbfs/step5.vue

@@ -39,13 +39,22 @@
         <el-collapse accordion>
           <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
-              <el-input
+<!--                <el-input-->
-                      type="textarea"
+<!--                    type="textarea"-->
-                      :rows="3"
+<!--                    :rows="3"-->
-                      resize="none"
+<!--                    resize="none"-->
-                      placeholder="请输入意见"
+<!--                    placeholder="请输入意见"-->
-                      v-model="commentText">
+<!--                    v-model="commentText">-->
-              </el-input>
+<!--                </el-input>-->
+              <el-form-item prop="commentText" label-width="0px">
+                <el-input
+                    type="textarea"
+                    :rows="3"
+                    resize="none"
+                    placeholder="请输入意见"
+                    v-model="qbfsForm.commentText">
+                </el-input>
+              </el-form-item>
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -238,6 +247,7 @@ export default {
         jgUserId: '',
         bussFsSubUser2:'',
         bussFsSubUser2Name:'',
+        commentText:'',
       },
       formBuss: {
         selListRep2:[],
@@ -490,6 +500,7 @@ export default {
         this.standardDrawer = false
         this.verifySarStandard = true
         this.commentText = mes.commentText
+        this.qbfsForm.commentText = mes.commentText
         this.formKey++
         this.$forceUpdate()
       });
@@ -547,7 +558,8 @@ export default {
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
         qbfsForm: this.qbfsForm,
-        commentText: this.commentText
+        // commentText: this.commentText
+        commentText: this.qbfsForm.commentText
       }))
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
@@ -624,7 +636,8 @@ export default {
         taskInfo: '发起企标制修订流程',
         form: this.formBuss,
         roleForm: this.roleForm,
-        commentText: this.commentText
+        // commentText: this.commentText
+        commentText: this.qbfsForm.commentText
       }))
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
@@ -637,36 +650,36 @@ export default {
     handleSubmit(){
       this.getRule()
       this.$refs['qbfsForm'].validate((valid) => {
-          if (valid) {
+        if (valid) {
-            this.isSubmit = true
+          this.isSubmit = true
-            this.saveLoading = true
+          this.saveLoading = true
-            this.qbfsForm.commentText = this.commentText
+          // this.qbfsForm.commentText = this.commentText
-            // if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
+          // if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
-            //   this.qbfsForm.qcflag = 0
+          //   this.qbfsForm.qcflag = 0
-            // }else{
+          // }else{
-            //   this.qbfsForm.qcflag = 1
+          //   this.qbfsForm.qcflag = 1
-            // }
+          // }
-            this.qbfsForm.prcId = this.$route.query.prcId
+          this.qbfsForm.prcId = this.$route.query.prcId
-            let json = JSON.stringify(this.qbfsForm);
+          let json = JSON.stringify(this.qbfsForm);
-            this.$http.post('lawss/activiti/completeTask', {
+          this.$http.post('lawss/activiti/completeTask', {
-              taskIds: this.$route.query.taskIds,
+            taskIds: this.$route.query.taskIds,
-              userId: this.$store.getters.userInfo.userId,
+            userId: this.$store.getters.userInfo.userId,
-              json: json,
+            json: json,
-            }, {
+          }, {
-              _this: this
+            _this: this
-            }, res => {
+          }, res => {
-              if (res.success) {
+            if (res.success) {
-                this.isSubmit = false
+              this.isSubmit = false
-                if(this.qbfsForm.approvalOpinion === 0 && this.qbfsForm.standSort.indexOf("Q/QCBFC") == -1){
+              if(this.qbfsForm.approvalOpinion === 0 && this.qbfsForm.standSort.indexOf("Q/QCBFC") == -1){
-                  this.processCreateFsBuss(json)
+                this.processCreateFsBuss(json)
-                }
-                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
               }
-            }, e => {
+              this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-            });
+            }
-          }else {
+          }, e => {
-            this.$message.warning('请检查基础信息表单是否填写完整')
+          });
-          }
+        }else {
+          this.$message.warning('请检查基础信息表单是否填写完整')
+        }
       })
     },
     handleTransfer() {