修改车辆管理新增的表单等

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

 // }
 .el-scrollbar__wrap {
   overflow-x: hidden;
+}
+
+.el-form-item__label{
+  font-family: '微软雅黑';
+  color: #34363b;
 }

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

  * @Author: wrh
  * @Date: 2024-02-29 17:24:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-04 14:10:06
+ * @LastEditTime: 2024-03-05 10:55:59
 -->
+
 <template>
   <div>
     <h2 style="text-align: center;">用车申请表</h2>
     <div>
       <el-form :model="form" label-width="100px">
+        <!-- 申请人填写 -->
         <el-row :gutter="20">
           <el-col :span="6" :xs="24">
             <el-form-item label="申请人：" prop="user">
             </el-form-item>
           </el-col>
         </el-row>
-
-        <el-form-item label="项目编号：" prop="projectNumber">
-          <el-select v-model="form.projectNumber" filterable placeholder="请选择" @change="handleSelectProject" clearable>
-            <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber" :value="item.projectId">
-            </el-option>
-          </el-select>
-          <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
-            <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-            }}</el-descriptions-item>
-            <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-            }}</el-descriptions-item>
-            <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
-            }}</el-descriptions-item>
-            <el-descriptions-item label="承担部门" label-class-name="my-label">
-              <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
-            </el-descriptions-item>
-            <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-            }}</el-descriptions-item>
-          </el-descriptions>
-        </el-form-item>
-        <el-form-item label="车牌号：">
-          <el-select v-model="form.licensePlate" filterable multiple placeholder="请选择" clearable>
-            <el-option v-for="item in carList" :key="item.id" :label="item.licensePlate" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24">
             <el-form-item label="开始日期：">
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="项目编号：" prop="projectNumber">
+          <el-select v-model="form.projectNumber" filterable placeholder="请选择" @change="handleSelectProject" clearable>
+            <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
+              :value="item.projectId">
+            </el-option>
+          </el-select>
+          <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+            <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+              }}</el-descriptions-item>
+            <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+            <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
+              }}</el-descriptions-item>
+            <el-descriptions-item label="承担部门" label-class-name="my-label">
+              <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+              }}</el-descriptions-item>
+          </el-descriptions>
+        </el-form-item>
+        <el-divider></el-divider>
+        <!-- 综合事务部管理人员填写 -->
 
+        <el-form-item label="车牌号：">
+          <el-select v-model="form.licensePlate" filterable multiple placeholder="请选择" clearable>
+            <el-option v-for="item in carList" :key="item.id" :label="item.licensePlate" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="驾驶员：">
-          <el-select v-model="form.driver" filterable multiple placeholder="请选择" clearable>
+          <!-- <el-select v-model="form.driver" filterable multiple placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
             </el-option>
-          </el-select>
+          </el-select> -->
+          <el-checkbox-group v-model="form.driver">
+            <el-checkbox :label="item.userId" v-for="item in driverList">{{ item.nickName }}</el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
       </el-form>
     </div>
     return {
       form: {
         date: new Date(),
-        day: ''
+        day: '',
+        driver:[]
       },
       projectList: [],
       carList: [],
         this.carList = response.rows;
       })
     },
