修改项目流转的人员、车辆、驾驶员

oa-ui/src/assets/styles/element-reset.scss

@@ -38,4 +38,9 @@
 // 描述框
 ::v-deep .el-descriptions-item__label.is-bordered-label{
   color: #686a6e;
+}
+
+// 多选框
+::v-deep .el-tag.el-tag--info {
+  color: #535559;
 }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-21 09:41:42
+ * @LastEditTime: 2024-05-24 09:28:54
 -->
 <template>
   <div class="app-container">
@@ -148,7 +148,6 @@ export default {
     initForm() {
       getProject(this.taskForm.formId).then(res => {
         this.form = res.data;
-        console.log(this.form);
         if (this.form.undertakingDept != null && this.form.undertakingDept != "" && this.form.undertakingDept != undefined) {
           this.form.deptId = this.form.undertakingDeptName.split(',')
         }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-15 09:35:41
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-23 17:41:35
+ * @LastEditTime: 2024-05-24 11:49:20
 -->
 <template>
   <div>
@@ -14,16 +14,37 @@
       </div>
       <el-form ref="progress" :model="form" :disabled="disabled" label-width="100px">
         <el-form-item label="参与人员：">
-          <el-tag class="mr10" :key="item" v-for="item in participates">{{ item.nickName }}</el-tag>
+          <el-select v-model="participates" multiple disabled style="width:84%">
+            <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+            </el-option>
+          </el-select>
+          <!-- <el-tag class="mr10" :key="item.userId" v-for="item in participates">{{ item.nickName }}</el-tag> -->
           <el-button class="ml10" @click="openPeople = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
+          <div v-if="participates.length == 0" style="color:#F56C6C">tips:请选择参与人员</div>
         </el-form-item>
         <el-form-item label="驾驶员：">
-          <el-tag class="mr10" :key="item" v-for="item in chooseDriver">{{ item.nickName }}</el-tag>
-          <el-button class="ml10" @click="openDriver = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
+          <el-tooltip :disabled="form.drivers.length == 0" class="item" effect="dark"
+            content="直接获取用车申请中的驾驶员,若无驾驶员,则需要先提交项目的用车申请" placement="top-end">
+            <el-select v-model="form.drivers" multiple disabled style="width:90%">
+              <el-option v-for="item in userList" :label="item.nickName" :value="item.userId" :key="item.userId">
+              </el-option>
+            </el-select>
+          </el-tooltip>
+          <!-- <el-tag class="mr10" :key="item" v-for="item in chooseDriver">{{ item.nickName }}</el-tag>
+          <el-button class="ml10" @click="openDriver = true" type="primary" size="mini" icon="el-icon-plus"></el-button> -->
         </el-form-item>
         <el-form-item label="使用车辆：">
-          <el-tag class="mr10" :key="item.licensePlate" v-for="item in chooseCar">{{ item.licensePlate + item.brand }}</el-tag>
-          <el-button class="ml10" @click="openCar = true" type="primary" size="mini" icon="el-icon-plus"></el-button>
+          <el-tooltip :disabled="form.cars.length == 0" class="item" effect="dark"
+            content="直接获取用车申请中的车辆,若无车辆,则需要先提交项目的用车申请" placement="top-end">
+            <el-select v-model="form.cars" multiple disabled style="width:90%">
+              <el-option v-for="item in carList" :label="item.licensePlate + item.brand" :value="item.carId"
+                :key="item.carId">
+              </el-option>
+            </el-select>
+          </el-tooltip>
+          <!-- <el-tag class="mr10" :key="item.licensePlate" v-for="item in chooseCar">{{ item.licensePlate + item.brand
+            }}</el-tag>
+          <el-button class="ml10" @click="openCar = true" type="primary" size="mini" icon="el-icon-plus"></el-button> -->
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="11">
@@ -101,7 +122,7 @@
     </el-dialog>
     <!-- 选择司机对话框 -->
     <el-dialog title="选择驾驶员" :visible.sync="openDriver" width="700px" append-to-body>
-      <choosePeople @chooseUser="getChooseDriver"></choosePeople>
+      <choosePeople :deptId="200" @chooseUser="getChooseDriver"></choosePeople>
     </el-dialog>
   </div>
 </template>
@@ -109,34 +130,13 @@
 <script>
 import { mapGetters } from "vuex";
 import { parseTime } from "@/utils/ruoyi";
-import {
-  complete,
-  rejectTask,
-  returnList,
-  returnTask,
-  getNextFlowNode,
-  delegate,
-  flowTaskForm,
-} from "@/api/flowable/todo";
-import {
-  getProjectComment,
-  addProjectComment,
-  updateProjectComment,
-} from "@/api/oa/project/projectComment";
-import { getUsersDeptLeaderByDept } from "@/api/system/post";
-import {
-  listProjectProgress,
-  addProjectProgress,
-  delProjectProgress,
-} from "@/api/oa/project/projectProgress";
-import { listBudgetCar } from "@/api/oa/budget/budgetCar";
-import { listBudgetDevice } from "@/api/oa/budget/budgetDevice";
-import { listBudgetSettle } from "@/api/oa/budget/budgetSettle";
-import { listBudgetStaff } from "@/api/oa/budget/budgetStaff";
-import { listBudget } from "@/api/oa/budget/budget";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import { listProjectProgress, addProjectProgress, delProjectProgress } from "@/api/oa/project/projectProgress";
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
+import { listCarApproval, getCarApproval } from '@/api/oa/car/carApproval'
 import { listUser } from '@/api/system/user';
+import { listCar } from '@/api/oa/car/car'
 import borrowData from '../inProgress/borrowData.vue';
 import SettleData from '../inProgress/settleData.vue';
 import ChoosePeople from '../budget/components/choosePeople.vue';
@@ -174,7 +174,9 @@ export default {
       openCar: false,
       form: {
         licensePlate: "",
-        driver: [],
+        drivers: [],
+        cars: [],
+        participates:[],
         staff: "",
         entryTime: "",
         exitTime: "",
@@ -192,9 +194,10 @@ export default {
       oldProgressList: [],
       budgetId: "",
       userList: [],
+      carList: [],
       participates: [],
       chooseCar: [],
-      chooseDriver: []
+      chooseDriver: [],
     };
   },
   watch: {
@@ -209,14 +212,29 @@ export default {
       // this.doesItExistBudget(this.taskForm.formId);
       this.initProgress();
       this.getUserList();
+      this.getCarList();
     }
   },
+  mounted() {
+  },
   methods: {
     initProgress() {
       getProject(this.taskForm.formId).then(res => {
         if (res.data) {
           this.form.entryTime = res.data.entryTime;
           this.form.exitTime = res.data.exitTime;
+          if (res.data.participates) {
+            this.participates = (res.data.participates.split(',')).map(Number);
+          }
+          if (res.data.cars) {
+            this.form.cars = (res.data.cars.split(',')).map(Number);
+          }
+          if (res.data.drivers) {
+            this.form.drivers = (res.data.drivers.split(',')).map(Number);
+          }
+          if (!(res.data.cars && res.data.drivers)) {
+            this.getCarAndDriver();
+          }
         }
       });
       listProjectProgress({ projectId: this.taskForm.formId }).then(res => {
@@ -227,7 +245,8 @@ export default {
       });
     },
     getChooseUser(val) {
-      this.participates = val;
+      this.participates = val.map(item => item.userId);
+      console.log(this.participates);
       this.openPeople = false;
     },
     getChooseCar(val) {
@@ -238,35 +257,30 @@ export default {
       this.chooseDriver = val;
       this.openDriver = false;
     },
-    // 查询是否有预算表
-    doesItExistBudget(projectId) {
-      listBudget({ projectId }).then(res => {
-        this.loading = false;
-        if (res.total == 0) {
-        } else {
-          this.noBudget = false;
-          this.budgetId = res.rows[0].budgetId;
-          listBudgetCar({ budgetId: this.budgetId }).then(res => {
-            let carArr = [];
-            let carDriverList = [];
-            for (let i of res.rows) {
-              carArr.push(i.car.licensePlate);
-              getCar(i.carId).then(res => {
-                carDriverList.push(res.rows.driverUser.nickName);
-                // this.form.driver = carDriverList.join("、");
+    // 通过用车审批表获取车辆和驾驶员信息
+    getCarAndDriver() {
+      listCarApproval({ projectId: this.taskForm.formId }).then(res => {
+        console.log(res);
+        if (res.rows) {
+          this.form.drivers = []
+          this.form.cars = []
+          for (let data of res.rows) {
+            if (data.cars) {
+              let cars = data.cars.split(',');
+              cars = cars.map(Number);
+              cars.map(item => {
+                this.form.cars.push(Number(item));
               });
             }
-            this.form.licensePlate = carArr.join("、");
-          });
-          listBudgetStaff({ budgetId: this.budgetId }).then(res => {
-            let userArr = [];
-            for (let u of res.rows) {
-              userArr.push(u.user.nickName);
+            if (data.drivers) {
+              let drivers = data.drivers.split(',');
+              drivers.map(item => {
+                this.form.drivers.push(Number(item));
+              });
             }
-            this.form.staff = userArr.join("、");
-          });
+          }
         }
-      });
+      })
     },
     addProgressList() {
       this.progressList.push({
@@ -302,11 +316,13 @@ export default {
           addProjectProgress(progress);
         }
       }
-      updateProject({
-        projectId: this.taskForm.formId,
-        entryTime: this.form.entryTime,
-        exitTime: this.form.exitTime,
-      }).then(res => {
+      this.form.projectId = this.taskForm.formId;
+      this.form.cars = this.form.cars.length != 0 ? this.form.cars.join(',') : '';
+      this.form.drivers = this.form.drivers.length != 0 ? this.form.drivers.join(',') : '';
+      // this.participates = this.participates.map(item => item.userId)
+      this.form.participates = this.participates.join(',')
+      console.log(this.form);
+      updateProject(this.form).then(res => {
         this.$message.success("保存成功");
       });
     },
@@ -316,6 +332,12 @@ export default {
         this.userList = res.rows
       })
     },
+    // 查询车辆列表
+    getCarList() {
+      listCar({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.carList = res.rows
+      })
+    },
     submitNextFlow() {
       this.preserve();
       const params = { taskId: this.taskForm.taskId };
@@ -346,6 +368,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+
 .auditor {
   font-family: "华文行楷";
   font-size: 20px;