diff --git a/src/views/Home/qjgl/QjglCreate.vue b/src/views/Home/qjgl/QjglCreate.vue
index ea9efba..071030a 100644
--- a/src/views/Home/qjgl/QjglCreate.vue
+++ b/src/views/Home/qjgl/QjglCreate.vue
@@ -11,65 +11,76 @@
label-width="100px"
v-loading="formLoading"
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -78,12 +89,9 @@
-
-
-
@@ -133,7 +141,7 @@ const formData = ref({
day: 0,
filePath: undefined,
userName: '',
- deptId: '',
+ deptId: undefined,
deptName: '',
processInstanceId: undefined,
userId: undefined,
@@ -254,7 +262,7 @@ const startUserSelectAssigneesFormRef = ref() // 发起人选择审批人的表
const startUserSelectAssigneesFormRules = ref({}) // 发起人选择审批人的表单 Rules
const userList = ref([]) // 用户列表
-const njList = ref([]) // 列表的数据
+const njList = ref(null); // 列表的数据
const total = ref(0) // 列表的总页数
const queryParamsNjgl = reactive({
pageNo: 1,
@@ -290,17 +298,20 @@ const submitForm = async () => {
formLoading.value = true
try {
+ // 年假类型才判断
if (formData.value.type == 1) {
- queryParamsNjgl.userId = formData.value.userId
- queryParamsNjgl.year = new Date().getFullYear().toString()
- const njData = await NjglApi.getNjglPageNac(queryParamsNjgl)
- njList.value = njData.list
-
- if (njData.total !== 1 || njList.value[0].status === 0){
- message.error("不能重复申请年假")
+ // (判断数据状态为0阻止进行) (判断申请天数大于剩余天数阻止) (判断剩余天数为0时组织)
+ if (njData.value.total !== 1 || njList.value?.status === 0){
+ message.error("存在另一年假申请记录")
+ return
+ } else if (njList.value!.remainingDays < formData.value.day) {
+ message.error("申请天数大于剩余天数")
+ return
+ } else if (njList.value?.remainingDays === 0) {
+ message.error("无剩余年假天数")
return
}else {
- let nData: NjglVO = njList.value[0];
+ const nData: NjglVO = njList.value;
nData.status = 0
await NjglApi.updateNjglNac(nData)
}
@@ -331,7 +342,22 @@ const submitForm = async () => {
formLoading.value = false
}
}
+//接受年假数据
+const njData = ref();
+// 获取年假数据
+const getNjglData = async ()=> {
+ // 设置搜索数据
+ queryParamsNjgl.userId = formData.value.userId
+ queryParamsNjgl.deptId = formData.value.deptId
+ queryParamsNjgl.year = new Date().getFullYear().toString()
+ // 搜索符合要求数据
+ njData.value = await NjglApi.getNjglPageNac(queryParamsNjgl)
+ // 直接第一条拿出来不用每次都写
+ if (njData.value.list[0]) {
+ njList.value = njData.value.list[0]
+ }
+}
/** 重置表单 */
const resetForm = () => {
formData.value = {
@@ -391,6 +417,7 @@ onMounted(async () => {
userList.value = await UserApi.getSimpleUserList()
//console.log(userList.value ,"userList.value")
}
+ await getNjglData()
})