mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
weipengfei 2023-08-22 11:56:03 +08:00
parent d9e3d8eeaf
commit 7d22e61158
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/oaHome/oaHome.vue
View File

@ -14,8 +14,8 @@
:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image> :src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
</view> </view>
<text class="nickname">工作证: {{ myOaInfo.nickname }}</text> <text class="head_text">工作证: {{ myOaInfo.nickname }}</text>
<text>身份: {{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}</text> <text class="head_text" style="flex-shrink: 0;">身份: {{ myOaInfo.admin_id ? "管理员" : "普通用户" }}</text>
</view> </view>
<view v-if="!$store.state.app.token" @click="login" class="mesg_box"> <view v-if="!$store.state.app.token" @click="login" class="mesg_box">
<view class="name"> <view class="name">
@ -26,7 +26,7 @@
<!-- <view v-else class="mesg_box"> <!-- <view v-else class="mesg_box">
<view class="name"> <view class="name">
<text class="nickname">姓名:{{ myOaInfo.nickname }}</text> <text class="nickname">姓名:{{ myOaInfo.nickname }}</text>
<text>（{{ myOaInfo.admin_id ? "超级管理员" : "普通用户" }}）</text> <text>（{{ myOaInfo.admin_id ? "管理员" : "普通用户" }}）</text>
</view> </view>
<view class="duty"> <view class="duty">
@ -463,7 +463,7 @@
border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx; border-radius: 35.05rpx 35.05rpx 35.05rpx 35.05rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-right: 50rpx; padding-right: 28rpx;
color: white; color: white;
font-size: 34rpx; font-size: 34rpx;
padding-left: 150rpx; padding-left: 150rpx;
@ -487,6 +487,12 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
} }
.head_text{
font-size: 33rpx;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
// font-we // font-we
} }

2
static/server/contract.js
View File

@ -1,2 +1,2 @@
export const companyContractType = [23,24,25] export const companyContractType = [23,24,25,29]
export const personnerContractType = [19,20,21,22] export const personnerContractType = [19,20,21,22]

8
subpkg/archivesDetail/archivesDetail.vue
View File

@ -249,10 +249,10 @@
<!-- <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents> --> <!-- <residents v-show="current==0" ref="residentsRef" :readonly="true" :datas="formData"></residents> -->
<view v-show="current==1"> <view v-show="current==1">
<block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id"> <block v-for="(item, index) in formData.datas" :key="'demand'+index+item.id">
<view class="update_time"> <!-- <view class="update_time">
<!-- <view>更新时间:{{item.update_time}}</view> --> <view>更新时间:{{item.update_time}}</view>
<!-- <view class="right">{{updateTo(item.update_time)}}</view> --> <view class="right">{{updateTo(item.update_time)}}</view>
</view> </view> -->
<block> <block>
<breeding v-if="item.id==32" ref="demandRef32" :update_time="item.update_time" <breeding v-if="item.id==32" ref="demandRef32" :update_time="item.update_time"
:datas="item.datas" :readonly="true"></breeding> :datas="item.datas" :readonly="true"></breeding>