From 7d22e61158ddd46aa6c89a91824be874bf1bb3bc Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 22 Aug 2023 11:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaHome/oaHome.vue                  | 14 ++++++++++----
 static/server/contract.js                |  2 +-
 subpkg/archivesDetail/archivesDetail.vue |  8 ++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue
index 02e2f64..a0b6d33 100644
--- a/pages/oaHome/oaHome.vue
+++ b/pages/oaHome/oaHome.vue
@@ -14,8 +14,8 @@
 							:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
 					</view>
 
-					<text class="nickname">工作证: {{ myOaInfo.nickname }}</text>
-					<text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text>
+					<text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
+					<text class="head_text" style="flex-shrink: 0;">身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text>
 				</view>
 				<view v-if="!$store.state.app.token" @click="login" class="mesg_box">
 					<view class="name">
@@ -26,7 +26,7 @@
 				<!-- <view v-else class="mesg_box">
 					<view class="name">
 						<text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
-						<text>（{{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}）</text>
+						<text>（{{ myOaInfo.admin_id ? "管理员" : "普通用户" }}）</text>
 					</view>
 					<view class="duty">
 
@@ -463,7 +463,7 @@
 			border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
 			display: flex;
 			justify-content: space-between;
-			padding-right: 50rpx;
+			padding-right: 28rpx;
 			color: white;
 			font-size: 34rpx;
 			padding-left: 150rpx;
@@ -487,6 +487,12 @@
 					transform: translate(-50%, -50%);
 				}
 			}
+      .head_text{
+        font-size: 33rpx;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
 
 			// font-we
 		}
diff --git a/static/server/contract.js b/static/server/contract.js
index 2a661d7..b1baed0 100644
--- a/static/server/contract.js
+++ b/static/server/contract.js
@@ -1,2 +1,2 @@
-export const companyContractType = [23,24,25]
+export const companyContractType = [23,24,25,29]
 export const personnerContractType = [19,20,21,22]
\ No newline at end of file
diff --git a/subpkg/archivesDetail/archivesDetail.vue b/subpkg/archivesDetail/archivesDetail.vue
index d77725b..2c49279 100644
--- a/subpkg/archivesDetail/archivesDetail.vue
+++ b/subpkg/archivesDetail/archivesDetail.vue
@@ -249,10 +249,10 @@
 			<!-- <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents> -->
 			<view v-show="current==1">
 				<block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
-					<view class="update_time">
-						<!-- <view>更新时间:{{item.update_time}}</view> -->
-						<!-- <view class="right">{{updateTo(item.update_time)}}</view> -->
-					</view>
+					<!-- <view class="update_time">
+						<view>更新时间:{{item.update_time}}</view>
+						<view class="right">{{updateTo(item.update_time)}}</view>
+					</view> -->
 					<block>
 						<breeding v-if="item.id==32" ref="demandRef32" :update_time="item.update_time"
 							:datas="item.datas" :readonly="true"></breeding>