Browse Source

修改用车申请的申请记录

余思翰 1 year ago
parent
commit
724068d999

+ 4
- 3
oa-ui/src/views/flowable/form/oa/carForm.vue View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-02-29 11:44:28
3
  * @Date: 2024-02-29 11:44:28
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-07-17 14:25:59
5
+ * @LastEditTime: 2024-07-17 17:29:24
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
19
                 <el-col :span="7" :xs="24">
19
                 <el-col :span="7" :xs="24">
20
                   <el-form-item label="申请人:" prop="user.nickName">
20
                   <el-form-item label="申请人:" prop="user.nickName">
21
                     <!-- <el-input v-model="form.user"></el-input> -->
21
                     <!-- <el-input v-model="form.user"></el-input> -->
22
-                    {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
22
+                    {{ form.applierUser ? form.applierUser.nickName : (form.user ? form.user.nickName : '') }}
23
                   </el-form-item>
23
                   </el-form-item>
24
                 </el-col>
24
                 </el-col>
25
                 <el-col :span="7" :xs="24">
25
                 <el-col :span="7" :xs="24">
26
                   <el-form-item label="所在部门:" prop="dept.deptName">
26
                   <el-form-item label="所在部门:" prop="dept.deptName">
27
                     <!-- <el-input v-model="form.deptName"></el-input> -->
27
                     <!-- <el-input v-model="form.deptName"></el-input> -->
28
-                    {{ form.dept.deptName }}
28
+                    {{ form.dept ? form.dept.deptName:'' }}
29
                   </el-form-item>
29
                   </el-form-item>
30
                 </el-col>
30
                 </el-col>
31
                 <el-col :span="7" :xs="24">
31
                 <el-col :span="7" :xs="24">
493
               this.isSelect = true
493
               this.isSelect = true
494
             })
494
             })
495
           }
495
           }
496
+          this.calculateDay();
496
           this.loading = false
497
           this.loading = false
497
         }
498
         }
498
       })
499
       })

+ 2
- 1
oa-ui/src/views/flowable/form/oa/deviceForm.vue View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-03-07 13:44:39
3
  * @Date: 2024-03-07 13:44:39
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-07-17 15:11:45
5
+ * @LastEditTime: 2024-07-17 17:31:44
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
373
           } else {
373
           } else {
374
             data.modifyDevices = data.modifyDevices.split(',');
374
             data.modifyDevices = data.modifyDevices.split(',');
375
             let arr = []
375
             let arr = []
376
+            this.modifyDeviceList = []
376
             for (let d of data.modifyDevices) {
377
             for (let d of data.modifyDevices) {
377
               arr.push(parseInt(d));
378
               arr.push(parseInt(d));
378
               getDevice(d).then(result => {
379
               getDevice(d).then(result => {

Loading…
Cancel
Save