-    
+
     // 查询驾驶员列表
     getDriverList() {
       listDriver({
 </script>
 
 <style lang="scss" scoped></style>
+
 <style>
 .my-label {
   width: 100px;

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

+<!--
+ * @Author: ysh
+ * @Date: 2024-02-27 14:49:15
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-05 11:35:07
+-->
+
+<template>
+  <div class="project-wrapper">
+    <!-- 新建项目 -->
+    <h2>经营管理部登记</h2>
+    <el-form :model="addForm" :rules="rules" label-width="100px">
+      <el-form-item label="项目编号：" prop="projectNumber">
+        <el-input v-model="addForm.projectNumber"></el-input>
+      </el-form-item>
+      <el-form-item label="项目名称：" prop="projectName">
+        <el-input v-model="addForm.projectName"></el-input>
+      </el-form-item>
+      <el-form-item label="项目负责人：" prop="projectLeader">
+        <el-tag effect="plain" type="warning" style="margin-right: 10px;"
+          v-if="addForm.projectLeaderName != undefined">{{ addForm.projectLeaderName }}</el-tag>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
+      </el-form-item>
+      <el-form-item label="项目类型：" prop="projectType">
+        <el-input v-model="addForm.projectType"></el-input>
+      </el-form-item>
+      <el-form-item label="项目级别：" prop="projectLevel">
+        <el-radio v-model="addForm.projectLevel" label="0">一般项目</el-radio>
+        <el-radio v-model="addForm.projectLevel" label="1">重大项目</el-radio>
+      </el-form-item>
+      <el-form-item label="项目来源：" prop="projectSource">
+        <el-radio v-model="addForm.projectSource" label="0">院内</el-radio>
+        <el-radio v-model="addForm.projectSource" label="1">院外</el-radio>
+      </el-form-item>
+      <el-form-item label="甲方单位：" prop="partyA">
+        <el-input v-model="addForm.partyA"></el-input>
+      </el-form-item>
+      <el-form-item label="联系人：" prop="contactPerson">
+        <el-input v-model="addForm.contactPerson"></el-input>
+      </el-form-item>
+      <el-form-item label="联系电话：" prop="telephone">
+        <el-input v-model="addForm.telephone"></el-input>
+      </el-form-item>
+      <el-form-item label="项目概况：" prop="projectRegistrant">
+        <table border="1">
+          <tr>
+            <td style="width:250px;">工作内容</td>
+            <td>等级或比例尺</td>
+            <td>单位</td>
+            <td>工作量</td>
+            <td style="width:100px;">要求完成时间</td>
+            <td>备注</td>
+          </tr>
+          <tr v-for="(work, index) in workList" :key="index">
+            <td>
+              <el-input v-model="work.content" type="textarea" autosize clearable></el-input>
+            </td>
+            <td>
+              <el-input v-model="work.scale" clearable></el-input>
+            </td>
+            <td>
+              <el-input v-model="work.unit" clearable></el-input>
+            </td>
+            <td>
+              <el-input v-model="work.workload" clearable></el-input>
+            </td>
+            <td>
+              <el-date-picker style="width:140px;" v-model="work.deadline" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </td>
+            <td>
+              <el-input v-model="work.remark" type="textarea" autosize clearable></el-input>
+            </td>
+            <td>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                @click="deletWorkItem(index)"></el-button>
+            </td>
+          </tr>
+        </table>
+
+        <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
+      </el-form-item>
+      <el-form-item label="项目登记人：" prop="projectRegistrant">
+        <el-input v-model="addForm.projectRegistrant"></el-input>
+      </el-form-item>
+      <el-form-item label="备注：" prop="projectRegistrant">
+        <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
+      </el-form-item>
+
+    </el-form>
+    <div slot="footer" class="dialog-footer" style="text-align: center;">
+      <el-button type="primary" @click="confirmAddForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+    <!-- 人员选择对话框 -->
+    <el-dialog width="30%" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
+      <el-form>
+        <el-form-item label="部门：">
+          <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
+            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
+              :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="人员：">
+          <el-select v-model="peopleForm.userId">
+            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
+              :value="item.userId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="confirmPeople" type="primary">确定</el-button>
+          <el-button @click="cancelChoosePeople">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listProject, submitProject, modifyProject, delProject } from "@/api/oa/project/project";
+import { listDept } from '@/api/system/dept'
+import { listUser, getUser } from '@/api/system/user'
+export default {
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectNumber: '',
+        projectLeader: '',
+        projectLeaderName: undefined,
+        projectName: '',
+      },
+      projectList: [],
+      total: 0,
+      loading: true,
+      addOpen: false,
+      modifyOpen: false,
+      title: '',
+      addForm: {},
+      rules: {
+        projectNumber: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
+        projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }]
+      },
+      peopleVisible: false,
+      peopleForm: {
+        deptId: '',
+        deptList: [],
+        userId: '',
+        userList: []
+      },
+      workList: [{
+        content: '',
+        scale: '',
+        unit: '',
+        workload: '',
+        deadline: '',
+        remark: ''
+      }],
+    }
+  },
+  created() {
+    this.getList();
+    this.getDeptList();
+  },
+  methods: {
+    // 查询项目列表
+    getList() {
+      this.loading = true
+      listProject(this.queryParams).then(response => {
+        this.projectList = [];
+        for (let p of response.rows) {
+          if (p.projectLeader != null) {
+            getUser(Number(p.projectLeader)).then(res => {
+              p.projectLeaderName = res.data.nickName;
+            })
+          }
+          this.projectList.push(p);
+        }
+        this.total = response.total;
+        this.loading = false;
+      })
+    },
+    getDeptList() {
+      listDept({
+        deptName: undefined,
+        status: undefined
+      }).then(res => {
+        this.peopleForm.deptList = res.data
+      })
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    handleAdd() {
+      this.title = '新增项目'
+      this.addOpen = true
+    },
+    handleUpdate(row) {
+      debugger
+      this.addForm = row;
+      this.title = '修改项目信息';
+      this.addOpen = true;
+    },
+    handleDelete(row) {
+      const projectIds = row.projectId || this.ids;
+      const projectNumbers = row.projectNumber || this.ids;
+      this.$modal.confirm('是否确认删除项目编号为"' + projectNumbers + '"的数据项？').then(function () {
+        return delProject(projectIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    confirmAddForm() {
+      this.addForm.workList = this.workList;
+      let formData = new FormData();
+      let form = JSON.stringify(this.addForm);
+      formData.append("form", form);
+      console.log(this.title);
+      if (this.title == '新增项目')
+        submitProject(formData).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.addOpen = false;
+          this.getList();
+        });
+      else
+        modifyProject(formData).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.addOpen = false;
+          this.getList();
+        });
+    },
+    // 人员选择
+    choosePeople() {
+      this.peopleVisible = true;
+    },
+    // 改变部门选择
+    handleChangeDept(deptId) {
+      this.peopleForm.userId = '';
+      listUser({ pageSize: 999999, deptId }).then(res => {
+        console.log(res);
+        this.peopleForm.userList = res.rows
+      })
+    },
+    // 确定项目负责人
+    confirmPeople() {
+      this.addForm.projectLeader = this.peopleForm.userId;
+      this.addForm.projectLeaderName = this.tagLeader()
+      this.peopleVisible = false
+    },
+    tagLeader() {
+      if (this.addForm.projectLeader == '' || this.addForm.projectLeader == undefined || this.addForm.projectLeader == null) {
+        return undefined
+      } else {
+        for (let user of this.peopleForm.userList) {
+          if (this.addForm.projectLeader == user.userId) {
+            return user.nickName
+          }
+        }
+      }
+    },
+    cancel() {
+      this.peopleForm.deptId = '';
+      this.peopleForm.userId = '';
+      this.addOpen = false;
+      this.addForm = {}
+    },
+    addWorkList() {
+      this.workList.push({
+        content: '',
+        scale: '',
+        unit: '',
+        workload: '',
+        deadline: '',
+        remark: ''
+      });
+    },
+    deletWorkItem(index) {
+      let arr = this.workList
+      if (arr.length == 1) {
+        return
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    cancelChoosePeople() {
+      this.peopleForm.deptId = '';
+      this.peopleForm.userId = '';
+      this.peopleVisible = false;
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.project-wrapper {
+  padding: 25px;
+}
+
+.table-header {
+  background-color: #f5f5f5;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 10px;
+}
+
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+</style>

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

         <template slot-scope="scope">
           <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
         </template>
-      </el-table-column> -->
+</el-table-column> -->
       <el-table-column label="提交时间" align="center" prop="createTime" width="180" />
       <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>
       <el-table-column label="耗时" align="center" prop="duration" width="180" />
       <el-table-column label="当前节点" align="center" prop="taskName" />
       <el-table-column label="办理人" align="center">
+
         <template slot-scope="scope">
           <label v-if="scope.row.assigneeName">{{ scope.row.assigneeName }} <el-tag type="info" size="mini">{{
-            scope.row.assigneeDeptName }}</el-tag></label>
+      scope.row.assigneeDeptName }}</el-tag></label>
           <!--          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>-->
         </template>
       </el-table-column>
       <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
+
         <template slot-scope="scope">
           <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">进度</el-button>
           <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button>
         </el-table-column> -->
         <el-table-column label="流程分类" align="center" prop="category" />
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+
           <template slot-scope="scope">
             <el-button size="mini" type="text" icon="el-icon-edit-outline"
               @click="handleStartProcess(scope.row)">发起申请</el-button>
     },
     /**  发起流程申请 */
     handleStartProcess(row) {
-      if (row.category == "assess" || row.category == "car") {
-        getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {} }).then(res => {
-          let data = res.data;
-          if (data.dataType === 'dynamic') {
-            if (data.type === 'assignee') { // 指定人员
-              this.checkSendUser = true;
-              this.checkType = "single";
-            } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
-              this.checkSendUser = true;
-              this.checkType = "multiple";
-            } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
-              this.checkSendRole = true;
-            } else { // 会签
-              // 流程设计指定的 elementVariable 作为会签人员列表
-              this.multiInstanceVars = data.vars;
-              this.checkSendUser = true;
-              this.checkType = "multiple";
-            }
-            this.taskOpen = true;
-            this.taskTitle = "选择任务接收";
-          } else {
-            const variables = {};
-            const formData = {};
-            formData.disabled = true;
-            formData.formBtns = false;
-
-            formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
-            if (row.id) {
-              variables.variables = formData;
-              // 启动流程并将表单数据加入流程变量
-              definitionStart(row.id, JSON.stringify(variables)).then(res => {
+      // if (row.category == "assess" || row.category == "car" || ) {
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {} }).then(res => {
+        let data = res.data;
+        if (data.dataType === 'dynamic') {
+          if (data.type === 'assignee') { // 指定人员
+            this.checkSendUser = true;
+            this.checkType = "single";
+          } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
+            this.checkSendUser = true;
+            this.checkType = "multiple";
+          } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
+            this.checkSendRole = true;
+          } else { // 会签
+            // 流程设计指定的 elementVariable 作为会签人员列表
+            this.multiInstanceVars = data.vars;
+            this.checkSendUser = true;
+            this.checkType = "multiple";
+          }
+          this.taskOpen = true;
+          this.taskTitle = "选择任务接收";
+        } else {
+          const variables = {};
+          const formData = {};
+          formData.disabled = true;
+          formData.formBtns = false;
 
-                this.$modal.msgSuccess(res.msg);
-                let procInstanceId = res.data;
-                todoList({
-                  pageNum: 1,
-                  pageSize: 99999999, processInsId: procInstanceId
-                }).then(toDoRes => {
-                  let records = toDoRes.data.records;
-                  if (records.length == 1) {
-                    records = records[0]
+          formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+          if (row.id) {
+            variables.variables = formData;
+            // 启动流程并将表单数据加入流程变量
+            definitionStart(row.id, JSON.stringify(variables)).then(res => {
+              this.$modal.msgSuccess(res.msg);
+              let procInstanceId = res.data;
+              todoList({
+                pageNum: 1,
+                pageSize: 99999999, processInsId: procInstanceId
+              }).then(toDoRes => {
+                let records = toDoRes.data.records;
+                if (records.length == 1) {
+                  records = records[0]
+                }
+                this.$router.push({
+                  path: '/flowable/task/todo/detail/index',
+                  query: {
+                    procInsId: records.procInsId,
+                    executionId: records.executionId,
+                    deployId: records.deployId,
+                    taskId: records.taskId,
+                    taskName: records.taskName,
+                    startUser: records.startUserName + '-' + records.startDeptName,
+                    formId: formData.formId,
+                    procDefName: records.procDefName
                   }
-                  this.$router.push({
-                    path: '/flowable/task/todo/detail/index',
-                    query: {
-                      procInsId: records.procInsId,
-                      executionId: records.executionId,
-                      deployId: records.deployId,
-                      taskId: records.taskId,
-                      taskName: records.taskName,
-                      startUser: records.startUserName + '-' + records.startDeptName,
-                      formId: formData.formId,
-                      procDefName: records.procDefName
-                    }
-                  })
                 })
-                // this.goBack();
-                // this.$router.push({
-                //   path: '/flowable/task/myProcess/send/index',
-                //   query: {
-                //     deployId: row.deploymentId,
-                //     procDefId: row.id,
-                //     name: row.name
-                //   }
-                // })
               })
-            }
+              // this.goBack();
+              // this.$router.push({
+              //   path: '/flowable/task/myProcess/send/index',
+              //   query: {
+              //     deployId: row.deploymentId,
+              //     procDefId: row.id,
+              //     name: row.name
+              //   }
+              // })
+            })
           }
-        })
-      } else {
+        }
+      })
+      // } else {
 
-      }
+      // }
 
     },
     /**  取消流程申请 */
   }
 };
 </script>
