From cdcd42c6e24b6ede604fab2e9437bbd34930fc23 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 15 八月 2024 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/distribute/index.vue | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 80d3b32..21a63c1 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -96,10 +96,22 @@
<el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo"/>
- <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName"/>
- <el-table-column label="宸ュ崟鏉ユ簮" align="center" prop="source"/>
+ <el-table-column label="鏁呴殰鐐逛綅" align="center" prop="source">
+ <template slot-scope="scope">
+ <el-popover
+ placement="right"
+ :title="scope.row.important ? '閲嶇偣鐐逛綅': '姝ｅ父鐐逛綅'"
+ width="200"
+ trigger="hover">
+ <span :class="{important: scope.row.important}" slot="reference">{{ scope.row.source }}</span>
+ </el-popover>
+ </template>
+ </el-table-column>
<el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType"/>
+ <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName"/>
<el-table-column label="浜х敓鏃堕棿" align="center" prop="createTime"/>
+ <el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂浜�" align="center" prop="realName"/>
+ <el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂鏃堕棿" align="center" prop="distributeTime"/>
</el-table>
<pagination
@@ -420,6 +432,12 @@
</script>
<style scoped>
+.important {
+ color: red;
+}
+/deep/ .el-popover__title {
+ margin-bottom: 0px;
+}
.row {
padding: 0 20px;
}
--
Gitblit v1.8.0