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

物流页面

Browse Source
This commit is contained in:
THK3121 2023-08-09 17:34:31 +08:00
commit 140faa1e10
15 changed files with 442 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/company/company.vue
View File

@ -17,7 +17,7 @@
</view> </view>
<view class="bottom"> <view class="bottom">
<view class="left"> <view class="left">
<uni-icons type="location" color="#666666" size="13"></uni-icons> <uni-icons type="location" color="#666666" size="14"></uni-icons>
<view class="location">区域:</view> <view class="location">区域:</view>
</view> </view>
<view style="flex: 1;">{{company.address}}</view> <view style="flex: 1;">{{company.address}}</view>

6
components/companyFinance/companyFinance.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<view class="c_card"> <view class="c_card">
<view class="f_card" @click="naviTo('/subpkg/topUp/topUp')"> <view class="f_card">
<view class="item"> <view class="item" @click="naviTo('/subpkg/topUp/topUp')">
<view>公司账户余额(元)</view> <view>公司账户余额(元)</view>
<view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view> <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
<view class="price" v-else>0.00</view> <view class="price" v-else>0.00</view>
</view> </view>
<view class="item"> <view class="item" @click="naviTo('/subpkg/withdrawDeposit/withdrawDeposit')">
<view>公司收益金额(元)</view> <view>公司收益金额(元)</view>
<view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view> <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
<view class="price" v-else>0.00</view> <view class="price" v-else>0.00</view>

189
components/districtSelector/districtSelectorTow.vue
View File

