From 4be10170bc9a1546537762e03f2c963d61d2f6ea Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 22 二月 2024 09:16:24 +0800
Subject: [PATCH] mrshi
---
company/src/components/enterprise/additionSubtractionApplication.vue | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 9a62700..3129e40 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -148,7 +148,7 @@
label="璐圭敤">
<template slot-scope="{row}">
<span v-if="activeName === '0'">{{row.fee}}</span>
- <span v-else>-{{row.fee}}</span>
+ <span v-else>{{row.fee ? '-' + row.fee : ''}}</span>
</template>
</el-table-column>
<el-table-column
@@ -285,7 +285,7 @@
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.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
}
};
this.changeSolution1(res.solutionId)
@@ -304,13 +304,15 @@
this.form.addDetailList.forEach(item => {
total += item.fee
})
+ sums[index] = total
+ return
} else {
this.form.delDetailList.forEach(item => {
total += item.fee
})
+ sums[index] = '-' + total
+ return
}
- sums[index] = '-' + total
- return
}
})
return sums
@@ -391,10 +393,14 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
+ if (!this.form.applyStartTime) {
+ this.$message.warning('璇峰厛閫夋嫨鎵瑰崟鐢熸晥璧锋湡')
+ return
+ }
if (this.activeName === '0') {
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id })
+ this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
} else {
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id })
+ this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
}
},
addUser() {
@@ -423,6 +429,7 @@
changeSolution1(e) {
this.company.forEach(item => {
if (item.id === e) {
+ console.log(item)
this.item = item
}
})
@@ -476,7 +483,7 @@
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
- all({})
+ all({ dataType: 2 })
.then(res => {
this.company = res
})
--
Gitblit v1.9.3