From 3a45da15c947c2d478a44a51bd0f926647b1b841 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 11 四月 2025 16:33:17 +0800
Subject: [PATCH] 提交
---
company/src/components/enterprise/editFactoryChange.vue | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index aa65bc0..45740b1 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -28,7 +28,7 @@
<el-form-item label="鎶曚繚骞撮緞" v-if="item">
<span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
</el-form-item>
- <el-form-item label="璐圭敤" v-if="item">
+ <el-form-item label="璐圭敤" v-if="item && item.type==0">
<span>{{item.price}}鍏�</span>
<span v-if="item.timeUnit === 0">/澶�</span>
<span v-if="item.timeUnit === 1">/鍗婃湀</span>
@@ -69,15 +69,16 @@
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"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
@@ -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,
@@ -175,7 +177,7 @@
return {
form: {
id: null,
- applyChangId: '',
+ applyChangeId: '',
solutionId: '',
solutionsName: '',
applyStartTime: '',
@@ -219,7 +221,7 @@
this.$nextTick(() => {
this.$refs.form.resetFields()
this.form.id = target.id
- this.form.applyChangId = target.applyChangId
+ this.form.applyChangeId = target.applyChangId
this.getDetails()
this.getapplyChagneDetailList()
})
@@ -236,15 +238,15 @@
// 鑾峰彇鎹㈠巶浜哄憳
getapplyChagneDetailList() {
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangeId,
types: [2]
}).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 +257,7 @@
},
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
- findList({ applyId: this.form.id })
+ /*findList({ applyId: this.form.id })
.then(res => {
res.forEach(item => {
item.idCard = item.idcardNo
@@ -272,7 +274,7 @@
item.duName = ''
})
// this.form.factory = res
- })
+ })*/
getDetail(this.form.id)
.then(res => {
this.list.push(res)
@@ -282,7 +284,23 @@
this.pickerOptions = {
disabledDate(time) {
// - 8.64e7
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date().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)
@@ -323,7 +341,7 @@
// })
this.isWorking = true
update({
- id: this.form.applyChangId,
+ id: this.form.applyChangeId,
applyId: this.form.id,
changeDetailList: this.form.factory,
validTime: this.form.applyStartTime,
--
Gitblit v1.9.3