update 优化 请假天数计算不精确问题

疯狂的狮子Li

2024-06-06 2c9c837c1b999748e3ec7e0526f5673111d108bd

 src/views/workflow/leave/leaveEdit.vue

@@ -6,12 +6,7 @@
          <el-button
            v-if="
              routeParams.type === 'add' ||
              (routeParams.type === 'update' &&
                form.processInstanceVo &&
                form.processInstanceVo.businessStatus &&
                (form.processInstanceVo.businessStatus === 'draft' ||
                  form.processInstanceVo.businessStatus === 'cancel' ||
                  form.processInstanceVo.businessStatus === 'back'))
              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
            "
            :loading="buttonLoading"
            type="info"
@@ -21,11 +16,7 @@
          <el-button
            v-if="
              routeParams.type === 'add' ||
              (routeParams.type === 'update' &&
                form.processInstanceVo &&
                (form.processInstanceVo.businessStatus === 'draft' ||
                  form.processInstanceVo.businessStatus === 'cancel' ||
                  form.processInstanceVo.businessStatus === 'back'))
              (routeParams.type === 'update' && form.status && (form.status === 'draft' || form.status === 'cancel' || form.status === 'back'))
            "
            :loading="buttonLoading"
            type="primary"
@@ -33,13 +24,13 @@
            >提 交</el-button
          >
          <el-button
            v-if="routeParams.type === 'approval' && form.processInstanceVo && form.processInstanceVo.businessStatus === 'waiting'"
            v-if="routeParams.type === 'approval' && form.status && form.status === 'waiting'"
            :loading="buttonLoading"
            type="primary"
            @click="approvalVerifyOpen"
            >审批</el-button
          >
          <el-button v-if="processInstanceId" type="primary" @click="handleApprovalRecord">流程进度</el-button>
          <el-button v-if="form.status !== 'draft'" type="primary" @click="handleApprovalRecord">流程进度</el-button>
        </div>
        <div>
          <el-button style="float: right" @click="goBack()">返回</el-button>
@@ -91,8 +82,6 @@
const buttonLoading = ref(false);
const loading = ref(true);
const leaveTime = ref<Array<string>>([]);
//流程实例id
const processInstanceId = ref('');
//路由参数
const routeParams = ref<Record<string, any>>({});
const options = [
@@ -134,7 +123,7 @@
  endDate: undefined,
  leaveDays: undefined,
  remark: undefined,
  processInstanceVo: {}
  status: undefined
};
const data = reactive<PageData<LeaveForm, LeaveQuery>>({
  form: { ...initFormData },
@@ -165,7 +154,7 @@
  const startDate = new Date(leaveTime.value[0]).getTime();
  const endDate = new Date(leaveTime.value[1]).getTime();
  const diffInMilliseconds = endDate - startDate;
  form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24));
  form.value.leaveDays = Math.floor(diffInMilliseconds / (1000 * 60 * 60 * 24)) + 1;
};
/** 获取详情 */
const getInfo = () => {
@@ -177,9 +166,6 @@
    leaveTime.value = [];
    leaveTime.value.push(form.value.startDate);
    leaveTime.value.push(form.value.endDate);
    if (form.value.processInstanceVo) {
      processInstanceId.value = form.value.processInstanceVo.id;
    }
    loading.value = false;
    buttonLoading.value = false;
  });
@@ -228,8 +214,8 @@
    taskVariables.value = {
      entity: data,
      leaveDays: data.leaveDays,
      userList: [1, 2],
      userList2: [1, 2]
      userList: [1, 3],
      userList2: [1, 3]
    };
    submitFormData.value.variables = taskVariables.value;
    const resp = await startWorkFlow(submitFormData.value);
@@ -243,7 +229,7 @@
};
//审批记录
const handleApprovalRecord = () => {
  approvalRecordRef.value.init(processInstanceId.value);
  approvalRecordRef.value.init(form.value.id);
};
//提交回调
const submitCallback = async () => {