修改一些样式，新增借款列表

oa-ui/src/assets/styles/variables.scss

 // $base-menu-color:#bfcbd9;
 $base-menu-color:#fff;
 $base-menu-color-active:#f4f4f5;
-$base-menu-background:#304156;
+// $base-menu-background:#304156;
+$base-menu-background:#303133;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);
 $base-menu-light-background:#ffffff;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background:#1f2d3d;
-$base-sub-menu-hover:#001528;
+// $base-sub-menu-background:#1f2d3d;
+$base-sub-menu-background:#1a1a1b;
+$base-sub-menu-hover:var(--current-color);
 
 // 自定义暗色菜单风格
 /**

oa-ui/src/views/flowable/form/borrow/borrowData.vue

+<!--
+ * @Author: ysh
+ * @Date: 2024-04-25 17:17:53
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-25 17:50:04
+-->
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
+export default {
+  props: {
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  mounted(){
+    this.getBorrowData()
+  },
+  methods: {
+    getBorrowData() {
+      listBorrow({projectId:this.taskForm.formId}).then(res => {
+        
+        console.log(res);
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
                 }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-      chooseProject.projectLeaderUser.nickName : ''
+    chooseProject.projectLeaderUser.nickName : ''
                 }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   <el-input v-model="detail.unit" :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.price" @change="calculateAmount(detail)" :disabled="taskName != '借款申请'"></el-input>
+                  <el-input v-model="detail.price" @change="calculateAmount(detail)"
+                    :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
-                  <el-input v-model="detail.quantity" @change="calculateAmount(detail)" :disabled="taskName != '借款申请'"></el-input>
+                  <el-input v-model="detail.quantity" @change="calculateAmount(detail)"
+                    :disabled="taskName != '借款申请'"></el-input>
                 </td>
                 <td>
                   <el-input v-model="detail.applyAmount" :disabled="taskName != '借款申请'"></el-input>
                     @change="calculateManagerAmount(detail)"></el-input>
                 </td>
                 <td>
-                  <el-button type="danger" icon="el-icon-minus" size="mini" circle  :disabled="taskName != '借款申请'"
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle :disabled="taskName != '借款申请'"
                     @click="deleDetailItem(index)"></el-button>
                 </td>
               </tr>
             </table>
-            <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain :disabled="taskName != '借款申请'"></el-button>
+            <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain
+              :disabled="taskName != '借款申请'"></el-button>
           </el-form-item>
           <el-row :gutter="20">
             <el-col :span="6" :xs="24">
             </el-col>
             <el-col :span="6" :xs="24">
               <el-form-item label="核准金额" prop="managerAmount">
-                <el-input v-model="form.managerAmount" placeholder="请输入核准金额" :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
+                <el-input v-model="form.managerAmount" placeholder="请输入核准金额"
+                  :disabled="taskName != '分管审核' && taskName != '党工团审核'" />
               </el-form-item>
             </el-col>
           </el-row>
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-form-item label="项目部校核意见" prop="xmComment">
+            <el-form-item label="项目部校核意见" prop="xmComment" v-if="form.borrowUsage == '0'">
               <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见"
                 :disabled="taskName != '项目部审核'" />
             </el-form-item>
-            <el-row>
+            <el-row v-if="form.borrowUsage == '0'">
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px" v-if="showFormItem('项目部审核')">
                   <span class="auditor"> {{ form.xmUser ? form.xmUser.nickName : xmUser }} </span>
       xmUser: '',
       managerUser: '',
       zjlUser: '',
-      unionUser:'',
+      unionUser: '',
       cwUser: '',
       deptTime: '',
       xmTime: '',
       managerTime: '',
       zjlTime: '',
-      unionTime:'',
+      unionTime: '',
       lendTime: '',
       // 遮罩层
       loading: true,
         }
       });
       getBorrow(this.taskForm.formId).then(res => {
-        console.log(res);
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.applier = this.$store.getters.userId;
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '部门审核') {
-                getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
-                  let userId = res.data.userId;
-                  this.$set(this.taskForm.variables, "approval", userId);
-                  this.$set(this.taskForm.variables, "isProject", this.isProject);
-                  complete(this.taskForm).then(response => {
-                    this.$modal.msgSuccess(response.msg);
-                    this.$emit('goBack')
+                if (this.isProject) {
+                  getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
+                    let userId = res.data.userId;
+                    this.$set(this.taskForm.variables, "approval", userId);
+                    this.$set(this.taskForm.variables, "isProject", this.isProject);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
                   });
-                });
+                } else {
+                  getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
+                    let userId = res.data.userId;
+                    this.$set(this.taskForm.variables, "approval", userId);
+                    this.$set(this.taskForm.variables, "isProject", this.isProject);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    });
+                  })
+                }
+
               }
               else if (this.taskName == '项目部审核') {
                 getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
       });
     },
     showFormItem(name) {
-      debugger
       let isShow = false;
       if (name == '借款申请')
         isShow = true;
         isShow = (this.taskName != '借款申请' && this.taskName != '部门审核' && this.taskName != '项目部审核');
       else if (name == '总经理审核')
         isShow = (this.taskName == '总经理审核' || this.taskName == '财务处理');
-      else if(name == '党工团审核')
+      else if (name == '党工团审核')
         isShow = (this.taskName == '党工团审核' || this.taskName == '财务处理');
       else if (name == '财务处理')
         isShow = (this.taskName == '财务处理');
     },
     // 修改借款类型
     hanldeChangeType() {
-      debugger
       if (this.form.borrowUsage == '0') {
         this.dgtLabel = '工会审核意见'
         this.isProject = true
           this.dgtLabel = '工会审核意见'
         } else if (this.form.borrowUsage == '3') {
           this.dgtLabel = '党委审核意见'
-        }else{
+        } else {
           this.dgtLabel = '团委审核意见'
         }
       }

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

  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-24 14:12:39
+ * @LastEditTime: 2024-04-25 13:52:22
 -->
 
 <template>
                 </el-checkbox-group>
               </el-form-item>
               <el-form-item label="驾驶员：">
-                <el-checkbox-group v-model="form.drivers" :disabled="taskName != '安排用车'">
+                <!-- <el-checkbox-group v-model="form.drivers" :disabled="taskName != '安排用车'"
+                  v-if="chooseOtherDrivers == false">
                   <el-checkbox :label="item.userId" v-for="item in driverList" :key="item.userId" :value="item.userId">
                     {{ item.nickName }}
                   </el-checkbox>
-                </el-checkbox-group>
+                </el-checkbox-group> -->
+                <el-select v-model="form.drivers" filterable multiple clearable style="width:220px" :disabled="taskName != '安排用车'">
+                  <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+                    v-if="item.nickName != 'admin'">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-form>
             <el-row style="text-align: center;" v-if="taskName == '用车申请'">
               <el-button type="primary" @click="submit">提交申请</el-button>
             </el-row>
             <el-row style="text-align: center;" v-else>
-              <el-button type="primary" @click="completeApply">{{ taskName == '申请确认' ? "确认" : "完成审批" }}</el-button>
+              <el-button type="primary" :disabled="taskName == ''" @click="completeApply">{{ taskName == '申请确认' ? "确认" : "完成审批" }}</el-button>
             </el-row>
           </div>
         </el-card>
 import { getUsersDeptLeader, getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import { listUser } from '@/api/system/user';
 export default {
   components: {
     flow
     }
   },
   created() {
+    this.getUserList();
     if (this.taskName == '部门审核') {
       this.deptUser = this.$store.getters.name;
       this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
       formTotal: 0,
       flowData: {},
       dept: 0,
-      dgtAdvice: '审核意见'//党工团审核意见的label
+      dgtAdvice: '审核意见',//党工团审核意见的label
+      userList: []
     }
   },
   mounted() {
       })
     },
     completeApply() {
-      debugger
       this.form.formId = this.taskForm.formId;
       this.form.carApplyId = this.taskForm.formId;
       let formData = new FormData();
         this.driverList = response.rows;
       })
     },
+    // 查询用户列表
+    getUserList() {
+      listUser({ pageSize: 9999, pageNum: 1 }).then(res => {
+        this.userList = res.rows
+      })
+    },
     calculateDay() {
       if (this.form.beginDate && this.form.endDate) {
         let y1 = new Date(this.form.beginDate);

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

  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-24 09:50:29
+ * @LastEditTime: 2024-04-25 14:15:08
 -->
 
 <template>
   },
   created() {
     this.registerTime = parseTime(new Date(), '{y}-{m}-{d}')
-    debugger
     if (this.$route.query.taskName != '项目登记') {
       this.getProjectInfo();
       this.getProjectWorkList();
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 .project-wrapper {
   padding: 25px;
 }

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

  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-22 11:31:51
+ * @LastEditTime: 2024-04-25 17:41:02
 -->
 <template>
   <div>
           </el-col>
           <el-col :span="11">
             <el-form-item label="驾驶员：">
-              {{ form.driver }}
+              <el-select v-model="form.driver" filterable multiple clearable style="width:220px">
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+                  v-if="item.nickName != 'admin'">
+                </el-option>
+              </el-select>
             </el-form-item>
+
           </el-col>
         </el-row>
         <el-form-item label="参与人员：" v-if="!noBudget">
         <el-row :gutter="20">
           <el-col :span="11">
             <el-form-item label="进场时间：">
-              <el-date-picker
-                type="date"
-                placeholder="选择日期"
-                v-model="form.entryTime"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
+              <el-date-picker type="date" placeholder="选择日期" v-model="form.entryTime"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="撤场时间：">
-              <el-date-picker
-                type="date"
-                placeholder="选择日期"
-                v-model="form.exitTime"
-                value-format="yyyy-MM-dd"
-              ></el-date-picker>
+              <el-date-picker type="date" placeholder="选择日期" v-model="form.exitTime"
+                value-format="yyyy-MM-dd"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
                 {{ index + 1 }}
               </td>
               <td>
-                <el-date-picker
-                  type="date"
-                  placeholder="选择日期"
-                  v-model="progress.date"
-                  value-format="yyyy-MM-dd"
-                ></el-date-picker>
+                <el-date-picker type="date" placeholder="选择日期" v-model="progress.date"
+                  value-format="yyyy-MM-dd"></el-date-picker>
               </td>
               <td>
-                <el-input-number
-                  v-model="progress.percentage"
-                  :controls="false"
-                  style="width: 120px"
-                ></el-input-number
-                >%
+                <el-input-number v-model="progress.percentage" :controls="false"
+                  style="width: 120px"></el-input-number>%
               </td>
               <td>
                 <el-input v-model="progress.situation" type="textarea"></el-input>
               </td>
               <td>
-                <el-button
-                  type="danger"
-                  icon="el-icon-minus"
-                  size="mini"
-                  circle
-                  @click="deleProgressItem(index)"
-                ></el-button>
+                <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                  @click="deleProgressItem(index)"></el-button>
               </td>
             </tr>
           </table>
-          <el-button
-            icon="el-icon-plus"
-            size="mini"
-            @click="addProgressList()"
-            type="primary"
-            plain
-          ></el-button>
+          <el-button icon="el-icon-plus" size="mini" @click="addProgressList()" type="primary" plain></el-button>
         </el-form-item>
       </el-form>
       <div class="headers">
         项目借款
         <div class="line"></div>
+        <borrow-data :taskForm="taskForm"></borrow-data>
       </div>
 
       <div class="headers">
         <div class="line"></div>
       </div>
       <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button @click="preserve()" :disabled="disabled" type="warning"
-          >保 存</el-button
-        >
-        <el-button type="primary" @click="submitNextFlow()" :disabled="disabled"
-          >提交下一个流程</el-button
-        >
+        <el-button @click="preserve()" :disabled="disabled" type="warning">保 存</el-button>
+        <el-button type="primary" @click="submitNextFlow()" :disabled="disabled">提交下一个流程</el-button>
       </div>
     </div>
   </div>
 import { listBudget } from "@/api/oa/budget/budget";
 import { getProject, updateProject } from "@/api/oa/project/project";
 import { getCar } from "@/api/oa/car/car";
+import { listUser } from '@/api/system/user';
+import borrowData from '../borrow/borrowData.vue';
 export default {
+  components: {
+    borrowData
+  },
   computed: {
     ...mapGetters(["name", "userId"]),
   },
       loading: true,
       form: {
         licensePlate: "",
-        driver: "",
+        driver: [],
         staff: "",
         entryTime: "",
         exitTime: "",
           situation: "",
         },
       ],
+      oldProgressList: [],
       noBudget: true,
       budgetId: "",
+      userList: []
     };
   },
   watch: {
     if (this.taskName == "项目生产") {
       this.doesItExistBudget(this.taskForm.formId);
       this.initProgress();
+      this.getUserList();
     }
   },
   methods: {
         }
       });
       getProjectProgress(this.taskForm.formId).then(res => {
+        this.oldProgressList = res.data
         if (res.data.length != 0) {
           this.progressList = res.data;
         }
               carArr.push(i.car.licensePlate);
               getCar(i.carId).then(res => {
                 carDriverList.push(res.data.driverUser.nickName);
-                this.form.driver = carDriverList.join("、");
+                // this.form.driver = carDriverList.join("、");
               });
             }
             this.form.licensePlate = carArr.join("、");
     },
     // 暂存数据
     preserve() {
-      delProjectProgress([this.taskForm.formId]).then(res => {
+      console.log(this.oldProgressList);
+      if (this.oldProgressList.length != 0) {
+        delProjectProgress([this.taskForm.formId]).then(res => {
+          console.log(res);
+          for (let progress of this.progressList) {
+            progress.projectId = this.taskForm.formId;
+            addProjectProgress(progress);
+          }
+        });
+      } else {
         for (let progress of this.progressList) {
           progress.projectId = this.taskForm.formId;
           addProjectProgress(progress);
         }
-      });
+      }
       updateProject({
         projectId: this.taskForm.formId,
         entryTime: this.form.entryTime,
         this.$message.success("保存成功");
       });
     },
-    submitNextFlow() {},
+    // 查询用户列表
+    getUserList() {
+      listUser(this.addDateRange({ pageSize: 9999, pageNum: 1, deptId: undefined }, [])).then(res => {
+        this.userList = res.rows
+      })
+    },
+    submitNextFlow() { },
   },
 };
 </script>

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

  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-17 15:51:53
+ * @LastEditTime: 2024-04-25 09:13:47
 -->
 <template>
   <div class="app-container">
       this.$refs['scConfirm'].validate((valid) => {
         if (valid) {
           this.form.projectId = this.taskForm.formId
-          debugger
           if (this.form.scApprover == '' || this.form.scApprover == null) {
             if (this.form.scApproverName != '' && this.form.scApproverName != null){
               this.form.scApprover = this.$store.state.user.id;

oa-ui/src/views/flowable/task/finished/detail/index.vue

           <cw-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
           <project-process :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
-          <car-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
+          <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
           <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
           <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
           <el-col :span="16" :offset="4" v-else>

oa-ui/src/views/flowable/task/myProcess/index.vue

  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-23 17:17:12
+ * @LastEditTime: 2024-04-25 14:32:14
 -->
 <template>
   <div class="app-container">
         <el-input v-model="queryParams.name" placeholder="请输入名称" clearable size="small"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="开始时间" prop="deployTime">
-        <el-date-picker clearable size="small" v-model="queryParams.deployTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="选择时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column label="流程状态" align="center" width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
           <el-tag type="success" v-if="scope.row.finishTime != null" size="mini">已完成</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
       <!-- <el-table-column label="流程类别" align="center" prop="category" width="100px" /> -->
       <!-- <el-table-column label="流程版本" align="center" width="80px">
           <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">办理进度</el-button>
           <el-button @click="handleFlowNote(scope.row)" type="text" size="small">表单信息</el-button>
           <!-- <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button> -->
-          <el-button @click="handleDelete(scope.row)" type="text" size="small"
+          <el-button @click="handleDelete(scope.row)" type="text" size="small" :disabled="beDeleted(scope.row)"
             v-hasPermi="['system:deployment:remove']">删除</el-button>
         </template>
       </el-table-column>
         this.$modal.msgSuccess("删除成功");
       })
     },
+    // 子流程不可以删除
+    beDeleted(row) {
+      console.log(row);
+      if (row.procDefName == '项目预算' || row.procDefName == '技术交底' || row.procDefName == '安全交底' || row.finishTime != null) {
+        return true
+      } else {
+        return false
+      }
+    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

oa-ui/src/views/flowable/task/myProcess/progressTree.vue

       ];
       for (let i of this.definitionList) {
         if (i.category == "project" || i.category == "contract") {
-          debugger;
           if (i.name != "安全交底" && i.name != "技术交底" && i.name != "项目预算") {
             this.treeData[0].children.push(i);
           }

oa-ui/src/views/flowable/task/todo/index.vue

     </el-row>
 
     <el-table v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <!-- <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" /> -->
       <el-table-column label="流程名称" align="center" prop="procDefName" />
       <el-table-column label="当前节点" align="center" prop="taskName" />
       <!-- <el-table-column label="流程版本" align="center">

oa-ui/src/views/oa/budget/components/chooseMoney.vue

       for (let user of this.chooseUser) {
         days = days + Number(user.days)
       }
-      debugger
       this.peopleNumber = days
       if (this.budgetForm.inOutPriceSum && this.budgetForm.inOutPriceSum != 0) {
         if (this.inOutPriceSum ==0 ) {
       this.$emit('getSettle', obj);
     },
     getInoutpriceSum() {
-      debugger
       this.inOutPriceSum = Number(this.inOutPrice) * Number(this.peopleNumber);
       this.getSettleSum()
     },