From b496da6315314d9bd048ac2214d8bc95d2f1df02 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 13 十一月 2024 08:59:18 +0800
Subject: [PATCH] 优化
---
company/src/components/enterprise/additionSubtractionApplication.vue | 108 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 4e49a6e..c3e10b6 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -12,6 +12,9 @@
<el-form-item label="淇濋櫓鏂规">
<span>{{form.solutionsName}}</span>
</el-form-item>
+ <el-form-item label=" ">
+ <span style="color: #F95601; font-size: 14px;">鎵规敼鎻愮ず锛氾紙娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+ </el-form-item>
<!-- <el-form-item label="鐢宠鏃ユ湡" prop="applyStartTime">
<div style="display: flex; flex-direction: column;">
<el-date-picker
@@ -71,9 +74,14 @@
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"
@@ -96,7 +104,7 @@
<div class="btns">
<div class="btns_item">
<el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
- <el-button type="primary" @click="uploadUser" v-if="activeName !== '1'">瀵煎叆鍛樺伐</el-button>
+ <el-button type="primary" @click="uploadUser">瀵煎叆鍛樺伐</el-button>
<el-button type="primary" @click="addUser" v-if="activeName !== '1'">娣诲姞鍛樺伐</el-button>
<el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
</div>
@@ -148,7 +156,7 @@
label="璐圭敤">
<template slot-scope="{row}">
<span v-if="activeName === '0'">{{row.fee}}</span>
- <span v-else>{{row.fee ? '-' + row.fee : ''}}</span>
+ <span v-else>{{row.reducePrice ? row.reducePrice : '0'}}</span>
</template>
</el-table-column>
<el-table-column
@@ -167,9 +175,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" />
@@ -182,7 +190,7 @@
<!-- 璇︽儏 -->
<ApplyChangeDetails1 ref="ApplyChangeDetails1" @success="success" />
<!-- 鍔犲噺淇濊鎯� -->
- <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />
+<!-- <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />-->
</GlobalWindow>
</template>
@@ -190,20 +198,28 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import selectEmployees from '@/components/enterprise/selectEmployees'
-import addEmployee from '@/components/enterprise/addEmployee'
+import addEmployee from '@/components/enterprise/addEmployeeWithDu'
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
-import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
+// import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import { all } from '@/api/business/solutions'
-import { getDetail } from '@/api/business/insuranceApply'
+import { getDetail, getApplyPower } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
import { getDate, compareDates, getTomorrow } from '@/utils/util'
import { mapState } from 'vuex'
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, OperaApplyChangeDetailWindow, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
+ components: {
+ GlobalWindow,
+ selectEmployees,
+ // OperaApplyChangeDetailWindow,
+ addEmployee,
+ importEmployees,
+ confirmJobType,
+ ApplyChangeDetails1
+ },
data () {
return {
form: {
@@ -215,6 +231,8 @@
addDetailList: [],
delDetailList: []
},
+ addTrue: '',
+ delTrue: '',
tempMemberIndex: -1,
activeName: '0',
pickerOptions: {},
@@ -262,6 +280,7 @@
this.form.id = target.id
this.getDetails()
this.changeApplyStartTime(null)
+ this.getApplyPowerData()
})
} else {
this.$nextTick(() => {
@@ -273,18 +292,26 @@
this.visible = true
// this.updatePickerOptions()
},
+ // 鑾峰彇鏄惁鑳藉姞鍑忎繚
+ getApplyPowerData() {
+ getApplyPower({ applyId: this.form.id })
+ .then(res => {
+ this.addTrue = res.addTrue
+ this.delTrue = res.delTrue
+ })
+ },
changeApplyStartTime (e) {
getChangeCountCyclePriceVO({
applyId: this.form.id,
validTime: e
}).then(res => {
this.price = res.cyclePrice
- this.reducePrice=res.reducePrice
+ this.reducePrice = 0
this.form.addDetailList.forEach(item => {
item.fee = res.cyclePrice
})
this.form.delDetailList.forEach(item => {
- item.fee = res.reducePrice
+ // item.fee = item.reducePrice
})
}).catch(e => {
this.$tip.apiFailed(e)
@@ -345,20 +372,25 @@
let total = 0
if (this.activeName === '0') {
this.form.addDetailList.forEach(item => {
- total += item.fee
+ total += item.fee || 0
})
- sums[index] = total.toFixed(2)
+ sums[index] = (total || 0).toFixed(2)
} else {
this.form.delDetailList.forEach(item => {
- total += item.fee
+ total += item.reducePrice
})
- sums[index] = '-' + total.toFixed(2)
+ sums[index] = (total || 0).toFixed(2)
}
}
})
return sums
},
deleItem () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (this.seleData.length === 0) {
this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
return
@@ -402,8 +434,8 @@
}).then(res => {
this.visible = false
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
- this.$emit('success')
+ // this.$refs.OperaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { applyId: this.form.id, id: res })
+ this.$emit('success', { applyId: this.form.id, id: res })
}).catch(e => {
this.$tip.apiFailed(e)
}).finally(() => {
@@ -411,6 +443,7 @@
})
},
confirm () {
+ if (this.addTrue !== 0 && this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
this.$refs.form.validate((valid) => {
if (valid) {
// if (this.form.addDetailList.length === 0) {
@@ -471,40 +504,56 @@
})
},
seleUser () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- /* if (!this.form.applyStartTime) {
+ /* 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, validTime: this.form.applyStartTime })
+ 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.reducePrice, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
+ this.$refs.selectEmployees.open('閫夊彇鍑忎繚鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
}
},
addUser () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
if (this.activeName === '0') {
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.addDetailList, price: this.price })
+ this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
} else {
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice })
+ this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
}
},
uploadUser () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
+
if (this.activeName === '0') {
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.addDetailList, price: this.price, solutionId: this.form.solutionId })
+ this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
} else {
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.delDetailList, price: this.reducePrice, solutionId: this.form.solutionId })
+ this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
}
},
// 鍒囨崲鏂规
@@ -555,6 +604,11 @@
},
// 閫夋嫨鍛樺伐
sele () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
return
--
Gitblit v1.9.3