From ba5f8ce99b414a89d1e21a650321bf373773e7ae Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 十一月 2024 09:03:02 +0800
Subject: [PATCH] 优化
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 19 +
company/.env.productionShop | 5
company/.env.developmentShop | 5
company/src/components/business/allocateEnterprises.vue | 8
company/src/components/business/OperaApplyChangeCheckWindow.vue | 15 +
company/src/utils/request.js | 2
company/src/views/system/role.vue | 4
company/src/utils/resetMessage.js | 38 +--
company/src/components/business/OperaWtbApplyShopWindow.vue | 13
company/src/components/system/user/RoleConfigWindow.vue | 7
company/src/components/business/detailsEntrustedInsurance.vue | 5
company/src/components/business/modification.vue | 5
company/.env.developmentCom | 6
company/src/views/system/user.vue | 338 ++++++++++++++++++------------------
company/.env | 2
company/.env.production | 6
company/src/views/business/insuranceApply.vue | 1
company/src/components/business/OperaCompanyUserApplyWindow.vue | 2
company/.env.productionCom | 4
company/src/components/common/CommonHeader.vue | 6
company/src/views/index.vue | 8
company/src/views/enterprise/insuranceApply.vue | 4
company/src/components/system/role/PermissionConfigWindow.vue | 7
company/.env.development | 5
company/src/components/business/OperaApplyChangeUnitCheckWindow.vue | 15 +
25 files changed, 284 insertions(+), 246 deletions(-)
diff --git a/company/.env b/company/.env
index ff18a61..db9f162 100644
--- a/company/.env
+++ b/company/.env
@@ -4,7 +4,7 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/yyb_admin'
+# VUE_APP_CONTEXT_PATH = '/yyb_admin'
# VUE_APP_CONTEXT_PATH = '/yyb_web'
# VUE_APP_CONTEXT_PATH = '/yyb_shop'
diff --git a/company/.env.development b/company/.env.development
index 2c87043..fa73b3f 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -4,11 +4,12 @@
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-骞冲彴绔�'
+VUE_APP_CONTEXT_PATH = '/yyb_admin'
VUE_APP_COOKIE_NAME='dmplat-auth-token'
# 娴嬭瘯鏈�
-# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# 浠诲悍
-VUE_APP_API = 'http://192.168.0.147:10030/'
+# VUE_APP_API = 'http://192.168.0.147:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 20dc8b0..97327af 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -4,11 +4,11 @@
# 鎺ュ彛鍓嶇紑
# VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-浼佷笟绔�'
-
+VUE_APP_CONTEXT_PATH = '/yyb_web'
VUE_APP_COOKIE_NAME='doumee-auth-token'
-#VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
-VUE_APP_API = 'http://192.168.0.147:10031/'
+# VUE_APP_API = 'http://192.168.0.147:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index b976fd2..04e6f03 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -5,9 +5,10 @@
# VUE_APP_API_PREFIX = '/yyb_admin_api'
VUE_APP_COOKIE_NAME='dmshop-auth-token'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
-#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
+VUE_APP_CONTEXT_PATH = '/yyb_shop'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
- VUE_APP_API = 'http://192.168.0.147:10032/'
+# VUE_APP_API = 'http://192.168.0.147:10032/'
#VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/.env.production b/company/.env.production
index 7de603d..1e74d9e 100644
--- a/company/.env.production
+++ b/company/.env.production
@@ -1,12 +1,12 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-# VUE_APP_CONTEXT_PATH = '/admin'
-
VUE_APP_API_PREFIX = '/yyb_admin_api'
-VUE_APP_CONTEXT_NAME = 'admin'
+VUE_APP_CONTEXT_NAME = 'yyb_admin'
VUE_APP_COOKIE_NAME='dmplat-auth-token'
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-骞冲彴绔�'
+VUE_APP_CONTEXT_PATH = '/yyb_admin'
+
# 骞冲彴绔�
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
diff --git a/company/.env.productionCom b/company/.env.productionCom
index 74dbcc8..e58bfab 100644
--- a/company/.env.productionCom
+++ b/company/.env.productionCom
@@ -3,9 +3,9 @@
VUE_APP_API_PREFIX = '/yyb_web_api'
-#VUE_APP_CONTEXT_PATH = '/company'
+VUE_APP_CONTEXT_PATH = '/yyb_web'
-VUE_APP_CONTEXT_NAME = 'company'
+VUE_APP_CONTEXT_NAME = 'yyb_company'
VUE_APP_COOKIE_NAME='doumee-auth-token'
diff --git a/company/.env.productionShop b/company/.env.productionShop
index 6623bf3..9547a87 100644
--- a/company/.env.productionShop
+++ b/company/.env.productionShop
@@ -1,11 +1,10 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_CONTEXT_PATH = '/shop'
VUE_APP_API_PREFIX = '/yyb_shop_api'
-VUE_APP_CONTEXT_NAME = 'shop'
+VUE_APP_CONTEXT_NAME = 'yyb_shop'
VUE_APP_COOKIE_NAME='dmshop-auth-token'
-
+VUE_APP_CONTEXT_PATH = '/yyb_shop'
# 骞冲彴绔�
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
diff --git a/company/src/components/business/OperaApplyChangeCheckWindow.vue b/company/src/components/business/OperaApplyChangeCheckWindow.vue
index cd4959c..18d9f6b 100644
--- a/company/src/components/business/OperaApplyChangeCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeCheckWindow.vue
@@ -122,7 +122,7 @@
<div class="form_item">
<div class="form_item_label"><span>*</span>涓婁紶鎵瑰崟锛�</div>
<div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
+ <UploadFile :limit="99" :uploadData="{ folder: 'apply',fileType:'.pdf' }" @remove="removeEditPiDan" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
</div>
</div>
<div class="form_item">
@@ -186,7 +186,7 @@
delValidTime: null,
validCode: null,
pidanFile: [],
- editPidanFile: null,
+ editPidanFile: [],
fileList1: [],
fileList2: [],
selectRadio: 0
@@ -218,7 +218,7 @@
applyStartTime: null,
validCode: null,
pidanFile: [],
- editPidanFile: null,
+ editPidanFile: [],
fileList1: [],
fileList2: [],
selectRadio: 0
@@ -323,7 +323,14 @@
})
},
editBaoxianFileUploaded (data) {
- this.form.editPidanFile = data
+ this.form.editPidanFile.push(data)
+ },
+ removeEditPiDan(e) {
+ this.form.editPidanFile.forEach((item, index) => {
+ if (e === item.imgaddr) {
+ this.form.editPidanFile.splice(index, 1)
+ }
+ })
},
backDo () {
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
diff --git a/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue b/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
index 61c3a72..7e881ff 100644
--- a/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitCheckWindow.vue
@@ -54,7 +54,7 @@
<div class="form_item">
<div class="form_item_label">涓婁紶鎵瑰崟锛�</div>
<div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
+ <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :limit="99" :fileList="form.fileList1" @remove="removePIDAN" @uploadSuccess="baoxianFileUploaded" />
</div>
</div>
</div>
@@ -135,7 +135,7 @@
editValidCode: '',
applyStartTime:null,
validCode:null,
- pidanFile:null,
+ pidanFile:[],
editPidanFile:null,
fileList1: [],
fileList2: [],
@@ -166,7 +166,7 @@
editValidCode: '',
applyStartTime:null,
validCode:null,
- pidanFile:null,
+ pidanFile:[],
editPidanFile:null,
fileList1: [],
fileList2: [],
@@ -219,8 +219,15 @@
}
},
baoxianFileUploaded(data){
- this.form.pidanFile=data
+ this.form.pidanFile.push(data)
},
+ removePIDAN(e) {
+ this.form.pidanFile.forEach((item, index) => {
+ if (item.imgaddr === e) {
+ this.form.pidanFile.splice(index, 1)
+ }
+ })
+ },
editBaoxianFileUploaded(data){
this.form.editPidanFile=data
},
diff --git a/company/src/components/business/OperaCompanyUserApplyWindow.vue b/company/src/components/business/OperaCompanyUserApplyWindow.vue
index d3a5d01..17e1d39 100644
--- a/company/src/components/business/OperaCompanyUserApplyWindow.vue
+++ b/company/src/components/business/OperaCompanyUserApplyWindow.vue
@@ -40,7 +40,7 @@
show-word-limit />
</el-form-item>
<el-form-item label="鎺堟潈涔�" prop="multifileList">
- <UploadFile @remove="deleFile" :limit="99" :uploadData="{ folder: 'companyUserApply', fileType:'.pdf' }" :fileList="fileList" @uploadSuccess="editFanganFile" />
+ <UploadFile v-if="visible" @remove="deleFile" :limit="99" :uploadData="{ folder: 'companyUserApply', fileType:'.pdf' }" :fileList="fileList" @uploadSuccess="editFanganFile" />
</el-form-item>
</el-form>
</GlobalWindow>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 6eaaad7..98cdbfa 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -19,7 +19,10 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浼佷笟锛歿{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span></span>
+ <span>淇濆崟鐘舵�侊細
+ <span style="color: #f95601;" v-if="[5,27].includes(model.status) && model.statusInfo === '寰呯敓鏁�'">{{ model.statusInfo }}</span>
+ <span :class="'apply-status'+model.status" v-else>{{ model.statusInfo }}</span>
+ </span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
@@ -49,7 +52,7 @@
<el-button v-if="[6,7,8,11].includes(model.status) && model.solutionType ==0" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
<el-button v-if="[22, 0].includes(model.status) && [0,1].includes(model.solutionType)" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
<el-button v-if="![1, 4, 5].includes(model.status) && [0,1].includes(model.solutionType)" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
- <el-button v-if="[5,27].includes(model.status) && userInfo.type === 0" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
+ <el-button v-if="[5,27].includes(model.status) && ['寰呯敓鏁�'].includes(model.statusInfo) && userInfo.type === 0" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
</template>
</div>
@@ -244,7 +247,7 @@
<template slot-scope="{row}">
<span v-if="row.applyStatus === 0" style="color: #00BA92;">淇濋殰涓�</span>
<span v-if="row.applyStatus === 1" style="color: #999;">涓嶅湪淇�</span>
- <span v-if="row.applyStatus === 2" style="color: #00BA92;">寰呯敓鏁�</span>
+ <span v-if="row.applyStatus === 2" style="color: #f95601;">寰呯敓鏁�</span>
</template>
</el-table-column>
<el-table-column
@@ -421,7 +424,7 @@
:key="Math.random()"
prop="changeNum"
align="center"
- label="鏇存崲宸ョ浜烘暟">
+ :label="model.hasDispatchUnit !== 1 ? '鏇存崲娲鹃仯鍗曚綅浜烘暟' : '鏇存崲宸ョ浜烘暟'">
<template scope="{row}">
{{row.changeNum||0}} 浜�
</template>
@@ -996,14 +999,18 @@
.desc_item_label {
width: 100%;
display: flex;
- align-items: center;
- justify-content: space-between;
+ align-items: start;
+ flex-direction: column;
margin-bottom: 10px;
span {
font-size: 14px;
color: black;
margin-right: 30px;
}
+ .desc_item_label_right {
+ width: 100%;
+ margin: 10px 0;
+ }
}
.desc_item_from {
width: 100%;
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index a406df4..3ea73c1 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -20,7 +20,9 @@
<div class="desc_item_label_left">
<span>鎶曚繚浜猴細{{ model.shopName }}</span>
<span>琚繚闄╀汉锛歿{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span></span>
+ <span>淇濆崟鐘舵�侊細
+ <span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span>
+ </span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
@@ -127,6 +129,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-select>
</el-form-item>
<el-form-item label="娲鹃仯鍗曚綅" prop="duId" v-if="model.hasDispatchUnit !== 1">
@@ -246,9 +249,9 @@
:key="Math.random()"
label="鍦ㄤ繚鐘舵��">
<template slot-scope="{row}">
- <span v-if="row.applyStatus === 0">淇濋殰涓�</span>
- <span v-if="row.applyStatus === 1">涓嶅湪淇�</span>
- <span v-if="row.applyStatus === 2">寰呯敓鏁�</span>
+ <span v-if="row.applyStatus === 0" style="color: #00BA92;">淇濋殰涓�</span>
+ <span v-if="row.applyStatus === 1" style="color: #999;">涓嶅湪淇�</span>
+ <span v-if="row.applyStatus === 2" style="color: #f95601;">寰呯敓鏁�</span>
</template>
</el-table-column>
<el-table-column
@@ -415,7 +418,7 @@
:key="Math.random()"
prop="changeNum"
align="center"
- label="鏇存崲娲鹃仯鍗曚綅浜烘暟">
+ :label="model.hasDispatchUnit !== 1 ? '鏇存崲娲鹃仯鍗曚綅浜烘暟' : '鏇存崲宸ョ浜烘暟'">
</el-table-column>
<el-table-column
:key="Math.random()"
diff --git a/company/src/components/business/allocateEnterprises.vue b/company/src/components/business/allocateEnterprises.vue
index d67e1cb..9488e2c 100644
--- a/company/src/components/business/allocateEnterprises.vue
+++ b/company/src/components/business/allocateEnterprises.vue
@@ -3,7 +3,7 @@
class="menu-config-dialog"
:visible.sync="visible"
:confirm-working="isWorking"
- width="576px"
+ width="800px"
title="鍒嗛厤鏈嶅姟浼佷笟"
@confirm="confirm"
>
@@ -93,7 +93,11 @@
}
}
</script>
-
+<style>
+ .el-transfer-panel {
+ width: 300px !important;
+ }
+</style>
<style scoped lang="scss">
@import "@/assets/style/variables.scss";
.global-window {
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index e63681b..d57101c 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -28,6 +28,11 @@
<el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
<!-- <el-button v-if="[2].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>-->
<el-button v-if="model.status == 3" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+
+ <el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '鏌ョ湅鐢宠鍗�' : '鏌ョ湅鎶曚繚鍗�'}}</el-button>
+ <el-button v-if="[0,1,2,5].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
+ <el-button v-if="[5].includes(model.status)" type="primary" @click="fusheng">鎶曚繚澶嶅</el-button>
+
<el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('閫�鍥炵敵璇�',model,1)">閫�鍥炵敵璇�</el-button>
</template>
<template v-if="userInfo.type ===0">
diff --git a/company/src/components/business/modification.vue b/company/src/components/business/modification.vue
index 710adf3..7d186a0 100644
--- a/company/src/components/business/modification.vue
+++ b/company/src/components/business/modification.vue
@@ -124,9 +124,10 @@
if (item.id === e) {
baseId = item.baseId
this.form.solutionList[index].solution.type = item.type
- if(item.type == 1){
+ // console.log(item.type)
+ // if(item.type == 1){
this.form.solutionList[index].shopId =item.shopId
- }
+ // }
}
})
diff --git a/company/src/components/common/CommonHeader.vue b/company/src/components/common/CommonHeader.vue
index 26bcbeb..606771e 100644
--- a/company/src/components/common/CommonHeader.vue
+++ b/company/src/components/common/CommonHeader.vue
@@ -214,7 +214,11 @@
}
}
</script>
-
+<style>
+ .el-dropdown-menu {
+ width: 240px !important;
+ }
+</style>
<style scoped lang="scss">
@import "@/assets/style/variables.scss";
.common-header {
diff --git a/company/src/components/system/role/PermissionConfigWindow.vue b/company/src/components/system/role/PermissionConfigWindow.vue
index 17476a0..7c2c014 100644
--- a/company/src/components/system/role/PermissionConfigWindow.vue
+++ b/company/src/components/system/role/PermissionConfigWindow.vue
@@ -2,7 +2,7 @@
<GlobalWindow
:visible.sync="visible"
:confirm-working="isWorking"
- width="582px"
+ width="800px"
title="閰嶇疆瑙掕壊鏉冮檺"
@confirm="confirm"
>
@@ -122,3 +122,8 @@
}
}
</style>
+<style>
+ .el-transfer-panel {
+ width: 300px !important;
+ }
+</style>
diff --git a/company/src/components/system/user/RoleConfigWindow.vue b/company/src/components/system/user/RoleConfigWindow.vue
index 5b029f7..3bf8d7a 100644
--- a/company/src/components/system/user/RoleConfigWindow.vue
+++ b/company/src/components/system/user/RoleConfigWindow.vue
@@ -2,7 +2,7 @@
<GlobalWindow
:visible.sync="visible"
:confirm-working="isWorking"
- width="582px"
+ width="800px"
title="閰嶇疆鐢ㄦ埛瑙掕壊"
@confirm="confirm"
>
@@ -125,3 +125,8 @@
}
}
</style>
+<style>
+ .el-transfer-panel {
+ width: 300px !important;
+ }
+</style>
diff --git a/company/src/utils/request.js b/company/src/utils/request.js
index df73178..ea38661 100644
--- a/company/src/utils/request.js
+++ b/company/src/utils/request.js
@@ -42,6 +42,7 @@
// 鏂板缓鍝嶅簲鎷︽埅鍣�
axiosInstance.interceptors.response.use((response) => {
+ // console.log(response)
// 璇锋眰澶辫触
if (response.status !== 200) {
return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
@@ -64,6 +65,7 @@
}
return response.data.data
}, function (error) {
+ console.log(error)
if (error.code == null) {
return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
}
diff --git a/company/src/utils/resetMessage.js b/company/src/utils/resetMessage.js
index 9408177..4fca990 100644
--- a/company/src/utils/resetMessage.js
+++ b/company/src/utils/resetMessage.js
@@ -1,32 +1,18 @@
-//resetMessage.js
-/**閲嶇疆message锛岄槻姝㈤噸澶嶇偣鍑婚噸澶嶅脊鍑簃essage娑堟伅鎻愮ず */
-import {
- Message
-} from 'element-ui';
+import { Message } from 'element-ui';
let messageInstance = null;
-const resetMessage = (options) => {
- if(messageInstance) {
- messageInstance.close();
-
+export const showMessage = (message) => {
+ if (messageInstance) {
+ // 濡傛灉宸茬粡瀛樺湪涓�涓秷鎭彁绀哄疄渚嬶紝鍒欏厛鍏抽棴瀹�
+ Message.closeAll();
}
- Message.closeAll(); //鎵嬪姩鍏抽棴鎵�鏈夋秷鎭彁绀哄疄渚�
- messageInstance = Message(options);
- // console.log(Message(options));
-};
-
-['error','success','info','warning'].forEach(type => {
- resetMessage[type] = options => {
- if(typeof options === 'string') {
- options = {
- message:options
- }
+ // 鏄剧ず鏂扮殑娑堟伅鎻愮ず锛屽苟淇濆瓨璇ュ疄渚�
+ messageInstance = Message({
+ message: message,
+ onClose: () => {
+ messageInstance = null; // 褰撴秷鎭彁绀哄叧闂椂锛屽皢瀹炰緥缃负null
}
- options.type = type
- return resetMessage(options)
- }
-})
-
-export const message = resetMessage
+ });
+}
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 95852cf..4a49a27 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -73,6 +73,7 @@
<span style="color: #666;" v-if="[9,25,27,5].includes(row.status) && ['宸插叧闂�','宸茶繃鏈�'].includes(row.statusInfo)">{{row.statusInfo}}</span>
<span style="color: red;" v-else-if="row.status === 4 && row.statusInfo === '宸查��鍥�'">{{ row.statusInfo}}</span>
<span style="color: #f95601;" v-else-if="[5,27].includes(row.status) && row.statusInfo === '寰呯敓鏁�'">{{ row.statusInfo}}</span>
+ <span style="color: #216EEE;" v-else-if="[12].includes(row.status) && row.statusInfo === '寰呭鏍�'">{{ row.statusInfo}}</span>
<span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
</template>
</el-table-column>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 40b24a3..73fc0c6 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -57,6 +57,7 @@
<span style="color: #666;" v-if="[9,25,27,5].includes(row.status) && ['宸插叧闂�','宸茶繃鏈�'].includes(row.statusInfo)">{{row.statusInfo}}</span>
<span style="color: red;" v-else-if="row.status === 4 && row.statusInfo === '宸查��鍥�'">{{ row.statusInfo}}</span>
<span style="color: #f95601;" v-else-if="[5,27].includes(row.status) && row.statusInfo === '寰呯敓鏁�'">{{ row.statusInfo}}</span>
+ <span style="color: #216EEE;" v-else-if="[12].includes(row.status) && row.statusInfo === '寰呭鏍�'">{{ row.statusInfo}}</span>
<span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
<!-- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>-->
</template>
@@ -199,7 +200,7 @@
isShow(status, endTime) {
const currentDate = new Date();
const specifiedDate = new Date(endTime);
- return status === 5 && (currentDate < specifiedDate);
+ return [5,27].includes(status) && (currentDate < specifiedDate);
},
changeStatus(e) {
if (e.indexOf(',') !== -1) {
@@ -221,7 +222,6 @@
this.search()
},
result(flag,param){
- console.log(flag,param)
if(param && param.godetail && param.id){
if (param.type == 1) {
this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: param.id })
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 5850eaa..86ba11f 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -147,7 +147,7 @@
</div>
<div class="home_content_right_page">
<el-pagination
- @current-change="handleCurrentChange2"
+ @current-change="handleCurrentChange6"
:current-page="page6"
:page-size="5"
layout="total, prev, pager, next, jumper"
@@ -187,10 +187,10 @@
</div>
</div>
<div v-if="activeName === '8'">
- <div class="home_content_right_list" v-if="tableData7 && tableData7.length">
- <div class="list_item" v-for="(item, index) in tableData7" :key="index">
+ <div class="home_content_right_list" v-if="tableData8 && tableData8.length">
+ <div class="list_item" v-for="(item, index) in tableData8" :key="index">
<div class="list_item_left">
- <span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
+ <span>{{item.title}}锛堝緟瀹℃牳锛�</span>
<span>{{item.info}}锛坽{item.content}}锛�</span>
</div>
<div class="list_item_center">
diff --git a/company/src/views/system/role.vue b/company/src/views/system/role.vue
index 667cc71..579e7ca 100644
--- a/company/src/views/system/role.vue
+++ b/company/src/views/system/role.vue
@@ -42,12 +42,12 @@
<el-table-column
v-if="containPermissions(['system:role:update', 'system:role:createRolePermission', 'system:role:createRoleMenu', 'system:role:delete'])"
label="鎿嶄綔"
- min-width="330"
+ min-width="260"
fixed="right"
>
<template slot-scope="{row}">
<el-button type="text" @click="$refs.operaRoleWindow.open('缂栬緫瑙掕壊', row)" icon="el-icon-edit" v-permissions="['system:role:update']">缂栬緫</el-button>
- <el-button type="text" @click="openRole(row.systemDataPermission, row.id)">鏁版嵁鏉冮檺</el-button>
+<!-- <el-button type="text" @click="openRole(row.systemDataPermission, row.id)">鏁版嵁鏉冮檺</el-button>-->
<el-button type="text" @click="$refs.permissionConfigWindow.open(row)" v-permissions="['system:role:createRolePermission']">閰嶇疆鏉冮檺</el-button>
<el-button type="text" @click="$refs.menuConfigWindow.open(row)" icon="el-icon-menu" v-permissions="['system:role:createRoleMenu']">鎺堟潈鑿滃崟</el-button>
<el-button v-if="!row.fixed" type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['system:role:delete']">鍒犻櫎</el-button>
diff --git a/company/src/views/system/user.vue b/company/src/views/system/user.vue
index 0b144fc..26bceaf 100644
--- a/company/src/views/system/user.vue
+++ b/company/src/views/system/user.vue
@@ -1,180 +1,180 @@
<template>
- <TableLayout :permissions="['system:user:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
- <el-form-item label="濮撳悕" prop="realname">
- <el-input v-model="searchForm.realname" v-trim placeholder="璇疯緭鍏�" @keypress.enter.native="search"/>
- </el-form-item>
- <el-form-item label="鎵�灞為儴闂�" prop="companyDepartmentPathName">
- <el-input v-model="searchForm.companyDepartmentPathName" v-trim placeholder="璇疯緭鍏�" @keypress.enter.native="search"/>
- </el-form-item>
- <section>
- <el-button type="primary" icon="el-icon-search" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['system:user:create', 'system:user:delete']">
- <li v-permissions="['system:user:create']"><el-button type="primary" @click="$refs.operaUserWindow.open('鏂板璐﹀彿')">鏂板璐﹀彿</el-button></li>
-<!-- <li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>-->
- </ul>
-<!-- @selection-change="handleSelectionChange"-->
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- :default-sort = "{prop: 'createTime', order: 'descending'}"
- stripe
- @sort-change="handleSortChange"
- >
- <el-table-column label="搴忓彿" width="80px">
- <template slot-scope="scope">
- <span>{{scope.$index + 1}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="username" label="璐﹀彿" min-width="120px"></el-table-column>
- <el-table-column prop="realname" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
- <el-table-column label="涓荤" min-width="100px">
- <template slot-scope="{ row }">
- <el-switch
- v-model="row.headStatus"
- @change="setHeadStatus($event, row)"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="1"
- :inactive-value="0">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="companyDepartmentPathName" label="鎵�鍦ㄩ儴闂�" min-width="100px"></el-table-column>
- <el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
- <template slot-scope="{row}">
- <ul>
- <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
- </ul>
- </template>
- </el-table-column>
- <el-table-column label="鍚敤鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <el-switch
- v-if="!row.fixed"
- @change="changeStatus($event, row)"
- v-model="row.status"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="0"
- :inactive-value="1">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column
- v-if="containPermissions(['system:user:update', 'system:user:createUserRole', 'system:user:resetPwd', 'system:user:delete'])"
- label="鎿嶄綔"
- width="270"
- fixed="right"
- >
-<!-- row.id !== userInfo.id &&-->
- <template v-if="isAdmin || (row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('缂栬緫鐢ㄦ埛', {...row, departmentId: row.companyDepartmentPathId.substring(0, row.companyDepartmentPathId.length - 1).split('/').map(val => +val)})" v-permissions="['system:user:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.allocationEnterprises.open('鍒嗛厤浼佷笟', row)" v-if="[0,2].includes(userInfo.type)">鍒嗛厤浼佷笟</el-button>
- <el-button type="text" icon="el-icon-s-custom" @click="$refs.roleConfigWindow.open(row)" v-permissions="['system:user:createUserRole']">閰嶇疆瑙掕壊</el-button>
- <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-button>
-<!-- <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:user:delete']">鍒犻櫎</el-button>-->
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- ></pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaUserWindow ref="operaUserWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
- <!-- 閰嶇疆瑙掕壊 -->
- <RoleConfigWindow ref="roleConfigWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
- <!-- 閲嶇疆瀵嗙爜 -->
- <ResetPwdWindow ref="resetPwdWindow"/>
- <!-- 鍒嗛厤浼佷笟 -->
- <allocationEnterprises ref="allocationEnterprises" @success="handlePageChange(tableData.pagination.pageIndex)"/>
- </TableLayout>
+ <TableLayout :permissions="['system:user:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="80px" inline>
+ <el-form-item label="濮撳悕" prop="realname">
+ <el-input v-model="searchForm.realname" v-trim placeholder="璇疯緭鍏�" @keypress.enter.native="search"/>
+ </el-form-item>
+ <el-form-item label="鎵�灞為儴闂�" prop="companyDepartmentPathName">
+ <el-input v-model="searchForm.companyDepartmentPathName" v-trim placeholder="璇疯緭鍏�" @keypress.enter.native="search"/>
+ </el-form-item>
+ <section>
+ <el-button type="primary" icon="el-icon-search" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['system:user:create', 'system:user:delete']">
+ <li v-permissions="['system:user:create']"><el-button type="primary" @click="$refs.operaUserWindow.open('鏂板璐﹀彿')">鏂板璐﹀彿</el-button></li>
+ <!-- <li v-permissions="['system:user:delete']"><el-button icon="el-icon-delete" @click="deleteByIdInBatch">鍒犻櫎</el-button></li>-->
+ </ul>
+ <!-- @selection-change="handleSelectionChange"-->
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ :default-sort = "{prop: 'createTime', order: 'descending'}"
+ stripe
+ @sort-change="handleSortChange"
+ >
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="username" label="璐﹀彿" min-width="120px"></el-table-column>
+ <el-table-column prop="realname" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
+ <el-table-column label="涓荤" min-width="100px">
+ <template slot-scope="{ row }">
+ <el-switch
+ v-model="row.headStatus"
+ @change="setHeadStatus($event, row)"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="1"
+ :inactive-value="0">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column prop="companyDepartmentPathName" label="鎵�鍦ㄩ儴闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
+ <template slot-scope="{row}">
+ <ul>
+ <li v-for="role in row.roles" :key="role.id">{{role.name}}</li>
+ </ul>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍚敤鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <el-switch
+ v-if="!row.fixed"
+ @change="changeStatus($event, row)"
+ v-model="row.status"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ :active-value="0"
+ :inactive-value="1">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-if="containPermissions(['system:user:update', 'system:user:createUserRole', 'system:user:resetPwd', 'system:user:delete'])"
+ label="鎿嶄綔"
+ width="270"
+ fixed="right"
+ >
+ <!-- row.id !== userInfo.id &&-->
+ <template v-if="isAdmin || (row.roles.findIndex(r => r.code === adminCode) === -1)" slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" @click="$refs.operaUserWindow.open('缂栬緫鐢ㄦ埛', {...row, departmentId: row.companyDepartmentPathId ? row.companyDepartmentPathId.substring(0, row.companyDepartmentPathId.length - 1).split('/').map(val => +val) : '' })" v-permissions="['system:user:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.allocationEnterprises.open('鍒嗛厤浼佷笟', row)" v-if="[0,2].includes(userInfo.type)">鍒嗛厤浼佷笟</el-button>
+ <el-button type="text" icon="el-icon-s-custom" @click="$refs.roleConfigWindow.open(row)" v-permissions="['system:user:createUserRole']">閰嶇疆瑙掕壊</el-button>
+ <el-button type="text" @click="$refs.resetPwdWindow.open(row)" v-permissions="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-button>
+ <!-- <el-button v-if="!row.fixed" type="text" icon="el-icon-delete" @click="deleteById(row)" v-permissions="['system:user:delete']">鍒犻櫎</el-button>-->
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ ></pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaUserWindow ref="operaUserWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
+ <!-- 閰嶇疆瑙掕壊 -->
+ <RoleConfigWindow ref="roleConfigWindow" @success="handlePageChange(tableData.pagination.pageIndex)"/>
+ <!-- 閲嶇疆瀵嗙爜 -->
+ <ResetPwdWindow ref="resetPwdWindow"/>
+ <!-- 鍒嗛厤浼佷笟 -->
+ <allocationEnterprises ref="allocationEnterprises" @success="handlePageChange(tableData.pagination.pageIndex)"/>
+ </TableLayout>
</template>
<script>
-import Pagination from '@/components/common/Pagination'
-import TableLayout from '@/layouts/TableLayout'
-import BaseTable from '@/components/base/BaseTable'
-import OperaUserWindow from '@/components/system/user/OperaUserWindow'
-import allocationEnterprises from '@/components/system/user/allocationEnterprises'
-import RoleConfigWindow from '@/components/system/user/RoleConfigWindow'
-import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
-import DepartmentSelect from '@/components/common/DepartmentSelect'
-import PositionSelect from '@/components/common/PositionSelect'
-import { updUserStatus, updateHead } from '@/api/system/user'
-import { mapState } from 'vuex'
-export default {
- name: 'SystemUser',
- extends: BaseTable,
- computed: {
- ...mapState(['userInfo'])
- },
- components: { allocationEnterprises, PositionSelect, DepartmentSelect, ResetPwdWindow, RoleConfigWindow, OperaUserWindow, TableLayout, Pagination },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- username: '', // 鍚嶅瓧
- realname: '', // 濮撳悕
- rootDeptId: null, // 閮ㄩ棬ID
- positionId: null, // 宀椾綅ID
- mobile: '', // 鎵嬫満鍙风爜
- type: '',
- companyDepartmentPathName: '' // 閮ㄩ棬鍚嶇О
+ import Pagination from '@/components/common/Pagination'
+ import TableLayout from '@/layouts/TableLayout'
+ import BaseTable from '@/components/base/BaseTable'
+ import OperaUserWindow from '@/components/system/user/OperaUserWindow'
+ import allocationEnterprises from '@/components/system/user/allocationEnterprises'
+ import RoleConfigWindow from '@/components/system/user/RoleConfigWindow'
+ import ResetPwdWindow from '@/components/system/user/ResetPwdWindow'
+ import DepartmentSelect from '@/components/common/DepartmentSelect'
+ import PositionSelect from '@/components/common/PositionSelect'
+ import { updUserStatus, updateHead } from '@/api/system/user'
+ import { mapState } from 'vuex'
+ export default {
+ name: 'SystemUser',
+ extends: BaseTable,
+ computed: {
+ ...mapState(['userInfo'])
+ },
+ components: { allocationEnterprises, PositionSelect, DepartmentSelect, ResetPwdWindow, RoleConfigWindow, OperaUserWindow, TableLayout, Pagination },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ username: '', // 鍚嶅瓧
+ realname: '', // 濮撳悕
+ rootDeptId: null, // 閮ㄩ棬ID
+ positionId: null, // 宀椾綅ID
+ mobile: '', // 鎵嬫満鍙风爜
+ type: '',
+ companyDepartmentPathName: '' // 閮ㄩ棬鍚嶇О
+ }
+ }
+ },
+ created () {
+ this.config({
+ module: '鐢ㄦ埛',
+ api: '/system/user',
+ 'field.main': 'realname',
+ sorts: [{
+ property: 'CREATE_TIME',
+ direction: 'DESC'
+ }]
+ })
+ this.searchForm.type = this.userInfo.type
+ this.search()
+ },
+ methods: {
+ // 璁剧疆鍙栨秷涓荤
+ setHeadStatus(e, row) {
+ updateHead({ id: row.id, headStatus: row.headStatus })
+ .then(res => {
+ this.search()
+ })
+ },
+ changeStatus(status, row) {
+ updUserStatus({
+ id: row.id,
+ status
+ }).then(res => {
+ this.search()
+ }).catch(err => {
+ row.status = row.status === 0 ? 1 : 0
+ })
}
}
- },
- created () {
- this.config({
- module: '鐢ㄦ埛',
- api: '/system/user',
- 'field.main': 'realname',
- sorts: [{
- property: 'CREATE_TIME',
- direction: 'DESC'
- }]
- })
- this.searchForm.type = this.userInfo.type
- this.search()
- },
- methods: {
- // 璁剧疆鍙栨秷涓荤
- setHeadStatus(e, row) {
- updateHead({ id: row.id, headStatus: row.headStatus })
- .then(res => {
- this.search()
- })
- },
- changeStatus(status, row) {
- updUserStatus({
- id: row.id,
- status
- }).then(res => {
- this.search()
- }).catch(err => {
- row.status = row.status === 0 ? 1 : 0
- })
- }
}
-}
</script>
<style scoped lang="scss">
-@import "@/assets/style/variables.scss";
-// 鍒楄〃澶村儚澶勭悊
-.table-column-avatar {
- img {
- width: 48px;
- }
-}
+ @import "@/assets/style/variables.scss";
+ // 鍒楄〃澶村儚澶勭悊
+ .table-column-avatar {
+ img {
+ width: 48px;
+ }
+ }
</style>
--
Gitblit v1.9.3