修改生产确认

oa-ui/src/views/flowable/form/projectProcess/scConfirm.vue

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-12 14:17:37
+ * @LastEditTime: 2024-04-12 17:32:47
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align:center;">生产确认</h2>
-    <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
+    <el-form ref="scConfirm" :model="form" :rules="rules" label-width="100px" :disabled="disabled">
       <el-form-item label="确认信息：" prop="scComment">
         <el-input type="textarea" :rows="4" placeholder="请输入确认信息" v-model="form.scComment">
         </el-input>
@@ -82,10 +82,12 @@ export default {
     initForm() {
       getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
+          debugger
           this.form = res.data
-          // if (res.data.scApproverName) {
-          //   this.form.scApproverName = res.data.scApproverName
-          // }
+          this.form.scApprover = '';
+          if (res.data.scApproverName) {
+            this.form.scApproverName = res.data.scApproverName
+          }
         } else {
           this.form.scApprover = '';
           this.form.scApproverName = '';
@@ -137,21 +139,33 @@ export default {
       } else {
         this.form.scApproverName = this.$store.state.user.name;
       }
-
+      this.form.scApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
     },
     confirm() {
-      this.form.projectId = this.taskForm.formId
-      console.log(this.form);
-      updateProjectComment(this.form)
-      const params = { taskId: this.taskForm.taskId };
-      // 获取下一个流程节点
-      getNextFlowNode(params).then(res => {
-        this.$set(this.taskForm.variables, "approval", this.deptLeaderList);
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.$emit("goBack");
-        });
-      });
+      this.$refs['scConfirm'].validate((valid) => {
+        if (valid) {
+          this.form.projectId = this.taskForm.formId
+          debugger
+          if (this.form.scApprover == '' || this.form.scApprover == null) {
+            this.$modal.msgError('请签名');
+            return
+          }
+          updateProjectComment(this.form)
+          const params = { taskId: this.taskForm.taskId };
+          // 获取下一个流程节点
+          getNextFlowNode(params).then(res => {
+            this.$set(this.taskForm.variables, "approval", this.deptLeaderList);
+            complete(this.taskForm).then(response => {
+              this.$modal.msgSuccess(response.msg);
+              this.$emit("goBack");
+            });
+          });
+        } else {
+          this.$modal.msgError('必填项未写');
+          return false;
+        }
+      })
+
     },
 
   },