From d6d8996a79eaa486ce019789641fb81e266091bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 13 三月 2024 14:27:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/unit/people/index.vue | 2 +-
src/views/system/work-order/index.vue | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index 9c42a78..31a2fa1 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -82,7 +82,7 @@
<el-table-column label="杩愮淮浜哄憳缂栧彿" align="center" prop="ywPersonCode" />
<el-table-column label="杩愮淮浜哄憳濮撳悕" align="center" prop="ywPersonName" />
<el-table-column label="杩愮淮浜哄憳璐﹀彿" align="center" prop="ywPersonAccount" />
- <el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnit" />
+ <el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnitName" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 237bf1b..e1ef50b 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -297,6 +297,9 @@
杩愮淮鍗曚綅锛歿{flowForm.unitName}}
</div>
<div class="flow-item-x">
+ 鍒涘缓鏃堕棿锛歿{flowForm.createTime}}
+ </div>
+ <div class="flow-item-x">
澶勭悊鏈熼檺锛�<el-tag type="danger" size="small">12灏忔椂</el-tag>
</div>
</div>
--
Gitblit v1.8.0