修改设备审批

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-07-31 13:54:57
+ * @LastEditTime: 2024-08-26 13:44:24
 -->
 
 <template>
@@ -149,8 +149,8 @@
               </el-row>
               <!-- 归还确认 -->
               <el-divider></el-divider>
-              <el-form-item label="已归还设备" >
-                <el-table ref="returnDevicesRef" :data="returnDevicesList" @selection-change="handleSelectionReturn" >
+              <el-form-item label="已归还设备">
+                <el-table ref="returnDevicesRef" :data="returnDevicesList" @selection-change="handleSelectionReturn">
                   <el-table-column type="selection" width="55" disabled />
                   <el-table-column label="序号" type="index" />
                   <el-table-column label="出厂编号" align="center" prop="code" />
@@ -160,7 +160,7 @@
                   <el-table-column label="存放地址" align="center" prop="place" />
                 </el-table>
               </el-form-item>
-              <el-form-item label="需维修设备：" prop="state" label-width="120px">
+              <el-form-item label="需维修设备：" prop="repairDevices" label-width="120px">
                 <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '归还确认'">
                   <el-option v-for="item in modifyDeviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
@@ -241,7 +241,7 @@ export default {
       type: Boolean,
       default: true
     },
-    formDisabled:{
+    formDisabled: {
       type: Boolean,
       default: false
     }
@@ -420,6 +420,10 @@ export default {
               }
             })
           }
+          if (data.repairDevices) {
+            this.form.repairDevices = data.repairDevices.split(',');
+            this.form.repairDevices = this.form.repairDevices.map(v => Number(v));
+          }
           if (data.projectId) {
             getProject(data.projectId).then(response => {
               this.chooseProject = response.data;

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

@@ -23,6 +23,15 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="申请类型" prop="carUsage">
+        <el-select v-model="queryParams.carUsage" clearable @change="handleQuery">
+          <el-option label="项目用车" value="0"></el-option>
+          <el-option label="非项目用车" value="1"></el-option>
+          <el-option label="工会用车" value="2"></el-option>
+          <el-option label="党委用车" value="3"></el-option>
+          <el-option label="团委用车" value="4"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
       </el-form-item>
@@ -171,6 +180,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.carUsage = '0'
     this.getList();
   },
   methods: {