From e9c0af3fc026823ca54f206bbe8c2666ed5013cd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 20:06:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/business/switchCourt.vue | 8
company/src/components/enterprise/additionSubtractionApplication.vue | 23 +
company/src/components/enterprise/factoryChange.vue | 5
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 2
company/src/api/business/notices.js | 10 +
company/src/components/business/OperaInsuranceApplyWindow.vue | 48 +++-
company/src/components/enterprise/reinsurance.vue | 149 ++++++++++++--
company/src/views/business/applyChange.vue | 8
company/src/views/enterprise/myPolicy.vue | 55 +++++
company/src/components/enterprise/renewalInsurance.vue | 73 +++++++
company/src/components/enterprise/directInsuranceDetails.vue | 77 ++++---
company/src/components/business/dispatchReview.vue | 7
company/src/components/business/OperaApplyChangeDetailWindow.vue | 16
company/src/components/enterprise/commissionDetails.vue | 21 +
company/src/components/enterprise/directInvoicingApplication.vue | 10
company/src/utils/util.js | 21 ++
company/src/components/enterprise/entrustedInvoicingApplication.vue | 10
company/src/components/common/UploadFile.vue | 9
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 15 +
19 files changed, 438 insertions(+), 129 deletions(-)
diff --git a/company/src/api/business/notices.js b/company/src/api/business/notices.js
index 5d8928d..f2f2756 100644
--- a/company/src/api/business/notices.js
+++ b/company/src/api/business/notices.js
@@ -6,3 +6,13 @@
trim: true
})
}
+
+// 鏌ヨ鎶曚繚鍗曟彁閱掓暟閲�
+export function getCaptcha () {
+ return request.get('/business/notices/getApplyNotice')
+}
+
+// 鎶曚繚鍗曞叧闂彁閱�
+export function closeApplyNotice (type) {
+ return request.get(`/business/notices/closeApplyNotice?type=${type}`)
+}
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 1702dc1..47b2647 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,8 +11,8 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<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 === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
+ <span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
<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>
@@ -54,7 +54,7 @@
align="center"
label="淇濆崟鍙�">
<template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.applyId })">{{row.applyCode}}</el-button>
+ <el-button type="text" @click="$refs.insuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.applyId })">{{row.applyCode}}</el-button>
</template>
</el-table-column>
<el-table-column
@@ -191,7 +191,7 @@
<!-- 鎹㈠巶鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
<!-- 鎶曚繚璇︽儏 -->
- <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="successEvent" />
+ <insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -207,7 +207,7 @@
import reinsurance from '@/components/enterprise/reinsurance'
import factoryChange from '@/components/enterprise/factoryChange'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
-import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
+// import insuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import {
getDetail,
getChangeDetail,
@@ -219,7 +219,7 @@
import { mapState } from 'vuex'
export default {
- name: 'OperaApplyChangeDetailWindow',
+ name: 'OperaApplyChangeDetailWindow1',
extends: BaseOpera,
components: {
GlobalWindow,
@@ -229,7 +229,7 @@
OperaInsuranceApply,
reinsurance,
factoryChange,
- OperaInsuranceApplyDetails
+ insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
},
data () {
return {
@@ -310,7 +310,7 @@
capacity: 10,
page: this.currentPage,
model: {
- applyChangId: this.modelId,
+ applyChangeId: this.modelId,
types:[ this.activeName]
}
}).then(res => {
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 54e3d2e..2a80040 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -25,9 +25,9 @@
<!-- <el-button v-if="[0, 2, 3, 10].includes(model.status)" type="danger" @click="$refs.applyReturn.open('鐢宠閫�鍥�', {id: dataId})">鐢宠閫�鍥�</el-button>-->
<el-button v-if="[5, 8].includes(model.status)" type="primary" @click="$refs.editFactoryChange.open('鎹㈠巶鐢宠', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
<el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="[0, 1, 2, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
+ <el-button v-if="[0, 1, 3, 7].includes(model.status)" type="primary" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
<el-button v-if="model.status == 5" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
- <el-button v-if="model.status == 5" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
+ <el-button v-if="model.status == 5 || model.status == 2" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if="[5, 8].includes(model.status)" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-else>
@@ -56,6 +56,9 @@
prop="applyCode"
align="center"
label="鍏宠仈淇濆崟鍙�">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.insuranceApplyDetails.open('鎶曚繚璇︽儏', { id: row.applyId })">{{row.applyCode}}</el-button>
+ </template>
</el-table-column>
<el-table-column
prop="solutionsName"
@@ -179,6 +182,8 @@
<!-- 鎹㈠巶鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
<editFactoryChange ref="editFactoryChange" @success="successEvent" />
+ <!-- 鎶曚繚璇︽儏 -->
+ <insuranceApplyDetails ref="insuranceApplyDetails" @success="successEvent" />
<template v-slot:footer>
<el-button @click="visible=false">杩斿洖</el-button>
</template>
@@ -195,6 +200,7 @@
import editFactoryChange from '@/components/enterprise/editFactoryChange'
import applyReturn from '@/components/enterprise/applyReturn'
import add_subtract_return from '@/components/enterprise/add_subtract_return'
+// import insuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import {
getDetail,
getChangeDetail,
@@ -217,7 +223,8 @@
additionSubtractionApplication,
factoryChange,
add_subtract_return,
- editFactoryChange
+ editFactoryChange,
+ insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
},
data () {
return {
@@ -298,7 +305,7 @@
capacity: 10,
page: this.currentPage,
model: {
- applyChangId: this.modelId,
+ applyChangeId: this.modelId,
types:[2]
}
}).then(res => {
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 0920d80..b5210c1 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -98,8 +98,8 @@
</div>
<div class="desc_item_cate">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鍦ㄤ繚浜哄憳" name="0"></el-tab-pane>
- <el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
+ <el-tab-pane label="鍦ㄤ繚浜哄憳" name="0" ></el-tab-pane>
+ <el-tab-pane label="鍔�/鍑忎繚璁板綍" name="1"></el-tab-pane>
<el-tab-pane label="鎹㈠巶璁板綍" name="2"></el-tab-pane>
</el-tabs>
</div>
@@ -200,7 +200,8 @@
ref="table"
v-if="activeName === '0'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
@@ -208,9 +209,11 @@
<el-table-column
:key="Math.random()"
prop="memberName"
+ align="center"
label="鍛樺伐濮撳悕">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎬у埆">
<template slot-scope="{row}">
@@ -221,30 +224,36 @@
<el-table-column
:key="Math.random()"
prop="idcardNo"
+ align="center"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="duName"
+ align="center"
label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="workTypeName"
+ align="center"
label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="startTime"
+ align="center"
label="淇濋櫓鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="endTime"
+ align="center"
label="淇濋櫓鐢熸晥姝㈡湡">
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
prop="fee"
label="浜х敓璐圭敤锛堝厓锛�">
</el-table-column>
@@ -255,12 +264,14 @@
ref="table"
v-if="activeName === '1'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濆崟鐘舵��" :key="Math.random()">
+ <el-table-column label="淇濆崟鐘舵��" :key="Math.random()"
+ align="center">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -273,29 +284,35 @@
<el-table-column
:key="Math.random()"
prop="applyCode"
+ align="center"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="addNum"
+ align="center"
label="澧炲姞浜烘暟锛堜汉锛�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="delNum"
+ align="center"
label="鍑忓皯浜烘暟锛堜汉锛�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="createDate"
+ align="center"
label="鎻愪氦鏃堕棿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
+ align="center"
:key="Math.random()"
label="鎿嶄綔">
<template slot-scope="{row}">
@@ -309,12 +326,14 @@
ref="table"
v-if="activeName === '2'"
style="width: 100%">
- <el-table-column label="搴忓彿">
+ <el-table-column label="搴忓彿"
+ align="center">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="淇濆崟鐘舵��" :key="Math.random()">
+ <el-table-column
+ align="center" label="淇濆崟鐘舵��" :key="Math.random()">
<template slot-scope="{row}">
<span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
@@ -326,26 +345,31 @@
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
prop="applyCode"
label="鎵瑰崟鍙�">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="changeNum"
+ align="center"
label="鎹㈠巶浜烘暟">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="createDate"
+ align="center"
label="鎻愪氦鏃堕棿">
</el-table-column>
<el-table-column
:key="Math.random()"
prop="applyStartTime"
+ align="center"
label="鎵瑰崟鐢熸晥璧锋湡">
</el-table-column>
<el-table-column
:key="Math.random()"
+ align="center"
label="鎿嶄綔">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.OperaApplyChangeUnitDetailWindow.open('鎹㈠巶璇︽儏', row)">鏌ョ湅璇︽儏</el-button>
@@ -371,7 +395,7 @@
<div style="display: flex; flex-direction: column;">
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
- <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9].includes(activity.objType)">
+ <span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="[1, 2, 5, 6, 9, 11, 22].includes(activity.objType)">
{{activity.content}}
</span>
</span>
@@ -423,7 +447,7 @@
import { mapState } from 'vuex'
export default {
- name: 'OperaInsuranceApplyWindow',
+ name: 'OperaInsuranceApplyWindow1',
extends: BaseOpera,
components: {
GlobalWindow,
@@ -748,8 +772,10 @@
}
}
</script>
-<style>
-
+<style scoped>
+ ::v-deep .el-tabs__item{
+ font-weight: 600;
+ }
</style>
<style lang="scss" scoped>
.form {
diff --git a/company/src/components/business/dispatchReview.vue b/company/src/components/business/dispatchReview.vue
index 447fac7..3c3e5f8 100644
--- a/company/src/components/business/dispatchReview.vue
+++ b/company/src/components/business/dispatchReview.vue
@@ -14,7 +14,6 @@
</div>
</div>
</div>
-
<div class="box" v-for="(item, index) in duSolutionList" :key="index">
<div class="box_label">淇濋櫓鏂规锛歿{item.solutionName}}</div>
<el-table
@@ -104,10 +103,10 @@
flag = 1;
tempworktyps.push(item1);
}
- if(flag ==1){
- this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
- }
})
+ if(flag ==1){
+ this.duSolutionList.push({duWorktypeList:tempworktyps,solutionName:item.solutionName})
+ }
})
console.log(this.form)
diff --git a/company/src/components/common/UploadFile.vue b/company/src/components/common/UploadFile.vue
index 0ceb06f..45049cb 100644
--- a/company/src/components/common/UploadFile.vue
+++ b/company/src/components/common/UploadFile.vue
@@ -110,17 +110,14 @@
height: 90px !important;
}
::v-deep .el-upload-list__item {
- width: 90px !important;
- height: 90px !important;
+ width: 80% !important;
+ height: 50px !important;
}
.icon {
-webkit-transform: translate(-50%,-50%);
-ms-transform: translate(-50%,-50%);
transform: translate(0%, -85%);
}
-::v-deep .el-upload-list__item {
- width: 90px !important;
- height: 90px !important;
-}
+
</style>
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index 5f75645..ab34c40 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -151,7 +151,7 @@
import { all, getNewVersion } from '@/api/business/solutions'
import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
export default {
- name: 'OperaInsuranceApplyWindow',
+ name: 'OperaInsuranceApplyWindow2',
extends: BaseOpera,
components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType },
data () {
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 623e54c..c807afd 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -184,7 +184,7 @@
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
- import { getDate } from '@/utils/util'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
export default {
name: 'additionSubtractionApplication',
extends: BaseOpera,
@@ -286,11 +286,22 @@
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
- // - 8.64e7
- if (getDate()) {
-
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃ユ湡灏忎簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
+ // 鏈�鍚庝竴娆℃搷浣滄椂闂存湁鍊�
+ } else if (res.lastChangeDate) {
+ // 褰撳墠鏃ユ湡澶т簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃堕棿灏忎簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
+ }
}
- return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate ? res.lastChangeDate : res.startTime).getTime()
}
};
// this.changeSolution1(res.solutionId)
@@ -485,7 +496,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.item.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
diff --git a/company/src/components/enterprise/commissionDetails.vue b/company/src/components/enterprise/commissionDetails.vue
index 551eec0..8a783f7 100644
--- a/company/src/components/enterprise/commissionDetails.vue
+++ b/company/src/components/enterprise/commissionDetails.vue
@@ -10,29 +10,29 @@
<div class="info_list">
<div class="info_list_item">
<div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
- <div class="info_list_item_val">{{userInfo.company.name}}</div>
+ <div class="info_list_item_val">{{model.companyName}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
- <div class="info_list_item_val">{{userInfo.company.code}}</div>
+ <div class="info_list_item_val">{{model.taxCode}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">寮�鎴疯锛�</div>
- <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
+ <div class="info_list_item_val">{{model.taxBank}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">璐﹀彿锛�</div>
<div class="info_list_item_val">
- {{userInfo.company.taxAccount}}
+ {{model.taxAccount}}
</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
+ <div class="info_list_item_val">{{model.taxAddr}}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
</div>
<div class="list" style="width: 100%;" v-if="form.type === 0">
<div class="list_label">
@@ -40,7 +40,7 @@
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
<div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
</div>
@@ -111,7 +111,8 @@
id: null,
type: '',
addr: ''
- }
+ },
+ model:{}
}
},
created () {
@@ -129,6 +130,7 @@
this.visible = true
this.list1 = []
this.list2 = []
+ this.model ={}
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
@@ -142,6 +144,7 @@
getData() {
getDetail(this.form.id)
.then(res => {
+ this.model =res
let price = 0
this.list1 = res.applyList
this.list2 = res.delTaxList
diff --git a/company/src/components/enterprise/directInsuranceDetails.vue b/company/src/components/enterprise/directInsuranceDetails.vue
index d6ac55c..c4d92e5 100644
--- a/company/src/components/enterprise/directInsuranceDetails.vue
+++ b/company/src/components/enterprise/directInsuranceDetails.vue
@@ -8,39 +8,39 @@
>
<div class="info">
<div class="info_list">
- <div class="info_list_item">
- <div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
- <div class="info_list_item_val">{{userInfo.company.name}}</div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
+ <div class="info_list_item_val">{{model.companyName}}</div>
+ </div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
+ <div class="info_list_item_val">{{model.taxCode}}</div>
+ </div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">寮�鎴疯锛�</div>
+ <div class="info_list_item_val">{{model.taxBank}}</div>
+ </div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">璐﹀彿锛�</div>
+ <div class="info_list_item_val">
+ {{model.taxAccount}}
</div>
- <div class="info_list_item">
- <div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
- <div class="info_list_item_val">{{userInfo.company.code}}</div>
- </div>
- <div class="info_list_item">
- <div class="info_list_item_label">寮�鎴疯锛�</div>
- <div class="info_list_item_val">{{userInfo.company.taxBank}}</div>
- </div>
- <div class="info_list_item">
- <div class="info_list_item_label">璐﹀彿锛�</div>
- <div class="info_list_item_val">
- {{userInfo.company.taxAccount}}
- </div>
- </div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
- </div>
- <div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
- </div>
+ </div>
+ <div class="info_list_item" style="width: 100%;">
+ <div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
+ <div class="info_list_item_val">{{model.taxAddr}}</div>
+ </div>
+ <div class="info_list_item" style="width: 100%;">
+ <div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
+ </div>
<div class="list" style="width: 100%;" v-if="form.type === 0">
<div class="list_label">
鎺ユ敹鏂瑰紡锛氱數瀛愬彂绁�
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
<div class="list" style="width: 100%;" v-else>
@@ -49,7 +49,7 @@
</div>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <div class="list_val_info">{{form.addr}}</div>
+ <div class="list_val_info">{{model.addr}}</div>
</div>
</div>
</div>
@@ -103,17 +103,17 @@
</el-table-column>
<el-table-column
align="center"
- prop="solutionsName"
+ prop="solutionName"
label="淇濋櫓鏂规">
</el-table-column>
<el-table-column
align="center"
- prop="downCode"
+ prop="taxDoneCode"
label="鍙戠エ鍙�">
</el-table-column>
<el-table-column
align="center"
- prop="createTime"
+ prop="createDate"
label="鐢宠寮�绁ㄦ椂闂�">
</el-table-column>
<el-table-column
@@ -149,7 +149,8 @@
id: null,
type: '',
addr: ''
- }
+ },
+ model:{}
}
},
created () {
@@ -167,6 +168,7 @@
this.visible = true
this.list1 = []
this.list2 = []
+ this.model={}
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
@@ -181,6 +183,7 @@
getDetail(this.form.id)
.then(res => {
let price = 0
+ this.model = res
this.list1 = res.applyList
this.list2 = res.delTaxList
if (this.list1 && this.list1.length > 0) {
@@ -202,7 +205,7 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鍚堣'
- } else if (index == 4) {
+ } else if (index == 3) {
let price = 0
data.forEach(item => {
price += item.totalFee
@@ -218,7 +221,7 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鍚堣'
- } else if (index == 5) {
+ } else if (index == 4) {
let price = 0
data.forEach(item => {
price += item.totalFee
@@ -236,7 +239,10 @@
::v-deep .el-table__footer-wrapper tbody td {
cursor: pointer;
text-align: center;
- &:nth-child(5) {
+ &:nth-child(5),&:nth-child(4) {
+ color:rgba(249, 86, 1, 0.996078431372549);
+ }
+ &:nth-child(4) {
color:rgba(249, 86, 1, 0.996078431372549);
}
}
@@ -260,7 +266,8 @@
.info_list {
width: 100%;
display: flex;
- align-items: left;
+ /*align-items: left;*/
+ align-items: flex-start;
flex-wrap: wrap;
.list::v-deep {
width: 100%;
diff --git a/company/src/components/enterprise/directInvoicingApplication.vue b/company/src/components/enterprise/directInvoicingApplication.vue
index a6a6441..dd7d7e8 100644
--- a/company/src/components/enterprise/directInvoicingApplication.vue
+++ b/company/src/components/enterprise/directInvoicingApplication.vue
@@ -208,7 +208,15 @@
this.$message.warning('璇疯緭鍏ユ帴鏀跺湴鍧�')
return
}
- if (this.list2.length > 0 && this.setectData.length === 0) {
+ // if (this.list2.length > 0 && this.setectData.length === 0) {
+ // this.$message.warning('鑷冲皯鍕鹃�変竴椤瑰啿绾㈠崟鏁版嵁')
+ // return
+ // }
+ let price = 0
+ this.list1.forEach(item => {
+ price += item.amount
+ })
+ if (price < 0 && this.setectData.length === 0) {
this.$message.warning('鑷冲皯鍕鹃�変竴椤瑰啿绾㈠崟鏁版嵁')
return
}
diff --git a/company/src/components/enterprise/entrustedInvoicingApplication.vue b/company/src/components/enterprise/entrustedInvoicingApplication.vue
index 95a98d1..60dfdab 100644
--- a/company/src/components/enterprise/entrustedInvoicingApplication.vue
+++ b/company/src/components/enterprise/entrustedInvoicingApplication.vue
@@ -28,7 +28,7 @@
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">{{userInfo.company.invoiceAddr}} {{userInfo.company.phone}}</div>
+ <div class="info_list_item_val">{{userInfo.company.taxAddr}}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
@@ -38,14 +38,14 @@
<el-radio v-model="type" label="0">鐢靛瓙鍙戠エ</el-radio>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <el-input v-model="val" :disabled="type === '1'" placeholder="111222333@qq.com"></el-input>
+ <el-input v-model="val" :disabled="type === '1'" placeholder="" ></el-input>
</div>
</div>
<div class="list" style="width: 100%;">
<el-radio v-model="type" label="1">绾歌川鍙戠エ</el-radio>
<div class="list_val">
<div class="list_val_label">鎺ユ敹鍦板潃锛�</div>
- <el-input v-model="val1" :disabled="type === '0'" placeholder="瀹夊窘鐪佸悎鑲ュ競缁忔祹鎶�鏈紑鍙戝尯鑾茶姳璺互涓溿�佺煶闂ㄨ矾浠ュ崡鑾茶姳璺�1锛� 0551-63450845"></el-input>
+ <el-input v-model="val1" :disabled="type === '0'" placeholder=""></el-input>
</div>
</div>
</div>
@@ -139,14 +139,14 @@
open (title, target) {
this.title = title
this.type = '0'
- this.val = ''
- this.val1 = ''
this.visible = true
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
}
})
+ this.val = this.userInfo.company.invoiceEmail
+ this.val1 = this.userInfo.company.invoiceAddr
},
confirm () {
if (!this.val && !this.val1) {
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index f2e2196..31c896f 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -181,6 +181,7 @@
applyEndTime: '',
factory: []
},
+ newVersionSolutionId: '',
pickerOptions: {},
price: '',
endTime: '', // 瀹為檯淇濋櫓鐢熸晥姝㈡湡
@@ -253,9 +254,11 @@
})
getDetail(this.form.id)
.then(res => {
+ console.log(res)
this.list.push(res)
this.endTime = res.endTime
this.form.solutionId = res.solutionId
+ this.newVersionSolutionId = res.newVersionSolutionId
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
@@ -381,7 +384,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index f7e1068..3faec31 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -15,13 +15,13 @@
<el-form-item label="鎵瑰崟鐢熸晥璧锋湡" prop="applyStartTime">
<div style="display: flex; flex-direction: column;">
<el-date-picker
- @change="changeApplyStartTime"
- v-model="form.applyStartTime"
- type="date"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd"
- format="yyyy 骞� MM 鏈� dd 鏃�"
- placeholder="閫夋嫨鏃ユ湡">
+ @change="changeApplyStartTime"
+ v-model="form.applyStartTime"
+ type="date"
+ :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>
@@ -105,13 +105,14 @@
</div>
</div>
<el-table
- :data="activeName === '0' ? form.addDetailList : form.delDetailList"
- border
- show-summary
- :summary-method="getSummaries"
- ref="multipleTable"
- @selection-change="handleSelectionChange"
- style="width: 100%;margin-bottom: 15px;">
+ v-if="activeName === '0'"
+ :data="form.addDetailList"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ ref="multipleTable"
+ @selection-change="handleSelectionChange"
+ style="width: 100%;margin-bottom: 15px;">
<el-table-column
type="selection"
width="55">
@@ -122,14 +123,17 @@
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="memberName"
label="濮撳悕">
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="idCard"
label="韬唤璇佸彿">
</el-table-column>
<el-table-column
+ :key="Math.random()"
label="骞撮緞">
<template slot-scope="{row}">
<template v-if="item">
@@ -139,21 +143,83 @@
</template>
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="duName"
label="娲鹃仯鍗曚綅">
</el-table-column>
<el-table-column
+ :key="Math.random()"
prop="workTypeName"
label="鎵�灞炲伐绉�">
</el-table-column>
<el-table-column
+ :key="Math.random()"
+ prop="fee"
label="璐圭敤">
- <template slot-scope="{row}">
- <span v-if="activeName === '0'">{{row.fee}}</span>
- <span v-else>-{{row.fee}}</span>
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table
+ v-if="activeName === '1'"
+ :data="form.delDetailList"
+ 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
+ :key="Math.random()"
+ prop="memberName"
+ label="濮撳悕">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="idCard"
+ label="韬唤璇佸彿">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ label="骞撮緞">
+ <template slot-scope="{row}">
+ <template v-if="item">
+ <span style="color: red;" v-if="(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
+ :key="Math.random()"
+ prop="duName"
+ label="娲鹃仯鍗曚綅">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="workTypeName"
+ label="鎵�灞炲伐绉�">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
+ prop="fee"
+ label="璐圭敤">
+ </el-table-column>
+ <el-table-column
+ :key="Math.random()"
label="鎿嶄綔">
<template slot-scope="scope">
<el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
@@ -185,6 +251,7 @@
import confirmJobType from '@/components/enterprise/confirmJobType'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
+ import { getDate, compareDates, getTomorrow } from '@/utils/util'
import { update, getChangeCountCyclePriceVO, applyChagneDetailList } from '@/api/business/applyChange'
export default {
name: 'reinsurance',
@@ -202,6 +269,7 @@
addDetailList: [],
delDetailList: [],
},
+ newVersionSolutionId: '',
activeName: '0',
pickerOptions: {},
price: '',
@@ -263,7 +331,7 @@
item.fee = res.cyclePrice
})
this.form.delDetailList.forEach(item => {
- item.fee = res.cyclePrice
+ item.fee = -res.cyclePrice
})
})
},
@@ -273,7 +341,7 @@
// 鑾峰彇鎶曚繚璇︽儏
getDetails() {
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangId,
types: [0]
}).then(res => {
res.forEach(item => {
@@ -287,32 +355,51 @@
this.form.addDetailList = res
})
applyChagneDetailList({
- applyChangId: this.form.applyChangId,
+ applyChangeId: this.form.applyChangId,
types: [1]
}).then(res => {
res.forEach(item => {
- item.fee = ''
+ // item.fee = ''
item.idCard = item.memberIdcardNo
- item.workTypeName = ''
- item.worktypeId = ''
- item.duName = ''
- item.duId = ''
+ // item.workTypeName = ''
+ // item.worktypeId = ''
+ // item.duName = ''
+ // item.duId = ''
})
this.form.delDetailList = res
})
getDetail(this.form.id)
.then(res => {
+ console.log(res)
this.list.push(res)
+ this.item = res
this.endTime = res.endTime
this.form.solutionId = res.solutionId
+ this.newVersionSolutionId = res.newVersionSolutionId
this.form.solutionsName = res.solutionsName
this.pickerOptions = {
disabledDate(time) {
+ // 褰撳墠鏃ユ湡澶т簬绛変簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ if ([1,3].includes(compareDates(getDate(), res.startTime)) && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃ユ湡灏忎簬鐢熸晥鏃ユ湡骞朵笖鏈�鍚庝竴娆℃搷浣滄椂闂寸瓑浜庣┖
+ } else if (compareDates(getDate(), res.startTime) === 2 && !res.lastChangeDate) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.startTime).getTime()
+ // 鏈�鍚庝竴娆℃搷浣滄椂闂存湁鍊�
+ } else if (res.lastChangeDate) {
+ // 褰撳墠鏃ユ湡澶т簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ if ([1,3].includes(compareDates(getDate(), res.lastChangeDate))) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(getTomorrow()).getTime()
+ // 褰撳墠鏃堕棿灏忎簬鏈�鍚庝竴娆℃搷浣滄椂闂�
+ } else if (compareDates(getDate(), res.lastChangeDate) === 2) {
+ return time.getTime() > new Date(res.endTime).getTime() || time.getTime() < new Date(res.lastChangeDate).getTime()
+ }
+ }
// - 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().getTime()
}
};
- this.changeSolution1(res.solutionId)
+ // this.changeSolution1(res.solutionId)
})
},
getSummaries(param) {
@@ -334,7 +421,11 @@
this.form.delDetailList.forEach(item => {
total += item.fee
})
- sums[index] = '-' + total
+ // if (total < 0) {
+ sums[index] = total
+ // } else {
+ // sums[index] = '-' + total
+ // }
return
}
sums[index] = ''
@@ -500,7 +591,7 @@
this.$message.warning('璇烽�夋嫨鍛樺伐')
return
}
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
+ this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.newVersionSolutionId })
},
// 鏌ヨ鍏ㄩ儴鏂规
getCompany() {
diff --git a/company/src/components/enterprise/renewalInsurance.vue b/company/src/components/enterprise/renewalInsurance.vue
new file mode 100644
index 0000000..7021e02
--- /dev/null
+++ b/company/src/components/enterprise/renewalInsurance.vue
@@ -0,0 +1,73 @@
+<template>
+ <GlobalWindow
+ :title="title"
+ width="100%"
+ :visible.sync="visible"
+ :confirm-working="isWorking"
+ @confirm="confirm"
+ >
+ <el-table
+ :data="tableData"
+ border
+ style="width: 100%">
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="statusInfo" label="鐘舵��">
+ <template slot-scope="{row}">
+ <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="solutionsName" label="淇濋櫓鏂规"></el-table-column>
+ <el-table-column label="淇濆崟鍙�">
+ <template slot-scope="{row}">
+ <span>{{row.code ? row.code : '-'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="insureNum" label="鎶曚繚浜烘暟"></el-table-column>
+ <el-table-column prop="serviceDays" label="鎶曚繚鏃堕暱锛堝ぉ锛�"></el-table-column>
+ <el-table-column prop="currentFee" label="浜х敓璐圭敤"></el-table-column>
+ <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級"></el-table-column>
+ <el-table-column prop="checkDate" label="鎻愪氦鏃ユ湡"></el-table-column>
+ <el-table-column prop="startTime" label="鎶曚繚鐢熸晥鏃ユ湡"></el-table-column>
+ <el-table-column prop="endTime" label="鎶曚繚澶辨晥鏃ユ湡"></el-table-column>
+ <el-table-column
+ prop="address"
+ label="鎿嶄綔">
+ </el-table-column>
+ </el-table>
+ </GlobalWindow>
+</template>
+
+<script>
+ import BaseOpera from '@/components/base/BaseOpera'
+ import GlobalWindow from '@/components/common/GlobalWindow'
+ export default {
+ name: 'renewalInsurance',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ id: null
+ },
+ tableData: []
+ }
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/company/src/utils/util.js b/company/src/utils/util.js
index 779f5a3..2cbb86d 100644
--- a/company/src/utils/util.js
+++ b/company/src/utils/util.js
@@ -75,3 +75,24 @@
let day = currentDate.getDate(); // 鑾峰彇褰撳墠鏃ユ湡
return `${year}-${month}-${day}`
}
+
+// 瀵规瘮鏃ユ湡
+export function compareDates(date1, date2) {
+ if (new Date(date1).getTime() > new Date(date2).getTime()) {
+ return 1
+ } else if (new Date(date1).getTime() < new Date(date2).getTime()) {
+ return 2
+ } else {
+ return 3
+ }
+}
+
+// 鑾峰彇鏄庡ぉ鐨勬棩鏈�
+export function getTomorrow() {
+ var today = new Date();
+ today.setDate(today.getDate() + 1);
+ var year = today.getFullYear();
+ var month = today.getMonth() + 1;
+ var day = today.getDate();
+ return year + "-" + month + "-" + day;
+}
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index 6780e93..3c3421d 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -5,8 +5,8 @@
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="寰呯缃�" value="1"></el-option>
- <el-option label="寰呭鏍�" value="0"></el-option>
+ <el-option label="寰呯缃�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
@@ -64,8 +64,8 @@
</el-table-column>
<el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'change-status'+row.status" v-if="row.status === 1">寰呯缃�</span>
- <span :class="'change-status'+row.status" v-if="row.status === 0">寰呭鏍�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
+ <span :class="'change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index de3094c..d8064f9 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -5,8 +5,8 @@
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
<el-option label="鍏ㄩ儴" value=""></el-option>
- <el-option label="寰呯缃�" value="1"></el-option>
- <el-option label="寰呭鏍�" value="0"></el-option>
+ <el-option label="寰呯缃�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
@@ -64,8 +64,8 @@
</el-table-column>
<el-table-column prop="status" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'change-status'+ row.status" v-if="row.status === 1">寰呯缃�</span>
- <span :class="'change-status'+ row.status" v-if="row.status === 0">寰呭鏍�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status === 0">寰呯缃�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'change-status'+ row.status" v-if="row.status === 2">宸茬敓鏁�</span>
<span :class="'change-status'+ row.status" v-if="row.status === 3 || row.status === 4">閫�鍥炵敵璇�</span>
<span :class="'change-status'+ row.status" v-if="row.status ===5 || row.status === 8">宸查��鍥�</span>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 4b875c3..87c499e 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -56,6 +56,18 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+ <div style="margin-bottom: 30px;" v-if="obj.waitSignNum > 0 && obj.renewalNum > 0">
+ <el-alert type="warning" show-icon :closable="false" style="margin-bottom: 15px;" v-if="obj.renewalNum > 0">
+ <span style="margin-right: 15px;">缁繚鎻愰啋: 鎮ㄦ湁鍗冲皢鍒版湡淇濋櫓</span>
+ <el-button type="text" @click="$refs.renewalInsurance.open('缁繚鎻愰啋')">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="closeRemind(1)">鍏抽棴鎻愰啋</el-button>
+ </el-alert>
+ <el-alert type="warning" :closable="false" show-icon v-if="obj.waitSignNum > 0">
+ <span style="margin-right: 15px;">鎶曚繚鎻愰啋: 鎮ㄦ湁鎶曚繚鐢宠寰呯缃�</span>
+ <el-button type="text" @click="see">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" @click="closeRemind(2)">鍏抽棴鎻愰啋</el-button>
+ </el-alert>
+ </div>
<ul class="toolbar" v-permissions="['business:dispatchunit:create']">
<li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('鎶曚繚鐢宠')">鎶曚繚鐢宠</el-button></li>
</ul>
@@ -114,6 +126,8 @@
<OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" @success="handlePageChange" />
<!-- 鍔犲噺淇濈敵璇� -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="handlePageChange" />
+ <!-- 缁繚寮圭獥 -->
+ <renewalInsurance ref="renewalInsurance" @success="handlePageChange" />
</TableLayout>
</template>
@@ -124,12 +138,21 @@
import OperaInsuranceApplyWindow from '@/components/enterprise/OperaInsuranceApplyWindow'
import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
+ import renewalInsurance from '@/components/enterprise/renewalInsurance'
import { all as solutionAll} from '@/api/business/solutions'
+ import { getCaptcha, closeApplyNotice } from '@/api/business/notices'
export default {
name: 'myPolicy',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaInsuranceApplyWindow, OperaInsuranceApplyDetails, additionSubtractionApplication },
+ components: {
+ TableLayout,
+ Pagination,
+ OperaInsuranceApplyWindow,
+ OperaInsuranceApplyDetails,
+ renewalInsurance,
+ additionSubtractionApplication
+ },
data () {
return {
// 鎼滅储
@@ -141,6 +164,10 @@
startTimeS: '',
baseSolutionId: '',
statusCollect: '2'
+ },
+ obj: {
+ renewalNum: 0,
+ waitSignNum: 0
},
time1: [],
time2: [],
@@ -156,8 +183,34 @@
})
this.search()
this.loadSelectList()
+ this.getNum()
},
methods:{
+ see() {
+ this.searchForm.statusCollect = '7'
+ this.search()
+ },
+ closeRemind(type) {
+ this.$confirm('纭畾鍏抽棴姝ゆ彁绀哄悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ closeApplyNotice(type)
+ .then(res => {
+ this.getNum()
+ })
+ }).catch(() => {
+
+ });
+ },
+ getNum() {
+ getCaptcha()
+ .then(res => {
+ this.obj.renewalNum = res.renewalNum
+ this.obj.waitSignNum = res.waitSignNum
+ })
+ },
reset() {
this.time1 = []
this.time2 = []
--
Gitblit v1.9.3