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

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: 2025-04-15 17:17:46
+ * @LastEditTime: 2025-08-27 11:15:28
 -->
 
 <template>
@@ -29,7 +29,7 @@
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请时间：" prop="applyDate">
                     <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
-                      placeholder="选择日期" :disabled="taskName != '设备申请'">
+                      placeholder="选择日期" disabled>
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
@@ -39,17 +39,17 @@
                   v-if="taskName == '设备申请'">选择项目</el-button>
                 <el-descriptions border v-if="isSelect && chooseProject" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
                     chooseProject.projectLeaderUser.nickName : ''
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="设备选择：" prop="devices">
@@ -164,7 +164,8 @@
                 <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 + '】' : '')
-                    + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place" :value="item.deviceId">
+                    + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"
+                    :value="item.deviceId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -436,6 +437,13 @@ export default {
     submit() {
       this.$refs['deviceForm'].validate((valid) => {
         if (valid) {
+          let y1 = new Date(this.form.beginDate);
+          let y2 = new Date(this.form.endDate);
+          if (y2 < y1) {
+            this.form.days = '';
+            this.$message.error('结束日期不能小于开始日期');
+            return
+          }
           this.form.formId = this.taskForm.formId;
           let jsonForm = JSON.stringify(this.form);
           const params = { taskId: this.taskForm.taskId };
@@ -565,6 +573,7 @@ export default {
         let y2 = new Date(this.form.endDate);
         if (y2 < y1) {
           this.form.days = '';
+          this.$message.error('结束日期不能小于开始日期');
           return
         }
         let sub = Math.abs(y2 - y1);