From 0f409b25f91717e00e10c37738740b22583cb4ff Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 08 五月 2024 09:00:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index 535c8b6..2423a30 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -121,6 +121,14 @@
{{item.type==1?'-':row.fee}}
</template>
</el-table-column>
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞">
+ <template slot-scope="{row}">
+ <el-input v-model="row.remark" placeholder="璇疯緭鍏�"></el-input>
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔">
<template slot-scope="scope">
@@ -143,6 +151,10 @@
<confirmJobType ref="confirmJobType" @result="getUser" />
<!-- 鏌ョ湅璇﹀崟 -->
<detailsPolicyholder ref="detailsPolicyholder" @success="successEvent" />
+ <!-- 鐩翠繚鎶曚繚璇︽儏 -->
+ <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" />
+ <!-- 濮旀墭鎶曚繚璇︽儏 -->
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />
</GlobalWindow>
</template>
@@ -154,13 +166,15 @@
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import detailsPolicyholder from '@/components/business/detailsPolicyholder'
+import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
import { all, getNewVersion } from '@/api/business/solutions'
import { mapState } from 'vuex'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
export default {
- name: 'OperaInsuranceApplyWindow2',
+ name: 'OperaInsuranceApplyWindow',
extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, detailsPolicyholder },
+ components: { GlobalWindow, selectEmployees, addEmployee, OperaWtbApplyShopWindow, importEmployees, confirmJobType, detailsPolicyholder, OperaInsuranceApplyDetails },
data () {
return {
form: {
@@ -211,10 +225,16 @@
applyStartTime: this.form.applyStartTime,
applyEndTime: this.form.applyEndTime,
solutionId: this.form.solutionId
- }).then(() => {
+ }).then(res=> {
+ console.log(res)
this.visible = false
+ if (this.item.type == 1) {
+ this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
+ } else {
+ this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
+ }
this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
+ // this.$emit('success')
})
.catch(e => {
this.$tip.apiFailed(e)
@@ -298,11 +318,15 @@
if (index === 0) {
sums[index] = '鎬讳环'
} else if (index === 7) {
- let total = 0
- this.tableData.forEach(item => {
- total += item.fee
- })
- sums[index] = total.toFixed(2)
+ if(this.item || this.item.type == 1){
+ sums[index] = "-"
+ }else{
+ let total = 0
+ this.tableData.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = total.toFixed(2)
+ }
}
})
return sums
--
Gitblit v1.9.3