From 70126b337a4f3559a4852a4af6734ecb248cc25c Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 30 十月 2024 09:32:38 +0800
Subject: [PATCH] 优化需求
---
company/src/components/enterprise/additionSubtractionApplication.vue | 39 ++++++++++++
company/src/components/enterprise/OperaDispatchUnitWindow.vue | 2
company/src/api/business/insuranceApply.js | 4 +
company/.env.productionCom | 8 +-
company/src/views/enterprise/myPolicy.vue | 68 ++++++++++++++--------
company/.env.developmentCom | 8 +-
company/.env | 4
company/src/views/index.vue | 20 +++++-
company/src/views/enterprise/insuranceApply.vue | 2
9 files changed, 113 insertions(+), 42 deletions(-)
diff --git a/company/.env b/company/.env
index ff18a61..d0e2989 100644
--- a/company/.env
+++ b/company/.env
@@ -4,8 +4,8 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/yyb_admin'
-# VUE_APP_CONTEXT_PATH = '/yyb_web'
+# VUE_APP_CONTEXT_PATH = '/yyb_admin'
+VUE_APP_CONTEXT_PATH = '/yyb_web'
# VUE_APP_CONTEXT_PATH = '/yyb_shop'
# 鎺ュ彛鍓嶇紑
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 985df94..b2dc706 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -6,9 +6,9 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-浼佷笟绔�'
VUE_APP_COOKIE_NAME='doumee-auth-token'
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-#VUE_APP_API = 'http://localhost:10031/'
-#VUE_APP_API = 'http://192.168.0.135:10031/'
+#VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
+VUE_APP_API = 'http://192.168.0.138:10031/'
+
+# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.productionCom b/company/.env.productionCom
index 23027b2..74dbcc8 100644
--- a/company/.env.productionCom
+++ b/company/.env.productionCom
@@ -3,7 +3,7 @@
VUE_APP_API_PREFIX = '/yyb_web_api'
-VUE_APP_CONTEXT_PATH = '/company'
+#VUE_APP_CONTEXT_PATH = '/company'
VUE_APP_CONTEXT_NAME = 'company'
@@ -11,8 +11,8 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-浼佷笟绔�'
-# 骞冲彴绔�
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
+# 浼佷笟绔�
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 浼佷笟绔�
-VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
+# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/src/api/business/insuranceApply.js b/company/src/api/business/insuranceApply.js
index 226a224..bc52189 100644
--- a/company/src/api/business/insuranceApply.js
+++ b/company/src/api/business/insuranceApply.js
@@ -181,3 +181,7 @@
download: true
})
}
+// 鏌ヨ淇濆崟鏄惁鍙繘琛屽姞鍑忎繚
+export function getApplyPower (data) {
+ return request.post('/business/insuranceApply/getApplyPower', data)
+}
diff --git a/company/src/components/enterprise/OperaDispatchUnitWindow.vue b/company/src/components/enterprise/OperaDispatchUnitWindow.vue
index a3d61f4..117960f 100644
--- a/company/src/components/enterprise/OperaDispatchUnitWindow.vue
+++ b/company/src/components/enterprise/OperaDispatchUnitWindow.vue
@@ -23,7 +23,7 @@
<div class="list_item_input">
<div class="list_item_input_label"><span>*</span>淇濋櫓鏂规</div>
<div class="list_item_input_val">
- <el-select v-model="item.solutionId" @change="changeTypeWork($event, index)" placeholder="璇烽�夋嫨">
+ <el-select v-model="item.solutionId" filterable @change="changeTypeWork($event, index)" placeholder="璇烽�夋嫨">
<el-option
v-for="item in insuranceScheme"
:key="item.id"
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 8409f63..c3e10b6 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -204,7 +204,7 @@
import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
// import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import { all } from '@/api/business/solutions'
-import { getDetail } from '@/api/business/insuranceApply'
+import { getDetail, getApplyPower } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
import { getDate, compareDates, getTomorrow } from '@/utils/util'
import { mapState } from 'vuex'
@@ -231,6 +231,8 @@
addDetailList: [],
delDetailList: []
},
+ addTrue: '',
+ delTrue: '',
tempMemberIndex: -1,
activeName: '0',
pickerOptions: {},
@@ -278,6 +280,7 @@
this.form.id = target.id
this.getDetails()
this.changeApplyStartTime(null)
+ this.getApplyPowerData()
})
} else {
this.$nextTick(() => {
@@ -288,6 +291,14 @@
this.getCompany()
this.visible = true
// this.updatePickerOptions()
+ },
+ // 鑾峰彇鏄惁鑳藉姞鍑忎繚
+ getApplyPowerData() {
+ getApplyPower({ applyId: this.form.id })
+ .then(res => {
+ this.addTrue = res.addTrue
+ this.delTrue = res.delTrue
+ })
},
changeApplyStartTime (e) {
getChangeCountCyclePriceVO({
@@ -375,6 +386,11 @@
return sums
},
deleItem () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (this.seleData.length === 0) {
this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
return
@@ -427,6 +443,7 @@
})
},
confirm () {
+ if (this.addTrue !== 0 && this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
this.$refs.form.validate((valid) => {
if (valid) {
// if (this.form.addDetailList.length === 0) {
@@ -487,6 +504,11 @@
})
},
seleUser () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
@@ -502,6 +524,11 @@
}
},
addUser () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
@@ -513,6 +540,11 @@
}
},
uploadUser () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
@@ -572,6 +604,11 @@
},
// 閫夋嫨鍛樺伐
sele () {
+ if (this.activeName === '0') {
+ if (this.addTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ } else {
+ if (this.delTrue !== 0) return this.$message.warning('褰撳墠淇濆崟鏆備笉鏀寔鎿嶄綔')
+ }
if (!this.form.solutionId) {
this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
return
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index b887a5f..1013974 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -16,7 +16,7 @@
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
- <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.baseSolutionId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
:key="item.baseId"
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index f583878..b711b90 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -6,7 +6,7 @@
<el-input v-model="searchForm.code" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
- <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
+ <el-select v-model="searchForm.baseSolutionId" filterable placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in solutionList"
:key="item.baseId"
@@ -15,19 +15,32 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐘舵��" prop="statusCollect">
- <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="search">
- <el-option label="寰呭鏍�" value="0"></el-option>
- <el-option label="寰呭嚭鍗�" value="1"></el-option>
- <el-option label="寰呯缃�" value="7"></el-option>
- <el-option label="淇濋殰涓�" value="2"></el-option>
- <el-option label="宸茶繃鏈�" value="3"></el-option>
- <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="26"></el-option>
+ <el-form-item label="鎶曚繚绫诲瀷" prop="solutionType">
+ <el-select v-model="searchForm.solutionType" placeholder="璇烽�夋嫨" @change="search">
+ <el-option label="鐩存帴鎶曚繚" value="0"></el-option>
+ <el-option label="濮旀墭鎶曚繚" value="1"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鐘舵��" prop="timeOut">
+ <el-select v-model="searchForm.timeOut" placeholder="璇烽�夋嫨" @change="search">
+ <el-option label="鏈紑濮�" value="0"></el-option>
+ <el-option label="淇濋殰涓�" value="1"></el-option>
+ <el-option label="宸茶繃鏈�" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+<!-- <el-form-item label="鐘舵��" prop="statusCollect">-->
+<!-- <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="search">-->
+<!-- <el-option label="寰呭鏍�" value="0"></el-option>-->
+<!-- <el-option label="寰呭嚭鍗�" value="1"></el-option>-->
+<!-- <el-option label="寰呯缃�" value="7"></el-option>-->
+<!-- <el-option label="淇濋殰涓�" value="2"></el-option>-->
+<!-- <el-option label="宸茶繃鏈�" value="3"></el-option>-->
+<!-- <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="26"></el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item label="淇濋櫓鐢熸晥璧锋湡" prop="time1">
<el-date-picker
v-model="time1"
@@ -84,7 +97,7 @@
</el-table-column>
<el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
<template slot-scope="{row}">
- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ <span :class="'apply-status'+row.status">{{row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionsName" align="center" fixed label="淇濋櫓鏂规" min-width="150"></el-table-column>
@@ -99,12 +112,12 @@
<span>{{row.code ? row.code : '-'}}</span>
</template>
</el-table-column>
- <el-table-column prop="insureNum" align="center" label="鎶曚繚浜烘暟" >
- <template slot-scope="{row}">
- <span>{{(row.insureNum||0) + '浜�'}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="guaranteeNum" align="center" label="鍦ㄤ繚浜烘暟" >
+<!-- <el-table-column prop="insureNum" align="center" label="鎶曚繚浜烘暟" >-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{(row.insureNum||0) + '浜�'}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column prop="guaranteeNum" align="center" label="褰撳墠鍦ㄤ繚浜烘暟" width="120">
<template slot-scope="{row}">
<span>{{(row.guaranteeNum||0)}} 浜�</span>
</template>
@@ -114,11 +127,16 @@
<span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : (row.serviceDays - row.loseEfficacyDays+'澶�')}}</span>
</template>
</el-table-column>
- <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">
+<!-- <el-table-column prop="currentFee" label="宸蹭骇鐢熻垂鐢�" align="center">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column prop="fee" label="鎵规敼璐圭敤鍚堣" align="center" width="120">
<template slot-scope="{row}">
- <span>{{row.currentFee!=null?row.currentFee+' 鍏�': '-'}}</span>
+ <span>{{row.changeMoney+' 鍏�'}}</span>
</template>
- </el-table-column>
+ </el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢�" align="center">
<template slot-scope="{row}">
<span>{{row.fee!=null?row.fee+' 鍏�': '-'}}</span>
@@ -138,7 +156,7 @@
<el-button type="text" @click="godetail(row)" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
<!-- <el-button type="text" @click="$refs.OperaApplyChangeMonthWindow.open('鍔犲噺淇濇湀搴﹁垂鐢ㄧ粺璁�',row)" v-permissions="['business:applychange:query']">鍔犲噺淇濊垂鐢�</el-button>
<template v-if="row.statusCollect === 2">-->
-<!-- <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>-->
+ <el-button type="text" @click="$refs.additionSubtractionApplication.open('鍔犲噺淇濈敵璇�', { id: row.id })">鍔犲噺淇濈敵璇�</el-button>
<!-- </template>-->
</template>
</el-table-column>
@@ -198,7 +216,9 @@
startTimeE: '',
startTimeS: '',
baseSolutionId: '',
- statusCollect: '2'
+ status: '5',
+ solutionType: '',
+ timeOut: ''
},
obj: {
renewalNum: 0,
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 70d5505..ff4cb7f 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -341,6 +341,11 @@
this.tabs.push({ name: '2', label: '鐞嗚禂鎻愰啋' })
// this.handleCurrentChange2(0);
}
+ //鏂板鍒嗙被
+ if (pemissons.includes('business:notice:settle')) {
+ this.tabs.push({ name: '3', label: '鍚堝悓绛剧讲鎻愰啋' })
+ // this.handleCurrentChange2(0);
+ }
/* if (pemissons.includes('business:notice:insurance')) {
this.getNoticeList(0, this.page0)
}
@@ -544,22 +549,25 @@
}
.home_content {
width: 100%;
- height: calc(100% - 170px);
+ /*height: calc(100% - 170px);*/
margin-top: 10px;
display: flex;
- align-items: center;
- justify-content: space-between;
+ /*align-items: center;*/
+ /*justify-content: space-between;*/
.home_content_left {
width: 350px;
- height: 100%;
+ /*height: 100%;*/
+ height: auto;
flex-shrink: 0;
display: flex;
flex-direction: column;
justify-content: space-between;
.home_content_left_item {
width: 100%;
- height: 32%;
+ /*height: 32%;*/
+ height: 200px;
background: #ffffff;
+ margin-bottom: 10px;
}
}
.home_content_right {
@@ -584,6 +592,7 @@
box-sizing: border-box;
width: 100%;
display: flex;
+ align-items: center;
justify-content: space-between;
border: 1px solid #ececec;
margin-bottom: 15px;
@@ -619,6 +628,7 @@
}
}
.list_item_right {
+ flex-shrink: 0;
height: 100%;
display: flex;
align-items: center;
--
Gitblit v1.9.3