From 3e72240f9926463bba8d2d5cbec743dbcdcf9bd3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 07 四月 2024 16:00:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OperaSolutionsDescWindow.vue | 13
company/src/components/enterprise/addEmployee.vue | 7
company/src/views/business/switchCourtShop.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 4
company/src/views/indexShop.vue | 40 +-
company/src/views/business/applyChangeShop.vue | 2
company/src/views/business/unionChangeUnit.vue | 2
company/src/views/business/policyList.vue | 4
company/src/views/business/unionChange.vue | 2
company/src/components/business/OperaShopDescWindow.vue | 18
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 7
server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java | 4
company/src/components/business/OperaCompanyWindow.vue | 2
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 4
company/src/views/business/switchCourt.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java | 1
company/src/components/business/OperaCompanyDescWindow.vue | 22
company/src/components/enterprise/additionSubtractionApplication.vue | 826 +++++++++++++++++++++---------------------
company/src/components/business/modification.vue | 35 +
company/src/views/business/applyChange.vue | 2
company/src/components/business/OperaSolutionsWindow.vue | 27 +
company/src/views/business/insuranceApplyShop.vue | 2
company/src/views/business/insuranceApply.vue | 4
company/src/components/business/OperaApplyChangeDetailWindow.vue | 8
company/src/components/business/OperaShopWindow.vue | 64 +++
company/src/views/index.vue | 21
company/src/components/business/ApplyChangeDetails.vue | 1
company/src/views/enterprise/insuranceApply.vue | 2
28 files changed, 631 insertions(+), 497 deletions(-)
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index 1587990..5ac1140 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -171,7 +171,6 @@
var addModel = addDetailList.length > i?addDetailList[i]:{}
var delModel = delDetailList.length > i?delDetailList[i]:{}
that.detailList.push({add:addModel,del:delModel});
- console.log(detailList)
}
}).catch(err => {})
},
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index a4c4046..6c5a3b1 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -31,7 +31,7 @@
<el-button v-if="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-if="2">
+ <template v-if="userInfo.type ===2">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
@@ -40,16 +40,16 @@
<el-button v-if=" model.solutionType == 1 && [7].includes(model.status)" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
- <template v-if="0">
+ <template v-if="userInfo.type ===0">
<el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
<el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
</div>
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 079d084..fa89976 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -40,7 +40,7 @@
<el-button v-if=" model.solutionType == 1 && [7].includes(model.status)" type="danger" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
<template v-if="userInfo.type === 0">
@@ -49,7 +49,7 @@
<el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">鏌ョ湅鎵瑰崟</el-button>
<el-button v-if=" model.solutionType == 0 && [1].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('涓婁紶鎵瑰崟',model,3)">涓婁紶鎵瑰崟</el-button>
<el-button v-if="model.solutionType == 0 &&[3,4].includes(model.status)" type="primary" @click="$refs.OperaApplyChangeCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.solutionType == 0 &&[0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.solutionType == 0 &&[0,1,3,4].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
<el-button v-if="model.solutionType == 0 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
</template>
</div>
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index 8eba06f..b10e676 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -28,6 +28,10 @@
<div class="info_list_item_label">鍏徃璐﹀彿锛�</div>
<div class="info_list_item_val">{{form.username || '-'}}</div>
</div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">娉曚汉濮撳悕锛�</div>
+ <div class="info_list_item_val">{{form.legalName || '-'}}</div>
+ </div>
<div class="info_list_item">
<div class="info_list_item_label">缁戝畾鎵嬫満鍙凤細</div>
<div class="info_list_item_val">
@@ -112,8 +116,8 @@
<div class="info_list_item">
<div class="info_list_item_label" style="width: 100px;">娉曚汉韬唤璇侊細</div>
<div class="info_list_item_val">
- <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>1 && form.idcardImgList[0].fileurlFull">
- <el-image
+ <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>0 && form.idcardImgList[0].fileurlFull">
+ <el-image
append-to-body
v-if="form.idcardImgList[0].fileurlFull"
style="width: 90px; height: 90px"
@@ -121,8 +125,8 @@
:preview-src-list="[form.idcardImgList[0].fileurlFull]">
</el-image>
</div>
- <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>2 && form.idcardImgList[1].fileurlFull">
- <el-image
+ <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>1 && form.idcardImgList[1].fileurlFull">
+ <el-image
append-to-body
v-if="form.idcardImgList[1].fileurlFull"
style="width: 90px; height: 90px"
@@ -249,6 +253,8 @@
this.code = ''
clearInterval(this.timer)
this.num = 0
+ }) .catch(e => {
+ this.$tip.apiFailed(e)
})
},
send () {
@@ -260,7 +266,9 @@
.then(res => {
this.num = 60
this.setTime()
- })
+ }) .catch(e => {
+ this.$tip.apiFailed(e)
+ })
},
setTime () {
this.timer = setInterval(() => {
@@ -308,11 +316,11 @@
this.form.file.imgurl = res.businessImg.fileurl
this.form.file.imgurlfull = res.businessImg.fileurlFull
}
- if (res.idcardImgList&& res.idcardImgList.length>1) {
+ if (res.idcardImgList&& res.idcardImgList.length>0) {
this.form.file1.imgurl = res.idcardImgList[0].fileurl
this.form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
}
- if (res.idcardImgList && res.idcardImgList.length>2) {
+ if (res.idcardImgList && res.idcardImgList.length>1) {
this.form.file2.imgurl = res.idcardImgList[1].fileurl
this.form.file2.imgurlfull = res.idcardImgList[1].fileurlFull
}
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index f5e35b1..00aa20c 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -100,7 +100,7 @@
align="center"
label="濮旀墭鍟嗘埛">
<template slot-scope="scope">
- <el-select v-model="scope.row.shopId" clearable="true" value-key="id" placeholder="璇烽�夋嫨" >
+ <el-select v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨" >
<el-option
v-for="item in shops"
:key="item.id"
diff --git a/company/src/components/business/OperaShopDescWindow.vue b/company/src/components/business/OperaShopDescWindow.vue
index 3bd45eb..cfebc75 100644
--- a/company/src/components/business/OperaShopDescWindow.vue
+++ b/company/src/components/business/OperaShopDescWindow.vue
@@ -38,7 +38,11 @@
<div class="info_list_item_label">璁よ瘉閭锛�</div>
<div class="info_list_item_val">{{form.email || '-'}}</div>
</div>
- <div class="info_list_item">
+ <div class="info_list_item">
+ <div class="info_list_item_label">娉曚汉濮撳悕锛�</div>
+ <div class="info_list_item_val">{{form.legalName || '-'}}</div>
+ </div>
+<!-- <div class="info_list_item">
<div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
<div class="info_list_item_val">{{form.taxCode || '-'}}</div>
</div>
@@ -61,7 +65,7 @@
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">绾歌川鍙戠エ鎺ユ敹鍦板潃锛�</div>
<div class="info_list_item_val">{{form.invoiceAddr || '-'}}</div>
- </div>
+ </div>-->
</div>
<div class="info_list" v-if="JSON.stringify(form) !== '{}'">
<div class="info_list_item">
@@ -78,9 +82,9 @@
</div>
</div>
<div class="info_list_item">
- <div class="info_list_item_label" style="width: 100px;">娉曚汉韬唤璇侊細</div>
+ <div class="info_list_item_label" style="width: 100px;">娉曚汉韬唤璇� 锛�</div>
<div class="info_list_item_val">
- <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>1 && form.idcardImgList[0].fileurlFull">
+ <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>0 && form.idcardImgList[0].fileurlFull">
<el-image
append-to-body
v-if="form.idcardImgList[0].fileurlFull"
@@ -89,7 +93,7 @@
:preview-src-list="[form.idcardImgList[0].fileurlFull]">
</el-image>
</div>
- <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>2 && form.idcardImgList[1].fileurlFull">
+ <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>1 && form.idcardImgList[1].fileurlFull">
<el-image
append-to-body
v-if="form.idcardImgList[1].fileurlFull"
@@ -261,11 +265,11 @@
this.form.file.imgurl = res.businessImg.fileurl
this.form.file.imgurlfull = res.businessImg.fileurlFull
}
- if (res.idcardImgList&& res.idcardImgList.length>1) {
+ if (res.idcardImgList&& res.idcardImgList.length>0) {
this.form.file1.imgurl = res.idcardImgList[0].fileurl
this.form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
}
- if (res.idcardImgList && res.idcardImgList.length>2) {
+ if (res.idcardImgList && res.idcardImgList.length>1) {
this.form.file2.imgurl = res.idcardImgList[1].fileurl
this.form.file2.imgurlfull = res.idcardImgList[1].fileurlFull
}
diff --git a/company/src/components/business/OperaShopWindow.vue b/company/src/components/business/OperaShopWindow.vue
index e90e15b..a87c7d5 100644
--- a/company/src/components/business/OperaShopWindow.vue
+++ b/company/src/components/business/OperaShopWindow.vue
@@ -32,7 +32,7 @@
<el-form-item label="璁よ瘉閭" prop="email" >
<el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
- <el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="taxCode">
+<!-- <el-form-item label="绾崇◣浜鸿瘑鍒彿" prop="taxCode">
<el-input v-model="form.taxCode" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="閾惰璐﹀彿" prop="taxAccount">
@@ -49,7 +49,7 @@
</el-form-item>
<el-form-item label="绾歌川鍙戠エ鎺ユ敹鍦板潃" prop="invoiceAddr">
<el-input v-model="form.invoiceAddr" placeholder="璇疯緭鍏�" v-trim/>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="钀ヤ笟鎵х収" prop="businessImg">
<div style="width: 100%; height: 100px; display: flex; align-items: center;">
<UploadAvatarImage :uploadData="{ folder: 'company' }" :file="form.file" @uploadSuccess="result" />
@@ -107,7 +107,7 @@
fileurl: '',
name: ''
},
- idcardImgList: [],
+ idcardImgList: [{},{}],
signImg: {
fileurl: '',
name: ''
@@ -256,12 +256,14 @@
open (title, target, type) {
this.title = title
this.visible = true
- this.form = this.initParam
+ this.clearFrom()
+ console.log(this.form)
+
this.getAll()
// 鏂板缓
if (target == null) {
this.$nextTick(() => {
- this.$refs.form.resetFields()
+ // this.$refs.form.resetFields()
this.form[this.configData['field.id']] = null
})
return
@@ -273,6 +275,58 @@
}
})
},
+ clearFrom(){
+ this.form ={
+ id: null,
+ name: '',
+ code: '',
+ legalName: '',
+ taxCode: '',
+ taxAccount: '',
+ username: '',
+ taxBank: '',
+ taxAddr: '',
+ invoiceEmail: '',
+ invoiceAddr: '',
+ phone: '',
+ email: '',
+ type: 1,
+ actionType: 0,
+ captche: '',
+ businessImg: {
+ fileurl: '',
+ name: ''
+ },
+ idcardImgList: [{},{}],
+ signImg: {
+ fileurl: '',
+ name: ''
+ },
+ solutionList: [
+ {
+ solution: null,
+ canAdd: 0,
+ canReduce: 0
+ }
+ ],
+ file: {
+ imgurl: '',
+ imgurlfull: ''
+ },
+ file1: {
+ imgurl: '',
+ imgurlfull: ''
+ },
+ file2: {
+ imgurl: '',
+ imgurlfull: ''
+ },
+ file3: {
+ imgurl: '',
+ imgurlfull: ''
+ }
+ }
+ },
// 鑾峰彇鍏ㄩ儴鏂规
getAll () {
all({})
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index b6d2413..8404f01 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="50%"
+ width="70%"
text="淇敼"
:withFooter="userInfo.type !== 1"
:visible.sync="visible"
@@ -64,6 +64,10 @@
<div class="info_list_item_label">鎺ユ敹鏂囦欢閭锛�</div>
<div class="info_list_item_val">{{form.email}}</div>
</div>
+ <div class="info_list_item" style="width: 100%" v-if="form.type==1">
+ <div class="info_list_item_label">鏂规纭涔︼細</div>
+ <div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="鐐瑰嚮鏌ョ湅" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '鐐瑰嚮鏌ョ湅' }}</a></div>
+ </div>
</div>
<el-table
:data="form.worktypeList"
@@ -165,11 +169,13 @@
specialAgreement: '',
specialInfo: '',
ortherInfo: '',
+ fanganFile:null,
insuranceName: '',
signKeyword: '',
worktypeList: [],
worktypeIdList: []
}
+
this.$nextTick(() => {
for (const key in this.form) {
this.form[key] = target[key]
@@ -177,6 +183,11 @@
this.getDetails()
})
},
+ openFile (url) {
+ setTimeout(() => {
+ window.open(url)
+ }, 500)
+ },
getDetails() {
solutionsId(this.form.id)
.then(res => {
diff --git a/company/src/components/business/OperaSolutionsWindow.vue b/company/src/components/business/OperaSolutionsWindow.vue
index c48dbfe..61d2a8d 100644
--- a/company/src/components/business/OperaSolutionsWindow.vue
+++ b/company/src/components/business/OperaSolutionsWindow.vue
@@ -80,12 +80,12 @@
</div>
</el-form-item>
<el-form-item label="鎶曚繚绫诲瀷" prop="type">
- <el-radio-group v-model="form.type">
- <el-radio :label="0">鐩翠繚</el-radio>
+ <el-radio-group v-model="form.type" :disabled="form.id!=null">
+ <el-radio :label="0" >鐩翠繚</el-radio>
<el-radio :label="1">濮旀墭鎶曚繚</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="濮旀墭鍟嗘埛" prop="shopId" v-if="form.type =='1'">
+ <el-form-item label="濮旀墭鍟嗘埛" prop="shopId" v-if="form.type =='1'" :rules="form.type===1?[{required:true,message:'璇烽�夋嫨鍟嗘埛'}]:[{required:false}]">
<el-select v-model="form.shopId" placeholder="璇烽�夋嫨濮旀墭鍟嗘埛">
<el-option
v-for="item in shops"
@@ -95,8 +95,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="涓婁紶鏂规纭涔︼細" prop="fanganFile" v-if="form.type =='1'">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editFanganFile" />
+ <el-form-item label="涓婁紶鏂规纭涔︼細" prop="fanganFile" v-if="form.type =='1'" :rules="form.type===1?[{required:true,message:'璇蜂笂浼犳柟妗堢‘璁や功'}]:[{required:false}]">
+ <UploadFile @remove="deleFile" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editFanganFile" />
</el-form-item>
<el-form-item label="鎺ユ敹鏂囦欢閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏�" v-trim/>
@@ -258,6 +258,10 @@
if (!valid) {
return
}
+ if(data.type===1 && (!data.fanganFile || !data.fanganFile.fileurl)){
+ this.$message.error('璇蜂笂浼犳柟妗堢‘璁や功锛�')
+ return;
+ }
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
if (data.id == null || data.id === '') {
@@ -289,13 +293,16 @@
}
})
},
+ deleFile(){
+ this.form.fanganFile={}
+ },
open (title, target) {
this.title = title
+ this.visible = true
this.form.maxAge = ''
this.form.timeUnit = ''
this.form.insureCycleUnit = ''
this.form.validTypeNum = ''
- this.visible = true
this.form.fanganFile=null
this.form.fileList1= new Array();
this.form.worktypeIdList = [{ worktypeId: '' }]
@@ -306,6 +313,13 @@
if (target == null) {
this.$nextTick(() => {
this.$refs.form.resetFields()
+ this.form.maxAge = ''
+ this.form.timeUnit = ''
+ this.form.insureCycleUnit = ''
+ this.form.validTypeNum = ''
+ this.form.fanganFile=null
+ this.form.fileList1= new Array();
+ this.form.worktypeIdList = [{ worktypeId: '' }]
this.form[this.configData['field.id']] = null
})
return
@@ -338,6 +352,7 @@
this.typeWork = res
})
},
+
// 鏌ヨ鍏ㄩ儴淇濋櫓鍏徃
allCompany () {
all({ dataType: 2, status: 0 })
diff --git a/company/src/components/business/modification.vue b/company/src/components/business/modification.vue
index b0e28c8..7c2181f 100644
--- a/company/src/components/business/modification.vue
+++ b/company/src/components/business/modification.vue
@@ -7,7 +7,7 @@
@confirm="confirm"
>
<el-button type="primary" style="margin-bottom: 15px;" @click="add">娣诲姞</el-button>
- <el-table
+ <el-table v-if="form.solutionList && form.solutionList.length>0"
:data="form.solutionList"
border
style="width: 100%">
@@ -38,7 +38,7 @@
align="center"
label="濮旀墭鍟嗘埛">
<template slot-scope="scope">
- <el-select v-model="scope.row.shopId" clearable="true" value-key="id" placeholder="璇烽�夋嫨">
+ <el-select :ref="'shopSelect'+scope.$index" :disabled="scope.row.solution.type ==1" v-model="scope.row.shopId" clearable value-key="id" placeholder="璇烽�夋嫨">
<el-option
v-for="item in shops"
:key="item.id"
@@ -52,8 +52,8 @@
align="center"
label="鍔犲噺淇濆姛鑳�">
<template slot-scope="{row}">
- <el-checkbox :true-label="1" :false-label="0" v-model="row.canAdd">鍔犱繚</el-checkbox>
- <el-checkbox :true-label="1" :false-label="0" v-model="row.canReduce">鍑忎繚</el-checkbox>
+ <el-checkbox :true-label="1" :false-label="0" disabled v-model="row.canAdd">鍔犱繚</el-checkbox>
+ <el-checkbox :true-label="1" :false-label="0" disabled v-model="row.canReduce">鍑忎繚</el-checkbox>
</template>
</el-table-column>
<el-table-column
@@ -86,8 +86,9 @@
id: null,
solutionList: [
{
- solution: { id: null, baseId: null },
+ solution: { id: null, baseId: null,type:0 },
canAdd: 0,
+ shopId:null,
canReduce: 0
}
]
@@ -114,8 +115,13 @@
this.programme.forEach(item => {
if (item.id === e) {
baseId = item.baseId
+ this.form.solutionList[index].solution.type = item.type
+ if(item.type == 1){
+ this.form.solutionList[index].shopId =item.shopId
+ }
}
})
+
this.form.solutionList[index].solution.baseId = baseId
},
confirm () {
@@ -152,17 +158,18 @@
this.form[key] = target[key]
}
this.getAll()
+ this.form.solutionList=[]
listForCompany({ companyId: target.id })
.then(resa => {
- that.form.solutionList = resa.map(item => {
- return {
- solution: { id: item.solutionId, baseId: item.solutionBaseId },
+ resa.forEach(item => {
+ this.form.solutionList.push({
+ solution: { id: item.solutionId, baseId: item.solutionBaseId,type:item.solutionType },
shopId: item.shopId,
- canAdd: item.canAdd,
- canReduce: item.canReduce
- }
+ canAdd: 1,
+ canReduce: 1
+ })
})
- console.log(that.form.solutionList)
+ console.log(this.form.solutionList)
that.visible = true
})
},
@@ -170,8 +177,8 @@
this.form.solutionList.push({
solution: { id: null, baseId: null },
shopId: null,
- canAdd: '',
- canReduce: ''
+ canAdd: 1,
+ canReduce: 1
})
},
dele (index) {
diff --git a/company/src/components/enterprise/addEmployee.vue b/company/src/components/enterprise/addEmployee.vue
index e2039e2..766ec42 100644
--- a/company/src/components/enterprise/addEmployee.vue
+++ b/company/src/components/enterprise/addEmployee.vue
@@ -32,6 +32,7 @@
components: { GlobalWindow },
data () {
return {
+ tempIndex : -1,
list: [
{
memberName: '',
@@ -48,9 +49,10 @@
}
},
methods: {
- open (title, obj) {
+ open (title, obj,tempIndex) {
this.title = title
this.visible = true
+ this.tempIndex = tempIndex
this.list = [
{
memberName: '',
@@ -73,7 +75,8 @@
worktypeId: '',
duName: '',
duId: '',
- fee: ''
+ fee: '',
+ id:this.tempIndex - 1
})
},
dele(index) {
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index d241b4e..873b72a 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -177,417 +177,423 @@
</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 ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
- import { all } from '@/api/business/solutions'
- import { getDetail } from '@/api/business/insuranceApply'
- import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
- import { getDate, compareDates, getTomorrow } from '@/utils/util'
- import { mapState } from 'vuex'
- export default {
- name: 'additionSubtractionApplication',
- extends: BaseOpera,
- components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
- data () {
- return {
- form: {
- id: null,
- solutionId: '',
- solutionsName: '',
- applyStartTime: '',
- applyEndTime: '',
- addDetailList: [],
- delDetailList: [],
- },
- activeName: '0',
- pickerOptions: {},
- price: '',
- endTime: '', // 瀹為檯淇濋櫓鐢熸晥姝㈡湡
- company: [],
- seleData: [],
- item: null,
- // 楠岃瘉瑙勫垯
- rules: {
- applyStartTime: [
- { required: true, message: '璇烽�夋嫨鎵瑰崟鐢熸晥璧锋湡' }
- ]
- },
- list: []
- }
- },
- computed: {
- ...mapState(['userInfo'])
- },
- created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
- },
- methods: {
- open (title, target) {
- this.title = title
- this.form.addDetailList = []
- this.form.delDetailList = []
- this.list = []
- this.form.id = null
- this.item = null
- this.form.solutionId = ''
- this.form.solutionsName = ''
- 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()
- },
- changeApplyStartTime(e) {
- getChangeCountCyclePriceVO({
- applyId: this.form.id,
- validTime: e
- }).then(res => {
- this.price = res.cyclePrice
- this.form.addDetailList.forEach(item => {
- item.fee = res.cyclePrice
- })
- this.form.delDetailList.forEach(item => {
- item.fee = res.cyclePrice
- })
- })
- },
- handleClick(e) {
- this.activeName = e.index
- },
- // 鑾峰彇鎶曚繚璇︽儏
- getDetails() {
- // findList({ applyId: this.form.id })
- // .then(res => {
- // res.forEach(item => {
- // item.idCard = item.idcardNo
- // item.fee = ''
- // })
- // this.tableData = res
- // })
- getDetail(this.form.id)
- .then(res => {
- this.list.push(res)
- this.item = res
- this.endTime = res.endTime
- this.form.solutionId = res.solutionId
- 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()
- }
- }
- }
- };
- // this.changeSolution1(res.solutionId)
- })
- },
- getSummaries(param) {
- const { columns, data } = param
- const sums = []
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鎬讳环'
- return
- } else if (index === 7) {
- let total = 0
- if (this.activeName === '0') {
- this.form.addDetailList.forEach(item => {
- total += item.fee
- })
- sums[index] = total
- return
- } else {
- this.form.delDetailList.forEach(item => {
- total += item.fee
- })
- sums[index] = '-' + total
- return
- }
- }
- })
- return sums
- },
- deleItem() {
- if (this.seleData.length === 0) {
- this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
- return
- }
- if (this.activeName === '0') {
- this.seleData.forEach(item => {
- this.form.addDetailList.forEach((row, index) => {
- if (item === row.name) {
- this.form.addDetailList.splice(index, 1)
- }
- })
- })
- } else {
- this.seleData.forEach(item => {
- this.form.delDetailList.forEach((row, index) => {
- if (item === row.name) {
- this.form.delDetailList.splice(index, 1)
- }
- })
- })
- }
- },
- success() {
- this.form.addDetailList.forEach(item => {
- item.idcardNo = item.idCard
- })
- this.form.delDetailList.forEach(item => {
- item.idcardNo = item.idCard
- })
- // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
- // arr.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- this.isWorking = true
- create({
- applyId: this.form.id,
- addDetailList: this.form.addDetailList,
- delDetailList: this.form.delDetailList,
- validTime: this.form.applyStartTime,
- type: 0
- }).then(() => {
- this.visible = false
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- this.$emit('success')
- }).catch(e => {
- this.$tip.apiFailed(e)
- }).finally(() => {
- this.isWorking = false
- })
- },
- confirm() {
- this.$refs.form.validate((valid) => {
- if (valid) {
- // if (this.form.addDetailList.length === 0) {
- // this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
- // return
- // }
- for (let i = 0; i < this.form.addDetailList.length; i++) {
- if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
- this.$message.warning('璇峰畬鍠勫姞淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
- }
- }
- for (let i = 0; i < this.form.delDetailList.length; i++) {
- if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
- this.$message.warning('璇峰畬鍠勫噺淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
- }
- }
-
- this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
- companyName: this.userInfo.company.name,
- solutionsName: this.form.solutionsName,
- code: this.list[0].code,
- startTime: this.list[0].startTime,
- endTime: this.list[0].endTime,
- applyStartTime: this.form.applyStartTime
- })
-
- // return
-
- // this.form.addDetailList.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // this.form.delDetailList.forEach(item => {
- // item.idcardNo = item.idCard
- // })
- // // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
- // // arr.forEach(item => {
- // // item.idcardNo = item.idCard
- // // })
- // this.isWorking = true
- // create({
- // applyId: this.form.id,
- // addDetailList: this.form.addDetailList,
- // delDetailList: this.form.delDetailList,
- // validTime: this.form.applyStartTime,
- // type: 0
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // }).catch(e => {
- // this.$tip.apiFailed(e)
- // }).finally(() => {
- // this.isWorking = false
- // })
- }
- })
- },
- seleUser() {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- if (!this.form.applyStartTime) {
- this.$message.warning('璇峰厛閫夋嫨鎵瑰崟鐢熸晥璧锋湡')
- return
- }
- if (this.activeName === '0') {
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
- } else {
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
- }
- },
- addUser() {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- if (this.activeName === '0') {
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.addDetailList, price: this.price })
- } else {
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.delDetailList, price: this.price })
- }
- },
- uploadUser() {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- if (this.activeName === '0') {
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.addDetailList, price: this.price })
- } else {
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.delDetailList, price: this.price })
- }
- },
- // 鍒囨崲鏂规
- changeSolution1(e) {
- this.company.forEach(item => {
- console.log(item.id + '-----' + e)
- if (item.id === e) {
- console.log(item)
- this.item = item
- }
- })
- // this.tableData.forEach(item => {
- // item.fee = this.price
- // })
- },
- dele(index) {
- if (this.activeName === '0') {
- this.form.addDetailList.splice(index, 1)
- } else {
- this.form.delDetailList.splice(index, 1)
- }
- },
- getUser(obj) {
- this.seleData.forEach(item => {
- if (this.activeName === '0') {
- this.form.addDetailList.forEach(row => {
- if (item === row.name) {
- row.workTypeName = obj.workTypeName
- row.worktypeId = obj.worktypeId
- row.duName = obj.duName
- row.duId = obj.duId
- }
- })
- } else {
- this.form.delDetailList.forEach(row => {
- if (item === row.name) {
- 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.item.newVersionSolutionId })
- },
- // 鏌ヨ鍏ㄩ儴鏂规
- getCompany() {
- all({ dataType: 2 })
- .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.name)
- },
- getValue(list) {
- if (this.activeName === '0') {
- this.form.addDetailList.push(...list)
- } else {
- this.form.delDetailList.push(...list)
- }
- }
- }
+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 ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
+import { all } from '@/api/business/solutions'
+import { getDetail } from '@/api/business/insuranceApply'
+import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
+import { getDate, compareDates, getTomorrow } from '@/utils/util'
+import { mapState } from 'vuex'
+export default {
+ name: 'additionSubtractionApplication',
+ extends: BaseOpera,
+ components: { GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, ApplyChangeDetails1 },
+ data () {
+ return {
+ form: {
+ id: null,
+ solutionId: '',
+ solutionsName: '',
+ applyStartTime: '',
+ applyEndTime: '',
+ addDetailList: [],
+ delDetailList: []
+ },
+ tempMemberIndex: -1,
+ activeName: '0',
+ pickerOptions: {},
+ price: '',
+ endTime: '', // 瀹為檯淇濋櫓鐢熸晥姝㈡湡
+ company: [],
+ seleData: [],
+ item: null,
+ // 楠岃瘉瑙勫垯
+ rules: {
+ applyStartTime: [
+ { required: true, message: '璇烽�夋嫨鎵瑰崟鐢熸晥璧锋湡' }
+ ]
+ },
+ list: []
}
+ },
+ computed: {
+ ...mapState(['userInfo'])
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.form.addDetailList = []
+ this.form.delDetailList = []
+ this.list = []
+ this.form.id = null
+ this.item = null
+ this.tempMemberIndex = -1
+ this.form.solutionId = ''
+ this.form.solutionsName = ''
+ 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()
+ },
+ changeApplyStartTime (e) {
+ getChangeCountCyclePriceVO({
+ applyId: this.form.id,
+ validTime: e
+ }).then(res => {
+ this.price = res.cyclePrice
+ this.form.addDetailList.forEach(item => {
+ item.fee = res.cyclePrice
+ })
+ this.form.delDetailList.forEach(item => {
+ item.fee = res.cyclePrice
+ })
+ })
+ },
+ handleClick (e) {
+ this.activeName = e.index
+ },
+ // 鑾峰彇鎶曚繚璇︽儏
+ getDetails () {
+ // findList({ applyId: this.form.id })
+ // .then(res => {
+ // res.forEach(item => {
+ // item.idCard = item.idcardNo
+ // item.fee = ''
+ // })
+ // this.tableData = res
+ // })
+ getDetail(this.form.id)
+ .then(res => {
+ this.list.push(res)
+ this.item = res
+ this.endTime = res.endTime
+ this.form.solutionId = res.solutionId
+ 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()
+ }
+ }
+ }
+ }
+ // 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) {
+ let total = 0
+ if (this.activeName === '0') {
+ this.form.addDetailList.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = total
+ } else {
+ this.form.delDetailList.forEach(item => {
+ total += item.fee
+ })
+ sums[index] = '-' + total
+ }
+ }
+ })
+ return sums
+ },
+ deleItem () {
+ if (this.seleData.length === 0) {
+ this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
+ return
+ }
+ if (this.activeName === '0') {
+ this.seleData.forEach(item => {
+ this.form.addDetailList.forEach((row, index) => {
+ if (item === row.idCard) {
+ this.form.addDetailList.splice(index, 1)
+ }
+ })
+ })
+ } else {
+ this.seleData.forEach(item => {
+ this.form.delDetailList.forEach((row, index) => {
+ if (item === row.idCard) {
+ this.form.delDetailList.splice(index, 1)
+ }
+ })
+ })
+ }
+ },
+ success () {
+ this.form.addDetailList.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ this.form.delDetailList.forEach(item => {
+ item.idcardNo = item.idCard
+ })
+ // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
+ // arr.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ this.isWorking = true
+ create({
+ applyId: this.form.id,
+ addDetailList: this.form.addDetailList,
+ delDetailList: this.form.delDetailList,
+ validTime: this.form.applyStartTime,
+ type: 0
+ }).then(() => {
+ this.visible = false
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$emit('success')
+ }).catch(e => {
+ this.$tip.apiFailed(e)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ },
+ confirm () {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ // if (this.form.addDetailList.length === 0) {
+ // this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
+ // return
+ // }
+ for (let i = 0; i < this.form.addDetailList.length; i++) {
+ if (!this.form.addDetailList[i].worktypeId || !this.form.addDetailList[i].duId) {
+ this.$message.warning('璇峰畬鍠勫姞淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
+ return
+ }
+ }
+ for (let i = 0; i < this.form.delDetailList.length; i++) {
+ if (!this.form.delDetailList[i].worktypeId || !this.form.delDetailList[i].duId) {
+ this.$message.warning('璇峰畬鍠勫噺淇濇淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
+ return
+ }
+ }
+
+ this.$refs.ApplyChangeDetails1.open('鍔犲噺淇濊鍗�', this.form.addDetailList, this.form.delDetailList, {
+ companyName: this.userInfo.company.name,
+ solutionsName: this.form.solutionsName,
+ code: this.list[0].code,
+ startTime: this.list[0].startTime,
+ endTime: this.list[0].endTime,
+ applyStartTime: this.form.applyStartTime
+ })
+
+ // return
+
+ // this.form.addDetailList.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ // this.form.delDetailList.forEach(item => {
+ // item.idcardNo = item.idCard
+ // })
+ // // let arr = JSON.parse(JSON.stringify(this.form.addDetailList))
+ // // arr.forEach(item => {
+ // // item.idcardNo = item.idCard
+ // // })
+ // this.isWorking = true
+ // create({
+ // applyId: this.form.id,
+ // addDetailList: this.form.addDetailList,
+ // delDetailList: this.form.delDetailList,
+ // validTime: this.form.applyStartTime,
+ // type: 0
+ // }).then(() => {
+ // this.visible = false
+ // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ // this.$emit('success')
+ // }).catch(e => {
+ // this.$tip.apiFailed(e)
+ // }).finally(() => {
+ // this.isWorking = false
+ // })
+ }
+ })
+ },
+ seleUser () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+ return
+ }
+ if (!this.form.applyStartTime) {
+ this.$message.warning('璇峰厛閫夋嫨鎵瑰崟鐢熸晥璧锋湡')
+ return
+ }
+ if (this.activeName === '0') {
+ this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
+ } else {
+ this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.form.delDetailList, price: this.price, insuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
+ }
+ },
+ addUser () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+ return
+ }
+ if (this.activeName === '0') {
+ this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.addDetailList, price: this.price })
+ } else {
+ this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.form.delDetailList, price: this.price })
+ }
+ },
+ uploadUser () {
+ if (!this.form.solutionId) {
+ this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
+ return
+ }
+ if (this.activeName === '0') {
+ this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.addDetailList, price: this.price, solutionId: this.form.solutionId })
+ } else {
+ this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.form.delDetailList, price: this.price, solutionId: this.form.solutionId })
+ }
+ },
+ // 鍒囨崲鏂规
+ changeSolution1 (e) {
+ this.company.forEach(item => {
+ console.log(item.id + '-----' + e)
+ if (item.id === e) {
+ console.log(item)
+ this.item = item
+ }
+ })
+ // this.tableData.forEach(item => {
+ // item.fee = this.price
+ // })
+ },
+ dele (index) {
+ if (this.activeName === '0') {
+ this.form.addDetailList.splice(index, 1)
+ } else {
+ this.form.delDetailList.splice(index, 1)
+ }
+ },
+ getUser (obj) {
+ console.log(this.seleData)
+ this.seleData.forEach(item => {
+ if (this.activeName === '0') {
+ this.form.addDetailList.forEach(row => {
+ if (item === row.idCard) {
+ row.workTypeName = obj.workTypeName
+ row.worktypeId = obj.worktypeId
+ row.duName = obj.duName
+ row.duId = obj.duId
+ }
+ })
+ } else {
+ this.form.delDetailList.forEach(row => {
+ if (item === 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.item.newVersionSolutionId })
+ },
+ // 鏌ヨ鍏ㄩ儴鏂规
+ getCompany () {
+ all({ dataType: 2 })
+ .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) {
+ list.forEach(item => {
+ const temIndex = this.tempMemberIndex
+ item.id = temIndex
+ item.name = item.memberName
+ this.tempMemberIndex = this.tempMemberIndex - 1
+ })
+ if (this.activeName === '0') {
+ this.form.addDetailList.push(...list)
+ } else {
+ this.form.delDetailList.push(...list)
+ }
+ }
+ }
+}
</script>
<style lang="scss" scoped>
diff --git a/company/src/views/business/applyChange.vue b/company/src/views/business/applyChange.vue
index e2c15b5..e0944db 100644
--- a/company/src/views/business/applyChange.vue
+++ b/company/src/views/business/applyChange.vue
@@ -142,7 +142,7 @@
},
methods: {
loadSelectList() {
- solutionAll({dataType:2}).then(res => {
+ solutionAll({dataType:2,type:0}).then(res => {
this.solutionList = res
}).catch(err => {
})
diff --git a/company/src/views/business/applyChangeShop.vue b/company/src/views/business/applyChangeShop.vue
index fe7a7b9..1326fa1 100644
--- a/company/src/views/business/applyChangeShop.vue
+++ b/company/src/views/business/applyChangeShop.vue
@@ -8,7 +8,7 @@
<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>
+<!-- <el-option label="鐢宠閫�鍥�" value="3"></el-option>-->
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
<el-option label="寰呭嚭鍗�" value="7"></el-option>
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 43fd2b6..4eb4b0d 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -62,7 +62,7 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" label="鎶曚繚鐘舵��" min-width="100px">
+ <el-table-column prop="statusInfo" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
</template>
@@ -154,7 +154,7 @@
// this.search()
// },
loadSelectList() {
- solutionAll({dataType:2}).then(res => {
+ solutionAll({dataType:2,type:0}).then(res => {
this.solutionList = res
}).catch(err => {
})
diff --git a/company/src/views/business/insuranceApplyShop.vue b/company/src/views/business/insuranceApplyShop.vue
index 2e681d8..851e516 100644
--- a/company/src/views/business/insuranceApplyShop.vue
+++ b/company/src/views/business/insuranceApplyShop.vue
@@ -61,7 +61,7 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" label="鎶曚繚鐘舵��" min-width="100px">
+ <el-table-column prop="statusInfo" label="淇濆崟鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span :class="'apply-status'+row.statusCollect" >{{row.statusInfo}}</span>
</template>
diff --git a/company/src/views/business/policyList.vue b/company/src/views/business/policyList.vue
index adf1410..3861eb1 100644
--- a/company/src/views/business/policyList.vue
+++ b/company/src/views/business/policyList.vue
@@ -65,7 +65,7 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" label="鎶曚繚鐘舵��" align="center" min-width="100px">
+ <el-table-column prop="statusInfo" label="淇濆崟鐘舵��" align="center" min-width="100px">
<template slot-scope="{row}">
<span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
</template>
@@ -144,7 +144,7 @@
// this.search()
// },
loadSelectList() {
- solutionAll({dataType:2}).then(res => {
+ solutionAll({dataType:2,type:0}).then(res => {
this.solutionList = res
}).catch(err => {
})
diff --git a/company/src/views/business/switchCourt.vue b/company/src/views/business/switchCourt.vue
index 4444418..0464686 100644
--- a/company/src/views/business/switchCourt.vue
+++ b/company/src/views/business/switchCourt.vue
@@ -140,7 +140,7 @@
},
methods: {
loadSelectList() {
- solutionAll({dataType:2}).then(res => {
+ solutionAll({dataType:2,type:0}).then(res => {
this.solutionList = res
}).catch(err => {
})
diff --git a/company/src/views/business/switchCourtShop.vue b/company/src/views/business/switchCourtShop.vue
index e662cef..081ca51 100644
--- a/company/src/views/business/switchCourtShop.vue
+++ b/company/src/views/business/switchCourtShop.vue
@@ -8,7 +8,7 @@
<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>
+<!-- <el-option label="鐢宠閫�鍥�" value="3"></el-option>-->
<el-option label="寰呭嚭鍗�" value="7"></el-option>
<el-option label="鎶曚繚涓�" value="9"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
diff --git a/company/src/views/business/unionChange.vue b/company/src/views/business/unionChange.vue
index e374171..5d2adfe 100644
--- a/company/src/views/business/unionChange.vue
+++ b/company/src/views/business/unionChange.vue
@@ -31,7 +31,7 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:unionchange:create']">
+ <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionchange:create']">
<li><el-button type="primary" @click="$refs.OpearaUnionChange.open('鍔犲噺淇濈敵璇�')" v-permissions="['business:unionchange:create']">鎻愪氦鐢宠</el-button></li>
</ul>
<el-table
diff --git a/company/src/views/business/unionChangeUnit.vue b/company/src/views/business/unionChangeUnit.vue
index b8894fd..24eb144 100644
--- a/company/src/views/business/unionChangeUnit.vue
+++ b/company/src/views/business/unionChangeUnit.vue
@@ -31,7 +31,7 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:unionchange:create']">
+ <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionchange:create']">
<li><el-button type="primary" @click="$refs.OpearaUnionChangeUnit.open('鏇存崲娲鹃仯鍗曚綅鐢宠')" v-permissions="['business:unionchange:create']">鎻愪氦鐢宠</el-button></li>
</ul>
<el-table
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index f5aadd4..f157646 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -12,7 +12,7 @@
<el-option label="宸查��鍥�" value="4"></el-option>
<el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
- <el-option label="鎶曚繚涓�" value="25"></el-option>
+ <el-option label="鎶曚繚涓�" value="26"></el-option>
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index e00d8da..48a58aa 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -31,7 +31,7 @@
</el-tab-pane>
</el-tabs>
<div v-if="activeName === '0'" v-permissions="['business:notice:insurance']" >
- <div class="home_content_right_list">
+ <div class="home_content_right_list" v-if="tableData0 && tableData0.length">
<div class="list_item" v-for="(item, index) in tableData0" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
@@ -46,6 +46,11 @@
</div>
</div>
</div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
<div class="home_content_right_page">
<el-pagination
@current-change="handleCurrentChange0"
@@ -57,7 +62,7 @@
</div>
</div>
<div v-if="activeName === '1'" v-permissions="['business:notice:tax']">
- <div class="home_content_right_list">
+ <div class="home_content_right_list" v-if="tableData1 && tableData1.length">
<div class="list_item" v-for="(item, index) in tableData1" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
@@ -72,6 +77,11 @@
</div>
</div>
</div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
<div class="home_content_right_page">
<el-pagination
@current-change="handleCurrentChange1"
@@ -83,7 +93,7 @@
</div>
</div>
<div v-if="activeName === '2'" v-permissions="['business:notice:settle']">
- <div class="home_content_right_list">
+ <div class="home_content_right_list" v-if="tableData2 && tableData2.length">
<div class="list_item" v-for="(item, index) in tableData2" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
@@ -98,6 +108,11 @@
</div>
</div>
</div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
<div class="home_content_right_page">
<el-pagination
@current-change="handleCurrentChange2"
diff --git a/company/src/views/indexShop.vue b/company/src/views/indexShop.vue
index 8c02270..7f44181 100644
--- a/company/src/views/indexShop.vue
+++ b/company/src/views/indexShop.vue
@@ -25,7 +25,7 @@
</el-tab-pane>
</el-tabs>
<div v-if="activeName === '0'" >
- <div class="home_content_right_list">
+ <div class="home_content_right_list" v-if="tableData0&&tableData0.length">
<div class="list_item" v-for="(item, index) in tableData0" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
@@ -40,6 +40,11 @@
</div>
</div>
</div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
+ </div>
+ </div>
<div class="home_content_right_page">
<el-pagination
@current-change="handleCurrentChange0"
@@ -51,8 +56,8 @@
</div>
</div>
<div v-if="activeName === '1'" >
- <div class="home_content_right_list">
- <div class="list_item" v-for="(item, index) in tableData1" :key="index">
+ <div class="home_content_right_list" v-if="tableData1&&tableData1.length">
+ <div class="list_item" v-for="(item, index) in tableData1" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
<span>{{item.info}}锛坽{item.content}}锛�</span>
@@ -64,6 +69,11 @@
<div class="list_item_right">
<span @click="detail(item)">鏌ョ湅</span>
</div>
+ </div>
+ </div>
+ <div class="home_content_right_list" v-else>
+ <div class="list_item" style="width: 100%;font-size: 12px;display:block;color: #8c939d;text-align: center; padding: 20px">
+ 鏆傛棤娑堟伅
</div>
</div>
<div class="home_content_right_page">
@@ -79,8 +89,7 @@
</div>
</div>
<OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handleCurrentChange0()"/>
- <dispatchUnitDetailsPlat ref="dispatchUnitDetailsPlat" @success="handleCurrentChange0()"/>
- <OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handleCurrentChange2()"/>
+ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handleCurrentChange0()"/>
<OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
<OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handleCurrentChange0()"/>
<OperaTaxesWindow ref="OperaTaxesWindow" @success="handleCurrentChange1()"/>
@@ -91,20 +100,16 @@
import * as echarts from 'echarts'
import { mapState } from 'vuex'
import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
-import dispatchUnitDetailsPlat from '@/components/business/dispatchUnitDetailsPlat'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
-import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
-import OperaTaxesWindow from '@/components/business/OperaTaxesWindow'
-import { fetchList as noticeList, deleById } from '@/api/business/notices'
+import { fetchList as noticeList } from '@/api/business/notices'
export default {
components: {
OperaInsuranceApplyWindow,
- dispatchUnitDetailsPlat,
- OperaTaxesWindow,
- OperaSettleClaimsWindow,
OperaApplyChangeDetailWindow,
- OperaApplyChangeUnitDetailWindow
+ OperaApplyChangeUnitDetailWindow,
+ OperaWtbApplyShopWindow
},
name: 'Index',
data () {
@@ -168,7 +173,7 @@
detail (obj) {
if(obj && obj.type === 7){
if (obj.objType === 0) {
- this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
+ this.$refs.OperaWtbApplyShopWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
} else if (obj.objType === 1) {
this.$refs.operaApplyChangeDetailWindow.open('鍔犲噺淇濊鎯�', { id: obj.objId, applyId: obj.param1 })
} else if (obj.objType === 2) {
@@ -206,16 +211,13 @@
sorts: []
})
.then(response => {
- if (type === 0) {
+ if (type === 3) {
this.tableData0 = response.records
this.totalPage0 = response.total
}
- if (type === 1) {
+ if (type === 4) {
this.tableData1 = response.records
this.totalPage1 = response.total
- } if (type === 2) {
- this.tableData2 = response.records
- this.totalPage2 = response.total
}
})
.catch(e => {
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
index 28ae473..173a079 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/CompanySolution.java
@@ -79,6 +79,10 @@
@ApiModelProperty(value = "鏂规鍚嶇О" )
@TableField(exist = false)
private String solutionName ;
+
+ @ApiModelProperty(value = "绫诲瀷 0鐩翠繚 1濮旀墭鎶曚繚", example = "1")
+ @TableField(exist = false)
+ private Integer solutionType;
@ApiModelProperty(value = "濮旀墭鍟嗘埛鍚嶇О" )
@TableField(exist = false)
private String shopName ;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
index 297395d..89015f3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanySolutionServiceImpl.java
@@ -88,6 +88,7 @@
public List<CompanySolution> findListForCompany(CompanySolution companySolution) {
MPJLambdaWrapper<CompanySolution> csWrapper = new MPJLambdaWrapper<>();
csWrapper.selectAll(CompanySolution.class);
+ csWrapper.selectAs(Solutions::getType,CompanySolution::getSolutionType);
csWrapper.selectAs(Solutions::getName,CompanySolution::getSolutionName);
csWrapper.selectAs(Company::getName,CompanySolution::getShopName);
csWrapper.leftJoin(Solutions.class,Solutions::getId,CompanySolution::getSolutionBaseId);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index fe9edfc..35976f2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1917,9 +1917,14 @@
queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
- if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
+ if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
+ //濡傛灉鏄凡閬庢湡
queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
+ }else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
+ //濡傛灉鏄繚闅滀腑
+ queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+ queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index 2b7c1ed..4228f5b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -156,7 +156,7 @@
// ||Constants.formatIntegerNum(solutions.getPriceCycleUnit()) < 0
||Constants.formatIntegerNum(solutions.getInsureCycle()) < 0
||Constants.formatIntegerNum(solutions.getInsureCycleUnit()) < 0
- || solutions.getMinAge() >solutions.getMaxAge()
+ ||Constants.formatIntegerNum( solutions.getMinAge()) >Constants.formatIntegerNum(solutions.getMaxAge())
|| Constants.formatBigdecimal(solutions.getPrice()).compareTo(new BigDecimal(0)) !=1
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -194,6 +194,7 @@
}
//鏁版嵁鏈夋晥鎬ф牎楠�
initCreateParam(solutions);
+ solutions.setType(null);//涓嶆敮鎸佷慨鏀规姇淇濇柟妗�
if(solutionsMapper.selectCount(new QueryWrapper<Solutions>().lambda()
.eq(Solutions::getName,solutions.getName())
.eq(Solutions::getIsdeleted,Constants.ZERO)
@@ -213,7 +214,6 @@
.eq(Solutions::getDataType,Constants.TWO)
.last("limit 1")
);
-
if(Objects.isNull(oldVersion)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍘嗗彶鐗堟湰鏁版嵁");
--
Gitblit v1.9.3