Browse Source

新增用车审批,安排用车节点判断是否有意见

余思翰 4 months ago
parent
commit
b8b6664cd3
1 changed files with 12 additions and 6 deletions
  1. 12
    6
      oa-ui/src/views/flowable/form/oa/carForm.vue

+ 12
- 6
oa-ui/src/views/flowable/form/oa/carForm.vue View File

1
 <!--
1
 <!--
2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-29 11:44:28
3
  * @Date: 2024-02-29 11:44:28
4
- * @LastEditors: wrh
5
- * @LastEditTime: 2024-10-16 13:49:16
4
+ * @LastEditors: Please set LastEditors
5
+ * @LastEditTime: 2025-01-16 16:10:27
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
60
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
60
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
61
                     }}</el-descriptions-item>
61
                     }}</el-descriptions-item>
62
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
62
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
63
-    chooseProject.projectLeaderUser.nickName : ''
63
+                    chooseProject.projectLeaderUser.nickName : ''
64
                     }}</el-descriptions-item>
64
                     }}</el-descriptions-item>
65
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
65
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
66
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
66
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
211
               <!-- 综合事务部管理人员填写 -->
211
               <!-- 综合事务部管理人员填写 -->
212
               <el-form-item label="车牌号:" prop="cars">
212
               <el-form-item label="车牌号:" prop="cars">
213
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
213
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
214
-                  <el-checkbox :disabled="item.status == 1 ? false : true" :label="item.carId" v-for="item in carList" :key="item.carId" :value="item.carId"
215
-                    v-if="item.remark == null">
214
+                  <el-checkbox :disabled="item.status == 1 ? false : true" :label="item.carId" v-for="item in carList"
215
+                    :key="item.carId" :value="item.carId" v-if="item.remark == null">
216
                     {{ item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '') }}
216
                     {{ item.licensePlate + (item.brand ? item.brand : '') + (item.series ? item.series : '') }}
217
                   </el-checkbox>
217
                   </el-checkbox>
218
                 </el-checkbox-group>
218
                 </el-checkbox-group>
252
             </el-row>
252
             </el-row>
253
             <el-row style="text-align: center;" v-else>
253
             <el-row style="text-align: center;" v-else>
254
               <el-button type="warning" @click="saves()" v-if="taskName == '安排用车'">保存</el-button>
254
               <el-button type="warning" @click="saves()" v-if="taskName == '安排用车'">保存</el-button>
255
-              <el-button type="primary" v-if="taskName" @click="completeApply">完成审批</el-button>
255
+              <el-button type="primary" v-if="taskName" @click="completeApply" :disabled="taskName == '安排用车' && !form.returnDate">完成审批</el-button>
256
             </el-row>
256
             </el-row>
257
           </div>
257
           </div>
258
         </el-card>
258
         </el-card>
555
       })
555
       })
556
     },
556
     },
557
     saves() {
557
     saves() {
558
+      if (this.taskName == '安排用车') {
559
+        if(!this.form.dispatchComment){
560
+          this.$message.error('请填写安排用车意见')
561
+          return
562
+        }
563
+      }
558
       let formData = new FormData();
564
       let formData = new FormData();
559
       let jsonForm = JSON.stringify(this.form);
565
       let jsonForm = JSON.stringify(this.form);
560
       formData.append("form", jsonForm);
566
       formData.append("form", jsonForm);

Loading…
Cancel
Save