This commit is contained in:
2025-08-21 14:25:49 +08:00
parent 98d98e41f2
commit 2833f7d28b
8 changed files with 1127 additions and 1099 deletions

View File

@@ -1,10 +1,12 @@
<template>
<view class="warn-container">
<!-- 顶部导航 -->
<view class="warn-navbar">
<image src="/static/ic_back.png" class="warn-back" @click="goBack" />
<text class="warn-title">预警处理</text>
<text class="warn-right-txt" @click="goStatistics">预警统计</text>
</view>
<!-- tab栏 -->
<view class="warn-tabs">
<view v-for="(tab, idx) in tabs" :key="idx" :class="['warn-tab', { active: idx === activeTab }]"
@@ -15,13 +17,13 @@
</view>
<!-- 列表区 -->
<scroll-view scroll-y class="warn-list">
<scroll-view class="warn-list" scroll-y refresher-enabled refresher-background="#f7f7f7"
:refresher-triggered="refresherTriggered" @refresherrefresh="onRefresh" @scrolltolower="loadMore"
:lower-threshold="50">
<view v-for="(item, idx) in list" :key="idx" class="warn-card" @click="goDetail2(item)">
<view class="warn-row">
<view class="warn-no">{{item.smallTypeName}}</view>
<view class="warn-status">
{{item.levelName}}
</view>
<view class="warn-status">{{item.levelName}}</view>
</view>
<image class="warn-line-image" src="/static/ic_my_repair_03.png" />
<view class="warn-info">预警内容{{ item.description }}</view>
@@ -32,6 +34,15 @@
<view class="warn-eval-btn">去处理</view>
</view>
</view>
<!-- 底部加载提示 -->
<view v-if="loading" style="text-align:center;color:#999;font-size:26rpx;padding:20rpx;">
加载中...
</view>
<view v-if="noMore[activeTab]" style="text-align:center;color:#999;font-size:26rpx;padding:20rpx;">
没有更多数据了
</view>
</scroll-view>
</view>
</template>
@@ -42,56 +53,75 @@
return {
tabs: ["待处理", "全部"],
activeTab: 0,
tabData: [
[],
[]
],
tabLoaded: [false, false],
], // 每个 tab 的数据
pageNum: [1, 1], // 每个 tab 当前页码
pageSize: 10,
noMore: [false, false], // 每个 tab 是否没有更多数据
tabLoaded: [false, false], // tab 是否加载过
loading: false,
lastScrollTop: 0,
refresherTriggered: false
};
},
computed: {
list() {
return this.tabData[this.activeTab];
},
},
onShow() {
uni.$once('refreshData',s=> {
this.loadTabData(this.activeTab);
});
}
},
created() {
this.loadTabData(this.activeTab);
this.onRefresh()
},
methods: {
goBack() {
uni.navigateBack();
},
// 切换 tab
async changeTab(idx) {
this.activeTab = idx;
if (!this.tabLoaded[idx]) {
await this.loadTabData(idx);
this.onRefresh()
}
},
// 下拉刷新
async onRefresh() {
this.refresherTriggered = true;
this.pageNum[this.activeTab] = 1;
this.noMore[this.activeTab] = false;
this.tabData[this.activeTab] = [];
await this.loadTabData(this.activeTab);
this.refresherTriggered = false;
},
// 滚动加载更多
async loadMore() {
if (this.loading || this.noMore[this.activeTab]) return;
this.pageNum[this.activeTab]++;
await this.loadTabData(this.activeTab);
},
// 请求数据
async loadTabData(idx) {
this.loading = true;
let params = {};
if (idx == 0) {
params = {
'states': [20, 30, 31, 32]
}
let params = {
pageNum: this.pageNum[idx],
pageSize: this.pageSize
};
// 待处理
if (idx === 0) {
params.states = [20, 30, 31, 32];
}
let res = await this.$u.api.getWarns(params);
if (res.code == "200") {
this.$set(this.tabData, idx, res.rows);
let rows = res.rows || [];
if (rows.length < this.pageSize) {
this.noMore[idx] = true;
}
this.$set(this.tabData, idx, [...this.tabData[idx], ...rows]);
}
this.$set(this.tabLoaded, idx, true);
this.tabLoaded[idx] = true;
this.loading = false;
},
goDetail(item) {
const itemStr = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
@@ -101,7 +131,7 @@
goDetail2(item) {
const itemStr = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr+"&pageType=detail",
url: "/pages/sys/workbench/earlyWarning/warnDetail?item=" + itemStr + "&pageType=detail",
});
},
goStatistics() {
@@ -109,7 +139,7 @@
url: "/pages/sys/workbench/earlyWarning/warnStatistics"
});
}
},
}
};
</script>

