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/additionSubtractionApplication.vue | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 39ca24b..8409f63 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
@@ -101,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>
@@ -187,7 +190,7 @@
<!-- 璇︽儏 -->
<ApplyChangeDetails1 ref="ApplyChangeDetails1" @success="success" />
<!-- 鍔犲噺淇濊鎯� -->
- <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />
+<!-- <OperaApplyChangeDetailWindow ref="OperaApplyChangeDetailWindow" />-->
</GlobalWindow>
</template>
@@ -195,11 +198,11 @@
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 { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
@@ -208,7 +211,15 @@
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: {
@@ -284,7 +295,7 @@
validTime: e
}).then(res => {
this.price = res.cyclePrice
- this.reducePrice= 0
+ this.reducePrice = 0
this.form.addDetailList.forEach(item => {
item.fee = res.cyclePrice
})
@@ -350,14 +361,14 @@
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.reducePrice
})
- sums[index] = total.toFixed(2)
+ sums[index] = (total || 0).toFixed(2)
}
}
})
@@ -407,8 +418,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(() => {
@@ -480,14 +491,14 @@
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 () {
@@ -496,9 +507,9 @@
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 () {
@@ -506,10 +517,11 @@
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 })
}
},
// 鍒囨崲鏂规
--
Gitblit v1.9.3