From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/views/index.vue | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index 5850eaa..2ee998d 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -26,7 +26,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick" >
<el-tab-pane v-for="a in tabs" :key="a.path" :name="a.name" >
<span slot="label" title="鐐瑰嚮鍒锋柊"> {{a.label }}
- <el-badge v-if="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) >0" :value="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) " class="item"></el-badge>
+ <el-badge v-if="getTotalNoticeCount(a) >0" :value="getTotalNoticeCount(a) " class="item"></el-badge>
</span>
</el-tab-pane>
</el-tabs>
@@ -98,6 +98,9 @@
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
<span>{{item.info}}锛坽{item.content}}锛�</span>
+<!--
+ <span style="font-size: 12px;color: #8c939d;margin-top: 10px">{{item.createDate}}</span>
+-->
</div>
<div class="list_item_center">
<span>{{item.companyName}}</span>
@@ -129,7 +132,7 @@
<div class="list_item" v-for="(item, index) in tableData6" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
- <span>{{item.info}}锛坽{item.content}}锛�</span>
+ <span>{{item.content}}</span>
</div>
<div class="list_item_center">
<span>{{item.companyName}}</span>
@@ -147,7 +150,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"
@@ -160,7 +163,7 @@
<div class="list_item" v-for="(item, index) in tableData7" :key="index">
<div class="list_item_left">
<span>{{item.title}}锛坽{ item.typeDetail }}锛�</span>
- <span>{{item.info}}锛坽{item.content}}锛�</span>
+ <span>{{item.content}}</span>
</div>
<div class="list_item_center">
<span>{{item.companyName}}</span>
@@ -178,7 +181,7 @@
</div>
<div class="home_content_right_page">
<el-pagination
- @current-change="handleCurrentChange2"
+ @current-change="handleCurrentChange7"
:current-page="page7"
:page-size="5"
layout="total, prev, pager, next, jumper"
@@ -187,10 +190,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">
@@ -209,11 +212,11 @@
</div>
<div class="home_content_right_page">
<el-pagination
- @current-change="handleCurrentChange2"
- :current-page="page7"
+ @current-change="handleCurrentChange8"
+ :current-page="page8"
:page-size="5"
layout="total, prev, pager, next, jumper"
- :total="totalPage7">
+ :total="totalPage8">
</el-pagination>
</div>
</div>
@@ -240,8 +243,8 @@
import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import OperaTaxesWindow from '@/components/business/OperaTaxesWindow'
import { fetchList as noticeList, deleById } from '@/api/business/notices'
-import {getChangeDetail, getDetail} from "@/api/business/insuranceApply";
-import OperaWtbApplyShopWindow from "@/components/business/OperaWtbApplyShopWindow";
+import { getChangeDetail, getDetail } from '@/api/business/insuranceApply'
+import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
export default {
components: {
OperaWtbApplyShopWindow,
@@ -250,7 +253,7 @@
OperaTaxesWindow,
OperaSettleClaimsWindow,
OperaApplyChangeDetailWindow,
- OperaApplyChangeUnitDetailWindow,
+ OperaApplyChangeUnitDetailWindow
},
name: 'Index',
data () {
@@ -347,12 +350,29 @@
this.setLoadTimer()
},
methods: {
+ getTotalNoticeCount (a) {
+ if (a.name == 0) {
+ return this.totalPage0
+ } else if (a.name == 1) {
+ return this.totalPage1
+ } else if (a.name == 2) {
+ return this.totalPage2
+ } else if (a.name == 6) {
+ return this.totalPage6
+ } else if (a.name == 7) {
+ return this.totalPage7
+ } else if (a.name == 8) {
+ return this.totalPage8
+ }
+
+ return 0
+ },
detail (obj) {
if (obj.objType === 0) {
getDetail(obj.objId).then(res => {
- if( res.solutionType == 0){
+ if (res.solutionType == 0) {
this.$refs.operaInsuranceApplyWindow.open('鎶曚繚鐢宠璇︽儏', { id: obj.objId })
- }else{
+ } else {
this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚鐢宠璇︽儏', { id: obj.objId })
}
}).catch(err => {
@@ -372,16 +392,20 @@
} else if (obj.objType === 4) {
this.$refs.OperaTaxesWindow.open('寮�绁ㄧ敵璇疯鎯�', { id: obj.objId })
} else if (obj.objType === 5) {
- deleById(obj.id)
- .then(res => {
- this.tableData2.forEach((item, index) => {
- if (item.id === obj.id) {
- this.tableData2.splice(index, 1)
- this.totalPage2 = this.totalPage2 - 1
- }
+ this.$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂璇︽儏', obj.objId)
+ if ([1,4, 7,13, 14, 15, 16, 17, 18].includes(obj.type)) {
+ // 濡傛灉鏄彁閱掔疮娑堟伅锛屽垹闄ら�氱煡
+ deleById(obj.id)
+ .then(res => {
+ this.tableData2.forEach((item, index) => {
+ if (item.id === obj.id) {
+ this.tableData2.splice(index, 1)
+ this.totalPage2 = this.totalPage2 - 1
+ }
+ })
+ // this.$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂璇︽儏', obj.objId)
})
- this.$refs.operaSettleClaimsWindow.open('鐞嗚禂璇︽儏', { id: obj.objId })
- })
+ }
}
},
setLoadTimer () {
@@ -391,10 +415,10 @@
clearInterval(window.timer)
}
window.timer = setInterval(() => {
- that.initLoadData()
+ that.initLoadData()
}, 60000)
},
- initLoadData(){
+ initLoadData () {
var pemissons = this.userInfo.permissions
if (pemissons.includes('business:notice:insurance')) {
this.handleCurrentChange0(0)
@@ -455,7 +479,7 @@
// this.handleCurrentChange1(0);
}
if (pemissons.includes('business:notice:settle')) {
- this.tabs.push({ name: '2', label: '鐞嗚禂鎻愰啋' })
+ this.tabs.push({ name: '2', label: '鎶ユ鐞嗚禂' })
// this.handleCurrentChange2(0);
}
if (this.userInfo.type === 1) {
--
Gitblit v1.9.3