From 2746b283afebecbfaec80d68ec468ef6bc8adef5 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 22 Nov 2024 15:24:40 +0800
Subject: [PATCH] =?UTF-8?q?2563=20=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=20=E5=BB=B6=E6=97=B6=E7=9B=91?=
 =?UTF-8?q?=E7=81=AB=E6=98=AF=E9=83=A8=E9=97=A8=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=20=E6=89=80=E6=9C=89=E7=AB=AF=E9=83=BD?=
 =?UTF-8?q?=E8=A6=81=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/eight_assignments/view_info.vue                           | 2 +-
 .../cc-defineStep/components/cc-defineStep/cc-defineStep.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/eight_assignments/view_info.vue b/pages/eight_assignments/view_info.vue
index 6f54f0d..f45f43b 100644
--- a/pages/eight_assignments/view_info.vue
+++ b/pages/eight_assignments/view_info.vue
@@ -69,7 +69,7 @@
             <template #label>
               <view class="mt-10">
                 <view>部门：{{ item.DEPARTMENT_NAME }}</view>
-                <view>人员：{{ item.USER_NAME }}</view>
+                <view v-if="item.USER_NAME">人员：{{ item.USER_NAME }}</view>
                 <view v-if="item.SIGN_PICTURE">
                   <u-image width="400rpx" height="200rpx" :src="$filePath + '/' +item.SIGN_PICTURE" mode="widthFix"/>
                   <view>审批意见：{{ item.APPROVAL_OPINIONS }}</view>
diff --git a/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue b/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue
index 3344255..59af12d 100644
--- a/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue
+++ b/uni_modules/cc-defineStep/components/cc-defineStep/cc-defineStep.vue
@@ -4,7 +4,7 @@
       <view class="step_left"></view>
       <view class="step_right">
         <view class="right_content" v-for="(item,index) in stepData" :key="index">
-          <view class="title">{{ item.NODE_DESC }}（{{ item.USER_NAME }}）</view>
+          <view class="title">{{ item.NODE_DESC }}（{{ item.USER_NAME?item.USER_NAME:item.DEPARTMENT_NAME }}）</view>
           <view class="times" v-if="item.time">{{ item.time }}</view>
           <view class="result" v-if="item.desc">
             <text style="color: #202020;">{{ item.desc }}</text>