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-16 13:38:17 +08:00
parent 3259be3b13
commit e0ffaf6626
7 changed files with 82 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/company/company.vue
View File

@ -117,7 +117,13 @@
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
</template> </template>
</u--image> </u--image>
<u--image class="image" v-for="item in company.qualification.bank_account" :key="item" @click="priview(item)" <u--image class="image" v-for="item in company.qualification.other_qualifications" :key="item" @click="priview(item)"
:src="item" v-if="company.qualification.other_qualifications" :lazy-load="true">
<template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon>
</template>
</u--image>
<!-- <u--image class="image" v-for="item in company.qualification.bank_account" :key="item" @click="priview(item)"
:src="item" v-if="company.qualification.bank_account" :lazy-load="true"> :src="item" v-if="company.qualification.bank_account" :lazy-load="true">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
@ -128,7 +134,7 @@
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
</template> </template>
</u--image> </u--image> -->
</view> </view>
</block> </block>
</view> </view>
@ -208,13 +214,6 @@
} }
this.company = res.data.company; this.company = res.data.company;
try{
if(Array.isArray(JSON.parse(this.company.qualification.bank_account))){
this.company.qualification.bank_account = JSON.parse(this.company.qualification.bank_account)
}
}catch(e){
}
uni.$emit('companyInfo', this.company); //发送全局事件 uni.$emit('companyInfo', this.company); //发送全局事件
this.user = res.data.user; this.user = res.data.user;
this.contract = res.data.contract; this.contract = res.data.contract;

34
components/companyFinance/companyFinance.vue
View File

