From e1c072109e62f4adcb53af0d2c69b896b9159059 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期四, 29 五月 2025 18:21:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- company/src/views/index.vue | 72 +++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 33 deletions(-) diff --git a/company/src/views/index.vue b/company/src/views/index.vue index 3644f46..2ee998d 100644 --- a/company/src/views/index.vue +++ b/company/src/views/index.vue @@ -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> @@ -115,7 +118,7 @@ </div> <div class="home_content_right_page"> <el-pagination - @current-change="handleCurrentChange6" + @current-change="handleCurrentChange2" :current-page="page2" :page-size="5" layout="total, prev, pager, next, jumper" @@ -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,29 +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; + 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; + 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 => { @@ -389,17 +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) - // this.$refs.operaSettleClaimsWindow.open('鐞嗚禂璇︽儏', { id: obj.objId }) - // }) + 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) + }) + } } }, setLoadTimer () { @@ -409,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) -- Gitblit v1.9.3