Skip to content

C
company_app
提交 0f750f9d 作者: 毛细亚
操作

更新侧边栏

上级 1ad77633
正在显示 包含 66 行增加 和 40 行删除
src/views/applyRecord.vue
<!--
* @Author: maoxiya 937667504@qq.com
* @Date: 2025-06-25 16:46:39
* @LastEditors: maoxiya 937667504@qq.com
* @LastEditTime: 2025-09-02 14:15:46
* @FilePath: /company_app/src/views/applyRecord.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="gift-tab-container-errorHanledle">
<el-tabs v-model="activeTab">
<el-tab-pane label="误操作" name="errorHandle">
<errorHandle v-if="activeTab=='errorHandle'"></errorHandle>
<errorHandle v-if="activeTab == 'errorHandle'"></errorHandle>
</el-tab-pane>
<el-tab-pane label="举报信息" name="report">
<report v-if="activeTab === 'report'" />
</el-tab-pane>
<el-tab-pane label="转区申请" name="serve">
<AreaTransferApply v-if="activeTab=='serve'" />
<AreaTransferApply v-if="activeTab == 'serve'" />
</el-tab-pane>
<el-tab-pane label="转端申请" name="terminal">
<TerminalTransfer v-if="activeTab=='terminal'" />
<TerminalTransfer v-if="activeTab == 'terminal'" />
</el-tab-pane>
</el-tabs>
</div>
......@@ -17,12 +29,14 @@
import AreaTransferApply from './components/ApplyRecords/AreaTransferApply.vue'
import errorHandle from './components/ApplyRecords/errorHandle.vue'
import TerminalTransfer from './components/ApplyRecords/TerminaTranfer.vue'
import report from './components/roleInfo/report.vue'
export default {
name: 'applyRecord',
components: {
AreaTransferApply,
errorHandle,
TerminalTransfer
TerminalTransfer,
report
},
data() {
return {
......@@ -32,28 +46,34 @@ export default {
}
</script>
<style lang="scss" scoped>
.gift-tab-container-errorHanledle {
<style lang="scss" scoped>
.gift-tab-container-errorHanledle {
//padding: 20px;
width: 100%;
height: 100%;
padding-top: 10px;
background: #fff;
::v-deep .el-tabs{
::v-deep .el-tabs {
height: calc(100% - 40px);
}
::v-deep .el-tabs__content{
::v-deep .el-tabs__content {
height: 100%;
}
::v-deep .el-tab-pane{
::v-deep .el-tab-pane {
height: 100%;
}
::v-deep .el-tabs .el-tabs__header{
::v-deep .el-tabs .el-tabs__header {
margin: 0;
// height: 60px;
}
::v-deep .el-tabs__nav-next, ::v-deep .el-tabs__nav-prev{
::v-deep .el-tabs__nav-next,
::v-deep .el-tabs__nav-prev {
line-height: 50px;
}
}
</style>
\ No newline at end of file
}
</style>
\ No newline at end of file
src/views/components/giftRecord/wxGift.vue
......@@ -7,7 +7,8 @@
<div>礼包名称: {{ item.gift_package_name }}</div>
<div>发送时间: {{ item.send_time }}</div>
<div>礼包码: {{ item.code }}</div>
<div>领取角色: <span v-if="item.role_name">{{ item.role_name }}</span> <span v-else>-</span>
<div>领取角色: <span v-if="item.role_name && item.role_name != 0">{{ item.role_name }}</span> <span
v-else>-</span>
</div>
<div>W 账号: {{ item.username || '-' }}</div>
<div class="rowFlex spaceBetween columnCenter gift-sender">
......
src/views/components/roleInfo/report.vue
<template>
<div class="reportList">
<div class="reportList" v-scroll="paperScroll">
<el-form ref="taskForm" :model="reportForm" class="taskForm" label-position="top" label-width="85px">
<el-form-item label="角色名称">
<el-input v-model="reportForm.role_name" clearable placeholder="请输入角色名称" @change="filterChange">
......@@ -20,8 +20,7 @@
</el-select>
</el-form-item>
</el-form>
<div v-infinite-scroll="paperScroll" :infinite-scroll-disabled="!isMoreRecord" :infinite-scroll-immediate="false"
class="mailListScroll">
<div :infinite-scroll-disabled="!isMoreRecord" :infinite-scroll-immediate="false" class="mailListScroll">
<!-- 举报申请 -->
<div class="scrollMain" v-if="reportList.length > 0">
<div v-for="(item, index) in reportList" :key="index" class="reportContent" @click="reportProcess(item, index)">
......@@ -49,11 +48,12 @@
<!-- 重新提交 -->
<el-button v-else-if="item.approval_status == 4" type="primary" size="mini"
@click.stop="resubmitReport(item)">重新提交</el-button>
<img v-if="item.approval_status == 1" :src="shenpi1" class="icon" />
<img v-else-if="item.approval_status == 2" :src="shenpi2" class="icon" />
<img v-else-if="item.approval_status == 3" :src="shenpi3" class="icon" />
<img v-else-if="item.approval_status == 4" :src="shenpi4" class="icon" />
<img v-else-if="item.approval_status == 5" :src="shenpi5" class="icon" />
<!-- 换成 svg-icon 组件 -->
<svg-icon v-if="item.approval_status == 1" icon-class="shenpi1" class="icon" />
<svg-icon v-else-if="item.approval_status == 2" icon-class="shenpi2" class="icon" />
<svg-icon v-else-if="item.approval_status == 3" icon-class="shenpi3" class="icon" />
<svg-icon v-else-if="item.approval_status == 4" icon-class="shenpi4" class="icon" />
<svg-icon v-else-if="item.approval_status == 5" icon-class="shenpi5" class="icon" />
</div>
</div>
<!-- 审批进度 -->
......@@ -284,6 +284,11 @@ export default {
this.$forceUpdate()
},
paperScroll() {
console.log('开始滚动了')
if (!this.isMoreRecord) {
console.log('没有更多数据了')
return false
}
this.requestNextPage()
},
requestNextPage(pageInfo) {
......@@ -389,11 +394,6 @@ export default {
} else {
this.isMoreRecord = true
}
if (res.data.data.length < 20) {
this.isMoreRecord = false
} else {
this.isMoreRecord = true
}
}
}
}
......
src/views/roleInfo.vue
<!--
* @Author: maoxiya 937667504@qq.com
* @Date: 2025-06-25 16:46:39
* @LastEditors: maoxiya 937667504@qq.com
* @LastEditTime: 2025-09-02 14:16:38
* @FilePath: /company_app/src/views/roleInfo.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div class="roleTab">
<el-tabs v-model="roleActive">
<el-tab-pane label="角色信息" name="roleInfo">
<roleInfoPanel v-if="roleActive === 'roleInfo'" :chatUserDetails="chatUserInfo" />
</el-tab-pane>
<el-tab-pane label="举报信息" name="report">
<report v-if="roleActive === 'report'" />
</el-tab-pane>
<el-tab-pane label="申诉记录" name="approval">
<approval v-if="roleActive === 'approval'" />
</el-tab-pane>
<el-tab-pane label="违规记录" name="violation">
<violationRecord v-if="roleActive === 'violation'" />
</el-tab-pane>
</el-tabs>
</div>
</template>
<script>
import roleInfoPanel from './components/roleInfo/roleInfoPanel.vue'
import report from './components/roleInfo/report.vue'
import approval from './components/roleInfo/approval.vue'
import { mapState } from 'vuex'
import violationRecord from '@/views/ViolationRecord.vue';
export default {
name: 'roleInfo',
components: {
roleInfoPanel,
approval,
report
violationRecord,
},
computed: {
...mapState('game', ['chatUserInfo'])
......
src/views/userInfo/userInfo.vue
......@@ -15,9 +15,6 @@
<el-tab-pane label="订单信息" name="order">
<orderList v-if="activeTab === 'order'" />
</el-tab-pane>
<el-tab-pane label="违规记录" name="violation">
<violationRecord v-if="activeTab === 'violation'" />
</el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -25,7 +22,6 @@
import Info from './components/Info.vue';
import roleInfo from '@/views/roleInfo.vue';
import orderList from '@/views/orderList.vue';
import violationRecord from '@/views/ViolationRecord.vue';
import { mapState, mapMutations } from 'vuex';
import { createRoleRecentActivityNotPushNum } from '@/views/hooks/useGetCount';
import Cookies from 'js-cookie';
......@@ -35,9 +31,8 @@ export default {
Info,
roleInfo,
orderList,
violationRecord,
},
mounted() {},
mounted() { },
watch: {
async accountSelect(newVal) {
await this.initInstance();
......@@ -81,7 +76,7 @@ export default {
},
},
beforeDestroy() {
this.instance.destroy();
this.instance && this.instance.destroy();
},
};
</script>
......@@ -120,6 +115,7 @@ export default {
}
}
}
::v-deep .el-badge__content.is-fixed {
top: 8px;
right: 6px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论