From 0c6aa6e556a8771897b9251a296a7a0c15c57c46 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 十一月 2024 18:28:17 +0800
Subject: [PATCH] 优化
---
company/src/components/business/OperaSolutionsDescWindow.vue | 3
company/src/components/enterprise/additionSubtractionApplication.vue | 16 +++++
company/src/views/business/unionApply.vue | 14 +++-
company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue | 2
company/src/components/business/OperaInsuranceApplyWindow.vue | 6 +-
company/src/components/business/OperaSolutionsBaseWindow.vue | 42 +++++++++++++-
company/src/components/business/detailsEntrustedInsurance.vue | 14 +++-
company/src/components/business/modification.vue | 1
company/src/components/enterprise/addEmployeeWithDu.vue | 6 +
company/src/views/system/user.vue | 4
company/src/components/system/user/allocationEnterprises.vue | 11 ++-
company/src/views/business/unionChangeUnit.vue | 16 ++--
company/src/components/system/user/OperaUserWindow.vue | 4
company/src/views/business/insuranceApply.vue | 11 ++-
company/src/views/business/unionChange.vue | 2
company/src/assets/style/style.scss | 10 +++
company/src/views/enterprise/insuranceApply.vue | 8 ++
company/src/api/business/worktype.js | 5 +
18 files changed, 135 insertions(+), 40 deletions(-)
diff --git a/company/src/api/business/worktype.js b/company/src/api/business/worktype.js
index c6fbbfc..39238ec 100644
--- a/company/src/api/business/worktype.js
+++ b/company/src/api/business/worktype.js
@@ -14,3 +14,8 @@
export function findListByDTO (data) {
return request.post('/business/worktype/findListByDTO', data)
}
+
+// 涓绘柟妗堝鍏ュ伐绉�
+export function importExcelForSolution (data) {
+ return request.post('/business/worktype/importExcelForSolution', data)
+}
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index 620ff86..e3d4276 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -99,7 +99,15 @@
.settle-status1,.change-status6,
.tax-status2,.union-apply-status4,
.du-status2 {
- color: #F95601 !important;
+ color: #f95601 !important;
+}
+
+.change-status6 {
+ color: #999 !important;
+}
+
+.change-status5, .change-status8 {
+ color: red !important;
}
.tip-warn {
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 2b8e69d..6eaaad7 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -242,9 +242,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: #00BA92;">寰呯敓鏁�</span>
</template>
</el-table-column>
<el-table-column
diff --git a/company/src/components/business/OperaSolutionsBaseWindow.vue b/company/src/components/business/OperaSolutionsBaseWindow.vue
index 6772793..bbb4437 100644
--- a/company/src/components/business/OperaSolutionsBaseWindow.vue
+++ b/company/src/components/business/OperaSolutionsBaseWindow.vue
@@ -87,7 +87,11 @@
placeholder="璇烽�夋嫨鎵规敼鎻愰啋鏃堕棿">
</el-time-picker>
</el-form-item>
- <el-button type="primary" @click="add" style="margin-bottom: 10px;">娣诲姞宸ョ</el-button>
+ <div style="display: flex; align-items: center;">
+ <el-button type="primary" @click="add" style="margin-bottom: 10px;">娣诲姞宸ョ</el-button>
+ <el-button type="primary" @click="impor" style="margin-bottom: 10px;">瀵煎叆宸ョ</el-button>
+ <el-button type="text" @click="exprot">瀵煎叆妯＄増xls</el-button>
+ </div>
<el-table
:data="form.worktypeIdList"
border
@@ -133,6 +137,8 @@
<RichEditor :richData="form.ortherInfo" :styleEditor="'border: 1px solid #ccc;display: inline-block;'" @getWangedditor="getWangedditor2" :readonly="false"/>
</el-form-item>
</el-form>
+ <!-- 涓婁紶宸ョ -->
+ <input type="file" @change="getFile" style="opacity: 0;" ref="upload" accept=".xlsx" />
</GlobalWindow>
</template>
@@ -140,7 +146,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { all } from '@/api/business/insurance'
- import { all as allWorktype } from '@/api/business/worktype'
+ import { all as allWorktype, importExcelForSolution } from '@/api/business/worktype'
import { solutionsBaseId } from '@/api/business/solutionsBase'
import { pageAll as shopList } from '@/api/business/company'
import UploadFile from '@/components/common/UploadFile'
@@ -233,6 +239,37 @@
})
},
methods: {
+ // 瀵煎叆宸ョ妯℃澘
+ getFile(e) {
+ const formdate = new FormData()
+ formdate.append('file', e.target.files[0])
+ formdate.append('insuranceId', this.form.insuranceId)
+ importExcelForSolution(formdate)
+ .then(res => {
+ console.log(res)
+ res.forEach(id => {
+ if (this.form.worktypeIdList.length === 1 && !this.form.worktypeIdList[0].worktypeId) {
+ this.form.worktypeIdList[0].worktypeId = id
+ } else {
+ this.form.worktypeIdList.push({ worktypeId: id })
+ }
+ })
+ })
+ .catch(err => {
+ this.$message.error(err.message)
+ })
+ .finally(() => {
+ this.$refs.upload.value = null
+ })
+ },
+ impor() {
+ if (!this.form.insuranceId) return this.$message.warning('璇峰厛閫夋嫨浼佷笟')
+ this.$refs.upload.click()
+ },
+ // 瀵煎嚭妯℃澘
+ exprot() {
+ window.open(process.env.VUE_APP_TYPEWORK_URL)
+ },
getWangedditor(val){
this.form.specialAgreement = val;
},
@@ -349,7 +386,6 @@
this.form[key] = res[key]
}
this.form.correctWarnTime = `${this.form.correctWarnTime}:00`
- console.log(this.form.correctWarnTime)
if (res.worktypeList) {
this.form.worktypeIdList = res.worktypeList.map(item => {
return {
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index 2fa8651..67a8b60 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -57,8 +57,9 @@
<div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="鐐瑰嚮鏌ョ湅" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '鐐瑰嚮鏌ョ湅' }}</a></div>
</div>
</div>
- <div style="font-size: 18px; font-weight: bold; margin-bottom: 10px;">鏂规浣跨敤鎯呭喌</div>
+ <div style="font-size: 18px; font-weight: bold; margin-bottom: 10px;" v-if="userInfo.type === 0">鏂规浣跨敤鎯呭喌</div>
<el-table
+ v-if="userInfo.type === 0"
:data="list"
border
style="width: 100%; margin-bottom: 20px;">
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index 0c64a2f..e63681b 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -11,7 +11,13 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浜猴細{{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細<span :class="'union-apply-status'+model.status" >{{ model.statusInfo }}</span></span>
+ <span>淇濆崟鐘舵�侊細
+ <span v-if="model.status === 5 && model.statusInfo === '寰呭鏍�'" style="color: #216EEE;">{{ model.statusInfo }}</span>
+ <span v-else-if="model.status === 3 && model.statusInfo === '宸茶繃鏈�'" style="color: #999;">{{ model.statusInfo }}</span>
+ <span v-else-if="model.status === 3 && model.statusInfo === '寰呯敓鏁�'" style="color: #f95601;">{{ model.statusInfo }}</span>
+ <span v-else-if="model.status === 4 && model.statusInfo === '宸查��鍥�'" style="color: red;">{{ model.statusInfo }}</span>
+ <span :class="'union-apply-status'+model.status" v-else>{{ model.statusInfo }}</span>
+ </span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
@@ -189,9 +195,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: #00BA92;">寰呯敓鏁�</span>
</template>
</el-table-column>
<el-table-column
diff --git a/company/src/components/business/modification.vue b/company/src/components/business/modification.vue
index 081cdb9..710adf3 100644
--- a/company/src/components/business/modification.vue
+++ b/company/src/components/business/modification.vue
@@ -10,6 +10,7 @@
<el-table v-if="form.solutionList && form.solutionList.length>0"
:data="form.solutionList"
border
+ border
style="width: 100%">
<el-table-column
label="搴忓彿"
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
index 98b1247..2b3f5b0 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyAddWindow.vue
@@ -544,7 +544,7 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price, solutionId: this.form.solutionId, companyId: this.form.companyId })
+ this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price, solutionId: this.form.solutionId, hasDispatchUnit: this.item.hasDispatchUnit, companyId: this.userInfo.type === 1 ? this.userInfo.companyId : this.form.companyId })
},
uploadUser () {
if (!this.form.solutionId) {
diff --git a/company/src/components/enterprise/addEmployeeWithDu.vue b/company/src/components/enterprise/addEmployeeWithDu.vue
index 1988fb2..80b00ca 100644
--- a/company/src/components/enterprise/addEmployeeWithDu.vue
+++ b/company/src/components/enterprise/addEmployeeWithDu.vue
@@ -14,7 +14,7 @@
<el-form-item label="韬唤璇佸彿" required>
<el-input v-model="item.idCard" maxlength="18" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
- <el-form-item label="娲鹃仯鍗曚綅" v-if="!companyId">
+ <el-form-item label="娲鹃仯鍗曚綅" v-if="hasDispatchUnit !== 1">
<el-select v-model="item.duId" @change="selectChange(index)" placeholder="璇烽�夋嫨" clearable>
<el-option
v-for="item in dispatching"
@@ -58,6 +58,7 @@
dispatching: [],
solutionId: null,
companyId: null,
+ hasDispatchUnit: null,
list: [
{
memberName: '',
@@ -81,6 +82,7 @@
this.tempIndex = tempIndex
this.solutionId = obj.solutionId
this.companyId = obj.companyId
+ this.hasDispatchUnit = obj.hasDispatchUnit
this.dispatching = []
this.list = [
{
@@ -96,7 +98,7 @@
]
this.arr = obj.arr
this.price = obj.price
- if (!obj.companyId) {
+ if (obj.hasDispatchUnit === 1) {
this.getFindListByDTO()
} else {
worktype({ id: obj.solutionId, queryType: 0 })
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 7451a80..b3c9821 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -125,6 +125,7 @@
</div>
</div>
<el-table
+ v-if="item"
:data="activeName === '0' ? form.addDetailList : form.delDetailList"
border
show-summary
@@ -373,7 +374,20 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鎬讳环'
- } else if (index === 7) {
+ } else if (this.item.hasDispatchUnit === 1 && index === 6) {
+ let total = 0
+ if (this.activeName === '0') {
+ this.form.addDetailList.forEach(item => {
+ total += item.fee || 0
+ })
+ sums[index] = (total || 0).toFixed(2)
+ } else {
+ this.form.delDetailList.forEach(item => {
+ total += item.reducePrice
+ })
+ sums[index] = (total || 0).toFixed(2)
+ }
+ } else if (this.item.hasDispatchUnit !== 1 && index === 7) {
let total = 0
if (this.activeName === '0') {
this.form.addDetailList.forEach(item => {
diff --git a/company/src/components/system/user/OperaUserWindow.vue b/company/src/components/system/user/OperaUserWindow.vue
index 53891db..85dce16 100644
--- a/company/src/components/system/user/OperaUserWindow.vue
+++ b/company/src/components/system/user/OperaUserWindow.vue
@@ -92,7 +92,7 @@
return
}
let obj = JSON.parse(JSON.stringify(this.form))
- obj.departmentId = obj.departmentId[0]
+ obj.departmentId = obj.departmentId[obj.departmentId.length - 1]
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
this.api.create(obj)
@@ -115,7 +115,7 @@
return
}
let obj = JSON.parse(JSON.stringify(this.form))
- obj.departmentId = obj.departmentId[0]
+ obj.departmentId = obj.departmentId[obj.departmentId.length - 1]
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
this.api.updateById(obj)
diff --git a/company/src/components/system/user/allocationEnterprises.vue b/company/src/components/system/user/allocationEnterprises.vue
index d9a9c14..0a26f64 100644
--- a/company/src/components/system/user/allocationEnterprises.vue
+++ b/company/src/components/system/user/allocationEnterprises.vue
@@ -2,8 +2,8 @@
<GlobalWindow
:visible.sync="visible"
:confirm-working="isWorking"
- width="582px"
- title="閰嶇疆鐢ㄦ埛瑙掕壊"
+ width="800px"
+ title="鍒嗛厤浼佷笟"
@confirm="confirm"
>
<p class="tip" v-if="user != null">涓虹敤鎴� <em>{{user.realname}}</em> 鍒嗛厤浼佷笟</p>
@@ -91,9 +91,14 @@
}
}
</script>
-
+<style>
+ .el-transfer-panel {
+ width: 300px !important;
+ }
+</style>
<style scoped lang="scss">
@import "@/assets/style/variables.scss";
+
// 瑙掕壊閰嶇疆
.global-window {
.tip {
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 3a6cc41..95852cf 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -68,9 +68,12 @@
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
+ <el-table-column prop="statusInfo" align="center" fixed label="鐘舵��">
<template slot-scope="{row}">
- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
+ <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 :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionsName" fixed label="淇濋櫓鏂规" align="center" min-width="150"></el-table-column>
@@ -208,6 +211,7 @@
this.searchForm.timeOut = e.split(',')[1]
this.searchForm.statusCollect = e.split(',')[0]
} else {
+ this.searchForm.timeOut = ''
this.searchForm.statusCollect = e
}
this.search()
@@ -219,7 +223,8 @@
reset () {
this.$refs.searchForm.resetFields()
this.statusCollect = ''
- this.searchForm.statusCollect = ''
+ this.searchForm.timeOut = ''
+ this.searchForm.statusCollect = ''
this.searchForm.createTimeS = ''
this.searchForm.createTimeE = ''
this.search()
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index 9d9d336..cf2521e 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -2,13 +2,15 @@
<TableLayout :permissions="['business:insuranceapply:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="淇濆崟鐘舵��" prop="status" >
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @keypress.enter.native="search">
+ <el-form-item label="淇濆崟鐘舵��" prop="queryStatus" >
+ <el-select v-model="searchForm.queryStatus" placeholder="璇烽�夋嫨" clearable @change="search">
<el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呯缃�" value="1"></el-option>
<el-option label="寰呭嚭鍗�" value="2"></el-option>
<el-option label="淇濋殰涓�" value="3"></el-option>
<el-option label="宸查��鍥�" value="4"></el-option>
+ <el-option label="寰呯敓鏁�" value="5"></el-option>
+ <el-option label="宸茶繃鏈�" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="淇濋櫓鏂规" prop="solutionId">
@@ -54,7 +56,11 @@
</el-table-column>
<el-table-column prop="statusInfo" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <span :class="'union-apply-status'+row.status" >{{ row.statusInfo}}</span>
+ <span v-if="row.status === 3 && row.statusInfo === '宸茶繃鏈�'" style="color: #999;">{{ row.statusInfo}}</span>
+ <span v-else-if="row.status === 3 && row.statusInfo === '寰呯敓鏁�'" style="color: #f95601;">{{ row.statusInfo}}</span>
+ <span v-else-if="row.status === 4 && row.statusInfo === '宸查��鍥�'" style="color: red;">{{ row.statusInfo}}</span>
+ <span v-else-if="row.status === 5 && row.statusInfo === '寰呭鏍�'" style="color: #216EEE;">{{ row.statusInfo}}</span>
+ <span :class="'union-apply-status'+row.status" v-else>{{ row.statusInfo}}</span>
</template>
</el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
@@ -106,7 +112,7 @@
queryStartTime: '',
queryEndTime: '',
solutionId: '',
- status: '',
+ queryStatus: '',
time: []
},
solutionList: []
diff --git a/company/src/views/business/unionChange.vue b/company/src/views/business/unionChange.vue
index 7d4322b..3a5e242 100644
--- a/company/src/views/business/unionChange.vue
+++ b/company/src/views/business/unionChange.vue
@@ -49,7 +49,7 @@
<span :class="'union-change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
<span :class="'union-change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
<span :class="'union-change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
- <span :class="'union-change-status'+row.status" v-if="row.status === 3">宸查��鍥�</span>
+ <span style="color: red;" v-if="row.status === 3">宸查��鍥�</span>
</template>
</el-table-column>
<el-table-column align="center" prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="150px"></el-table-column>
diff --git a/company/src/views/business/unionChangeUnit.vue b/company/src/views/business/unionChangeUnit.vue
index 0f61809..1b2b926 100644
--- a/company/src/views/business/unionChangeUnit.vue
+++ b/company/src/views/business/unionChangeUnit.vue
@@ -4,10 +4,10 @@
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="淇濆崟鐘舵��" prop="status">
<el-select v-model="searchForm.status" clearable @change="search">
- <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="4"></el-option>
+ <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="solutionName">
@@ -46,10 +46,10 @@
</el-table-column>
<el-table-column align="center" prop="status" label="淇濆崟鐘舵��" min-width="80px">
<template slot-scope="{row}">
- <span :class="'union-change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
- <span :class="'union-change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
- <span :class="'union-change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
- <span :class="'union-change-status'+row.status" v-if="row.status === 3">宸查��鍥�</span>
+ <span :class="'union-change-status'+row.status" v-if="row.status === 0">寰呯缃�</span>
+ <span :class="'union-change-status'+row.status" v-if="row.status === 1">寰呭鏍�</span>
+ <span :class="'union-change-status'+row.status" v-if="row.status === 2">宸茬敓鏁�</span>
+ <span style="color: red;" v-if="row.status === 3">宸查��鍥�</span>
</template>
</el-table-column>
<el-table-column align="center" prop="applyCode" label="鍏宠仈淇濆崟鍙�" min-width="150px"></el-table-column>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 46949c0..40b24a3 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -54,7 +54,11 @@
</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 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 :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
+<!-- <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>-->
</template>
</el-table-column>
<el-table-column prop="solutionsName" fixed label="淇濋櫓鏂规" align="center" min-width="150"></el-table-column>
@@ -202,12 +206,14 @@
this.searchForm.timeOut = e.split(',')[1]
this.searchForm.statusCollect = e.split(',')[0]
} else {
+ this.searchForm.timeOut = ''
this.searchForm.statusCollect = e
}
this.search()
},
reset() {
this.searchForm.createTimeS = ''
+ this.searchForm.timeOut = ''
this.searchForm.createTimeE = ''
this.statusCollect = ''
this.searchForm.statusCollect = ''
diff --git a/company/src/views/system/user.vue b/company/src/views/system/user.vue
index ddd8f3f..0b144fc 100644
--- a/company/src/views/system/user.vue
+++ b/company/src/views/system/user.vue
@@ -76,8 +76,8 @@
>
<!-- 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.departmentId]})" v-permissions="['system:user:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.allocationEnterprises.open('鍒嗛厤浼佷笟', row)" v-if="userInfo.type === 0">鍒嗛厤浼佷笟</el-button>
+ <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>-->
--
Gitblit v1.9.3