修改结算提交不上的问题，办公设备新增搜索栏，人事管理修改名称

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-26 14:48:48
+ * @LastEditTime: 2025-02-27 13:46:03
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -1176,13 +1176,16 @@ export default {
         this.prOpen = false;
         this.chooseProject = val[0];
         let settleData = await listSettle({ projectId: val[0].projectId });
-        console.log(settleData)
         if (settleData.total >= 1) {
           this.$modal.confirm('该项目已经发起过项目结算，是否追加结算？').then(() => {
             this.$set(this.form, 'projectId', val[0].projectId)
             this.isSelect = true;
             this.isAppend = true;
           })
+        } else {
+          this.$set(this.form, 'projectId', val[0].projectId)
+          this.isSelect = true;
+          this.isAppend = false;
         }
       } else {
         this.$message.error("项目只能选择一个！");

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

@@ -128,7 +128,7 @@
           </el-table-column>
           <el-table-column label="职业资格" align="center" key="certificates" prop="certificates" v-if="columns[18].visible"
             :formatter="formatterCertificates" />
-          <el-table-column label="毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
+          <el-table-column label="最高学历毕业院校" align="center" key="graduateSchool" prop="graduateSchool"
             v-if="columns[10].visible" sortable="custom" />
           <el-table-column label="专业" align="center" key="major" prop="major" v-if="columns[11].visible" />
           <el-table-column label="学历" align="center" key="degree" prop="degree" :formatter="formatterDegree"
@@ -462,7 +462,7 @@ export default {
         { key: 7, label: `合同签订`, visible: true },
         { key: 8, label: `合同期满`, visible: true },
         { key: 9, label: `状态`, visible: true },
-        { key: 10, label: `毕业院校`, visible: false },
+        { key: 10, label: `最高学历毕业院校`, visible: false },
         { key: 11, label: `专业`, visible: false },
         { key: 12, label: `学历`, visible: false },
         { key: 13, label: `籍贯`, visible: false },

oa-ui/src/views/oa/staff/info.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-22 14:50:46
- * @LastEditors: wrh
- * @LastEditTime: 2025-02-27 10:22:52
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2025-02-27 11:40:45
 -->
 <template>
   <div class="bg" v-loading="loading">
@@ -191,12 +191,12 @@ export default {
               value: this.form.ethnic
             },
             {
-              label: '毕业院校：',
+              label: '最高学历毕业院校：',
               icon: 'school',
               value: this.form.graduateSchool
             },
             {
-              label: '专业：',
+              label: '最高学历专业：',
               icon: 'major',
               value: this.form.major
             },
@@ -206,7 +206,7 @@ export default {
               value: this.selectDictLabel(this.dict.type.sys_user_degree, this.form.degree)
             },
             {
-              label: '初始专业：',
+              label: '初始学历专业：',
               icon: 'major',
               value: this.form.initialMajor
             },
@@ -351,7 +351,7 @@ export default {
     }
 
     .item-label {
-      max-width: 150px;
+      max-width: 156px;
       display: flex;
       align-items: center;
       font-family: '微软雅黑';

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

@@ -16,7 +16,8 @@
         </el-select>
       </el-form-item>
       <el-form-item label="设备编码" prop="deviceNumber">
-        <el-input v-model="queryParams.deviceNumber" placeholder="请输入设备编码" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.deviceNumber" placeholder="请输入设备编码" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="设备名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
@@ -27,6 +28,16 @@
       <el-form-item label="规格型号" prop="series">
         <el-input v-model="queryParams.series" placeholder="请输入规格型号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="管理部门" prop="manageDept">
+        <el-select v-model="queryParams.manageDept" filterable clearable @change="handleQuery">
+          <el-option v-for="item in $store.state.user.deptList" :key="item.deptId" :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="使用人" prop="deviceUser">
+        <el-input v-model="queryParams.deviceUser" 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>
@@ -76,7 +87,7 @@
       <!-- <el-table-column label="预计使用年限" align="center" prop="expectLife" />
       <el-table-column label="单日成本（元）" align="center" prop="dayCost" />
       <el-table-column label="存放地点" align="center" prop="place" /> -->
-      <el-table-column label="管理部门" align="center" prop="manageDept" >
+      <el-table-column label="管理部门" align="center" prop="manageDept">
         <template slot-scope="scope">
           <span>{{ getDeptName(scope.row.manageDept) }}</span>
         </template>
@@ -166,7 +177,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="管理部门" prop="manageDept">