保留学籍申请表单调整

src/views/routine/enlistmentReserve/applicationForm.vue

@@ -684,7 +684,8 @@ export default {
           }
           this.formData.updateTime = new Date().toISOString().split('T')[0];
           this.formData.applyReason = "本人应征入伍，申请保留学籍从 " + this.formData.reserveStartDate + " 至退役后两年。"
-
+          // 新增的时候根据点击的按钮确定状态，点击保存按钮申请状态是草稿，点击提交按钮申请状态就是待审核
+          this.formData.applyStatus = applyStatus;
 
           const submitData = {
             formData: this.formData,
@@ -695,11 +696,11 @@ export default {
               this.loading = false;
             });
             // 批量新增材料附件
-            batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList)
+            if (this.enlistmentReserveAttachList && this.enlistmentReserveAttachList.length > 0) {
+              this.batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList);
+            }
             this.goBack()
           } else {
-            // 新增的时候根据点击的按钮确定状态，点击保存按钮申请状态是草稿，点击提交按钮申请状态就是待审核
-            this.formData.applyStatus = applyStatus;
             addEnlistmentReserve(submitData.formData).then(response => {
               this.$modal.msgSuccess("新增成功");
               // 申请表新增成功之后，进行附件的添加
@@ -711,7 +712,9 @@ export default {
                 })
                 this.loading = false;
                 // 批量新增材料附件
-                batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList)
+                if (this.enlistmentReserveAttachList && this.enlistmentReserveAttachList.length > 0) {
+                  this.batchAddEnlistmentReserveAttach(this.enlistmentReserveAttachList);
+                }
                 this.goBack()
               }
             });

src/views/routine/enlistmentReserve/index.vue

@@ -103,7 +103,8 @@
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.applyStatus == 0" type="info">待提交</el-tag>
+          <el-tag v-if="scope.row.applyStatus == 0 && scope.row.processInstanceId == ''" type="info">待提交</el-tag>
+          <el-tag v-if="scope.row.applyStatus == 0 && scope.row.processInstanceId != ''" type="info">被驳回</el-tag>
           <el-tag v-if="scope.row.applyStatus == 1">审核中</el-tag>
           <el-tag v-if="scope.row.applyStatus == 2" type="success">审核通过</el-tag>
         </template>