-

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

           <js-form @submit="submitForm" v-else-if="deployName == '技术质量部考核'"></js-form>
           <xm-form @submit="submitForm" v-else-if="deployName == '项目管理部考核'"></xm-form>
           <cw-form @submit="submitForm" v-else-if="deployName == '财务部考核'"></cw-form>
+          <ProjectProcess v-else-if="deployName == '项目流转'"></ProjectProcess>
           <el-col :span="16" :offset="4" v-else>
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="formConf" @submit="submitForm" ref="parser"
 import JsForm from '../../../form/jsForm.vue';
 import XmForm from '../../../form/xmForm.vue';
 import CwForm from '../../../form/cwForm.vue';
+import ProjectProcess from '../../../form/projectProcess/index'
 
 export default {
   name: "Record",
     ZhForm,
     JsForm,
     XmForm,
-    CwForm
-},
+    CwForm,
+    ProjectProcess
+  },
   props: {},
   data() {
     return {
       // 遮罩层
       loading: true,
       deployId: "",  // 流程定义编号
-      deployName:"",//流程定义名称
+      deployName: "",//流程定义名称
       procDefId: "",  // 流程实例编号
       formConf: {}, // 默认表单数据
       variables: [], // 流程变量数据
     },
     /** 提交流程 */
     submitTask() {
-      
+
       if (!this.checkValues && this.checkSendUser) {
         this.$modal.msgError("请选择任务接收!");
         return;
   }
 };
 </script>
+
 <style lang="scss" scoped>
 .test-form {
   margin: 15px auto;

oa-ui/src/views/oa/car/index.vue

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="车牌号" prop="licensePlate">
-        <el-input
-          v-model="queryParams.licensePlate"
-          placeholder="请输入车牌号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.licensePlate" placeholder="请输入车牌号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+
       <el-form-item label="驾驶员" prop="driver">
-        <el-input
-          v-model="queryParams.driver"
-          placeholder="请输入驾驶员"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.driver" placeholder="请输入驾驶员" clearable @keyup.enter.native="handleQuery" />
       </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-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['oa:car:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['oa:car:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['oa:car:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['oa:car:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['oa:car:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['oa:car:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['oa:car:export']"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['oa:car:export']">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
     <el-table v-loading="loading" :data="carList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="车辆id" align="center" prop="carId" />
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
       <el-table-column label="驾驶员" align="center" prop="driver" />
+      <el-table-column label="车系" align="center" prop="series" />
+      <el-table-column label="车级" align="center" prop="level" />
+      <el-table-column label="购卖时间" align="center" prop="time" />
+      <el-table-column label="购买金额" align="center" prop="cost" />
+      <el-table-column label="预计使用年限" align="center" prop="expectLife" />
+      <!-- <el-table-column label="使用成本（天）" align="center" prop="driver" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:car:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:car:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:car:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:car:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改cmc车辆信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="车牌号" prop="licensePlate">
           <el-input v-model="form.licensePlate" placeholder="请输入车牌号" />
         </el-form-item>
+        <el-form-item label="车系" prop="series">
+          <el-input v-model="form.series" placeholder="请输入车系" />
+        </el-form-item>
+        <el-form-item label="车级" prop="level">
+          <el-input v-model="form.level" placeholder="请输入车级" />
+        </el-form-item>
+        <el-form-item label="购卖时间" prop="time">
+          <el-date-picker v-model="form.time" type="date" placeholder="选择日期" format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="购买金额" prop="cost">
+          <el-input style="width:130px;margin-right:10px;" v-model="form.cost" placeholder="请输入金额" /><el-tag
+            type="warning">万元</el-tag>
+        </el-form-item>
+        <el-form-item label="预计使用年限" prop="expectLife">
+          <el-input  v-model="form.expectLife" placeholder="请输入" />
+        </el-form-item>
         <el-form-item label="驾驶员" prop="driver">
-          <el-input v-model="form.driver" placeholder="请输入驾驶员" />
+          <el-select v-model="form.driver" filterable  placeholder="请选择" clearable>
+            <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
 
 <script>
 import { listCar, getCar, delCar, addCar, updateCar } from "@/api/oa/car/car";
+import { listDriver } from "@/api/system/post";
 
 export default {
   name: "Car",
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      driverList: []
     };
   },
   created() {
     this.getList();
+    this.getDriverList();
   },
   methods: {
     /** 查询cmc车辆信息列表 */
         this.loading = false;
       });
     },
+    // 查询驾驶员列表
+    getDriverList() {
+      listDriver({
+        pageNum: 1,
+        pageSize: 9999999999
+      }).then(response => {
+        this.driverList = response.rows;
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false;
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.carId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加cmc车辆信息";
+      this.title = "添加车辆信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       getCar(carId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改cmc车辆信息";
+        this.title = "修改车辆信息";
       });
     },
     /** 提交按钮 */
     /** 删除按钮操作 */
     handleDelete(row) {
       const carIds = row.carId || this.ids;
-      this.$modal.confirm('是否确认删除cmc车辆信息编号为"' + carIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除cmc车辆信息编号为"' + carIds + '"的数据项？').then(function () {
         return delCar(carIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {

oa-ui/src/views/oa/project/index.vue

  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-29 16:59:28
+ * @LastEditTime: 2024-03-04 09:29:14
 -->
 <template>
   <div class="project-wrapper">
           </el-form-item>
           <el-form-item>
             <el-button @click="confirmPeople" type="primary">确定</el-button>
-            <el-button>取消</el-button>
+            <el-button @click="cancelChoosePeople">取消</el-button>
           </el-form-item>
         </el-form>
       </el-dialog>
         workload: '',
         deadline: '',
         remark: ''
-      }]
+      }],
     }
   },
   created() {
       if (index >= 0 && index < arr.length) {
         arr.splice(index, 1);
       }
+    },
+    cancelChoosePeople(){
+      this.peopleForm.deptId = '';
+      this.peopleForm.userId = '';
+      this.peopleVisible = false;
     }
   },
 }

