修改成果归档

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:51
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-18 16:56:44
+ * @LastEditTime: 2024-09-19 13:57:28
 -->
 <template>
   <div class="app-container">
@@ -105,11 +105,16 @@
             <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量与安全部归档意见"
               :disabled="taskName != '成果归档'" :autosize="{ minRows: 4 }" />
           </el-form-item>
-          <auditor-row key="2" :isCurrent="taskName == '成果归档'" :signature="form.archiver" :signTime="form.archiveTime"></auditor-row>
+          <auditor-row key="2" :isCurrent="taskName == '成果归档'" :signature="form.archiver"
+            :signTime="form.archiveTime"></auditor-row>
         </el-form>
         <div style="text-align: center;" v-if="isFlow">
-          <el-button type="primary" @click="submitForm" :disabled="taskName == '成果归档' && hasArchievement == false">
+          <el-button type="primary" @click="submitForm" v-if="taskName == '成果归档'"
+            :disabled="taskName == '成果归档' && hasArchievement == false">
             提交并结束流程</el-button>
+          <el-button type="primary" @click="submitForm" v-else
+            :disabled="taskName == '成果归档' && hasArchievement == false">
+            提交</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24" v-if="isFlow">
@@ -296,6 +301,9 @@ export default {
     initRules() {
       if (this.taskName == '归档发起') {
         this.rules = {
+          projectId: [
+            { required: true, message: '请选择项目', trigger: 'blur' }
+          ],
           submitTime: [
             { required: true, message: '请选择成果提交日期', trigger: 'change' }
           ]
@@ -426,9 +434,17 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              this.checkSendUser = true;
-              this.completeOpen = true;
-              this.completeTitle = "流程审批";
+              // this.checkSendUser = true;
+              // this.completeOpen = true;
+              // this.completeTitle = "流程审批";
+              getUsersDeptLeaderByDept({ deptId: 109 }).then(res => {
+                let userId = res.data.userId;
+                this.$set(this.taskForm.variables, "approval", userId);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              });
             })
           }
         }
@@ -441,7 +457,8 @@ export default {
       } else if (val.length == 1) {
         this.chooseProject = val[0]
         this.isSelect = true
-        this.form.projectId = val[0].projectId
+        this.$set(this.form, 'projectId', val[0].projectId)
+        this.$refs.form.validateField('projectId');
       }
       this.openProject = false;
       listAchievement({ projectId: this.form.projectId }).then(response => {