From fe3af72b806d42d60b099fe5795e40c390b1cd29 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:37:44 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/detailsPolicyholder.vue | 80 +-
company/src/components/enterprise/additionSubtractionApplication.vue | 10
company/src/components/enterprise/factoryChange.vue | 8
company/src/components/business/OperaWtbApplyShopWindow.vue | 16
company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue | 603 ++++++++++++++++++++++
company/src/components/business/OperaInsuranceApplyWindow.vue | 8
company/src/views/enterprise/myPolicy.vue | 3
company/src/components/business/OperaInsuranceApplyShopWindow.vue | 2
company/src/components/enterprise/renewalInsurance.vue | 2
company/src/components/business/OperaUnionChangeDetailWindow.vue | 2
/dev/null | 599 ----------------------
company/src/components/business/OperaApplyChangeDetailWindow.vue | 6
company/src/components/business/ApplyChangeUnitDetails1.vue | 30
company/src/components/business/ApplyChangeDetails1.vue | 118 ++--
company/src/components/business/OperaUnionChangeUnitDetailWindow.vue | 2
company/src/components/enterprise/add_subtract_return.vue | 104 +-
company/src/views/enterprise/add_subtract.vue | 5
company/src/views/enterprise/insuranceApply.vue | 8
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 2
19 files changed, 820 insertions(+), 788 deletions(-)
diff --git a/company/src/components/business/ApplyChangeDetails1.vue b/company/src/components/business/ApplyChangeDetails1.vue
index 93e621b..d2b5ab6 100644
--- a/company/src/components/business/ApplyChangeDetails1.vue
+++ b/company/src/components/business/ApplyChangeDetails1.vue
@@ -41,18 +41,20 @@
<div class="box_table_head" style="width: 50%;">
<div class="box_table_head_item">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
- <div class="box_table_head_item">韬唤璇佸彿</div>
- <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item">韬唤璇佸彿</div><!--
+ <div class="box_table_head_item">鎬у埆</div>-->
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_head" style="width: 50%;">
<div class="box_table_head_item">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
- <div class="box_table_head_item">韬唤璇佸彿</div>
- <div class="box_table_head_item">鎬у埆</div>
+ <div class="box_table_head_item">韬唤璇佸彿</div><!--
+ <div class="box_table_head_item">鎬у埆</div>-->
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
</div>
<div style="width: 100%; display: flex;">
@@ -60,20 +62,22 @@
<div class="box_table_content" style="width: 100%;" v-for="(item, index) in arr1" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
<div class="box_table_content_item">{{item.name}}</div>
- <div class="box_table_content_item">{{item.idCard}}</div>
- <div class="box_table_content_item">{{item.sex === 0 ? '鐢�' : '濂�'}}</div>
+ <div class="box_table_content_item">{{item.idCard}}</div><!--
+ <div class="box_table_content_item">{{item.sex === 0 ? '鐢�' : '濂�'}}</div>-->
<div class="box_table_content_item">{{item.duName}}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
</div>
</div>
<div style="width: 50%; border-bottom: 1px solid #b4bbc5;">
<div class="box_table_content" style="width: 100%;" v-for="(item, index) in arr2" :key="index">
<div class="box_table_content_item">{{index + 1}}</div>
<div class="box_table_content_item">{{item.name}}</div>
- <div class="box_table_content_item">{{item.idCard}}</div>
- <div class="box_table_content_item">{{item.sex === 0 ? '鐢�' : '濂�'}}</div>
+ <div class="box_table_content_item">{{item.idCard}}</div><!--
+ <div class="box_table_content_item">{{item.sex === 0 ? '鐢�' : '濂�'}}</div>-->
<div class="box_table_content_item">{{item.duName}}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
</div>
</div>
</div>
@@ -87,56 +91,56 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- export default {
- name: 'ApplyChangeDetails',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- form: {
- companyName: '',
- solutionsName: '',
- code: '',
- startTime: '',
- endTime: '',
- applyStartTime: ''
- },
- arr1: [],
- arr2: []
- }
- },
- created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
- },
- methods: {
- submit() {
- this.$emit('success')
- this.visible = false
- },
- go() {
- this.visible = false
- },
- open(title, arr1, arr2, obj){
- this.title = title
- this.arr1 = arr1
- this.arr2 = arr2
- this.visible = true
- this.$nextTick(() => {
- for (const key in this.form) {
- this.form[key] = obj[key]
- }
- })
- },
- confirm() {
- this.$emit('success')
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+ name: 'ApplyChangeDetails',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ companyName: '',
+ solutionsName: '',
+ code: '',
+ startTime: '',
+ endTime: '',
+ applyStartTime: ''
+ },
+ arr1: [],
+ arr2: []
}
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ submit () {
+ this.$emit('success')
+ this.visible = false
+ },
+ go () {
+ this.visible = false
+ },
+ open (title, arr1, arr2, obj) {
+ this.title = title
+ this.arr1 = arr1
+ this.arr2 = arr2
+ this.visible = true
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = obj[key]
+ }
+ })
+ },
+ confirm () {
+ this.$emit('success')
+ }
+ }
+}
</script>
<style lang="scss" scoped>
diff --git a/company/src/components/business/ApplyChangeUnitDetails1.vue b/company/src/components/business/ApplyChangeUnitDetails1.vue
index f75288c..e32c63e 100644
--- a/company/src/components/business/ApplyChangeUnitDetails1.vue
+++ b/company/src/components/business/ApplyChangeUnitDetails1.vue
@@ -12,7 +12,7 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item">鎶曚繚浼佷笟</div>
+ <div class="box_table_head_item" style="flex: 1.5">鎶曚繚浼佷笟</div>
<div class="box_table_head_item">淇濋櫓鏂规</div>
<div class="box_table_head_item">淇濆崟鍙�</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
@@ -21,7 +21,7 @@
<div class="box_table_head_item">鎵瑰崟鐢熸晥鏈�</div>
</div>
<div class="box_table_content " >
- <div class="box_table_content_item box_table_content_header">{{ apply.companyName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ apply.companyName }}</div>
<div class="box_table_content_item box_table_content_header">{{ apply.solutionsName }}</div>
<div class="box_table_content_item box_table_content_header">{{ apply.code }}</div>
<div class="box_table_content_item box_table_content_header">{{ apply.startTime }}</div>
@@ -32,24 +32,28 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item" style="flex: 0.5">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
+<!--
<div class="box_table_head_item">鎬у埆</div>
+-->
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">鍘熸淳閬ｅ崟浣�</div>
<div class="box_table_head_item">鍘熸墍灞炲伐绉�</div>
<div class="box_table_head_item">鏇存崲鍚庢淳閬ｅ崟浣�</div>
<div class="box_table_head_item">鏇存崲鍚庢墍灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in detailList" :key="index">
- <div class="box_table_content_item">{{index + 1}}</div>
- <div class="box_table_content_item" >{{ item.memberName }}</div>
- <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{index + 1}}</div>
+ <div class="box_table_content_item" >{{ item.memberName }}</div><!--
+ <div class="box_table_content_item">{{ item.sex==0?"鐢�":(item.sex==1?"濂�":"" )}}</div>-->
<div class="box_table_content_item">{{ item.idCard }}</div>
<div class="box_table_content_item">{{ item.oldDuName }}</div>
<div class="box_table_content_item">{{item.oldWorkTypeName}}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{item.workTypeName}}</div>
+ <div class="box_table_content_item">{{item.remark}}</div>
</div>
</div>
</div>
@@ -181,13 +185,13 @@
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(4) {
- flex: 1.5;;
+ //flex: 1.5;;
}
&:nth-child(6) {
- flex: 1.5;;
+ //flex: 1.5;;
}
&:nth-child(8) {
- flex: 1.5;;
+ //flex: 1.5;;
}
}
.box_table_head_item5 {
@@ -237,19 +241,21 @@
display: flex;
align-items: center;
justify-content: center;
+ word-break: break-all;
+ word-wrap: break-word;
font-size: 14px;
color: black;
border-right: 1px solid #b4bbc5;
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(4) {
- flex: 1.5;
+ //flex: 1.5;
}
&:nth-child(6) {
- flex: 1.5;
+ //flex: 1.5;
}
&:nth-child(8) {
- flex: 1.5;
+ //flex: 1.5;
}
}
}
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index d2d6eb9..9e98ee4 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -10,7 +10,7 @@
<div class="desc_item">
<div class="desc_item_label">
<div class="desc_item_label_left">
- <span>鎶曚繚1浼佷笟锛歿{ apply.companyName }}</span>
+ <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
<span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
<span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
@@ -19,7 +19,7 @@
<span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >閫�鍥炵敵璇�</span></span>
<span v-if="model.status === 5 || model.status === 8">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸查��鍥�</span></span>
<span v-if=" model.status === 6">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸插叧闂�</span></span>
- <span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
+ <span>鐢宠鏃ユ湡锛歿{ model.validTime }}</span>
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
@@ -265,7 +265,7 @@
getChangeMemberListOnlineSignLink} from '@/api/business/applyChange'
import {sendSms} from "@/api/business/smsEmail";
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
export default {
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 204ecf2..db8e194 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -249,7 +249,7 @@
getChangeUnitSignLink
} from '@/api/business/insuranceApply'
import { applyChangeOpt, getChangeMemberListOnlineSignLink } from '@/api/business/applyChange'
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
import { sendSms } from '@/api/business/smsEmail'
diff --git a/company/src/components/business/OperaInsuranceApplyShopWindow.vue b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
index 76923bc..ae0b765 100644
--- a/company/src/components/business/OperaInsuranceApplyShopWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
@@ -445,7 +445,7 @@
import { findListByDTO } from "@/api/business/dispatchUnit";
import { fetchList } from "@/api/business/applyChange";
import { findListByDTO as worktypeFindListByDTO } from "@/api/business/worktype";
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
export default {
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 5467066..0d27dd0 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -11,7 +11,7 @@
<div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect === 2 || model.statusCollect === 3)">
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
- <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
+ <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApplyAddWindow.open('缁繚', {id: dataId,type: 1 })">涓�閿画淇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
<el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
</div>
@@ -449,7 +449,7 @@
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
+ <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
@@ -482,7 +482,7 @@
import { findListByDTO } from "@/api/business/dispatchUnit";
import { fetchList } from "@/api/business/applyChange";
import { findListByDTO as worktypeFindListByDTO } from "@/api/business/worktype";
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
export default {
@@ -493,7 +493,7 @@
InsuranceDetails,
OperaInsuranceApplyCheckWindow,
applyReturn,
- OperaInsuranceApply,
+ OperaInsuranceApplyAddWindow,
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index d46604b..c5d1a1b 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -264,7 +264,7 @@
import detailsEntrustedInsurance from '@/components/business/detailsEntrustedInsurance'
import {sendSms} from "@/api/business/smsEmail";
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
export default {
diff --git a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
index cedb00f..58017bc 100644
--- a/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -240,7 +240,7 @@
import {applyChangeOpt, listAll as applyList} from '@/api/business/applyChange'
import {sendSms} from "@/api/business/smsEmail";
-import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { mapState } from 'vuex'
export default {
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 39cddd5..2cd5ddd 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -11,7 +11,7 @@
<div class="desc_item_label" v-if="userInfo.type === 1 && model.status ===27 ">
<div class="desc_item_label_left">
<span>淇濋櫓鍒版湡杩樻湁 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 澶�</span>
- <el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApply.open('缁繚', { id: dataId, type: 1 })">涓�閿画淇�</el-button>
+ <el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApplyAddWindow.open('缁繚', {id: dataId,type: 1 })">涓�閿画淇�</el-button>
<el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: dataId })">鍔犲噺淇濈敵璇�</el-button>
<el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.factoryChange.open('鏇存崲娲鹃仯鍗曚綅鐢宠', { id: dataId })">鏇存崲娲鹃仯鍗曚綅鐢宠</el-button>
</div>
@@ -454,7 +454,7 @@
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApplyWindow ref="OperaInsuranceApply" @success="successEvent" />
+ <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="successEvent" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
@@ -500,6 +500,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
+import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import GlobalWindow from '@/components/common/GlobalWindow'
import InsuranceDetails from '@/components/business/InsuranceDetails'
import OperaWtbApplyCheckWindow from '@/components/business/OperaWtbApplyCheckWindow'
@@ -507,9 +508,7 @@
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
-import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
-
import applyReturn from '@/components/enterprise/applyReturn'
import {
getDetail,
@@ -534,7 +533,7 @@
InsuranceDetails,
OperaWtbApplyCheckWindow,
applyReturn,
- OperaInsuranceApplyWindow,
+ OperaInsuranceApplyAddWindow,
additionSubtractionApplication,
factoryChange,
OperaApplyChangeDetailWindow,
@@ -606,11 +605,10 @@
},
methods: {
open (title, target) {
- this.visible = true
this.title = title
this.model = {}
- this.num=0
- this.timer=null
+ this.num= 0
+ this.timer= null
this.dataId = null
this.dataId = target.id
this.form.businessId = target.id
@@ -626,6 +624,8 @@
this.formInline.startTimeS = ''
this.formInline.type = ''
this.activeName = '0'
+
+ this.visible = true
this.getDetail()
this.getList()
this.getDW()
diff --git a/company/src/components/business/detailsPolicyholder.vue b/company/src/components/business/detailsPolicyholder.vue
index a2118ae..044b6bd 100644
--- a/company/src/components/business/detailsPolicyholder.vue
+++ b/company/src/components/business/detailsPolicyholder.vue
@@ -12,16 +12,16 @@
</div>
<div class="box_table">
<div class="box_table_head">
- <div class="box_table_head_item">鎶曚繚浼佷笟</div>
- <div class="box_table_head_item">淇濋櫓鏂规</div>
+ <div class="box_table_head_item" style="flex: 1.5">鎶曚繚浼佷笟</div>
+ <div class="box_table_head_item" >淇濋櫓鏂规</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥璧锋湡</div>
<div class="box_table_head_item">淇濋櫓鐢熸晥姝㈡湡</div>
<div class="box_table_head_item">鎶曚繚浜烘暟</div>
<div class="box_table_head_item">鎬昏垂鐢�(鍏�)</div>
</div>
<div class="box_table_content " >
- <div class="box_table_content_item box_table_content_header">{{ model.companyName }}</div>
- <div class="box_table_content_item box_table_content_header">{{ model.solutionName }}</div>
+ <div class="box_table_content_item box_table_content_header" style="flex:1.5">{{ model.companyName }}</div>
+ <div class="box_table_content_item box_table_content_header" >{{ model.solutionName }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyStartTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.applyEndTime }}</div>
<div class="box_table_content_item box_table_content_header">{{ model.insureNum }}</div>
@@ -30,20 +30,22 @@
</div>
<div class="box_table" v-if="model">
<div class="box_table_head">
- <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item" style="flex: 0.5">搴忓彿</div>
<div class="box_table_head_item">鍛樺伐濮撳悕</div>
<div class="box_table_head_item">韬唤璇佸彿</div>
<div class="box_table_head_item">鎬у埆</div>
<div class="box_table_head_item">娲鹃仯鍗曚綅</div>
<div class="box_table_head_item">鎵�灞炲伐绉�</div>
+ <div class="box_table_head_item">澶囨敞</div>
</div>
<div class="box_table_content" v-for="(item, index) in model.detailList" :key="index">
- <div class="box_table_content_item">{{index + 1}}</div>
+ <div class="box_table_content_item" style="flex: 0.5">{{index + 1}}</div>
<div class="box_table_content_item">{{ item.memberName }}</div>
<div class="box_table_content_item">{{ item.idCard }}</div>
<div class="box_table_content_item">{{ getGender(item.idCard) }}</div>
<div class="box_table_content_item">{{ item.duName }}</div>
<div class="box_table_content_item">{{ item.workTypeName}}</div>
+ <div class="box_table_content_item">{{ item.remark}}</div>
</div>
</div>
</div>
@@ -55,39 +57,39 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- export default {
- name: 'InsuranceDetails',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- model:{}
- }
- },
- methods: {
- open(title, target){
- this.title = title
- this.visible = true
- this.model = target
- },
- submit() {
- this.$emit('success')
- this.visible = false
- },
- getGender(idCardNumber) {
- // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栬韩浠借瘉鍙风爜鐨勭17浣嶆暟瀛�
- const genderCode = idCardNumber.substr(-2);
-
- if (genderCode % 2 === 0) {
- return '濂�';
- } else {
- return '鐢�';
- }
- },
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+export default {
+ name: 'InsuranceDetails',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ model: {}
}
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ this.model = target
+ },
+ submit () {
+ this.$emit('success')
+ this.visible = false
+ },
+ getGender (idCardNumber) {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栬韩浠借瘉鍙风爜鐨勭17浣嶆暟瀛�
+ const genderCode = idCardNumber.substr(-2)
+
+ if (genderCode % 2 === 0) {
+ return '濂�'
+ } else {
+ return '鐢�'
+ }
+ }
+ }
+}
</script>
<style lang="scss" scoped>
@@ -164,7 +166,7 @@
border-bottom: 1px solid #b4bbc5;
box-sizing: border-box;
&:nth-child(1) {
- //flex: 0.5;
+ //flex: 2;
}
}
.box_table_head_item5 {
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
new file mode 100644
index 0000000..b079e87
--- /dev/null
+++ b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
@@ -0,0 +1,603 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="100%"
+ text="鎶曚繚鐢宠"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <div class="list">
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
+ <el-form-item label="淇濋櫓鏂规" prop="solutionId">
+ <el-select v-model="form.solutionId" @change="changeSolution" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in company"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏈熸湜淇濋櫓鐢熸晥璧锋湡" prop="applyStartTime">
+ <div style="display: flex; flex-direction: column;">
+ <el-date-picker
+ @change="getTimeVal"
+ v-model="form.applyStartTime"
+ type="date"
+ class="date_picker"
+ :clearable="false"
+ :disabled="!form.solutionId"
+ :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+ </div>
+ </el-form-item>
+ <el-form-item label="淇濋櫓鐢熸晥姝㈡湡" prop="applyEndTime">
+ <el-date-picker
+ disabled
+ v-model="form.applyEndTime"
+ type="date"
+ class="date_picker"
+ :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鎶曚繚骞撮緞" v-if="item">
+ <span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
+ </el-form-item>
+ <el-form-item label="璐圭敤" v-if="item && item.type ==0">
+ <span>{{item.price}}鍏�</span>
+ <span v-if="item.timeUnit === 0">/澶�</span>
+ <span v-if="item.timeUnit === 1">/鍗婃湀</span>
+ <span v-if="item.timeUnit === 2">/鏈�</span>
+ <span v-if="item.timeUnit === 3">/骞�</span>
+ <span>/浜�</span>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="btns">
+ <div class="btns_item">
+ <el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
+ <el-button type="primary" @click="uploadUser">瀵煎叆鍛樺伐</el-button>
+ <el-button type="primary" @click="addUser">娣诲姞鍛樺伐</el-button>
+ <el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
+ </div>
+ <div class="btns_item">
+ <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
+ </div>
+ </div>
+ <el-table
+ :data="tableData"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
+ style="width: 100%;margin-bottom: 15px;">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="memberName"
+ label="濮撳悕">
+ </el-table-column>
+ <el-table-column
+ prop="idCard"
+ label="韬唤璇佸彿">
+ </el-table-column>
+ <el-table-column
+ label="骞撮緞">
+ <template slot-scope="{row}">
+ <template v-if="item">
+ <span style="color: red;" v-if="row.idCard && (getAgeByIdCard(row.idCard) < item.minAge || getAgeByIdCard(row.idCard) > item.maxAge)">{{ getAgeByIdCard(row.idCard) }}</span>
+ <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
+ </template>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="duName"
+ label="娲鹃仯鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ prop="workTypeName"
+ label="鎵�灞炲伐绉�">
+ </el-table-column>
+ <el-table-column
+ prop="fee"
+ label="璐圭敤">
+ <template slot-scope="{row}">
+ {{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">
+ <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </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>
+ </div>
+ <!-- 閫夋嫨鍛樺伐 -->
+ <selectEmployees ref="selectEmployees" @result="getValue" />
+ <!-- 娣诲姞鍛樺伐 -->
+ <addEmployee ref="addEmployee" @result="getValue" />
+ <!-- 瀵煎叆鍚嶅崟 -->
+ <importEmployees ref="importEmployees" @result="getValue" />
+ <!-- 纭宸ョ -->
+ <confirmJobType ref="confirmJobType" @result="getUser" />
+ <!-- 鏌ョ湅璇﹀崟 -->
+ <detailsPolicyholder ref="detailsPolicyholder" @success="successEvent" />
+<!-- <!– 鐩翠繚鎶曚繚璇︽儏 –>
+ <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" />
+ <!– 濮旀墭鎶曚繚璇︽儏 –>
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />-->
+ </GlobalWindow>
+</template>
+
+<script>
+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 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: 'OperaInsuranceApplyAddWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow, selectEmployees, addEmployee,importEmployees, confirmJobType, detailsPolicyholder
+ // , OperaWtbApplyShopWindow, OperaInsuranceApplyDetails
+ },
+ data () {
+ return {
+ form: {
+ id: null,
+ ID: null,
+ solutionId: '',
+ applyStartTime: '',
+ applyEndTime: ''
+ },
+ solutionName: '',
+ type: '',
+ pickerOptions: {}, // 瀛樻斁picker options鐨勫彉閲�
+ price: '',
+ company: [],
+ seleData: [],
+ item: null,
+ // 楠岃瘉瑙勫垯
+ rules: {
+ solutionId: [
+ { required: true, message: '璇烽�夋嫨淇濋櫓鏂规' }
+ ],
+ applyStartTime: [
+ { required: true, message: '璇烽�夋嫨鏈熸湜淇濋櫓鐢熸晥璧锋湡' }
+ ]
+ },
+ tableData: []
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ computed: {
+ ...mapState(['userInfo'])
+ },
+ methods: {
+ successEvent () {
+ const arr = JSON.parse(JSON.stringify(this.tableData))
+ arr.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ this.isWorking = true
+ // if (!this.form.id) {
+ create({
+ applyDetailList: arr,
+ applyStartTime: this.form.applyStartTime,
+ applyEndTime: this.form.applyEndTime,
+ solutionId: this.form.solutionId
+ }).then(res=> {
+ console.log(res)
+ this.visible = false
+ if (this.item.type == 1) {
+ // this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
+ this.$emit('success','濮旀墭鎶曚繚璇︽儏', { id: res })
+ } else {
+ // this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
+ this.$emit('success','鎶曚繚璇︽儏', { id: res })
+ }
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ // this.$emit('success','濮旀墭鎶曚繚璇︽儏', { id: res })
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ // } else {
+ // updateData({
+ // id: this.form.id,
+ // applyDetailList: arr,
+ // applyStartTime: this.form.applyStartTime,
+ // applyEndTime: this.form.applyEndTime,
+ // solutionId: this.form.solutionId
+ // }).then(() => {
+ // this.visible = false
+ // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ // this.$emit('success')
+ // }).catch(e => {
+ // this.$tip.apiFailed(e)
+ // })
+ // .finally(() => {
+ // this.isWorking = false
+ // })
+ // }
+ },
+ open (title, target) {
+ this.title = title
+ this.tableData = []
+ this.form.id = null
+ this.item = {}
+ if (target.type) {
+ this.type = target.type
+ }
+ this.form.solutionId = ''
+ this.form.applyStartTime = ''
+ this.form.applyEndTime = ''
+ if (target && target.id) {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form.id = target.id
+ this.getDetails()
+ })
+ } else {
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ }
+ this.getCompany()
+ this.visible = true
+ this.updatePickerOptions()
+ },
+ // 鑾峰彇鎶曚繚璇︽儏
+ getDetails () {
+ findList({ applyId: this.form.id })
+ .then(res => {
+ res.forEach(item => {
+ console.log(item)
+ item.idCard = item.idcardNo
+ item.fee = ''
+ if (this.type === 1) {
+ item.duName = ''
+ item.duId = ''
+ item.worktypeId = ''
+ item.workTypeName = ''
+ }
+ })
+ this.tableData = res
+ })
+ getDetail(this.form.id)
+ .then(res => {
+ // this.form.solutionId = res.solutionId
+ this.changeSolution1(res.solutionId)
+ })
+ },
+ getSummaries (param) {
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鎬讳环'
+ } else if (index === 7) {
+ 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
+ },
+ deleItem () {
+ if (this.seleData.length === 0) {
+ this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ return
+ }
+ this.seleData.forEach(item => {
+ this.tableData.forEach((row, index) => {
+ if (item === row.idCard) {
+ this.tableData.splice(index, 1)
+ }
+ })
+ })
+ },
+ confirm () {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ if (this.tableData.length === 0) {
+ this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
+ return
+ }
+ for (let i = 0; i < this.tableData.length; i++) {
+ console.log(this.tableData[i].worktypeId)
+ console.log(this.tableData[i].duId)
+ if (!this.tableData[i].worktypeId || !this.tableData[i].duId) {
+ this.$message.warning('璇峰畬鍠勬淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
+ return
+ }
+ }
+
+ let price = 0
+ if (this.item && this.item.type != 1) {
+ this.tableData.forEach(item => {
+ price = price + item.fee
+ })
+ }
+ this.$refs.detailsPolicyholder.open('鎶曚繚璇︽儏鍗�', {
+ companyName: this.userInfo.company.name,
+ solutionName: this.item.name,
+ solutionType: this.item.type,
+ applyStartTime: this.form.applyStartTime,
+ applyEndTime: this.form.applyEndTime,
+ insureNum: this.tableData.length,
+ totalPrice: price,
+ detailList: this.tableData
+ })
+ }
+ })
+ },
+ // 鑾峰彇缁撴潫鏃堕棿鍜屼环鏍�
+ getTimeVal (time) {
+ getCountCyclePriceVO({
+ solutionsId: this.form.solutionId,
+ startDate: time
+ }).then(res => {
+ this.price = res.cyclePrice
+ this.form.applyEndTime = res.endDate
+ this.tableData.forEach(item => {
+ item.fee = res.cyclePrice
+ })
+ this.$forceUpdate()
+ })
+ },
+ getDate (n) { // n涓哄灏戝ぉ锛�-浠ｈ〃寰�鍓嶏紝+浠ｈ〃寰�鍚�
+ const date1 = new Date()
+ const time1 = date1.getFullYear() + '-' + (date1.getMonth() + 1) + '-' + date1.getDate()// time1琛ㄧず褰撳墠鏃堕棿
+ const date2 = new Date(date1)
+ date2.setDate(date1.getDate() + n)
+ const time2 = date2.getFullYear() + '-' + ('0' + (date2.getMonth() + 1)).slice(-2) + '-' + ('0' + date2.getDate()).slice(-2)
+ return time2
+ },
+ updatePickerOptions () {
+ var that = this
+ this.pickerOptions = {
+ disabledDate (time) {
+ if (!that.item) return
+ if (that.item.validType === 1) {
+ // 娆℃湀
+ const currentDate = new Date()
+ currentDate.setMonth(currentDate.getMonth() + 1)
+ currentDate.setDate(1)
+ return time.getTime() <= new Date(currentDate.toLocaleString()).getTime() - 8.64e7
+ } else if (that.item.validType === 0) {
+ // 澶氬皯鏃ュ悗鐢熸晥
+ return time.getTime() <= new Date(that.getDate(that.item.validTypeNum - 1)).getTime()
+ }
+ }
+ }
+ },
+ seleUser () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+ return
+ }
+ this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.tableData, price: this.price, type: 1 })
+ },
+ addUser () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+ return
+ }
+ this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price })
+ },
+ uploadUser () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+ return
+ }
+ this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.tableData, solutionId: this.form.solutionId, type: 1, price: this.price })
+ },
+ // 鍒囨崲鏂规
+ changeSolution (e) {
+ this.form.applyEndTime = ''
+ this.form.applyStartTime = ''
+ if (!this.form.id) {
+ this.tableData = []
+ } else {
+ this.price = ''
+ this.tableData.forEach(item => {
+ item.fee = ''
+ item.duName = ''
+ item.duId = ''
+ item.workTypeName = ''
+ item.workTypeId = ''
+ })
+ }
+ this.company.forEach(item => {
+ if (item.id === e) {
+ // this.price = item.price
+ this.item = item
+ if(this.item && this.item.type==1){
+ this.item.fee=0
+ }
+ this.updatePickerOptions()
+ }
+ })
+ this.tableData.forEach(item => {
+ item.fee = this.price
+ })
+ },
+ // 鍒囨崲鏂规
+ changeSolution1 (e) {
+ getNewVersion(e)
+ .then(res => {
+ this.form.solutionId = res.id
+ this.company.forEach(item => {
+ if (item.id === res.id) {
+ // this.price = item.price
+ this.item = item
+ if(this.item && this.item.type==1){
+ this.item.fee=0
+ }
+ this.updatePickerOptions()
+ }
+ })
+ })
+ this.tableData.forEach(item => {
+ item.fee = this.price
+ })
+ },
+ dele (index) {
+ this.tableData.splice(index, 1)
+ },
+ getUser (obj) {
+ this.seleData.forEach(id => {
+ this.tableData.forEach(row => {
+ if (id === row.idCard) {
+ row.workTypeName = obj.workTypeName
+ row.worktypeId = obj.worktypeId
+ row.duName = obj.duName
+ row.duId = obj.duId
+ }
+ })
+ })
+ this.seleData = []
+ this.$refs.multipleTable.clearSelection()
+ },
+ // 閫夋嫨鍛樺伐
+ sele () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
+ return
+ }
+ if (this.seleData.length === 0) {
+ this.$message.warning('璇烽�夋嫨鍛樺伐')
+ return
+ }
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ },
+ // 鏌ヨ鍏ㄩ儴鏂规
+ getCompany () {
+ all({})
+ .then(res => {
+ this.company = res
+ })
+ },
+ getAgeByIdCard (idCard) {
+ const sexAndAge = {}
+ // 鑾峰彇鐢ㄦ埛韬唤璇佸彿鐮�
+ const userCard = idCard
+ // 濡傛灉鐢ㄦ埛韬唤璇佸彿鐮佷负undefined鍒欒繑鍥炵┖
+ if (!userCard) {
+ return sexAndAge
+ }
+ // 鑾峰彇鍑虹敓鏃ユ湡
+ const yearBirth = userCard.substring(6, 10)
+ const monthBirth = userCard.substring(10, 12)
+ const dayBirth = userCard.substring(12, 14)
+ // 鑾峰彇褰撳墠骞存湀鏃ュ苟璁＄畻骞撮緞
+ const myDate = new Date()
+ const monthNow = myDate.getMonth() + 1
+ const dayNow = myDate.getDate()
+ let age = myDate.getFullYear() - yearBirth
+ if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
+ age--
+ }
+ // 寰楀埌骞撮緞
+ sexAndAge.age = age
+ return sexAndAge.age
+ },
+ handleSelectionChange (e) {
+ this.seleData = e.map(item => item.idCard)
+ },
+ getValue (list) {
+ this.tableData.push(...list)
+ }
+ }
+}
+</script>
+
+<style>
+.el-picker-panel__footer .el-button--text.el-picker-panel__link-btn {
+ display: none;
+}
+</style>
+
+<style lang="scss" scoped>
+.list {
+ width: 100%;
+}
+.btns {
+ width: 100%;
+ margin-bottom: 15px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .btns_item {
+ display: flex;
+ align-items: center;
+ }
+}
+.submit {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 15px;
+}
+.info {
+ width: 100%;
+ font-size: 14px;
+ color: black;
+ span{
+ display: block;
+ }
+}
+</style>
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
deleted file mode 100644
index 2423a30..0000000
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ /dev/null
@@ -1,599 +0,0 @@
-<template>
- <GlobalWindow
- :title="title"
- width="100%"
- text="鎶曚繚鐢宠"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
- <div class="list">
- <el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
- <el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="form.solutionId" @change="changeSolution" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in company"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏈熸湜淇濋櫓鐢熸晥璧锋湡" prop="applyStartTime">
- <div style="display: flex; flex-direction: column;">
- <el-date-picker
- @change="getTimeVal"
- v-model="form.applyStartTime"
- type="date"
- class="date_picker"
- :clearable="false"
- :disabled="!form.solutionId"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd HH:mm:ss"
- format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
- </div>
- </el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥姝㈡湡" prop="applyEndTime">
- <el-date-picker
- disabled
- v-model="form.applyEndTime"
- type="date"
- class="date_picker"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd HH:mm:ss"
- format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鎶曚繚骞撮緞" v-if="item">
- <span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
- </el-form-item>
- <el-form-item label="璐圭敤" v-if="item && item.type ==0">
- <span>{{item.price}}鍏�</span>
- <span v-if="item.timeUnit === 0">/澶�</span>
- <span v-if="item.timeUnit === 1">/鍗婃湀</span>
- <span v-if="item.timeUnit === 2">/鏈�</span>
- <span v-if="item.timeUnit === 3">/骞�</span>
- <span>/浜�</span>
- </el-form-item>
- </el-form>
- </div>
- <div class="btns">
- <div class="btns_item">
- <el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
- <el-button type="primary" @click="uploadUser">瀵煎叆鍛樺伐</el-button>
- <el-button type="primary" @click="addUser">娣诲姞鍛樺伐</el-button>
- <el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
- </div>
- <div class="btns_item">
- <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
- </div>
- </div>
- <el-table
- :data="tableData"
- border
- show-summary
- :summary-method="getSummaries"
- ref="multipleTable"
- @selection-change="handleSelectionChange"
- style="width: 100%;margin-bottom: 15px;">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column label="搴忓彿" width="80px">
- <template slot-scope="scope">
- <span>{{scope.$index + 1}}</span>
- </template>
- </el-table-column>
- <el-table-column
- prop="memberName"
- label="濮撳悕">
- </el-table-column>
- <el-table-column
- prop="idCard"
- label="韬唤璇佸彿">
- </el-table-column>
- <el-table-column
- label="骞撮緞">
- <template slot-scope="{row}">
- <template v-if="item">
- <span style="color: red;" v-if="row.idCard && (getAgeByIdCard(row.idCard) < item.minAge || getAgeByIdCard(row.idCard) > item.maxAge)">{{ getAgeByIdCard(row.idCard) }}</span>
- <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
- </template>
- </template>
- </el-table-column>
- <el-table-column
- prop="duName"
- label="娲鹃仯鍗曚綅">
- </el-table-column>
- <el-table-column
- prop="workTypeName"
- label="鎵�灞炲伐绉�">
- </el-table-column>
- <el-table-column
- prop="fee"
- label="璐圭敤">
- <template slot-scope="{row}">
- {{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">
- <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
- </template>
- </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>
- </div>
- <!-- 閫夋嫨鍛樺伐 -->
- <selectEmployees ref="selectEmployees" @result="getValue" />
- <!-- 娣诲姞鍛樺伐 -->
- <addEmployee ref="addEmployee" @result="getValue" />
- <!-- 瀵煎叆鍚嶅崟 -->
- <importEmployees ref="importEmployees" @result="getValue" />
- <!-- 纭宸ョ -->
- <confirmJobType ref="confirmJobType" @result="getUser" />
- <!-- 鏌ョ湅璇﹀崟 -->
- <detailsPolicyholder ref="detailsPolicyholder" @success="successEvent" />
- <!-- 鐩翠繚鎶曚繚璇︽儏 -->
- <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" />
- <!-- 濮旀墭鎶曚繚璇︽儏 -->
- <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />
- </GlobalWindow>
-</template>
-
-<script>
-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 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: 'OperaInsuranceApplyWindow',
- extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, OperaWtbApplyShopWindow, importEmployees, confirmJobType, detailsPolicyholder, OperaInsuranceApplyDetails },
- data () {
- return {
- form: {
- id: null,
- ID: null,
- solutionId: '',
- applyStartTime: '',
- applyEndTime: ''
- },
- solutionName: '',
- type: '',
- pickerOptions: {}, // 瀛樻斁picker options鐨勫彉閲�
- price: '',
- company: [],
- seleData: [],
- item: null,
- // 楠岃瘉瑙勫垯
- rules: {
- solutionId: [
- { required: true, message: '璇烽�夋嫨淇濋櫓鏂规' }
- ],
- applyStartTime: [
- { required: true, message: '璇烽�夋嫨鏈熸湜淇濋櫓鐢熸晥璧锋湡' }
- ]
- },
- tableData: []
- }
- },
- created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
- },
- computed: {
- ...mapState(['userInfo'])
- },
- methods: {
- successEvent () {
- const arr = JSON.parse(JSON.stringify(this.tableData))
- arr.forEach(item => {
- item.idcardNo = item.idCard
- })
- this.isWorking = true
- // if (!this.form.id) {
- create({
- applyDetailList: arr,
- applyStartTime: this.form.applyStartTime,
- applyEndTime: this.form.applyEndTime,
- solutionId: this.form.solutionId
- }).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')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- // } else {
- // updateData({
- // id: this.form.id,
- // applyDetailList: arr,
- // applyStartTime: this.form.applyStartTime,
- // applyEndTime: this.form.applyEndTime,
- // solutionId: this.form.solutionId
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // }).catch(e => {
- // this.$tip.apiFailed(e)
- // })
- // .finally(() => {
- // this.isWorking = false
- // })
- // }
- },
- open (title, target) {
- this.title = title
- this.tableData = []
- this.form.id = null
- this.item = null
- if (target.type) {
- this.type = target.type
- }
- this.form.solutionId = ''
- this.form.applyStartTime = ''
- this.form.applyEndTime = ''
- if (target && target.id) {
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- this.form.id = target.id
- this.getDetails()
- })
- } else {
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- this.form[this.configData['field.id']] = null
- })
- }
- this.getCompany()
- this.visible = true
- this.updatePickerOptions()
- },
- // 鑾峰彇鎶曚繚璇︽儏
- getDetails () {
- findList({ applyId: this.form.id })
- .then(res => {
- res.forEach(item => {
- console.log(item)
- item.idCard = item.idcardNo
- item.fee = ''
- if (this.type === 1) {
- item.duName = ''
- item.duId = ''
- item.worktypeId = ''
- item.workTypeName = ''
- }
- })
- this.tableData = res
- })
- getDetail(this.form.id)
- .then(res => {
- // this.form.solutionId = res.solutionId
- this.changeSolution1(res.solutionId)
- })
- },
- getSummaries (param) {
- const { columns, data } = param
- const sums = []
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鎬讳环'
- } else if (index === 7) {
- 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
- },
- deleItem () {
- if (this.seleData.length === 0) {
- this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
- return
- }
- this.seleData.forEach(item => {
- this.tableData.forEach((row, index) => {
- if (item === row.idCard) {
- this.tableData.splice(index, 1)
- }
- })
- })
- },
- confirm () {
- this.$refs.form.validate((valid) => {
- if (valid) {
- if (this.tableData.length === 0) {
- this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
- return
- }
- for (let i = 0; i < this.tableData.length; i++) {
- console.log(this.tableData[i].worktypeId)
- console.log(this.tableData[i].duId)
- if (!this.tableData[i].worktypeId || !this.tableData[i].duId) {
- this.$message.warning('璇峰畬鍠勬淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
- }
- }
-
- let price = 0
- if (this.item && this.item.type != 1) {
- this.tableData.forEach(item => {
- price = price + item.fee
- })
- }
- this.$refs.detailsPolicyholder.open('鎶曚繚璇︽儏鍗�', {
- companyName: this.userInfo.company.name,
- solutionName: this.item.name,
- solutionType: this.item.type,
- applyStartTime: this.form.applyStartTime,
- applyEndTime: this.form.applyEndTime,
- insureNum: this.tableData.length,
- totalPrice: price,
- detailList: this.tableData
- })
- }
- })
- },
- // 鑾峰彇缁撴潫鏃堕棿鍜屼环鏍�
- getTimeVal (time) {
- getCountCyclePriceVO({
- solutionsId: this.form.solutionId,
- startDate: time
- }).then(res => {
- this.price = res.cyclePrice
- this.form.applyEndTime = res.endDate
- this.tableData.forEach(item => {
- item.fee = res.cyclePrice
- })
- this.$forceUpdate()
- })
- },
- getDate (n) { // n涓哄灏戝ぉ锛�-浠ｈ〃寰�鍓嶏紝+浠ｈ〃寰�鍚�
- const date1 = new Date()
- const time1 = date1.getFullYear() + '-' + (date1.getMonth() + 1) + '-' + date1.getDate()// time1琛ㄧず褰撳墠鏃堕棿
- const date2 = new Date(date1)
- date2.setDate(date1.getDate() + n)
- const time2 = date2.getFullYear() + '-' + ('0' + (date2.getMonth() + 1)).slice(-2) + '-' + ('0' + date2.getDate()).slice(-2)
- return time2
- },
- updatePickerOptions () {
- var that = this
- this.pickerOptions = {
- disabledDate (time) {
- if (!that.item) return
- if (that.item.validType === 1) {
- // 娆℃湀
- const currentDate = new Date()
- currentDate.setMonth(currentDate.getMonth() + 1)
- currentDate.setDate(1)
- return time.getTime() <= new Date(currentDate.toLocaleString()).getTime() - 8.64e7
- } else if (that.item.validType === 0) {
- // 澶氬皯鏃ュ悗鐢熸晥
- return time.getTime() <= new Date(that.getDate(that.item.validTypeNum - 1)).getTime()
- }
- }
- }
- },
- seleUser () {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.tableData, price: this.price, type: 1 })
- },
- addUser () {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price })
- },
- uploadUser () {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.tableData, solutionId: this.form.solutionId, type: 1, price: this.price })
- },
- // 鍒囨崲鏂规
- changeSolution (e) {
- this.form.applyEndTime = ''
- this.form.applyStartTime = ''
- if (!this.form.id) {
- this.tableData = []
- } else {
- this.price = ''
- this.tableData.forEach(item => {
- item.fee = ''
- item.duName = ''
- item.duId = ''
- item.workTypeName = ''
- item.workTypeId = ''
- })
- }
- this.company.forEach(item => {
- if (item.id === e) {
- // this.price = item.price
- this.item = item
- if(this.item && this.item.type==1){
- this.item.fee=0
- }
- this.updatePickerOptions()
- }
- })
- this.tableData.forEach(item => {
- item.fee = this.price
- })
- },
- // 鍒囨崲鏂规
- changeSolution1 (e) {
- getNewVersion(e)
- .then(res => {
- this.form.solutionId = res.id
- this.company.forEach(item => {
- if (item.id === res.id) {
- // this.price = item.price
- this.item = item
- if(this.item && this.item.type==1){
- this.item.fee=0
- }
- this.updatePickerOptions()
- }
- })
- })
- this.tableData.forEach(item => {
- item.fee = this.price
- })
- },
- dele (index) {
- this.tableData.splice(index, 1)
- },
- getUser (obj) {
- this.seleData.forEach(id => {
- this.tableData.forEach(row => {
- if (id === row.idCard) {
- row.workTypeName = obj.workTypeName
- row.worktypeId = obj.worktypeId
- row.duName = obj.duName
- row.duId = obj.duId
- }
- })
- })
- this.seleData = []
- this.$refs.multipleTable.clearSelection()
- },
- // 閫夋嫨鍛樺伐
- sele () {
- if (!this.form.solutionId) {
- this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
- return
- }
- if (this.seleData.length === 0) {
- this.$message.warning('璇烽�夋嫨鍛樺伐')
- return
- }
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
- },
- // 鏌ヨ鍏ㄩ儴鏂规
- getCompany () {
- all({})
- .then(res => {
- this.company = res
- })
- },
- getAgeByIdCard (idCard) {
- const sexAndAge = {}
- // 鑾峰彇鐢ㄦ埛韬唤璇佸彿鐮�
- const userCard = idCard
- // 濡傛灉鐢ㄦ埛韬唤璇佸彿鐮佷负undefined鍒欒繑鍥炵┖
- if (!userCard) {
- return sexAndAge
- }
- // 鑾峰彇鍑虹敓鏃ユ湡
- const yearBirth = userCard.substring(6, 10)
- const monthBirth = userCard.substring(10, 12)
- const dayBirth = userCard.substring(12, 14)
- // 鑾峰彇褰撳墠骞存湀鏃ュ苟璁＄畻骞撮緞
- const myDate = new Date()
- const monthNow = myDate.getMonth() + 1
- const dayNow = myDate.getDate()
- let age = myDate.getFullYear() - yearBirth
- if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
- age--
- }
- // 寰楀埌骞撮緞
- sexAndAge.age = age
- return sexAndAge.age
- },
- handleSelectionChange (e) {
- this.seleData = e.map(item => item.idCard)
- },
- getValue (list) {
- this.tableData.push(...list)
- }
- }
-}
-</script>
-
-<style>
- .el-picker-panel__footer .el-button--text.el-picker-panel__link-btn {
- display: none;
- }
-</style>
-
-<style lang="scss" scoped>
- .list {
- width: 100%;
- }
- .btns {
- width: 100%;
- margin-bottom: 15px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .btns_item {
- display: flex;
- align-items: center;
- }
- }
- .submit {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-bottom: 15px;
- }
- .info {
- width: 100%;
- font-size: 14px;
- color: black;
- span{
- display: block;
- }
- }
-</style>
diff --git a/company/src/components/enterprise/add_subtract_return.vue b/company/src/components/enterprise/add_subtract_return.vue
index 402f62a..c066762 100644
--- a/company/src/components/enterprise/add_subtract_return.vue
+++ b/company/src/components/enterprise/add_subtract_return.vue
@@ -15,58 +15,58 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- import { applyChangeOpt } from '@/api/business/applyChange'
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { applyChangeOpt } from '@/api/business/applyChange'
- export default {
- name: 'add_subtract_return',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- // 琛ㄥ崟鏁版嵁
- form: {
- id: null,
- remark: ''
- }
- }
- },
- created () {
- this.config({
- api: '/business/insurance',
- 'field.id': 'id'
- })
- },
- methods: {
- open (title, target) {
- this.title = title
- this.visible = true
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- this.form[this.configData['field.id']] = null
- })
- this.$nextTick(() => {
- for (const key in this.form) {
- this.form[key] = target[key]
- }
- })
- },
- confirm() {
- this.isWorking = true
- applyChangeOpt({ applyId: this.form.id, optIllustration: this.form.remark, optType: 3 })
- .then(res => {
- this.visible = false
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- }
- }
+export default {
+ name: 'add_subtract_return',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ remark: ''
+ }
}
+ },
+ created () {
+ this.config({
+ api: '/business/insurance',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ this.form[this.configData['field.id']] = null
+ })
+ this.$nextTick(() => {
+ for (const key in this.form) {
+ this.form[key] = target[key]
+ }
+ })
+ },
+ confirm () {
+ this.isWorking = true
+ applyChangeOpt({ applyId: this.form.id, optIllustration: this.form.remark, optType: 3 })
+ .then(res => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ }
+ }
+}
</script>
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 224afe6..135a6fc 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -12,7 +12,7 @@
<el-form-item label="淇濋櫓鏂规">
<span>{{form.solutionsName}}</span>
</el-form-item>
- <el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="applyStartTime">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyStartTime">
<div style="display: flex; flex-direction: column;">
<el-date-picker
@change="changeApplyStartTime"
@@ -151,6 +151,14 @@
<span v-else>{{row.fee ? '-' + row.fee : ''}}</span>
</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">
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index 968ba7d..8e86c55 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -134,6 +134,14 @@
prop="workTypeName"
label="鍙樻洿鍚庢墍灞炲伐绉�">
</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">
diff --git a/company/src/components/enterprise/renewalInsurance.vue b/company/src/components/enterprise/renewalInsurance.vue
index 6d7f44d..2d422a5 100644
--- a/company/src/components/enterprise/renewalInsurance.vue
+++ b/company/src/components/enterprise/renewalInsurance.vue
@@ -64,7 +64,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
- import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
+ import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import { fetchList } from '@/api/business/insuranceApply'
export default {
name: 'renewalInsurance',
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 52173b9..bf0fe7b 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -74,9 +74,10 @@
<span style="color: #F95601;" v-else>鐩存帴鎶曚繚</span>
</template>
</el-table-column>
- <el-table-column prop="addNum" label="鍔犱繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
- <el-table-column prop="delNum" label="鍑忎繚浜烘暟锛堜汉锛�" min-width="100px"></el-table-column>
+ <el-table-column prop="addNum" label="鍔犱繚浜烘暟(浜�)" min-width="100px"></el-table-column>
+ <el-table-column prop="delNum" label="鍑忎繚浜烘暟(浜�)" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="璐圭敤鍙樻洿" min-width="100px"></el-table-column>
+ <el-table-column prop="validTime" label="鐢宠鏃ユ湡" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
<el-table-column
label="鎿嶄綔"
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index a9eb6de..d316324 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -44,7 +44,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:dispatchunit:create']">
- <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠', {type: ''})">鎶曚繚鐢宠</el-button></li>
+ <li><el-button type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('鎶曚繚鐢宠', {type: ''})">鎶曚繚鐢宠</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -106,7 +106,7 @@
</pagination>
</template>
<!-- 鏂板鎶曚繚 -->
- <OperaInsuranceApplyWindow ref="OperaInsuranceApplyWindow" @success="handlePageChange" />
+ <OperaInsuranceApplyAddWindow ref="OperaInsuranceApplyAddWindow" @success="handlePageChange" />
<OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handlePageChange" />
<!-- 鎶曚繚璇︽儏 -->
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
@@ -117,7 +117,7 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyAddWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
@@ -125,7 +125,7 @@
export default {
name: 'InsuranceApply',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails,OperaWtbApplyShopWindow },
+ components: { TableLayout, Pagination, OperaInsuranceApplyAddWindow, OperaInsuranceApplyDetails,OperaWtbApplyShopWindow },
data () {
return {
// 鎼滅储
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index cebff07..0c1ca3f 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -150,12 +150,11 @@
<renewalInsurance ref="renewalInsurance" @success="handlePageChange" />
</TableLayout>
</template>
-
<script>
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
+import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyAddWindow'
import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
import renewalInsurance from '@/components/enterprise/renewalInsurance'
--
Gitblit v1.9.3