From d2bc6e096f0806b78ea92d4b90a21d3627d406c7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 08 三月 2024 18:28:42 +0800
Subject: [PATCH] mrshi
---
company/src/components/enterprise/additionSubtractionApplication.vue | 120 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 31 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 623e54c..d241b4e 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -78,7 +78,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="浜х敓璐圭敤(鍏�)">
+ label="宸蹭骇鐢熻垂鐢�(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
@@ -171,6 +171,8 @@
<importEmployees ref="importEmployees" @result="getValue" />
<!-- 纭宸ョ -->
<confirmJobType ref="confirmJobType" @result="getUser" />
+ <!-- 璇︽儏 -->
+ <ApplyChangeDetails1 ref="ApplyChangeDetails1" @success="success" />
</GlobalWindow>
</template>
@@ -181,14 +183,16 @@
import addEmployee from '@/components/enterprise/addEmployee'
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
+ import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
- import { getDate } from '@/utils/util'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
+ import { mapState } from 'vuex'
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
+ components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
data () {
return {
form: {
@@ -215,6 +219,9 @@
},
list: []
}
+ },
+ computed: {
+ ...mapState(['userInfo'])
},
created () {
this.config({
@@ -286,11 +293,22 @@
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
- // - 8.64e7
- if (getDate()) {
-
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ 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()
+ }
}
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
}
};
// this.changeSolution1(res.solutionId)
@@ -345,6 +363,34 @@
})
}
},
+ success() {
+ this.form.addDetailList.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ this.form.delDetailList.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
+ // arr.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ this.isWorking = true
+ create({
+ applyId: this.form.id,
+ addDetailList: this.form.addDetailList,
+ delDetailList: this.form.delDetailList,
+ validTime: this.form.applyStartTime,
+ type: 0
+ }).then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ },
confirm() {
this.$refs.form.validate((valid) => {
if (valid) {
@@ -364,32 +410,44 @@
return
}
}
- this.form.addDetailList.forEach(item => {
- item.idcardNo = item.idCard
+
+ this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
+ companyName: this.userInfo.company.name,
+ solutionsName: this.form.solutionsName,
+ code: this.list[0].code,
+ startTime: this.list[0].startTime,
+ endTime: this.list[0].endTime,
+ applyStartTime: this.form.applyStartTime
})
- this.form.delDetailList.forEach(item => {
- item.idcardNo = item.idCard
- })
- // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
- // arr.forEach(item => {
+
+ // return
+
+ // this.form.addDetailList.forEach(item => {
// item.idcardNo = item.idCard
// })
- this.isWorking = true
- create({
- applyId: this.form.id,
- addDetailList: this.form.addDetailList,
- delDetailList: this.form.delDetailList,
- validTime: this.form.applyStartTime,
- type: 0
- }).then(() => {
- this.visible = false
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
- }).catch(e => {
- this.$tip.apiFailed(e)
- }).finally(() => {
- this.isWorking = false
- })
+ // this.form.delDetailList.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ // // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
+ // // arr.forEach(item => {
+ // // item.idcardNo = item.idCard
+ // // })
+ // this.isWorking = true
+ // create({
+ // applyId: this.form.id,
+ // addDetailList: this.form.addDetailList,
+ // delDetailList: this.form.delDetailList,
+ // validTime: this.form.applyStartTime,
+ // type: 0
+ // }).then(() => {
+ // this.visible = false
+ // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ // this.$emit('success')
+ // }).catch(e => {
+ // this.$tip.apiFailed(e)
+ // }).finally(() => {
+ // this.isWorking = false
+ // })
}
})
},
@@ -485,7 +543,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.item.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
--
Gitblit v1.9.3