1.新增入职合同开始结束时间做限制（合同起始时间匹配合同年限）

gaoluyang

3 天以前 431c0d52116837d798d68c6a8c68c81e21526066

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

@@ -53,7 +53,11 @@
                  :key="node.id"
                  style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
                >
                  <div>节点{{ index + 1 }} →</div>
                  <div>
                    <span v-if="index === 0">发起</span>
                    <span v-else>审批</span>
                    →
                  </div>
                  <el-select
                    v-model="node.userId"
                    placeholder="选择人员"
@@ -126,8 +130,8 @@
  approveProcessAdd, approveProcessGetInfo,
  approveProcessUpdate,
  getDept
} from "../../../../api/collaborativeApproval/approvalProcess.js";
import {userListNoPage, getUserProfile} from "../../../../api/system/user.js";
} from "@/api/collaborativeApproval/approvalProcess.js";
import {userListNoPageByTenantId} from "@/api/system/user.js";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])
import useUserStore from "@/store/modules/user";
@@ -156,6 +160,7 @@
});
const { form, rules } = toRefs(data);
const productOptions = ref([]);
const currentApproveStatus = ref(0)

// 审批人节点相关
const approverNodes = ref([
@@ -174,7 +179,8 @@
const openDialog = (type, row) => {
  operationType.value = type;
  dialogFormVisible.value = true;
  userListNoPage().then((res) => {
   currentApproveStatus.value = row.approveStatus
   userListNoPageByTenantId().then((res) => {
    userList.value = res.data;
  });
  getProductOptions();
@@ -236,7 +242,7 @@
  }
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      if (operationType.value === "add") {
      if (operationType.value === "add" || currentApproveStatus.value == 3) {
        approveProcessAdd(form.value).then(res => {
          proxy.$modal.msgSuccess("提交成功");
          closeDia();