From 02cb47bef10bafc3a591f160f0b286df529c704a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/enterprise/editFactoryChange.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index 976d5b3..f4ef3b3 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -167,6 +167,7 @@
import { all } from '@/api/business/solutions'
import { getDetail, findList } from '@/api/business/insuranceApply'
import { create, update, applyChagneDetailList } from '@/api/business/applyChange'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
export default {
name: 'editFactoryChange',
extends: BaseOpera,
@@ -241,10 +242,10 @@
}).then(res => {
res.forEach(item => {
item.idCard = item.memberIdcardNo
- item.oldDuId = item.duId
- item.oldDuName = item.duName
- item.oldWorkTypeName = item.workTypeName
- item.oldWorktypeId = item.worktypeId
+ // item.oldDuId = item.duId
+ // item.oldDuName = item.duName
+ // item.oldWorkTypeName = item.workTypeName
+ // item.oldWorktypeId = item.worktypeId
item.workTypeName = ''
item.worktypeId = ''
item.duId = ''
@@ -255,7 +256,7 @@
},
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
- findList({ applyId: this.form.id })
+ /*findList({ applyId: this.form.id })
.then(res => {
res.forEach(item => {
item.idCard = item.idcardNo
@@ -272,7 +273,7 @@
item.duName = ''
})
// this.form.factory = res
- })
+ })*/
getDetail(this.form.id)
.then(res => {
this.list.push(res)
@@ -282,7 +283,23 @@
this.pickerOptions = {
disabledDate(time) {
// - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
+ // return time.getTime() > new Date(res.endTime).getTime() || time.getTime() <new Date(res.startTime).getTime()
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ if ([1, 3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃ユ湡灏忎簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
+ // 鏈�鍚庝竴娆℃搷浣滄椂闂存湁鍊�
+ } else if (res.lastChangeDate) {
+ // 褰撳墠鏃ユ湡澶т簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ if ([1, 3].includes(compareDates(getDate(), res.lastChangeDate))) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃堕棿灏忎簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
+ }
+ }
}
};
this.changeSolution1(res.solutionId)
--
Gitblit v1.9.3