@ -1,14 +1,30 @@
<template> <template>
<view class="component"> <view class="component">
<view class="title">地区信息</view> <view class="title">地区信息</view>
<u--form labelPosition="left" :model="formData" :rules="rules" ref="districtForm"> <u--form labelPosition="left" :model="formData" :rules="rules" ref="districtForm">
<u-form-item v-if="datas && datas.street" label="村社" :required="!readonly" prop="village" @click="changeCity()" borderBottom> <u-form-item label="地址" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
<u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
</u-form-item>
<u-form-item v-if="!formDataRead.street" label="乡镇" :required="!readonly" prop="street" @click="changeCity('street')" borderBottom>
<u--input :value="formDataText.street" disabled disabledColor="#fff" placeholder="请选择镇"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item v-if="!formDataRead.village" label="村社" :required="!readonly" prop="village" @click="changeCity('village')" borderBottom>
<u--input :value="formDataText.village" type="text" disabled disabledColor="#fff" placeholder="请选择村"></u--input> <u--input :value="formDataText.village" type="text" disabled disabledColor="#fff" placeholder="请选择村"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
<u-form-item label="小队" :required="!readonly" prop="brigade" @click="changeCity('brigade')" borderBottom> <u-form-item v-if="!formDataRead.brigade" label="小队" :required="!readonly" prop="brigade" borderBottom>
<u--input :value="formDataText.brigade" disabled disabledColor="#fff" placeholder="请选择小队"></u--input> <u-checkbox-group
<u-icon slot="right" name="arrow-right"></u-icon> placement="row"
@change="changeBrigade"
>
<view class="box">
<view class="box_item" v-for="item in brigadeList" :key="item.id">
<u-checkbox style="checkbox" :customStyle="{marginBottom: '12px',marginRight: '12px'}" activeColor="#3175f9" :label="item.brigade_name" :name="item.id"></u-checkbox>
</view>
</view>
</u-checkbox-group>
</u-form-item> </u-form-item>
</u--form> </u--form>
<u-picker :show="showProvince" :columns="[changeList()]" :keyName="changeType+'_name'" @confirm="confirm" <u-picker :show="showProvince" :columns="[changeList()]" :keyName="changeType+'_name'" @confirm="confirm"
@ -20,13 +36,13 @@
import { commonProvince, commonCity, commonArea, commonStreet, commonVillage, commonBrigade } from "@/api/oaPbulic.js" import { commonProvince, commonCity, commonArea, commonStreet, commonVillage, commonBrigade } from "@/api/oaPbulic.js"
import { Toast } from "../../libs/uniApi" import { Toast } from "../../libs/uniApi"
export default { export default {
name:"districtSelector", name: "districtSelector",
props:{ props: {
readonly: { readonly: {
type: Boolean, type: Boolean,
default: false default: false
}, },
datas:{ datas: {
type: Object, type: Object,
default: null default: null
} }
@ -35,78 +51,150 @@
return { return {
showProvince: false, showProvince: false,
formData: { formData: {
province: '',
city: '',
area: '',
street: '',
village: '', village: '',
brigade: '', brigade: '',
}, },
formDataText: { formDataText: {
province: '',
city: '',
area: '',
street: '',
village: '', village: '',
brigade: '', brigade: '',
}, },
rules:{ formDataRead: {
province: false,
city: false,
area: false,
street: false,
village: false,
brigade: false,
},
rules: {
street: {
required: true,
message: '不能为空',
trigger: ['change', 'blur']
},
village: { village: {
required: true, required: true,
message: '不能为空', message: '不能为空',
trigger: ['change', 'blur'] trigger: ['change', 'blur']
}, },
brigade: { brigade: {
validator: (rule, value, callback )=>{ validator: (rule, value, callback) => {
value?callback():callback('不能为空') value ? callback() : callback('不能为空')
}, },
trigger: ['change', 'blur'] trigger: ['change', 'blur']
}, },
}, },
streetList: [],
villageList: [], villageList: [],
brigadeList: [], brigadeList: [],
changeType: '', //当前选择的城市类型 changeType: '', //当前选择的城市类型
}; };
}, },
watch: {
datas(newValue, oldValue) {
if (this.$props.readonly && newValue) {
this.formDataText.street = this.$props.datas.street_name;
this.formDataText.village = this.$props.datas.village_name;
this.formDataText.brigade = this.$props.datas.brigade_name;
this.formData.street = this.$props.datas.street_id;
this.formData.village = this.$props.datas.village_id;
this.formData.brigade = this.$props.datas.brigade_id;
}
}
},
created() { created() {
if(!this.$props.readonly) { if (!this.$props.readonly) {
this.initProvinceAndCity(); this.initProvinceAndCity();
}else{ } else {
this.rules = {}; this.rules = {};
} }
}, },
methods:{ computed:{
async validate(){ nowAddress(){
let address = this.$store.state.app.userInfo;
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: {
async validate() {
return await this.$refs.districtForm.validate(); return await this.$refs.districtForm.validate();
}, },
// 初始化 // 初始化
async initProvinceAndCity() { async initProvinceAndCity() {
if(this.$store.state.app.userInfo.village)this.loadBrigade(this.$store.state.app.userInfo.village); let user = this.$store.state.app.userInfo;
else if(this.$store.state.app.userInfo?.street)this.loadVillage(this.$store.state.app.userInfo.street); Object.keys(this.formData).forEach(key => {
this.formData[key] = user[key];
this.formDataText[key] = user[key + '_name'];
if (user[key]&&key!='brigade') {
this.formDataRead[key] = true;
// 获取选择的列表
switch (key) {
case 'street':
this.loadVillage(this.formData['street']);
break;
case 'village':
this.loadBrigade(this.formData['village']);
break;
}
}
})
}, },
// 选择城市 // 选择城市
changeCity(type) { changeCity(type) {
if(this.$props.readonly)return ; if (this.$props.readonly) return;
if (type&&this[type + 'List'].length == 0) return Toast('请先选择上一级地区'); if (this[type + 'List'].length == 0) return Toast('请先选择上一级地区');
this.changeType = type; this.changeType = type;
this.showProvince = true; this.showProvince = true;
}, },
// 多选小队
changeBrigade(e){
this.formData.brigade = e;
},
// 选择列表 // 选择列表
changeList() { changeList() {
return this[this.changeType + 'List']; return this[this.changeType + 'List'];
}, },
// 选中城市 // 选中城市
confirm(e) { confirm(e) {
let flag = false;//清空所选标记 let flag = false; //清空所选标记
if(this.formData[this.changeType] != e.value[0][this.changeType + '_code'])flag = true; if (this.formData[this.changeType] != e.value[0][this.changeType + '_code']) flag = true;
if (this.changeType == 'brigade') { if (this.changeType == 'brigade') {
this.formData.brigade = e.value[0].id; this.formData.brigade = e.value[0].id;
this.formDataText.brigade = e.value[0].brigade_name; this.formDataText.brigade = e.value[0].brigade_name;
this.showProvince = false; this.showProvince = false;
return ; return;
} }
this.formData[this.changeType] = e.value[0][this.changeType + '_code']; this.formData[this.changeType] = e.value[0][this.changeType + '_code'];
this.formDataText[this.changeType] = e.value[0][this.changeType + '_name']; this.formDataText[this.changeType] = e.value[0][this.changeType + '_name'];
// 加载下一级城市信息
switch (this.changeType) {
case 'area':
this.loadStreet(this.formData['area']);
break;
case 'street':
this.loadVillage(this.formData['street']);
break;
case 'village':
this.loadBrigade(this.formData['village']);
break;
}
// 清空之前所选信息 // 清空之前所选信息
if(flag) switch (this.changeType) { if (flag) switch (this.changeType) {
case 'province':
this.formData.city = '';
this.formDataText.city = ''
case 'city':
this.formData.area = '';
this.formDataText.area = ''
case 'area': case 'area':
this.formData.street = ''; this.formData.street = '';
this.formDataText.street = '' this.formDataText.street = ''
@ -119,6 +207,13 @@
} }
this.showProvince = false; this.showProvince = false;
}, },
loadStreet(code) {
commonStreet({
street: code
}).then(res => {
this.streetList = res.data;
})
},
loadVillage(code) { loadVillage(code) {
commonVillage({ commonVillage({
village: code village: code
@ -138,20 +233,30 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.component{ .component {
.title { .title {
font-weight: 500; font-weight: 500;
font-size: 34rpx; font-size: 34rpx;
&::before { &::before {
width: 8rpx; width: 8rpx;
height: 26rpx; height: 26rpx;
border-radius: 4rpx; border-radius: 4rpx;
background-color: #3175f9; background-color: #3175f9;
content: ""; content: "";
display: inline-block; display: inline-block;
margin-right: 8rpx; margin-right: 8rpx;
}
}
// .checkbox{
// margin: 28rpx;
// }
.box{
display: flex;
flex-wrap: wrap;
} }
} }
} .u-checkbox-group--row[data-v-2ef8bac9]{
flex: 1;
}
</style> </style>

36
pages/logistics/index.vue
View File

@ -1,19 +1,25 @@
<template> <template>
<view class="content"> <view class="content">
<u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='white' <view style="background-color: #fff;padding: 18rpx 28rpx 0 18rpx;">
v-model="keywords"></u-search> <u-search placeholder="搜索你的订单" @search="getOrderList" :show-action='false' bg-color='#f5f5f5'
<view style="margin: 10rpx 0 0 0;"> v-model="keywords"></u-search>
</view> </view>
<u-sticky bgColor="#F5F5F5"> <!-- <view style="margin: 10rpx 0 0 0;"></view> -->
<u-subsection :list="list" :current="curNow" @change="sectionChange"></u-subsection> <u-sticky bgColor="#fff">
<u-tabs :list="list" lineColor='#3274F9' inactiveStyle='color:#666' activeStyle="color:#3274F9"
:current="curNow" @change="sectionChange" :scrollable="false"></u-tabs>
</u-sticky> </u-sticky>
<view v-if="!orderlist.length"> <view v-if="!orderlist.length">
<u-empty mode="data" icon="../../static/img/empty/data.png"> <u-empty mode="data" icon="../../static/img/empty/data.png">
</u-empty> </u-empty>
</view> </view>
<view v-else> <view v-else>
<logistiCard :ref="'logistiCard'+index" v-for='(item,index) in orderlist' @getlist="getOrderList" <logistiCard v-for='(item,index) in orderlist' @getlist="getOrderList" @showTost='showToast'
@showTost='showToast' :goodsInfo="item" :key="index"> :goodsInfo="item" :key="index">
</logistiCard> </logistiCard>
</view> </view>
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
@ -35,14 +41,20 @@
data() { data() {
return { return {
keywords: "", keywords: "",
list: ['待取货', '已取货', '已送达'], list: [{
name: '待取货'
}, {
name: '已取货'
}, {
name: '已送达'
}],
curNow: 0, curNow: 0,
orderlist: [] orderlist: []
} }
}, },
methods: { methods: {
sectionChange(index) { sectionChange(e) {
this.curNow = index; this.curNow = e.index;
this.getOrderList() this.getOrderList()
}, },
showToast() { showToast() {
@ -83,8 +95,4 @@
</script> </script>
<style lang='scss'> <style lang='scss'>
.content {
background-color: #F5F5F5;
padding: 1vh 2vw;
}
</style> </style>

4
pages/oaTask/oaTask.vue
View File

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

403
subpkg/archives/archives.vue
View File

@ -1,230 +1,215 @@
<template> <template>
<view class=""> <view class="">
<view class="personnel_list"> <view class="personnel_list">
<view class="item" v-for="(item, index) in list" :key="item.id"> <view class="item" v-for="(item, index) in list" :key="item.id">
<view class="top"> <view class="top">
<image class="avatar" src="../../static/img/public/record.png"></image> <image class="avatar" src="../../static/img/public/record.png"></image>
<view class="body"> <view class="body">
<view class="t_top"> <view>姓名:<text class="name">{{item.name}}</text></view>
<view>姓名:<text class="name">{{item.name}}</text></view> <view>
<view>电话:<text class="mobile">{{item.phone}}</text></view> 片区:<text class="name">{{item.village_name}}</text>
</view> <text class="name" style="margin-left: 0;" v-for="brigade_name in item.brigade_name">{{brigade_name.brigade_name}}</text>
<view class="t_bottom">片区:<text class="address">{{item.address}}</text></view> </view>
</view> <view>电话:<text class="name">{{item.phone}}</text></view>
</view> </view>
<u-line color="#cccccc"></u-line> </view>
<view class="bottom"> <u-line color="#cccccc"></u-line>
<view>更新时间: {{item.create_time}}</view> <view class="bottom">
<view class="right" v-if="showView"> <view>更新时间: {{item.create_time}}</view>
<view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)"> <view class="right" v-if="showView">
更新 <view class="update" @click="navTo('/subpkg/updateArchives/updateArchives?id='+item.id)">
</view> 更新
<view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)"> </view>
查看 <view class="look" @click="navTo('/subpkg/archivesDetail/archivesDetail?id='+item.id)">
</view> 查看
</view> </view>
</view> </view>
</view> </view>
<u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png"> </view>
</u-empty> <u-empty v-if="loadConfig.status=='nomore'&& list.length==0" text="没有档案" icon="/static/img/empty/list.png">
<u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText" </u-empty>
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> <u-loadmore v-else :status="loadConfig.status" :loading-text="loadConfig.loadingText"
</view> :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
<mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn> </view>
</view> <mybtn text="信息登记" v-if="showView" @click="navTo('/subpkg/newArchives/newArchives')"></mybtn>
</view>
</template> </template>
<script> <script>
import { import {
informationList informationList
} from "@/api/information.js" } from "@/api/information.js"
import { import {
Toast Toast
} from "../../libs/uniApi"; } from "../../libs/uniApi";
export default { export default {
data() { data() {
return { return {
user_id: -1, user_id: -1,
list: [], list: [],
loadConfig: { loadConfig: {
page: 1, page: 1,
limit: 15, limit: 15,
loadingText: '努力加载中', loadingText: '努力加载中',
loadmoreText: '轻轻上拉', loadmoreText: '轻轻上拉',
nomoreText: '我也是有底线的~~', nomoreText: '我也是有底线的~~',
status: 'loadmore' status: 'loadmore'
}, },
} }
}, },
onLoad(options) { onLoad(options) {
if (options.id) this.user_id = options.id; if (options.id) this.user_id = options.id;
else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id else if (this.$store.state.app.userInfo.admin_id == 0) { //如果用户是小队长,将带上自己的id
this.user_id = this.$store.state.app.userInfo.id; this.user_id = this.$store.state.app.userInfo.id;
} }
this.loadInformationList(); this.loadInformationList();
}, uni.$on('loadArchives', this.initLoad);
onShow() { },
onShow() {
},
computed: { },
// 是否显示查看和更新按钮 computed: {
showView() { // 是否显示查看和更新按钮
return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain; showView() {
} return !this.$store.state.app.userInfo.admin_id && this.$store.state.app.userInfo.is_captain;
}, }
onReachBottom() { },
this.loadInformationList(); onReachBottom() {
}, this.loadInformationList();
methods: { },
navTo(url) { methods: {
if (url) { navTo(url) {
uni.showLoading({ if (url) {
title: '加载中', uni.showLoading({
mask: true title: '加载中',
}) mask: true
uni.navigateTo({ })
url: url, uni.navigateTo({
success() { url: url,
uni.hideLoading() success() {
} uni.hideLoading()
}) }
} else Toast('暂未开放'); })
}, } else Toast('暂未开放');
async initLoad() { },
this.loadConfig.page = 1; async initLoad() {
this.loadConfig.status = "loadmore"; this.loadConfig.page = 1;
this.list = []; this.loadConfig.status = "loadmore";
await this.loadInformationList(); this.list = [];
uni.stopPullDownRefresh(); await this.loadInformationList();
}, uni.stopPullDownRefresh();
async loadInformationList() { },
let that = this; async loadInformationList() {
if (this.loadConfig.status == "nomore") return; let that = this;
this.loadConfig.status = "loading" if (this.loadConfig.status == "nomore") return;
let res = await informationList({ this.loadConfig.status = "loading"
page: this.loadConfig.page, let res = await informationList({
limit: this.loadConfig.limit, page: this.loadConfig.page,
user_id: that.user_id limit: this.loadConfig.limit,
}) user_id: that.user_id
this.loadConfig.status = "loadmore" })
if (res.data.length < this.loadConfig.limit) { this.loadConfig.status = "loadmore"
this.loadConfig.status = "nomore" if (res.data.length < this.loadConfig.limit) {
} else { this.loadConfig.status = "nomore"
this.loadConfig.page++; } else {
} this.loadConfig.page++;
this.list = [...this.list, ...res.data]; }
} this.list = [...this.list, ...res.data];
}, }
onPullDownRefresh() { },
this.initLoad(); onPullDownRefresh() {
} this.initLoad();
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">
.new_btn { .new_btn {
position: fixed; position: fixed;
bottom: 28rpx; bottom: 28rpx;
left: 50%; left: 50%;
transform: translate(-50%); transform: translate(-50%);
margin-top: 32rpx; margin-top: 32rpx;
// margin-bottom: 40rpx; // margin-bottom: 40rpx;
width: 694rpx; width: 694rpx;
height: 84rpx; height: 84rpx;
background: $theme-oa-color; background: $theme-oa-color;
border-radius: 42rpx 42rpx 42rpx 42rpx; border-radius: 42rpx 42rpx 42rpx 42rpx;
color: #fff; color: #fff;
line-height: 80rpx; line-height: 80rpx;
text-align: center; text-align: center;
} }
.personnel_list { .personnel_list {
padding: 28rpx 0; padding: 28rpx 0;
margin-bottom: 130rpx; margin-bottom: 130rpx;
.item { .item {
margin: 0 auto; margin: 0 auto;
width: 694rpx; width: 694rpx;
// height: 201rpx; // height: 201rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 14rpx 14rpx 14rpx 14rpx; border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1; opacity: 1;
margin-bottom: 21rpx; margin-bottom: 21rpx;
box-sizing: border-box; box-sizing: border-box;
padding: 28rpx; padding: 28rpx;
font-size: 24.53rpx; font-size: 24.53rpx;
color: #999999FF; color: #999999FF;
.top { .top {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
.avatar { .avatar {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
margin-right: 18rpx; margin-right: 18rpx;
margin-bottom: 12rpx; margin-bottom: 12rpx;
} }
.body { .body {
flex: 1; flex: 1;
font-size: 28rpx;
color: #333;
font-weight: bold;
.t_top { .name {
display: flex; font-size: 28rpx;
justify-content: space-between; color: #333;
margin-bottom: 18rpx; font-weight: 500;
display: inline-block;
margin-left: 18rpx;
}
}
}
.name { .bottom {
font-size: 32rpx; display: flex;
color: #333; justify-content: space-between;
} align-items: center;
margin-top: 20rpx;
font-size: 25rpx;
.mobile { .right {
font-size: 28rpx; font-size: 28rpx;
color: #333; display: flex;
}
}
.t_bottom { .look {
width: 500rpx; color: $theme-oa-color;
overflow: hidden; }
white-space: nowrap;
text-overflow: ellipsis;
.address { .update {
font-size: 28rpx; color: #34A853;
color: #333; margin-right: 38rpx;
} }
} }
}
}
.bottom { }
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20rpx;
font-size: 25rpx;
.right {
font-size: 28rpx;
display: flex;
.look {
color: $theme-oa-color;
}
.update {
color: #34A853;
margin-right: 38rpx;
}
}
}
} }
} }
</style> </style>

9
subpkg/archivesDetail/archivesDetail.vue
View File

@ -182,8 +182,13 @@
computed: { computed: {
nowAddress() { nowAddress() {
let address = this.$store.state.app.userInfo; let address = this.$store.state.app.userInfo;
return address.province_name + address.city_name + address.area_name + address.street_name + address let str = '';
.village_name + address.brigade_name; 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: { methods: {

42
subpkg/captain/captain.vue
View File

@ -46,14 +46,21 @@
分管片区: 分管片区:
</text> </text>
<view class="item"> <view class="item">
<view class="location">{{ item.city_name+item.area_name+item.street_name }}</view> <view class="location">
<text>{{ (item.street_name||'')+(item.village_name||'') }}</text>
<text v-for="brigade in item.brigade_name">{{ brigade.brigade_name }}</text>
</view>
</view> </view>
</view> </view>
<view class="company"> <view class="info_bottom">
<text> <text class="item phone">
所属公司: 所属公司:
</text> </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> </view>
</view> </view>
@ -313,7 +320,7 @@
.item { .item {
display: flex; display: flex;
align-items: center; align-items: flex-start;
} }
.phone { .phone {
@ -322,12 +329,12 @@
.location { .location {
width: 320rpx; width: 320rpx;
white-space: nowrap; // white-space: nowrap;
/* 不换行 */ // /* 不换行 */
overflow: hidden; // overflow: hidden;
/* 将超出文本隐藏 */ // /* 将超出文本隐藏 */
text-overflow: ellipsis; // text-overflow: ellipsis;
/* 使用省略号表示被隐藏的文本 */ // /* 使用省略号表示被隐藏的文本 */
color: #000; color: #000;
} }
} }
@ -337,16 +344,17 @@
text { text {
margin-right: 30rpx; margin-right: 30rpx;
flex-shrink: 0;
} }
.itm { .itm {
width: 320rpx; width: 320rpx;
white-space: nowrap; // white-space: nowrap;
/* 不换行 */ // /* 不换行 */
overflow: hidden; // overflow: hidden;
/* 将超出文本隐藏 */ // /* 将超出文本隐藏 */
text-overflow: ellipsis; // text-overflow: ellipsis;
/* 使用省略号表示被隐藏的文本 */ // /* 使用省略号表示被隐藏的文本 */
color: #000; color: #000;
} }
} }

3
subpkg/companyInfo/companyInfo.vue
View File

@ -145,6 +145,9 @@
</script> </script>
<style lang="scss"> <style lang="scss">
page{
}
.fixed_box { .fixed_box {
width: 100%; width: 100%;
position: fixed; position: fixed;

9
subpkg/newArchives/newArchives.vue
View File

@ -229,7 +229,13 @@
computed:{ computed:{
nowAddress(){ nowAddress(){
let address = this.$store.state.app.userInfo; 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: { methods: {
@ -279,6 +285,7 @@
title: "添加成功", title: "添加成功",
success: () => { success: () => {
setTimeout(() => { setTimeout(() => {
uni.$emit('loadArchives');
uni.navigateBack() uni.navigateBack()
}, 1000) }, 1000)
} }

2
subpkg/newPersonnel/newPersonnel.vue
View File

@ -112,7 +112,7 @@
sex: '', sex: '',
avatar: '', avatar: '',
nickname: '', nickname: '',
address: '测试地址', address: '',
qualification: { qualification: {
id_card: "", id_card: "",
id_card_b: "", id_card_b: "",

26
subpkg/personnel/personnel.vue
View File

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

3
subpkg/personnelDetails/personnelDetails.vue
View File

@ -37,7 +37,8 @@
</view> </view>
</view> </view>
<view class="bottom"> <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> </view>
<u-popup :show="show" :round="10" mode="center"> <u-popup :show="show" :round="10" mode="center">
<view class="popup"> <view class="popup">

5
subpkg/topUp/topUp.vue
View File

@ -213,6 +213,10 @@
font-size: 32rpx; font-size: 32rpx;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
text:nth-child(1){
flex-shrink: 0;
margin-right: 18rpx;
}
} }
} }
} }
@ -221,6 +225,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 0 28rpx; padding: 0 28rpx;
margin-top: 50rpx;
.title { .title {
font-size: 32rpx; font-size: 32rpx;

9
subpkg/withdrawDeposit/withdrawDeposit.vue
View File

@ -6,7 +6,8 @@
<view class="title">提现信息</view> <view class="title">提现信息</view>
<view class="item"> <view class="item">
<text>提现账户</text> <text>提现账户</text>
<text>{{$store.state.app.userInfo.account||''}}</text> <text v-if="$store.state.app.userInfo.admin_id">{{$store.state.app.userInfo.company.company_name||''}}</text>
<text v-else>{{$store.state.app.userInfo.account||''}}</text>
</view> </view>
<view class="item"> <view class="item">
<text>可用余额</text> <text>可用余额</text>
@ -141,7 +142,7 @@
.card { .card {
width: 694rpx; width: 694rpx;
height: 180rpx; min-height: 180rpx;
background: #FFFFFF; background: #FFFFFF;
margin-top: 38.55rpx; margin-top: 38.55rpx;
box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1); box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@ -167,6 +168,10 @@
font-size: 32rpx; font-size: 32rpx;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
text:nth-child(1){
flex-shrink: 0;
margin-right: 18rpx;
}
} }
} }
} }