From f63e0073e96abe1e52d74749f408e3f542600a09 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 03 四月 2024 13:27:12 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 7
company/src/components/business/OperaWtbApplyShopWindow.vue | 16 +-
company/src/views/business/unionApply.vue | 2
company/src/views/business/switchCourtShop.vue | 4
company/src/views/business/applyChangeShop.vue | 1
company/src/components/business/OpearaUnionApply.vue | 30 ++-
company/src/components/business/OperaApplyChangeDetailWindow.vue | 12
server/service/src/main/java/com/doumee/core/utils/Constants.java | 4
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 4
company/src/assets/style/style.scss | 3
company/src/components/business/InsuranceDetails.vue | 3
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 326 +++++++++++++++++++++++++++++----------------
company/src/views/enterprise/switchCourt.vue | 4
13 files changed, 263 insertions(+), 153 deletions(-)
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index ab967af..2c1c279 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -74,6 +74,9 @@
::v-deep .el-table__fixed-right {
height: 100% !important;
}
+ .el-select-dropdown__item,.el-input--small {
+ font-size: 12px !important;
+}
::v-deep .el-table__cell {
height: 100% !important;
}
diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index 9cb2c76..52bb12c 100644
--- a/company/src/components/business/InsuranceDetails.vue
+++ b/company/src/components/business/InsuranceDetails.vue
@@ -86,6 +86,9 @@
<!-- <el-button type="danger" :loading="isWorking.export" @click="check(1)">瀹℃牳涓嶉�氳繃</el-button>-->
<el-button @click="visible=false">鍙栨秷</el-button>
</template>
+ <template v-if="type==2" v-slot:footer>
+ <el-button @click="visible=false">杩斿洖</el-button>
+ </template>
<template v-else v-slot:footer>
<el-button type="primary" :loading="isWorking.export" @click="exportComFilesDo">浼佷笟璇佷欢</el-button>
<el-button type="primary" :loading="isWorking.export" @click="exportDetail">瀵煎嚭璇﹀崟</el-button>
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index a21b7f0..6ae3352 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -9,7 +9,8 @@
>
<div class="list">
<el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
- <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
+ <el-form-item label="淇濋櫓鏂规锛�" prop="baseSolutionId">
+ <div style="display: flex; flex-direction: column;">
<el-select v-model="form.baseSolutionId" @change="selectSolutions" placeholder="璇烽�夋嫨">
<el-option
v-for="item in solutions"
@@ -18,8 +19,10 @@
:value="item.id">
</el-option>
</el-select>
+ <span style="color: #F95601; font-size: 14px;">锛�1. 璇峰厛閫夋嫨鏂规鏌ョ湅鐢宠璁板綍锛�</span>
+ </div>
</el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥璧锋鏈�" prop="startDate">
+ <el-form-item label="淇濋櫓鐢熸晥璧锋鏈燂細" prop="startDate" style="margin-left: 40px">
<div style="display: flex; flex-direction: column;">
<el-date-picker
@change="changeTime"
@@ -30,7 +33,7 @@
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" />
- <span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+ <span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
</el-form-item>
<el-form-item label="璐圭敤" v-if="item">
@@ -48,8 +51,8 @@
</div>
<div class="btns">
<div class="btns_item">
- <el-button type="primary" @click="selectApplicationForm">閫夋嫨鐢宠鍗�</el-button>
- <el-button type="primary" @click="$refs.employeeList.open('鎶曚繚鍛樺伐鍚嶅崟')">鏌ョ湅鍚嶅崟</el-button>
+<!-- <el-button type="primary" @click="selectAll">鏉冮檺</el-button>-->
+<!-- <el-button type="primary" @click="$refs.employeeList.open('鎶曚繚鍛樺伐鍚嶅崟')">鏌ョ湅鍚嶅崟</el-button>-->
</div>
</div>
<el-table
@@ -87,14 +90,14 @@
prop="fee"
label="鎬昏垂鐢�">
</el-table-column>
- <el-table-column
- label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button type="text" @click="$refs.employeeList.open('鎶曚繚鍛樺伐鍚嶅崟')">鏌ョ湅鍚嶅崟</el-button>
- <el-button type="text" style="color: #ff0000;">鍒犻櫎</el-button>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.InsuranceDetails.open('鎶曚繚浜哄憳鍚嶅崟',row,2)">鏌ョ湅鍚嶅崟</el-button>
+<!-- <el-button type="text" style="color: #ff0000;">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
+ <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�3. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
<div class="info" v-if="item">
<span v-if="item.specialAgreement">{{item.specialAgreement}}</span>
<span v-if="item.specialInfo">{{item.specialInfo}}</span>
@@ -104,6 +107,7 @@
<selectApplicationForm ref="selectApplicationForm" @success="getValue" />
<!-- 鎶曚繚鍛樺伐鍚嶅崟 -->
<employeeList ref="employeeList" />
+ <InsuranceDetails ref="InsuranceDetails" @success="successEvent" />
</GlobalWindow>
</template>
@@ -114,11 +118,12 @@
import employeeList from '@/components/business/employeeList'
import { all } from '@/api/business/solutions'
import { fetchList } from '@/api/business/insuranceApply'
+import InsuranceDetails from '@/components/business/InsuranceDetails'
import { merge } from '@/api/business/unionApply'
export default {
name: 'factoryChange',
extends: BaseOpera,
- components: { GlobalWindow, selectApplicationForm, employeeList },
+ components: { GlobalWindow, InsuranceDetails,selectApplicationForm, employeeList },
data () {
return {
form: {
@@ -267,7 +272,7 @@
selectSolutions (id) {
this.search()
this.solutions.forEach(item => {
- if (item.baseId === id) {
+ if (item.id === id) {
this.item = item
}
})
@@ -303,6 +308,7 @@
margin-bottom: 10px;
}
.info {
+ margin-top: 30px;
width: 100%;
font-size: 14px;
color: black;
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index 576a5e4..2336ea6 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -23,16 +23,16 @@
</div>
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
- <el-button type="primary" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
- <el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
- <el-button v-if="[1,2,4,7].includes(model.status)" type=".open('鍔犲噺淇濊鍗�',apply,model)">瀵煎嚭璇﹀崟</el-button>
- <el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button type="primary" v-if="[5,8,6].includes(model.status)" @click="$refs.reinsurance.open('鍔犲噺淇濈敵璇�', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+ <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
+ <el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
<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">
- <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鍔犲噺淇濊鍗�',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
+ <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 == 1 && [1].includes(model.status)" type="primary" @click="$refs.ApplyChangeDetails.open('鎶曚繚瀹℃牳',apply,model,1)">鎶曚繚瀹℃牳</el-button>
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 13e9d0e..3231746 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -14,32 +14,44 @@
<span v-if="model.status === 0">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呯缃�</span></span>
<span v-if="model.status === 1">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭鏍�</span></span>
<span v-if="model.status === 2">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸茬敓鏁�</span></span>
+ <span v-if="model.status === 7">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >寰呭嚭鍗�</span></span>
+ <span v-if="model.status === 9">淇濆崟鐘舵�侊細<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>
- <span v-if="model.status === 7 || model.status === 6">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸插叧闂�</span></span>
+ <span v-if=" model.status === 6">淇濆崟鐘舵�侊細<span :class="'change-status'+model.status" >宸插叧闂�</span></span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
- <template v-if="userInfo.type === 1">
- <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
-<!-- <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, 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 || 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>
- <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅鐢宠璇﹀崟',apply,model)">瀵煎嚭璇﹀崟</el-button>
- <el-button type="primary" v-if="model.status == 0" @click="goSign">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="[1,2,4].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,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 === 1">
+ <el-button type="primary" v-if="[5,8,6].includes(model.status)" @click="$refs.reinsurance.open('鏇存崲娲鹃仯鍗曚綅鐢宠', {id: dataId, applyChangId: modelId})">鍐嶆鎶曚繚</el-button>
+ <el-button type="primary" @click="$refs.ApplyChangeDetails.open('鏇存崲娲鹃仯鍗曚綅璇︽儏',apply,model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button type="primary" v-if="model.status == 0" @click="getSignLink(0)">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="[0, 1, 3, 7].includes(model.status) && model.solutionType == 0" type="danger" @click="$refs.add_subtract_return.open('鐢宠閫�鍥�', { id: modelId })">鐢宠閫�鍥�</el-button>
+ <el-button v-if="[1,2,4,7,9].includes(model.status)" type="primary" @click="viewApplyFile">鏌ョ湅鐢宠鍗�</el-button>
+ <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="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>
+ <el-button v-if=" model.solutionType == 1 && [1].includes(model.status)" type="primary" @click="$refs.ApplyChangeDetails.open('鎶曚繚瀹℃牳',apply,model,1)">鎶曚繚瀹℃牳</el-button>
+ <el-button v-if=" model.solutionType == 1 && [0,1].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+ <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 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
+ </template>
+ <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 &&[2].includes(model.status)" type="danger" @click="$refs.OperaApplyChangeCheckWindow.open('淇敼鎵瑰崟',model,4)">淇敼鎵瑰崟</el-button>
+ </template>
</div>
</div>
<div class="desc_item_from">
@@ -170,6 +182,31 @@
</div>
</div>
</div>
+ <el-dialog
+ :title="signTitle"
+ :visible.sync="visiblePhone"
+ width="500px"
+ :modal="false"
+ :show-close="false"
+ :close-on-click-modal="false"
+ center>
+ <el-form :model="form" ref="form" :rules="rules">
+ <el-form-item label="鎵嬫満鍙�" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏�" disabled v-trim/>
+ </el-form-item>
+ <el-form-item label="楠岃瘉鐮�" prop="code">
+ <div style="width: 100%; display: flex; align-items: center;">
+ <el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
+ <el-button type="primary" style="margin-left: 15px;" @click="send" v-if="num === 0">鍙戦�侀獙璇佺爜</el-button>
+ <el-button type="primary" style="margin-left: 15px;" v-else>{{num}}s</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="goSignDo()">纭� 瀹�</el-button>
+ <el-button @click="visiblePhone=false">鍙� 娑�</el-button>
+ </span>
+ </el-dialog>
<ApplyChangeUnitDetails ref="ApplyChangeDetails" @success="successEvent" />
<OperaApplyChangeUnitCheckWindow ref="OperaApplyChangeCheckWindow" @success="successEvent" />
<!-- 浼佷笟鐢宠閫�鍥� -->
@@ -177,7 +214,7 @@
<add_subtract_return ref="add_subtract_return" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
<OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
- <!-- 鍔犲噺淇濈敵璇� -->
+ <!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
<additionSubtractionApplication ref="additionSubtractionApplication" @success="successEvent" />
<!-- 鏇存崲娲鹃仯鍗曚綅鐢宠 -->
<factoryChange ref="factoryChange" @success="successEvent" />
@@ -207,147 +244,200 @@
applyChagneDetailPage,
getChangeUnitSignLink
} from '@/api/business/insuranceApply'
-import { applyChangeOpt } from '@/api/business/applyChange'
+import { applyChangeOpt, getChangeMemberListOnlineSignLink } from '@/api/business/applyChange'
import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
import { mapState } from 'vuex'
+import { sendSms } from '@/api/business/smsEmail'
export default {
name: 'OperaApplyChangeDetailWindow',
extends: BaseOpera,
components: {
- GlobalWindow,
+ GlobalWindow,
ApplyChangeUnitDetails,
OperaApplyChangeUnitCheckWindow,
- applyReturn,
- OperaInsuranceApply,
- additionSubtractionApplication,
- factoryChange,
- add_subtract_return,
- editFactoryChange,
- insuranceApplyDetails: () => import ('@/components/business/OperaInsuranceApplyWindow')
+ applyReturn,
+ OperaInsuranceApply,
+ additionSubtractionApplication,
+ factoryChange,
+ add_subtract_return,
+ editFactoryChange,
+ insuranceApplyDetails: () => import('@/components/business/OperaInsuranceApplyWindow')
},
data () {
return {
// 琛ㄥ崟鏁版嵁
- dataId:null,
- modelId:null,
- apply:{},
+ dataId: null,
+ modelId: null,
+ apply: {},
+ num: 0,
+ timer: null,
+ signTitle: '鎵嬫満鍙烽獙璇�',
model: {},
+ visiblePhone: false,
form: {
- id: null,
- editDate: ''
+ businessId: null,
+ phone: this.$store.state.userInfo.company.phone,
+ id: null,
+ editDate: '',
+ code: null
},
// 楠岃瘉瑙勫垯
rules: {
},
formInline: {
- applyStatus: '',
- duId: '',
- workTypeId: '',
- memberName: '',
- types: ''
+ applyStatus: '',
+ duId: '',
+ workTypeId: '',
+ memberName: '',
+ types: ''
},
reverse: false,
radio: 0,
activities: [],
tableData: [],
- list: [],
+ list: [],
activeName: '0',
- total: 0,
+ total: 0,
currentPage: 1
}
},
created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
},
- computed: {
- ...mapState(['userInfo'])
- },
+ computed: {
+ ...mapState(['userInfo'])
+ },
methods: {
- open(title,target){
- this.visible = true;
- this.title = title
- this.dataId = target.applyId
- this.modelId = target.id
- this.getDetail()
- this.getList()
- },
- closeOrder() {
- this.$confirm('纭鍏抽棴姝よ鍗曞悧?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- applyChangeOpt({
- optType: 6,
- applyId: this.model.id
- }).then(res => {
- this.getDetail()
- }).catch(e => {
- this.$message.error(e)
- })
- }).catch(() => {
+ open (title, target) {
+ this.visible = true
+ this.title = title
+ this.dataId = target.applyId
+ this.modelId = target.id
+ this.form.businessId = target.id
+ this.num=0
+ this.timer=null
+ this.getDetail()
+ this.getList()
+ },
+ send () {
+ sendSms({
+ phone: this.form.phone
+ }).then(res => {
+ this.num = 60
+ this.setTime()
+ })
+ },
+ setTime () {
+ this.timer = setInterval(() => {
+ if (this.num === 0) {
+ clearInterval(this.timer)
+ this.timer = null
+ return
+ }
+ this.num = this.num - 1
+ }, 1000)
+ },
+ getSignLink (flag) {
+ this.signTitle = '绛剧讲鐢宠鍗�'
+ this.form.type = flag
+ this.visiblePhone = true
+ this.$nextTick(() => {
+ this.$refs.form.resetFields()
+ })
+ },
+ goSignDo () {
+ this.$refs.form.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ this.isWorking = true
+ getChangeMemberListOnlineSignLink(this.form).then(res => {
+ setTimeout(() => {
+ this.visiblePhone = false
+ window.open(res)
+ }, 500)
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ },
+ closeOrder () {
+ this.$confirm('纭鍏抽棴姝よ鍗曞悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ applyChangeOpt({
+ optType: 6,
+ applyId: this.model.id
+ }).then(res => {
+ this.getDetail()
+ }).catch(e => {
+ this.$message.error(e)
+ })
+ }).catch(() => {
- });
- },
- resetting() {
- this.search()
- },
- search() {
- this.currentPage = 1
- this.getList()
- },
- getList() {
- applyChagneDetailPage({
- capacity: 10,
- page: this.currentPage,
- model: {
- applyChangeId: this.modelId,
- types:[2]
- }
- }).then(res => {
- this.list = res.records
- this.total = res.total
- })
- },
- handleClick(e) {
- this.activeName = e.index
- this.resetting()
- },
- goSign(){
- getChangeUnitSignLink({id:this.modelId}).then(res => {
+ })
+ },
+ resetting () {
+ this.search()
+ },
+ search () {
+ this.currentPage = 1
+ this.getList()
+ },
+ getList () {
+ applyChagneDetailPage({
+ capacity: 10,
+ page: this.currentPage,
+ model: {
+ applyChangeId: this.modelId,
+ types: [2]
+ }
+ }).then(res => {
+ this.list = res.records
+ this.total = res.total
+ })
+ },
+ handleClick (e) {
+ this.activeName = e.index
+ this.resetting()
+ },
+ goSign () {
+ getChangeUnitSignLink({ id: this.modelId }).then(res => {
setTimeout(() => {
window.open(res)
- }, 500);
+ }, 500)
}).catch(err => {
- this.$tip.apiFailed(err)
+ this.$tip.apiFailed(err)
})
},
- viewApplyFile(){
- if(this.model.applyUnitFile && this.model.applyUnitFile.fileurlFull){
+ viewApplyFile () {
+ if (this.model.applyUnitFile && this.model.applyUnitFile.fileurlFull) {
window.open(this.model.applyUnitFile.fileurlFull)
- }
+ }
},
- viewPidan(){
- if(this.model.pidanFile && this.model.pidanFile.fileurlFull){
+ viewPidan () {
+ if (this.model.pidanFile && this.model.pidanFile.fileurlFull) {
window.open(this.model.pidanFile.fileurlFull)
}
},
- handleSizeChange(val){
- console.log(val)
+ handleSizeChange (val) {
+ console.log(val)
},
- handleCurrentChange(val){
- console.log(val)
- this.page = val
- this.getList()
+ handleCurrentChange (val) {
+ console.log(val)
+ this.page = val
+ this.getList()
},
- onSubmit(){
+ onSubmit () {
},
- getDetail(){
+ getDetail () {
getDetail(this.dataId).then(res => {
this.apply = res
console.log(this.tableData)
@@ -362,8 +452,8 @@
}).catch(err => {
})
},
- successEvent(){
- // this.visible=false
+ successEvent () {
+ // this.visible=false
this.getDetail()
this.$emit('success')
}
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 5a03b39..510190d 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -26,15 +26,15 @@
<div class="desc_item_label_right">
<template v-if="userInfo.type === 1">
<el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('鎶曚繚鐢宠', {id: dataId})">鍐嶆鎶曚繚</el-button>
- <el-button v-if="model.status == 24" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
- <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
- <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
-<!-- goSign-->
- <el-button v-if="model.status == 20" type="primary" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
- <el-button v-if="model.status == 21" type="primary" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
- <el-button v-if="model.unionApplyTbdStatus == 1" type="primary" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
+ <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+ <!-- goSign-->
+ <el-button v-if="model.status == 20" type="primary" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
+ <el-button v-if="model.status == 21" type="primary" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
+ <el-button v-if="model.unionApplyTbdStatus == 1" type="primary" @click="getSignLink(2)">绛剧讲鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 24" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
</template>
<template v-if="userInfo.type === 2">
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
diff --git a/company/src/views/business/applyChangeShop.vue b/company/src/views/business/applyChangeShop.vue
index 0a63775..fe7a7b9 100644
--- a/company/src/views/business/applyChangeShop.vue
+++ b/company/src/views/business/applyChangeShop.vue
@@ -9,7 +9,6 @@
<el-option label="寰呭鏍�" value="1"></el-option>
<el-option label="宸茬敓鏁�" value="2"></el-option>
<el-option label="鐢宠閫�鍥�" value="3"></el-option>
- <!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
<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/switchCourtShop.vue b/company/src/views/business/switchCourtShop.vue
index c59e235..e662cef 100644
--- a/company/src/views/business/switchCourtShop.vue
+++ b/company/src/views/business/switchCourtShop.vue
@@ -9,6 +9,8 @@
<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="7"></el-option>
+ <el-option label="鎶曚繚涓�" value="9"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
@@ -70,6 +72,8 @@
<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>
<span :class="'change-status'+ row.status" v-if="row.status ===6">宸插叧闂�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status ===7">寰呭嚭鍗�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status ===9">鎶曚繚涓�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index 061f3b3..128adc6 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -67,7 +67,7 @@
min-width="120"
fixed="right"
>
- <template slot-scope="{row}" >
+ <template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.detailsEntrustedInsurance.open('濮旀墭鎶曚繚璇︽儏', row)" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
diff --git a/company/src/views/enterprise/switchCourt.vue b/company/src/views/enterprise/switchCourt.vue
index 37e7eea..a5d391e 100644
--- a/company/src/views/enterprise/switchCourt.vue
+++ b/company/src/views/enterprise/switchCourt.vue
@@ -9,6 +9,8 @@
<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="7"></el-option>
+ <el-option label="鎶曚繚涓�" value="9"></el-option>
<!-- 3 4 閮芥槸閫�鍥炵敵璇蜂腑-->
<el-option label="宸查��鍥�" value="5"></el-option>
<el-option label="宸插叧闂�" value="6"></el-option>
@@ -60,6 +62,8 @@
<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>
<span :class="'change-status'+row.status" v-if="row.status ===6">宸插叧闂�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status ===7">寰呭嚭鍗�</span>
+ <span :class="'change-status'+ row.status" v-if="row.status ===9">鎶曚繚涓�</span>
</template>
</el-table-column>
<el-table-column prop="validCode" label="鎵瑰崟鍙�" min-width="100px"></el-table-column>
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 17fdfc2..6788a98 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -449,7 +449,7 @@
HBD_BD_SIGNED_PDF(16, "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
SOLUTIONS_CONFIRMATION_LATTER(18, "鎶曚繚鏂规纭涔�", "鎶曚繚鏂规纭涔�"),
MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟"),
- CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�"),
+// CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�"),
WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�"),
WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"),
WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"),
@@ -1375,7 +1375,7 @@
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
CLOSE(6, "宸插叧闂�"),
- COMPANY_SIGN(7, "瀹℃牳閫氳繃"),
+ CHECHED_PASSED(7, "瀹℃牳閫氳繃"),
PALTFORM_CHECK_PASS_NO(8, "瀹℃牳涓嶉�氳繃"),
WTB_TOUBAOING(9, "鎶曚繚涓�"),
;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index dc1c036..d1e0c22 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1610,7 +1610,8 @@
}else if(applyChangeOptDTO.getOptType().equals(6)){
//浼佷笟鍏抽棴
applyLogType = Constants.ApplyLogType.CA_COMPANY_CLOSE;
- if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+ if(!(applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())
+ ||applyChange.getStatus().equals(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
}
applyChange.setStatus(Constants.ApplyChangeStatus.CLOSE.getKey());
@@ -1673,7 +1674,7 @@
applyChange.setApplyLogList(applyLogList);
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getObjId,Constants.equalsInteger(applyChange.getSolutionType(),Constants.ZERO)? applyChange.getId():applyChange.getUnionChangeId())
+ .eq(Multifile::getObjId, applyChange.getId() )
.in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
,Constants.MultiFile.CA_PD_PDF.getKey()
,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))
@@ -2092,7 +2093,7 @@
//濡傛灉鏄笉閫氳繃
update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
}else{
- update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
+ update.setStatus(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey());
}
applyChangeJoinMapper.updateById(update);
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index 4cfca91..febf8b6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -311,7 +311,7 @@
.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
.eq(ApplyChange::getIsdeleted, Constants.ZERO)
.eq(InsuranceApply::getUnionApplyId,saveUnionChangeDTO.getUnionApplyId())
- .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.COMPANY_SIGN.getKey())
+ .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
.eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
.in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
@@ -392,7 +392,7 @@
.set(ApplyChange::getUnionChangeId,null)
.set(ApplyChange::getCheckDate,new Date())
.set(ApplyChange::getCheckUserId,user.getId())
- .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.COMPANY_SIGN.getKey())
+ .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
.in(ApplyChange::getUnionChangeId,unionChange.getId())
);
--
Gitblit v1.9.3