From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/enterprise/editFactoryChange.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index d1b4d52..45740b1 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -69,10 +69,11 @@
align="center"
label="鎶曚繚浜烘暟">
</el-table-column>
+ <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" ></el-table-column>
<el-table-column
prop="serviceDays"
align="center"
- label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�">
+ label="淇濆崟鏃堕暱锛堝ぉ锛�">
</el-table-column>
<el-table-column
prop="currentFee"
@@ -142,9 +143,9 @@
</el-table-column>
</el-table>
<div class="info" v-if="item">
- <span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
- <span v-if="item.specialInfo">{{item.specialInfo}}</span>
- <span v-if="item.ortherInfo">{{item.ortherInfo}}</span>
+ <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
+ <span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
+ <span v-if="item.ortherInfo" v-html="item.ortherInfo"> </span>
</div>
<!-- 閫夋嫨鍛樺伐 -->
<selectEmployees ref="selectEmployees" @result="getValue" />
@@ -167,6 +168,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,
@@ -282,7 +284,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