Merge branch 'dev_NEW_pro' into dev_宁夏_英泽防锈

gaoluyang

9 小时以前 ab264123941cd3d345687af92aab2a9e04968960

 src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue

@@ -85,6 +85,35 @@
            </el-form-item>
          </el-col>
        </el-row>
        <!-- 出差时间（仅当 approveType 为 3 时显示） -->
        <el-row :gutter="30" v-if="props.approveType == 3">
          <el-col :span="12">
            <el-form-item label="出差开始时间：" prop="startDateTime">
              <el-date-picker
                  v-model="form.startDateTime"
                  type="datetime"
                  placeholder="请选择开始时间"
                  value-format="YYYY-MM-DD HH:mm"
                  format="YYYY-MM-DD HH:mm"
                  clearable
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="出差结束时间：" prop="endDateTime">
              <el-date-picker
                  v-model="form.endDateTime"
                  type="datetime"
                  placeholder="请选择结束时间"
                  value-format="YYYY-MM-DD HH:mm"
                  format="YYYY-MM-DD HH:mm"
                  clearable
                  style="width: 100%"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <!-- 出差地点（仅当 approveType 为 3 时显示） -->
        <el-row v-if="props.approveType == 3">
          <el-col :span="24">
@@ -152,6 +181,8 @@
    startDate: "", // 请假开始时间
    endDate: "", // 请假结束时间
    price: null, // 报销金额
    startDateTime: "", // 出差开始时间
    endDateTime: "", // 出差结束时间
    location: "", // 出差地点
    storageBlobDTOS: []
  },
@@ -163,6 +194,8 @@
    startDate: [{ required: true, message: "请选择请假开始时间", trigger: "change" }],
    endDate: [{ required: true, message: "请选择请假结束时间", trigger: "change" }],
    price: [{ required: true, message: "请输入报销金额", trigger: "blur" }],
    startDateTime: [{ required: true, message: "请选择出差开始时间", trigger: "change" }],
    endDateTime: [{ required: true, message: "请选择出差结束时间", trigger: "change" }],
    location: [{ required: true, message: "请输入出差地点", trigger: "blur" }],
  },
});
@@ -257,8 +290,20 @@
      return
    }
  }
  // 当 approveType 为 3 时，校验出差地点
  // 当 approveType 为 3 时，校验出差时间和地点
  if (props.approveType == 3) {
    if (!form.value.startDateTime) {
      proxy.$modal.msgError("请选择出差开始时间！")
      return
    }
    if (!form.value.endDateTime) {
      proxy.$modal.msgError("请选择出差结束时间！")
      return
    }
    if (new Date(form.value.endDateTime) < new Date(form.value.startDateTime)) {
      proxy.$modal.msgError("出差结束时间不能早于开始时间！")
      return
    }
    if (!form.value.location || form.value.location.trim() === '') {
      proxy.$modal.msgError("请输入出差地点！")
      return