View File

@@ -1,253 +1,261 @@
<template>
<view class="order-container" @click="handleOutsideClick">
<view class="filter">
<!-- 工单类型按钮 -->
<view class="filter-btn" @click.stop="togglePopup('type')">
{{ !selectedFilters.type ||selectedFilters.type.orderTypeName === '全部' ? '工单类型' : selectedFilters.type.orderTypeName }}
<image class="filter-img" src="/static/ic_down_arrow_g.png" />
<view v-if="activePopup === 'type'" class="dropdown">
<view class="dropdown-triangle"></view>
<view class="dropdown-list">
<view v-for="(item, index) in typeList" :key="index" class="dropdown-item"
@click.stop="selectFilter('type', item)">
{{ item.orderTypeName }}
</view>
</view>
</view>
</view>
<!-- 工单状态按钮 -->
<view v-if="activeTab == 1" class="filter-btn" @click.stop="togglePopup('status')">
{{ !selectedFilters.status || selectedFilters.status.name === '全部' ? '工单状态' : selectedFilters.status.name }}
<image class="filter-img" src="/static/ic_down_arrow_g.png" />
<view v-if="activePopup === 'status'" class="dropdown">
<view class="dropdown-triangle"></view>
<view class="dropdown-list">
<view v-for="(item, index) in statusList" :key="index" class="dropdown-item"
@click.stop="selectFilter('status', item)">
{{ item.name }}
</view>
</view>
</view>
</view>
<!-- 处理人按钮 -->
<view class="filter-btn" @click.stop="togglePopup('handler')">
{{ !selectedFilters.handler || selectedFilters.handler.name === '全部' ? '处理人' : selectedFilters.handler.name }}
<image class="filter-img" src="/static/ic_down_arrow_g.png" />
<view v-if="activePopup === 'handler'" class="dropdown">
<view class="dropdown-triangle"></view>
<view class="dropdown-list">
<view v-for="(item, index) in handlerList" :key="index" class="dropdown-item"
@click.stop="selectFilter('handler', item)">
{{ item.name }}
</view>
</view>
</view>
</view>
</view>
<!-- tab栏 -->
<view class="order-tabs">
<view v-for="(tab, idx) in tabs" :key="idx" :class="['order-tab', { active: idx === activeTab }]"
@click="changeTab(idx)">
{{ tab }}
<view v-if="idx === activeTab" class="tab-underline"></view>
</view>
</view>
<!-- 列表区 -->
<scroll-view scroll-y class="order-list" @scroll="handleScroll">
<view v-for="(item, idx) in list" :key="idx" class="order-card" @click="goDetail(item)">
<view class="order-row">
<view class="order-no">工单号{{ item.orderNo }}</view>
<view class="order-status" :class="getStatusColor(item.status)">
{{ getStatusLabel(item.status) }}
</view>
</view>
<image class="order-line-image" src="/static/ic_my_repair_03.png" />
<view class="order-info">工单名称{{ item.orderName }}</view>
<view class="order-info">工单类型{{ item.typeName }}</view>
<view class="order-info">创建时间{{ item.createTime }}</view>
<view class="order-info">
{{ item.createTime }}-{{ item.planCompleTime }}
</view>
<view v-if="item.statusText === '已结束'" class="order-eval-btn eval-btn-right">
服务评价
</view>
</view>
</scroll-view>
<!-- 悬浮新增按钮 -->
<image v-if="false" src="/static/ic_my_repair_02.png" :class="['order-add-btn-fixed', { hide: isAddBtnHidden }]"
@click="addOrder" />
</view>
</template>
<script>
export default {
data() {
return {
tabs: ["待办", "全部"],
activeTab: 0,
tabData: [
[],
[]
],
tabLoaded: [false, false],
loading: false,
lastScrollTop: 0,
isAddBtnHidden: false,
activePopup: null, // 当前显示哪个弹窗null表示都关闭
selectedFilters: {
type: null,
status: null,
handler: null,
},
typeList: [{
'orderTypeName': '全部'
}],
statusList: [],
handlerList: [
{
"name": '全部'
},
],
};
},
computed: {
list() {
return this.tabData[this.activeTab];
},
},
created() {
console.log("t1","!1111")
this.loadTabData(this.activeTab);
this.loadFilterData();
},
methods: {
goBack() {
uni.navigateBack();
},
addOrder() {
uni.navigateTo({
url: "/pages/sys/workbench/order/addOrder",
});
},
handleScroll(e) {
const scrollTop = e.detail.scrollTop;
if (Math.abs(scrollTop - this.lastScrollTop) < 20) return;
this.isAddBtnHidden = scrollTop > this.lastScrollTop && scrollTop > 50;
this.lastScrollTop = scrollTop;
},
async changeTab(idx) {
this.activeTab = idx;
if (!this.tabLoaded[idx]) {
await this.loadTabData(idx);
}
},
async loadTabData(idx) {
this.loading = true;
let params = {};
if (this.selectedFilters.type && this.selectedFilters.type.id) {
params.type = this.selectedFilters.type.id
}
if(this.selectedFilters.status&&this.selectedFilters.status.id){
params.status = this.selectedFilters.status.id
}
if(this.selectedFilters.handler&&this.selectedFilters.handler.value){
params.handler = this.selectedFilters.handler.value
}
if(idx == 0){
params.status = "1,2"
}
let res = await this.$u.api.getOrderList2(params);
if (res.code == "200") {
this.$set(this.tabData, idx, res.rows);
}
this.$set(this.tabLoaded, idx, true);
this.loading = false;
},
getStatusLabel(status) {
const statusMap = {
0: "创建工单",
1: "已接单",
2: "已接单",
3: "处理中",
4: "已完成",
};
return statusMap[status] || "";
},
getStatusColor(status) {
const statusMap = {
0: "orange",
1: "doing",
2: "doing",
3: "doing",
4: "done",
};
return statusMap[status] || "";
},
goDetail(item) {
const itemStr = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
url: "/pages/sys/workbench/order/orderDetail?item=" + itemStr,
});
},
togglePopup(name) {
if (this.activePopup === name) {
this.activePopup = null;
} else {
this.activePopup = name;
}
},
selectFilter(name, value) {
this.selectedFilters[name] = value;
this.activePopup = null;
this.loadTabData(this.activeTab)
},
handleOutsideClick() {
if (this.activePopup !== null) {
this.activePopup = null;
}
},
async loadFilterData() {
// 工单类型
let resType = await this.$u.api.getOrdersType();
if (resType.code === 200) {
this.typeList = [...this.typeList, ...resType.rows];
}
let handlers = await this.$u.api.getHandler();
if(handlers.code === 200){
this.handlerList = [...this.handlerList,...handlers.data]
}
this.statusList = [{
name: "全部"
},
{
name: "创建工单",
id:"0"
},
{
name: "已接单",
id:"1,2"
},
{
name: "处理中",
id:"3"
},
{
name: "已完成",
id:"4"
},
];
},
},
};
<template>
<view class="order-container" @click="handleOutsideClick">
<!-- 筛选区 -->
<view class="filter">
<!-- 工单类型按钮 -->
<view class="filter-btn" @click.stop="togglePopup('type')">
{{ !selectedFilters.type || selectedFilters.type.orderTypeName === '全部' ? '工单类型' : selectedFilters.type.orderTypeName }}
<image class="filter-img" src="/static/ic_down_arrow_g.png" />
<view v-if="activePopup === 'type'" class="dropdown">
<view class="dropdown-triangle"></view>
<view class="dropdown-list">
<view v-for="(item, index) in typeList" :key="index" class="dropdown-item"
@click.stop="selectFilter('type', item)">
{{ item.orderTypeName }}
</view>
</view>
</view>
</view>
<!-- 工单状态按钮 -->
<view v-if="activeTab == 1" class="filter-btn" @click.stop="togglePopup('status')">
{{ !selectedFilters.status || selectedFilters.status.name === '全部' ? '工单状态' : selectedFilters.status.name }}
<image class="filter-img" src="/static/ic_down_arrow_g.png" />
<view v-if="activePopup === 'status'" class="dropdown">
<view class="dropdown-triangle"></view>
<view class="dropdown-list">
<view v-for="(item, index) in statusList" :key="index" class="dropdown-item"
@click.stop="selectFilter('status', item)">
{{ item.name }}
</view>
</view>
</view>
</view>
<!-- 处理人按钮 -->
<view class="filter-btn" @click.stop="togglePopup('handler')">
{{ !selectedFilters.handler || selectedFilters.handler.name === '全部' ? '处理人' : selectedFilters.handler.name }}
<image class="filter-img" src="/static/ic_down_arrow_g.png" />
<view v-if="activePopup === 'handler'" class="dropdown">
<view class="dropdown-triangle"></view>
<view class="dropdown-list">
<view v-for="(item, index) in handlerList" :key="index" class="dropdown-item"
@click.stop="selectFilter('handler', item)">
{{ item.name }}
</view>
</view>
</view>
</view>
</view>
<!-- tab栏 -->
<view class="order-tabs">
<view v-for="(tab, idx) in tabs" :key="idx" :class="['order-tab', { active: idx === activeTab }]"
@click="changeTab(idx)">
{{ tab }}
<view v-if="idx === activeTab" class="tab-underline"></view>
</view>
</view>
<!-- 列表区 -->
<scroll-view
scroll-y
class="order-list"
:refresher-enabled="true"
:refresher-triggered="isRefreshing"
refresher-background="#f7f7f7"
@refresherrefresh="onRefresh"
@scrolltolower="onLoadMore"
@scroll="handleScroll"
>
<view v-for="(item, idx) in list" :key="idx" class="order-card" @click="goDetail(item)">
<view class="order-row">
<view class="order-no">工单号{{ item.orderNo }}</view>
<view class="order-status" :class="getStatusColor(item.status)">
{{ getStatusLabel(item.status) }}
</view>
</view>
<image class="order-line-image" src="/static/ic_my_repair_03.png" />
<view class="order-info">工单名称{{ item.orderName }}</view>
<view class="order-info">工单类型{{ item.typeName }}</view>
<view class="order-info">创建时间{{ item.createTime }}</view>
<view class="order-info">
{{ item.createTime }}-{{ item.planCompleTime }}
</view>
<view v-if="item.statusText === '已结束'" class="order-eval-btn eval-btn-right">
服务评价
</view>
</view>
<!-- 加载更多提示 -->
<view v-if="loading" style="text-align:center;color:#999;font-size:26rpx;padding:20rpx;">
加载中...
</view>
<view v-if="!hasMore && list.length > 0" style="text-align:center;color:#999;font-size:26rpx;padding:20rpx;">
没有更多数据了
</view>
</scroll-view>
</view>
</template>
<script>
export default {
data() {
return {
tabs: ["待办", "全部"],
activeTab: 0,
// 每个 tab 分页数据
tabData: [
{ list: [], pageNum: 1, pageSize: 10, hasMore: true },
{ list: [], pageNum: 1, pageSize: 10, hasMore: true },
],
tabLoaded: [false, false],
isRefreshing: false, // 控制下拉刷新动画
loading: false,
lastScrollTop: 0,
isAddBtnHidden: false,
activePopup: null,
selectedFilters: {
type: null,
status: null,
handler: null,
},
typeList: [{ orderTypeName: '全部' }],
statusList: [],
handlerList: [{ name: "全部" }],
};
},
computed: {
list() {
return this.tabData[this.activeTab].list;
},
hasMore() {
return this.tabData[this.activeTab].hasMore;
}
},
created() {
this.loadFilterData()
this.onRefresh();
},
methods: {
async changeTab(idx) {
this.activeTab = idx;
if (!this.tabLoaded[idx]) {
this.isRefreshing = true;
await this.onRefresh();
}
},
async onRefresh() {
const tab = this.tabData[this.activeTab];
tab.pageNum = 1;
tab.hasMore = true;
this.isRefreshing = true;
await this.loadTabData(this.activeTab);
this.isRefreshing = false;
},
async onLoadMore() {
const tab = this.tabData[this.activeTab];
if (!tab.hasMore || this.loading) return;
tab.pageNum++;
this.loading = true;
await this.loadTabData(this.activeTab);
this.loading = false;
},
async loadTabData(idx) {
let params = {
pageNum: this.tabData[idx].pageNum,
pageSize: this.tabData[idx].pageSize,
};
if (this.selectedFilters.type && this.selectedFilters.type.id) {
params.type = this.selectedFilters.type.id;
}
if (this.selectedFilters.status && this.selectedFilters.status.id) {
params.status = this.selectedFilters.status.id;
}
if (this.selectedFilters.handler && this.selectedFilters.handler.value) {
params.handler = this.selectedFilters.handler.value;
}
if (idx == 0) {
params.status = "1,2";
}
let res = await this.$u.api.getOrderList2(params);
if (res.code == "200") {
if (this.tabData[idx].pageNum === 1) {
this.tabData[idx].list = res.rows;
} else {
this.tabData[idx].list = [...this.tabData[idx].list, ...res.rows];
}
// 判断是否还有更多数据
this.tabData[idx].hasMore = res.rows.length >= this.tabData[idx].pageSize;
}
this.$set(this.tabLoaded, idx, true);
},
// 其它方法保持不变
handleScroll(e) {
const scrollTop = e.detail.scrollTop;
if (Math.abs(scrollTop - this.lastScrollTop) < 20) return;
this.isAddBtnHidden = scrollTop > this.lastScrollTop && scrollTop > 50;
this.lastScrollTop = scrollTop;
},
getStatusLabel(status) {
const statusMap = {
0: "创建工单",
1: "已接单",
2: "已接单",
3: "处理中",
4: "已完成",
};
return statusMap[status] || "";
},
getStatusColor(status) {
const statusMap = {
0: "orange",
1: "doing",
2: "doing",
3: "doing",
4: "done",
};
return statusMap[status] || "";
},
goDetail(item) {
const itemStr = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
url: "/pages/sys/workbench/order/orderDetail?item=" + itemStr,
});
},
togglePopup(name) {
this.activePopup = this.activePopup === name ? null : name;
},
selectFilter(name, value) {
this.selectedFilters[name] = value;
this.activePopup = null;
this.onRefresh();
},
handleOutsideClick() {
if (this.activePopup !== null) {
this.activePopup = null;
}
},
async loadFilterData() {
let resType = await this.$u.api.getOrdersType();
if (resType.code === 200) {
this.typeList = [...this.typeList, ...resType.rows];
}
let handlers = await this.$u.api.getHandler2();
if (handlers.code === 200) {
this.handlerList = [...this.handlerList, ...handlers.data];
}
this.statusList = [
{ name: "全部" },
{ name: "创建工单", id: "0" },
{ name: "已接单", id: "1,2" },
{ name: "处理中", id: "3" },
{ name: "已完成", id: "4" },
];
},
},
};
</script>
<style scoped>

View File

@@ -38,11 +38,11 @@
</view>
<!-- 底部操作按钮 -->
<view v-if="(!this.isManager&&this.detailStep == 2) || this.detailStep == 0" class="btn-group">
<view v-if="((!this.isManager&&this.detailStep != 0) || (this.isManager&&this.detailStep == 0))&&this.detailStep!=3" class="btn-group">
<button class="btn ghost"
@click="transfer">{{this.isManager ? '指派':this.detailStep == 0 ? '拒绝':'转派'}}</button>
<button v-if="!this.isManager" class="btn primary"
@click="complete">{{this.detailStep == 0 ? '接单':'完成'}}</button>
@click="transfer">{{this.isManager ? '指派':this.detailStep == 1 ? '开始':'完成'}}</button>
<button v-if="this.detailStep == 1" class="btn primary"
@click="complete">转派</button>
</view>
<SelectUser :visible.sync="showSelect" :list="users" :multiple="false" @confirm="onConfirm" />