oa-ui/src/views/system/user/index.vue

       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
           <el-form-item label="用户名称" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
               @keyup.enter.native="handleQuery" />
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']">修改</el-button>
           </el-table-column>
         </el-table>
 
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
     </el-row>
 
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
-                  :label="dict.value">{{ dict.label }}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+      dict.label
+    }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
             <el-form-item label="岗级" prop="engineerLevel">
-              <el-select v-model="form.engineerLevel" placeholder="请输入岗级">
-                <el-option v-for="dict in dict.type.sys_user_engineerlevel" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
-              </el-select>
+              <el-col :span="12">
+                <el-select v-model="form.postLevel" placeholder="请选择">
+                  <el-option v-for="dict in dict.type.sys_user_postlevel" :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
+                </el-select>
+              </el-col>
+              <el-col :span="12">
+                <el-select v-model="form.salaryLevel" placeholder="请选择">
+                  <el-option v-for="dict in dict.type.sys_user_salarylevel" :key="dict.value" :label="dict.label"
+                    :value="dict.value" />
+                </el-select>
+              </el-col>
             </el-form-item>
           </el-col>
         </el-row>
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+                  :disabled="item.status == 1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="更新原因">
               <el-select v-model="form.updateReason" placeholder="请选择更新原因">
-                <el-option
-                  v-for="item in updateReasonOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
+                <el-option v-for="item in updateReasonOptions" :key="item.value" :label="item.label"
+                  :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_pmlevel', 'sys_user_engineerlevel'],
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'sys_user_titles', 'sys_user_pmlevel', 'sys_user_postlevel','sys_user_salarylevel'],
   components: { Treeselect },
   data() {
     return {
       // 岗位选项
       postOptions: [],
       // 角色选项
-      roleOptions: [],      
+      roleOptions: [],
       // 更新原因选项
       updateReasonOptions: [
-        { value: '0', label: '误录修改'},
-        { value: '1', label: '正常调整'}
+        { value: '0', label: '误录修改' },
+        { value: '1', label: '正常调整' }
       ],
       titles: [],
       // 表单参数
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
-        
+
         if (response.data.titles != "" && response.data.titles != undefined && response.data.titles != null) {
           for (let i = 0; i < response.data.titles.split(",").length; i++)
             this.titles[i] = response.data.titles.split(",")[i]
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
-            if(this.form.titles != "" && this.form.titles != undefined && this.form.titles != null)
+            if (this.form.titles != "" && this.form.titles != undefined && this.form.titles != null)
               this.form.titles = this.form.titles.join(',')
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");