From 3fee8832ca52667b26f702255677d62775ce5cd6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 19:06:40 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OpearaUnionChange.vue | 48 ++++++
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 2
company/src/components/enterprise/onlineReporting.vue | 2
company/src/components/business/OperaWtbApplyShopWindow.vue | 4
company/src/components/business/OperaInsuranceApplyWindow.vue | 8
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 3
company/src/components/business/OpearaUnionChangeUnit.vue | 20 ++
server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java | 3
company/.env.developmentShop | 4
company/src/components/enterprise/directInsuranceDetails.vue | 6
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 17 +
company/src/views/business/unionChange.vue | 4
company/src/components/enterprise/selectSolutions.vue | 16 +-
company/src/components/enterprise/commissionDetails.vue | 2
company/src/components/enterprise/directInvoicingApplication.vue | 6
company/src/components/business/ApplyChangeDetails.vue | 261 ++++++++++++++++++------------------
company/src/components/enterprise/entrustedInvoicingApplication.vue | 8
17 files changed, 244 insertions(+), 170 deletions(-)
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 962e3ac..506b270 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -7,6 +7,6 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-VUE_APP_API = 'http://192.168.0.190:10032/'
+#VUE_APP_API = 'http://192.168.0.190:10032/'
-#VUE_APP_API = 'http://localhost:10032/'
+VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/src/components/business/ApplyChangeDetails.vue b/company/src/components/business/ApplyChangeDetails.vue
index 5ac1140..c6725e8 100644
--- a/company/src/components/business/ApplyChangeDetails.vue
+++ b/company/src/components/business/ApplyChangeDetails.vue
@@ -92,138 +92,137 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- import {getChangeDetailList, exportJiajianBaoExcel} from "@/api/business/insuranceApply";
- import {check } from "@/api/business/applyChange";
- import {exportComFiles} from "@/api/business/company";
- export default {
- name: 'ApplyChangeDetails',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- model:{},
- apply:{},
- type:0,
- detailList:[],
- // 琛ㄥ崟鏁版嵁
- form: {
- id: null,
- dealBackApply:0,
- checkInfo: ''
- },
- // 楠岃瘉瑙勫垯
- rules: {
- },
- reverse: false,
- tableData: []
- }
- },
- created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
- },
- methods: {
- open(title,target,target2,target3){
- this.title=title
- this.visible=true
- this.apply = target
- this.model = target2
- this.form.id=target2.id
- this.type=target3
- this.getDetailListDo()
- },
- check (type) {
- this.form.dealBackApply = type
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- check(this.form)
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
- .catch(() => {
- })
- },
- getDetailListDo() {
- this.detailList = []
- var that = this
- getChangeDetailList({applyChangeId: this.model.id})
- .then(res => {
- var addDetailList = []
- var delDetailList = []
- res.forEach(item1 => {
- if (item1.type == 1) {
- delDetailList.push(item1);
- } else {
- addDetailList.push(item1);
- }
- })
- var index = addDetailList.length > delDetailList.length?addDetailList.length : delDetailList.length
- for (var i = 0;i<index;i++) {
- var addModel = addDetailList.length > i?addDetailList[i]:{}
- var delModel = delDetailList.length > i?delDetailList[i]:{}
- that.detailList.push({add:addModel,del:delModel});
- }
- }).catch(err => {})
- },
- exportDetail(){
- this.$dialog.exportConfirm('纭瀵煎嚭璇﹀崟鍚楋紵')
- .then(() => {
- this.isWorking = true
- exportJiajianBaoExcel({ id: this.model.id })
- .then(response => {
- this.download(response)
- })
- .catch(e => {
- console.log(e)
- this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
- })
- .finally(() => {
- this.isWorking = false
- })
- })
- .catch(() => {
- })
- },
- exportComFilesDo(){
- this.$dialog.exportConfirm('纭瀵煎嚭浼佷笟璇佷欢鍚楋紵')
- .then(() => {
- this.isWorking = true
- exportComFiles({ id: this.apply.companyId })
- .then(response => {
- this.download(response)
- })
- .catch(e => {
- console.log(e)
- this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
- })
- })
- .catch(() => {
- })
-
- },
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉);
- },
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`);
- },
- handleClick(tab, event) {
- console.log(tab, event);
- },
- onSubmit() {
-
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { getChangeDetailList, exportJiajianBaoExcel } from '@/api/business/insuranceApply'
+import { check } from '@/api/business/applyChange'
+import { exportComFiles } from '@/api/business/company'
+export default {
+ name: 'ApplyChangeDetails',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ model: {},
+ apply: {},
+ type: 0,
+ detailList: [],
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ dealBackApply: 0,
+ checkInfo: ''
+ },
+ // 楠岃瘉瑙勫垯
+ rules: {
+ },
+ reverse: false,
+ tableData: []
}
+ },
+ created () {
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target, target2, target3) {
+ this.title = title
+ this.visible = true
+ this.apply = target
+ this.model = target2
+ this.form.id = target2.id
+ this.type = target3
+ this.getDetailListDo()
+ },
+ check (type) {
+ this.form.dealBackApply = type
+ this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
+ .then(() => {
+ this.isWorking = true
+ check(this.form)
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ .catch(() => {
+ })
+ },
+ getDetailListDo () {
+ this.detailList = []
+ var that = this
+ getChangeDetailList({ applyChangeId: this.model.id })
+ .then(res => {
+ var addDetailList = []
+ var delDetailList = []
+ res.forEach(item1 => {
+ if (item1.type == 1) {
+ delDetailList.push(item1)
+ } else {
+ addDetailList.push(item1)
+ }
+ })
+ var index = addDetailList.length > delDetailList.length ? addDetailList.length : delDetailList.length
+ for (var i = 0; i < index; i++) {
+ var addModel = addDetailList.length > i ? addDetailList[i] : {}
+ var delModel = delDetailList.length > i ? delDetailList[i] : {}
+ that.detailList.push({ add: addModel, del: delModel })
+ }
+ }).catch(err => {})
+ },
+ exportDetail () {
+ this.$dialog.exportConfirm('纭瀵煎嚭璇﹀崟鍚楋紵')
+ .then(() => {
+ this.isWorking = true
+ exportJiajianBaoExcel({ id: this.model.id })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ console.log(e)
+ this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
+ })
+ .finally(() => {
+ this.isWorking = false
+ })
+ })
+ .catch(() => {
+ })
+ },
+ exportComFilesDo () {
+ this.$dialog.exportConfirm('纭瀵煎嚭浼佷笟璇佷欢鍚楋紵')
+ .then(() => {
+ this.isWorking = true
+ exportComFiles({ id: this.apply.companyId })
+ .then(response => {
+ this.download(response)
+ })
+ .catch(e => {
+ console.log(e)
+ this.$message.error('鏁版嵁涓嬭浇澶辫触锛�')
+ })
+ })
+ .catch(() => {
+ })
+ },
+ handleSizeChange (val) {
+ console.log(`姣忛〉 ${val} 鏉)
+ },
+ handleCurrentChange (val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ },
+ handleClick (tab, event) {
+ console.log(tab, event)
+ },
+ onSubmit () {
+
+ }
+ }
+}
</script>
<style lang="scss" scoped>
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 7bff961..94d9c61 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -20,7 +20,8 @@
<el-date-picker
v-model="form.applyDate"
type="date"
- format="yyyy 骞� MM 鏈� dd 鏃�"
+ :picker-options="pickerOptions"
+ format="yyyy-MM-dd"
placeholder="鍓嶉�夋嫨鏃ユ湡"
value-format="yyyy-MM-dd" />
<span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
@@ -97,12 +98,12 @@
<el-dialog
title="閫夋嫨淇濋櫓鍗�"
:visible.sync="visibleSelect"
- width="70%"
+ width="80%"
:modal="true"
:show-close="false"
append-to-body
center>
- <div class="desc_item_from">
+ <div class="desc_item_from" id="selectTable">
<el-table
ref="multipleTable1"
v-loading="isWorking.search"
@@ -115,7 +116,7 @@
<el-table-column
type="selection"
width="55">
- </el-table-column>
+ </el-table-column>
<el-table-column label="搴忓彿" width="80px">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
@@ -129,6 +130,7 @@
<el-table-column prop="code" label="淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="addApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
</el-table>
@@ -160,6 +162,7 @@
import ApplyChangeDetails from '@/components/business/ApplyChangeDetails'
import { fetchList as pageUnionList } from '@/api/business/unionApply'
import {getDetail} from "@/api/business/insuranceApply";
+import {compareDates, getDate, getTomorrow} from "@/utils/util";
export default {
name: 'add_subtract_entrust',
extends: BaseOpera,
@@ -172,6 +175,7 @@
applyDate: null,
businessType: 0
},
+ pickerOptions: {},
visibleSelect:false,
solutions: [],
currentPage:0,
@@ -198,6 +202,15 @@
api: '/business/insuranceApply',
'field.id': 'id'
})
+ /* var now = new Date()
+ var start = now.setDate(now.getDate()+1)
+ var end = now.setDate(now.getDate()+10)
+ this.pickerOptions = {
+ disabledDate (time) {
+ console.log(( time.getTime() < start.getTime() || time.getTime()>end.getTime()))
+ return ( time.getTime() < start.getTime() || time.getTime()>end.getTime())
+ }
+ }*/
},
methods: {
rowselect(row){
@@ -237,6 +250,16 @@
this.model = null
}
},
+ convertToDate(dateString) {
+ try {
+ const parts = dateString.split(/[- : \/]/);
+ const monthIndex = parts[1] - 1
+ const convertedDate = new Date( parts[0], monthIndex, parts[2], parts[3], parts[5], parts[6] )
+ return convertedDate
+ }catch (e) {
+ return new Date()
+ }
+ },
selectDo(){
if(!this.model){
this.$tip.apiFailed({
@@ -245,8 +268,21 @@
})
return
}
+ this.form.applyDate=null
this.visibleSelect=false
this.form.unionApplyId = this.model.id
+ var that =this
+ this.pickerOptions = {
+ disabledDate (time) {
+ var start = new Date(that.model.startTime)
+ start.setDate(start.getDate() + 1);
+ var end = new Date(that.model.endTime)
+ // console.log(end )
+ // console.log(time )
+ return ( time.getTime() < start.getTime() || time.getTime()>end.getTime())
+ }
+ }
+
this.getList();
},
confirm () {
@@ -322,6 +358,7 @@
capacity: 10,
page: this.currentPage,
model: {
+ queryFlag:1,
status: 3,
}
}).then(res => {
@@ -373,6 +410,9 @@
align-items: center;
}
}
+::v-deep .desc_item_from .el-table__header .el-checkbox{
+ display:none!important;
+}
.submit {
width: 100%;
display: flex;
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index 61c4110..8513e06 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -20,8 +20,9 @@
<el-date-picker
v-model="form.applyDate"
placeholder="鍓嶉�夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
type="date"
- format="yyyy 骞� MM 鏈� dd 鏃�"
+ format="yyyy-MM-dd"
value-format="yyyy-MM-dd" />
<span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
@@ -97,7 +98,7 @@
<el-dialog
title="閫夋嫨淇濋櫓鍗�"
:visible.sync="visibleSelect"
- width="70%"
+ width="80%"
:modal="true"
:show-close="false"
append-to-body
@@ -129,6 +130,7 @@
<el-table-column prop="code" label="淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="changeApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
</el-table>
@@ -176,6 +178,7 @@
solutions: [],
currentPage:0,
list: [],
+ pickerOptions: {},
tableData:[],
tableTotal:0,
endTime: '',
@@ -247,6 +250,15 @@
}
this.visibleSelect=false
this.form.unionApplyId = this.model.id
+ var that =this
+ this.pickerOptions = {
+ disabledDate (time) {
+ var start = new Date(that.model.startTime)
+ start.setDate(start.getDate() + 1);
+ var end = new Date(that.model.endTime)
+ return ( time.getTime() < start.getTime() || time.getTime()>end.getTime())
+ }
+ }
this.getList();
},
confirm () {
@@ -322,6 +334,7 @@
capacity: 10,
page: this.currentPage,
model: {
+ queryFlag:2,
status: 3,
}
}).then(res => {
@@ -373,6 +386,9 @@
align-items: center;
}
}
+::v-deep .desc_item_from .el-table__header .el-checkbox{
+ display:none!important;
+}
.submit {
width: 100%;
display: flex;
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 736af21..8461fba 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -286,6 +286,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
@@ -327,8 +329,8 @@
</template>
</el-table-column>
</el-table>
- <el-table
- :data="list2"
+ <el-table
+ :data="list2"
border
ref="table"
v-if="activeName === '2'"
@@ -348,6 +350,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
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index 6b4359d..104cf7f 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -292,6 +292,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
@@ -354,6 +356,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
diff --git a/company/src/components/enterprise/commissionDetails.vue b/company/src/components/enterprise/commissionDetails.vue
index 10a8d91..12dfaf2 100644
--- a/company/src/components/enterprise/commissionDetails.vue
+++ b/company/src/components/enterprise/commissionDetails.vue
@@ -189,7 +189,7 @@
data.forEach(item => {
price += item.totalFee
})
- sums[index] = price
+ sums[index] = price.toFixed(2)
}
})
return sums;
diff --git a/company/src/components/enterprise/directInsuranceDetails.vue b/company/src/components/enterprise/directInsuranceDetails.vue
index c4d92e5..960033e 100644
--- a/company/src/components/enterprise/directInsuranceDetails.vue
+++ b/company/src/components/enterprise/directInsuranceDetails.vue
@@ -32,7 +32,7 @@
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price}}</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{model.price?model.price.toFixed(2):0}}</div>
</div>
<div class="list" style="width: 100%;" v-if="form.type === 0">
<div class="list_label">
@@ -210,7 +210,7 @@
data.forEach(item => {
price += item.totalFee
})
- sums[index] = price
+ sums[index] = price.toFixed(2)
}
})
return sums;
@@ -226,7 +226,7 @@
data.forEach(item => {
price += item.totalFee
})
- sums[index] = price
+ sums[index] = price.toFixed(2)
}
})
return sums;
diff --git a/company/src/components/enterprise/directInvoicingApplication.vue b/company/src/components/enterprise/directInvoicingApplication.vue
index dd7d7e8..4643aa3 100644
--- a/company/src/components/enterprise/directInvoicingApplication.vue
+++ b/company/src/components/enterprise/directInvoicingApplication.vue
@@ -32,7 +32,7 @@
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice}}</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{totalPrice ?totalPrice.toFixed(2):0}}</div>
</div>
<div class="list" style="width: 100%;">
<el-radio v-model="type" label="0">鐢靛瓙鍙戠エ</el-radio>
@@ -263,7 +263,7 @@
data.forEach(item => {
price += item.amount
})
- sums[index] = price
+ sums[index] = price.toFixed(2)
}
})
return sums;
@@ -279,7 +279,7 @@
data.forEach(item => {
price += item.amount
})
- sums[index] = price
+ sums[index] = price.toFixed(2)
}
})
return sums;
diff --git a/company/src/components/enterprise/entrustedInvoicingApplication.vue b/company/src/components/enterprise/entrustedInvoicingApplication.vue
index d0e31d5..a7a9a42 100644
--- a/company/src/components/enterprise/entrustedInvoicingApplication.vue
+++ b/company/src/components/enterprise/entrustedInvoicingApplication.vue
@@ -121,8 +121,8 @@
watch: {
type: {
handler(news) {
- this.val = ''
- this.val1 = ''
+ // this.val = ''
+ // this.val1 = ''
}
}
},
@@ -156,7 +156,7 @@
}
this.isWorking = true
entrustInvoicing({
- address: this.val || this.val1,
+ address: this.type === 0?this.val : this.val1,
invoicingMoney: this.total,
taxDetialList: this.form.list.map(item => {
return {
@@ -188,7 +188,7 @@
data.forEach(item => {
price += item.totalPrice
})
- sums[index] = price
+ sums[index] = price.toFixed(2)
}
})
return sums;
diff --git a/company/src/components/enterprise/onlineReporting.vue b/company/src/components/enterprise/onlineReporting.vue
index 548868d..a44e8a6 100644
--- a/company/src/components/enterprise/onlineReporting.vue
+++ b/company/src/components/enterprise/onlineReporting.vue
@@ -90,7 +90,7 @@
:visible.sync="centerDialogVisible"
width="50%"
center>
- <div class="fuwenben">
+ <div class="fuwenben" style="font-size: 12px">
灏婃暚鐨勫鎴凤細
棣栧厛鎰熻阿鎮ㄥ浜庢垜浠殑淇′换涓庢敮鎸侊紝鎴戜滑寰堣崳骞告垚涓鸿吹鍙哥殑淇濋櫓鍜ㄨ鏈嶅姟鍟嗭紒
diff --git a/company/src/components/enterprise/selectSolutions.vue b/company/src/components/enterprise/selectSolutions.vue
index a3d6f1d..44cd09b 100644
--- a/company/src/components/enterprise/selectSolutions.vue
+++ b/company/src/components/enterprise/selectSolutions.vue
@@ -41,14 +41,14 @@
prop="worktypeName"
label="鎵�灞炲伐绉�">
</el-table-column>
-<!-- <el-table-column-->
-<!-- prop="startTime"-->
-<!-- label="淇濋櫓鐢熸晥璧锋湡">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="endTime"-->
-<!-- label="淇濋櫓鐢熸晥姝㈡湡">-->
-<!-- </el-table-column>-->
+ <el-table-column
+ prop="startTime"
+ label="淇濋櫓鐢熸晥璧锋湡">
+ </el-table-column>
+ <el-table-column
+ prop="endTime"
+ label="淇濋櫓鐢熸晥姝㈡湡">
+ </el-table-column>
</el-table>
</GlobalWindow>
</template>
diff --git a/company/src/views/business/unionChange.vue b/company/src/views/business/unionChange.vue
index 5d2adfe..122656f 100644
--- a/company/src/views/business/unionChange.vue
+++ b/company/src/views/business/unionChange.vue
@@ -75,7 +75,7 @@
</pagination>
</template>
<!-- 鎻愪氦鐢宠 -->
- <OpearaUnionChange ref="OpearaUnionChange" />
+ <OpearaUnionChange ref="OpearaUnionChange" @success="handlerSuccess"/>
<OperaUnionChangeDetailWindow ref="OperaUnionChangeDetailWindow" @success="handlerSuccess"/>
</TableLayout>
</template>
@@ -114,7 +114,7 @@
},
methods: {
handlerSuccess(){
- this.reset();
+ this.reset()
},
changeTime(e) {
if (e.length > 0) {
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
index ad42551..0cc063a 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/UnionApply.java
@@ -119,6 +119,9 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ绫诲瀷 1瀛愭煡璇㈠彲鍚堝苟鍗曟暟", example = "1")
+ @TableField(exist = false)
+ private int queryFlag;
@ApiModelProperty(value = "鏌ヨ缁撴潫鏃ユ湡", example = "1")
@JsonFormat(pattern = "yyyy-MM-dd")
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 75cef66..4da9d33 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
@@ -1483,7 +1483,7 @@
Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
.eq(!Objects.isNull(model.getUnionApplyId()),InsuranceApply::getUnionApplyId,model.getUnionApplyId())
-// .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+ .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
.eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
.eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
.eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index af6dc52..e86801e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -785,9 +785,10 @@
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
// return new ArrayList<>();
}else {
+ company.setType(Constants.ZERO);
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
//濡傛灉鏄晢鎴�
- wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//璁剧疆鏃犳晥璁块棶
+ wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
}else{
//濡傛灉鏌ヨ浼佷笟鏁版嵁
if(company.getQueryFlag() == 0){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index a2e652a..ef92dd9 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -156,12 +156,19 @@
.selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
- queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
- "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0 ) as addApplyNum ");
+ if(pageWrap.getModel().getQueryFlag() == 1){
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 0 ) as addApplyNum ");
+ }else if(pageWrap.getModel().getQueryFlag() ==2){
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and a.status = "+Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()+" and a.type = 1 ) as changeApplyNum ");
+ }else{
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 0 ) as addApplyNum ");
- queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
- "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");
-
+ queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
+ "and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");
+ }
queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
--
Gitblit v1.9.3