@ -3,20 +3,20 @@
<view class="f_card"> <view class="f_card">
<view class="item" @click="navTo('/subpkg/topUp/topUp')"> <view class="item" @click="navTo('/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" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')"> <view class="item" @click="navTo('/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>
</view> </view>
</view> </view>
<view class="f_nav"> <view class="f_nav">
<view class="title">账单流水</view> <view class="title">账单流水</view>
<view class="right"> <view class="right">
<view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">日账单</view> <view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">今日账单</view>
<view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> <!-- <view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> -->
<view class="btn" @click="navTo('/subpkg/companyFinance/companyFinance')">更多</view> <view class="btn" @click="navTo('/subpkg/companyFinance/companyFinance')">更多</view>
</view> </view>
</view> </view>
@ -28,12 +28,21 @@
<view class="bottom"> <view class="bottom">
<view class="text"> <view class="text">
<view class="t_item" v-if="current==0"> <view class="t_item" v-if="current==0">
<view>任务名称：</view> <view class="t_title">任务名称：</view>
<view class="tips">{{item.remark}}</view> <view class="tips">{{item.remark}}</view>
</view> </view>
<view class="t_item"> <view class="t_item">
<view>收益来源：</view> <view class="t_title">金额归属：</view>
<view class="tips">{{current?item.remark:item.type_desc}}</view> <view class="tips"><text v-if="item.userInfo">{{item.userInfo.nickname}}</text></view>
</view>
<view class="t_item">
<view class="t_title">收益来源：</view>
<view class="tips">
<!-- {{current?item.remark:item.type_desc}} -->
<text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
<text v-else-if="item.change_type==203" style="color: #ff7c32;">{{item.type_desc}}</text>
<text v-else="item.change_type==203">{{item.type_desc}}</text>
</view>
</view> </view>
</view> </view>
<view class="price">{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}</view> <view class="price">{{current?(item.expenditure==0?'+'+item.income:'-'+item.income):item.change_amount_desc}}</view>
@ -53,14 +62,17 @@
return { return {
current: 0, current: 0,
list: [], list: [],
company:{}, company:{
company_money: "0",
deposit: "0"
},
loadConfig:{ loadConfig:{
page: 1, page: 1,
limit: 15, limit: 15,
lastpage: '', lastpage: '',
loadingText: '努力加载中', loadingText: '努力加载中',
loadmoreText: '轻轻上拉', loadmoreText: '轻轻上拉',
nomoreText: '我也是有底线的~~', nomoreText: '没有更多账单了~~',
status: 'loadmore' status: 'loadmore'
}, },
}; };
@ -68,6 +80,7 @@
mounted() { mounted() {
uni.$on('companyInfo', (e)=>{ uni.$on('companyInfo', (e)=>{
this.company = e; this.company = e;
console.log(this.company);
this.initLoad(); this.initLoad();
}) })
}, },
@ -233,8 +246,9 @@
line-height: 39rpx; line-height: 39rpx;
.t_item{ .t_item{
display: flex; display: flex;
&:nth-child(1){ .t_title{
margin-bottom: 16rpx; margin-bottom: 16rpx;
flex-shrink: 0 !important;
} }
.tips{ .tips{
font-size: 28rpx; font-size: 28rpx;

22
pages/updatePasswprd/updatePasswprd.vue
View File

@ -4,17 +4,29 @@
<u-form-item label="原密码" labelWidth="140rpx" borderBottom prop="old_password"> <u-form-item label="原密码" labelWidth="140rpx" borderBottom prop="old_password">
<u--input v-model="formData.old_password" :password="!pwdShow.old_password" placeholder="请输入原密码" maxlength="18"> <u--input v-model="formData.old_password" :password="!pwdShow.old_password" placeholder="请输入原密码" maxlength="18">
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<template slot="suffix"> <!-- <template slot="suffix">
<u-icon :name="pwdShow.old_password?'eye-off':'eye-fill'" @click="pwdShow.old_password=!pwdShow.old_password" color="#999"></u-icon> <uni-icons :type="pwdShow.old_password?'eye-filled':'eye-slash-filled'" @click="pwdShow.old_password=!pwdShow.old_password" color="#999"></uni-icons>
</template> </template> -->
<!-- #endif --> <!-- #endif -->
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="新密码" labelWidth="140rpx" borderBottom prop="password"> <u-form-item label="新密码" labelWidth="140rpx" borderBottom prop="password">
<u--input v-model="formData.password" type="password" placeholder="请输入新密码" maxlength="18"></u--input> <u--input v-model="formData.password" :password="!pwdShow.password" placeholder="请输入新密码" maxlength="18">
<!-- #ifdef APP-PLUS -->
<!-- <template slot="suffix">
<u--icon :name="pwdShow.password?'eye-off':'eye-fill'" @click="pwdShow.old_password=!pwdShow.old_password" color="#999"></u--icon>
</template> -->
<!-- #endif -->
</u--input>
</u-form-item> </u-form-item>
<u-form-item label="确认密码" labelWidth="140rpx" borderBottom prop="password_confirm"> <u-form-item label="确认密码" labelWidth="140rpx" borderBottom prop="password_confirm">
<u--input v-model="formData.password_confirm" type="password" placeholder="请确认新密码" maxlength="18"></u--input> <u--input v-model="formData.password_confirm" :password="!pwdShow.password_confirm" placeholder="请确认新密码" maxlength="18">
<!-- #ifdef APP-PLUS -->
<!-- <template slot="suffix">
<u--icon :name="pwdShow.password_confirm?'eye-off':'eye-fill'" @click="pwdShow.old_password=!pwdShow.old_password" color="#999"></u--icon>
</template> -->
<!-- #endif -->
</u--input>
</u-form-item> </u-form-item>
<u-button style="margin-top: 28rpx;background-color: #3175f9;color: #fff;" @click="submit">提交</u-button> <u-button style="margin-top: 28rpx;background-color: #3175f9;color: #fff;" @click="submit">提交</u-button>
</u--form> </u--form>

2
static/server/server.js
View File

@ -245,7 +245,7 @@ export const oaHomeData = [
// admin: true // admin: true
// }, // },
{ {
text: '财务管理', text: '个人财务',
icon: prefix + 'oa/gengduo@2x.png', icon: prefix + 'oa/gengduo@2x.png',
url: '/subpkg/finance/finance' url: '/subpkg/finance/finance'
}, },

5
subpkg/archivesDetail/archivesDetail.vue
View File

@ -44,7 +44,8 @@
<u--textarea :value="nowAddress" autoHeight readonly></u--textarea> <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="小队" required prop="address" borderBottom> <u-form-item labelWidth="auto" label="小队" required prop="address" borderBottom>
<u--input v-model="formData.brigade_name&&formData.brigade_name[0].brigade_name" :readonly="readonly" placeholder="请选择小队"></u--input> <!-- <u--input v-model="formData.brigade_name&&formData.brigade_name[0].brigade_name" :readonly="readonly" placeholder="请选择小队"></u--input> -->
<u--input v-model="formData.brigade_name" :readonly="readonly" placeholder="请选择小队"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom> <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
<u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input> <u--input v-model="formData.address" :readonly="readonly" placeholder="请输入详细地址"></u--input>
@ -204,7 +205,7 @@
}, },
async initInformationDetails(id) { async initInformationDetails(id) {
let res = await informationDetails(id); let res = await informationDetails(id);
this.$u.sleep(500).then(()=>{ this.$u.sleep(100).then(()=>{
this.skeleton = false; this.skeleton = false;
Object.keys(res.data).forEach(key => { Object.keys(res.data).forEach(key => {
this.formData[key] = res.data[key]; this.formData[key] = res.data[key];

22
subpkg/companyFinance/companyFinance.vue
View File

@ -17,12 +17,20 @@
<view class="bottom"> <view class="bottom">
<view class="text"> <view class="text">
<view class="t_item"> <view class="t_item">
<view>任务名称：</view> <view class="t_title">任务名称：</view>
<view class="tips">{{item.remark}}</view> <view class="tips">{{item.remark}}</view>
</view> </view>
<view class="t_item"> <view class="t_item">
<view>收益来源：</view> <view class="t_title">金额归属：</view>
<view class="tips">{{item.type_desc}}</view> <view class="tips"><text v-if="item.userInfo">{{item.userInfo.nickname}}</text></view>
</view>
<view class="t_item">
<view class="t_title">收益来源：</view>
<view class="tips">
<text v-if="item.change_type==202" style="color: #46be61;">{{item.type_desc}}</text>
<text v-else-if="item.change_type==203" style="color: #ff7c32;">{{item.type_desc}}</text>
<text v-else="item.change_type==203">{{item.type_desc}}</text>
</view>
</view> </view>
</view> </view>
<view class="price">{{item.change_amount_desc}}</view> <view class="price">{{item.change_amount_desc}}</view>
@ -122,6 +130,11 @@
}, },
methods: { methods: {
async loadBill() { async loadBill() {
// change_type 200,201,202,203
// 200 平台增加余额
// 201 充值增加余额
// 202 任务收益金额
// 203 任务账户余额增加
if(this.loadConfig.status=="nomore")return; if(this.loadConfig.status=="nomore")return;
this.loadConfig.status="loading" this.loadConfig.status="loading"
let res = await accountDateList({ let res = await accountDateList({
@ -299,8 +312,9 @@
line-height: 39rpx; line-height: 39rpx;
.t_item{ .t_item{
display: flex; display: flex;
&:nth-child(1){ .t_title{
margin-bottom: 16rpx; margin-bottom: 16rpx;
flex-shrink: 0 !important;
} }
.tips{ .tips{
font-size: 28rpx; font-size: 28rpx;

21
subpkg/newArchives/newArchives.vue
View File

@ -31,14 +31,14 @@
<u-form-item labelWidth="auto" label="地址" borderBottom> <u-form-item labelWidth="auto" label="地址" borderBottom>
<u--textarea :value="nowAddress" autoHeight readonly></u--textarea> <u--textarea :value="nowAddress" autoHeight readonly></u--textarea>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="小队" required prop="brigade" borderBottom> <!-- <u-form-item labelWidth="auto" label="小队" required prop="brigade" borderBottom>
<u-radio-group v-model="formData.brigade" style="margin: 16rpx;"> <u-radio-group v-model="formData.brigade" style="margin: 16rpx;">
<u-radio :customStyle="{marginRight: '16px'}" <u-radio :customStyle="{marginRight: '16px'}"
v-for="(brigade_name, index) in brigadeList" :key="index" :label="brigade_name.brigade_name" v-for="(brigade_name, index) in brigadeList" :key="index" :label="brigade_name.brigade_name"
:name="brigade_name.id" :checked="brigadeList.length==1"> :name="brigade_name.id" :checked="brigadeList.length==1">
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</u-form-item> </u-form-item> -->
<u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom> <u-form-item labelWidth="auto" label="详细地址" required prop="address" borderBottom>
<u--input v-model="formData.address" placeholder="请输入详细地址"></u--input> <u--input v-model="formData.address" placeholder="请输入详细地址"></u--input>
</u-form-item> </u-form-item>
@ -252,6 +252,7 @@
address.area_name ? str += address.area_name : null; address.area_name ? str += address.area_name : null;
address.street_name ? str += address.street_name : null; address.street_name ? str += address.street_name : null;
address.village_name ? str += address.village_name : null; address.village_name ? str += address.village_name : null;
address.brigade_name ? str += address.brigade_name : null;
return str; return str;
} }
}, },
@ -330,21 +331,21 @@
}, },
// 初始化商机分类 // 初始化商机分类
async initCategoryBusinessList() { async initCategoryBusinessList() {
try{ try {
uni.showLoading({ uni.showLoading({
title:'加载中', title: '加载中',
mask:true mask: true
}) })
let res = await categoryBusinessList(); let res = await categoryBusinessList();
this.demandList = res.data; this.demandList = res.data;
}catch(e){ } catch (e) {
console.log(e); console.log(e);
}finally{ } finally {
uni.hideLoading() uni.hideLoading()
} }
}, },
initBrigadeList(){ initBrigadeList() {
try{ try {
let arr = this.$store.state.app.userInfo.brigade.split(','); let arr = this.$store.state.app.userInfo.brigade.split(',');
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
this.brigadeList.push({ this.brigadeList.push({
@ -352,7 +353,7 @@
brigade_name: this.$store.state.app.userInfo.brigade_name[i].brigade_name brigade_name: this.$store.state.app.userInfo.brigade_name[i].brigade_name
}) })
} }
}catch(e){ } catch (e) {
Toast('未负责小队'); Toast('未负责小队');
} }
}, },