Selaa lähdekoodia

网页端:设备申请新增结束日期不能小于开始日期的判断

余思翰 1 viikko sitten
vanhempi
commit
d2c05348ea
1 muutettua tiedostoa jossa 16 lisäystä ja 7 poistoa
  1. 16
    7
      oa-ui/src/views/flowable/form/oa/deviceForm.vue

+ 16
- 7
oa-ui/src/views/flowable/form/oa/deviceForm.vue Näytä tiedosto

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: 2025-04-15 17:17:46
5
+ * @LastEditTime: 2025-08-27 11:15:28
6
 -->
6
 -->
7
 
7
 
8
 <template>
8
 <template>
29
                 <el-col :span="6" :xs="24">
29
                 <el-col :span="6" :xs="24">
30
                   <el-form-item label="申请时间:" prop="applyDate">
30
                   <el-form-item label="申请时间:" prop="applyDate">
31
                     <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
31
                     <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
32
-                      placeholder="选择日期" :disabled="taskName != '设备申请'">
32
+                      placeholder="选择日期" disabled>
33
                     </el-date-picker>
33
                     </el-date-picker>
34
                   </el-form-item>
34
                   </el-form-item>
35
                 </el-col>
35
                 </el-col>
39
                   v-if="taskName == '设备申请'">选择项目</el-button>
39
                   v-if="taskName == '设备申请'">选择项目</el-button>
40
                 <el-descriptions border v-if="isSelect && chooseProject" style="margin-top: 10px;" :column="1">
40
                 <el-descriptions border v-if="isSelect && chooseProject" style="margin-top: 10px;" :column="1">
41
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
41
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
42
-                    }}</el-descriptions-item>
42
+                  }}</el-descriptions-item>
43
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
43
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
44
-                    }}</el-descriptions-item>
44
+                  }}</el-descriptions-item>
45
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
45
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
46
                     chooseProject.projectLeaderUser.nickName : ''
46
                     chooseProject.projectLeaderUser.nickName : ''
47
-                    }}</el-descriptions-item>
47
+                  }}</el-descriptions-item>
48
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
48
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
49
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
49
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
50
                   </el-descriptions-item>
50
                   </el-descriptions-item>
51
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
51
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
52
-                    }}</el-descriptions-item>
52
+                  }}</el-descriptions-item>
53
                 </el-descriptions>
53
                 </el-descriptions>
54
               </el-form-item>
54
               </el-form-item>
55
               <el-form-item label="设备选择:" prop="devices">
55
               <el-form-item label="设备选择:" prop="devices">
164
                 <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
164
                 <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
165
                   clearable :disabled="taskName != '归还确认'">
165
                   clearable :disabled="taskName != '归还确认'">
166
                   <el-option v-for="item in modifyDeviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
166
                   <el-option v-for="item in modifyDeviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
167
-                    + (item.code != null ? '(设备编号:' + item.code + ')' : '') + '📍' + item.place" :value="item.deviceId">
167
+                    + (item.code != null ? '(设备编号:' + item.code + ')' : '') + '📍' + item.place"
168
+                    :value="item.deviceId">
168
                   </el-option>
169
                   </el-option>
169
                 </el-select>
170
                 </el-select>
170
               </el-form-item>
171
               </el-form-item>
436
     submit() {
437
     submit() {
437
       this.$refs['deviceForm'].validate((valid) => {
438
       this.$refs['deviceForm'].validate((valid) => {
438
         if (valid) {
439
         if (valid) {
440
+          let y1 = new Date(this.form.beginDate);
441
+          let y2 = new Date(this.form.endDate);
442
+          if (y2 < y1) {
443
+            this.form.days = '';
444
+            this.$message.error('结束日期不能小于开始日期');
445
+            return
446
+          }
439
           this.form.formId = this.taskForm.formId;
447
           this.form.formId = this.taskForm.formId;
440
           let jsonForm = JSON.stringify(this.form);
448
           let jsonForm = JSON.stringify(this.form);
441
           const params = { taskId: this.taskForm.taskId };
449
           const params = { taskId: this.taskForm.taskId };
565
         let y2 = new Date(this.form.endDate);
573
         let y2 = new Date(this.form.endDate);
566
         if (y2 < y1) {
574
         if (y2 < y1) {
567
           this.form.days = '';
575
           this.form.days = '';
576
+          this.$message.error('结束日期不能小于开始日期');
568
           return
577
           return
569
         }
578
         }
570
         let sub = Math.abs(y2 - y1);
579
         let sub = Math.abs(y2 - y1);

Loading…
Peruuta
Tallenna