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-09 16:07:24 +08:00
parent e50e2f51f0
commit f45c45a76c
8 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/oaTask/oaTask.vue
View File

@ -1,11 +1,11 @@
<template>
<view class="all_box">
<view class="task_list">
<u-empty v-if="list.length==0" icon="/static/img/empty/data.png" text="没有任务"></u-empty>
<view v-else class="task_list">
<!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
<view v-for="item in list" :key="item.id">
<task-item :datas="item"></task-item>
</view>
<!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
</view>
<!-- <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> -->

5
subpkg/archives/archives.vue
View File

@ -6,7 +6,10 @@
<image class="avatar" src="../../static/img/public/record.png"></image>
<view class="body">
<view>姓名:<text class="name">{{item.name}}</text></view>
<view>片区:<text class="name">{{item.address}}</text></view>
<view>
片区:<text class="name">{{item.village_name}}</text>
<text class="name" style="margin-left: 0;" v-for="brigade_name in item.brigade_name">{{brigade_name.brigade_name}}</text>
</view>
<view>电话:<text class="name">{{item.phone}}</text></view>
</view>
</view>

9
subpkg/archivesDetail/archivesDetail.vue
View File

@ -182,8 +182,13 @@
computed: {
nowAddress() {
let address = this.$store.state.app.userInfo;
return address.province_name + address.city_name + address.area_name + address.street_name + address
.village_name + address.brigade_name;
let str = '';
address.province_name?str+=address.province_name:null;
address.city_name?str+=address.city_name:null;
address.area_name?str+=address.area_name:null;
address.street_name?str+=address.street_name:null;
address.village_name?str+=address.village_name:null;
return str;
}
},
methods: {

28
subpkg/captain/captain.vue
View File

@ -47,16 +47,20 @@
</text>
<view class="item">
<view class="location">
<text>{{ item.street_name+item.village_name }}</text>
<text>{{ (item.street_name||'')+(item.village_name||'') }}</text>
<text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
</view>
</view>
</view>
<view class="company">
<text>
<view class="info_bottom">
<text class="item phone">
所属公司:
</text>
<view class="itm" v-if="item.company">{{item.company.company_name}}</view>
<view class="item" v-if="item.company">
<view class="location">
{{item.company.company_name}}
</view>
</view>
</view>
</view>
</view>
@ -316,7 +320,7 @@
.item {
display: flex;
align-items: center;
align-items: flex-start;
}
.phone {
@ -325,12 +329,12 @@
.location {
width: 320rpx;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 将超出文本隐藏 */
text-overflow: ellipsis;
/* 使用省略号表示被隐藏的文本 */
// white-space: nowrap;
// /* 不换行 */
// overflow: hidden;
// /* 将超出文本隐藏 */
// text-overflow: ellipsis;
// /* 使用省略号表示被隐藏的文本 */
color: #000;
}
}
@ -351,7 +355,7 @@
// /* 将超出文本隐藏 */
// text-overflow: ellipsis;
// /* 使用省略号表示被隐藏的文本 */
// color: #000;
color: #000;
}
}
}

1
subpkg/newArchives/newArchives.vue
View File

@ -235,7 +235,6 @@
address.area_name?str+=address.area_name:null;
address.street_name?str+=address.street_name:null;
address.village_name?str+=address.village_name:null;
address.brigade_name?str+=address.brigade_name:null;
return str;
}
},

24
subpkg/newPersonnel/newPersonnel.vue
View File

@ -103,23 +103,23 @@
data() {
return {
formData: {
account: '17685151643', //账号
account: '', //账号
password: '123456', //密码
password_confirm: '', //确认密码
// channel: 6, //注册渠道[1-微信小程序 2-微信公众号 3-手机H5 4-电脑PC 5-苹果APP 6-安卓APP]
id_card: '522636199812121212',
id_card: '',
is_captain: '',// 队长标识
sex: '',
avatar: 'sdgdgxgxfxxxfg',
nickname: 'dddd',
address: '测试地址',
avatar: '',
nickname: '',
address: '',
qualification: {
id_card: "sdgsdgds",
id_card_b: "sdgdsgdsg",
car_card: "sdgsd",
car_card_b: "gsdgds",
bank_account: "sdgdsgsd",
bank_account_b: "sdgsdgdg"
id_card: "",
id_card_b: "",
car_card: "",
car_card_b: "",
bank_account: "",
bank_account_b: ""
},
},
rules: {
@ -228,7 +228,7 @@
title: "添加成功",
success: () => {
setTimeout(() => {
// uni.navigateBack()
uni.navigateBack()
}, 1000)
}
})

26
subpkg/personnel/personnel.vue
View File

@ -23,14 +23,18 @@
分管片区:
</text>
<view class="item">
<view class="location">{{ item.city_name+item.area_name+item.street_name }}</view>
<view class="location">{{ (item.street_name||'')+(item.village_name||'') }}</view>
</view>
</view>
<view class="company">
<text>
<view class="info_bottom">
<text class="item phone">
所属公司:
</text>
<view class="itm" v-if="item.company">{{item.company.company_name}}</view>
<view class="item" v-if="item.company">
<view class="location">
{{item.company.company_name}}
</view>
</view>
</view>
</view>
</view>
@ -223,7 +227,7 @@
.item {
display: flex;
align-items: center;
align-items: flex-start;
}
.phone {
@ -232,12 +236,12 @@
.location {
width: 350rpx;
white-space: nowrap;
/* 不换行 */
overflow: hidden;
/* 将超出文本隐藏 */
text-overflow: ellipsis;
/* 使用省略号表示被隐藏的文本 */
// white-space: nowrap;
// /* 不换行 */
// overflow: hidden;
// /* 将超出文本隐藏 */
// text-overflow: ellipsis;
// /* 使用省略号表示被隐藏的文本 */
color: #000;
}
}

3
subpkg/personnelDetails/personnelDetails.vue
View File

@ -37,7 +37,8 @@
</view>
</view>
<view class="bottom">
负责区域:{{userInfo.street_name+(userInfo.village_name||'')+(userInfo.brigade_name||'')}}
负责区域:<text>{{userInfo.street_name+(userInfo.village_name||'')}}</text>
<text v-for="(item, index) in userInfo.brigade_name">{{item.brigade_name}}</text>
</view>
<u-popup :show="show" :round="10" mode="center">
<view class="popup">