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

修复bug

Browse Source
This commit is contained in:
weipengfei 2023-08-03 17:44:02 +08:00
parent 7b5fd83a19
commit bb4bd64f84
12 changed files with 80 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/company.js
View File

@ -37,12 +37,12 @@ export const companyUserDetail = (data) => oahttp.get('/company/user', data)
/**
* 人员详情
* 月流水
*/
export const accountMonthList = (data) => oahttp.get('/account_log/company_year_count', data)
/**
* 人员详情
* 日流水
*/
export const accountDateList = (data) => oahttp.get('/account_log/company_lists', data)
@ -61,3 +61,8 @@ export const Draftingcontracts = (data) => oahttp.post('/company/Draftingcontrac
*/
export const postsms = (data) => oahttp.post('/company/postsms', data)
/**
* 公司财务
*/
export const sss = (data) => oahttp.post('/company/postsms', data)

10
components/companyFinance/companyFinance.vue
View File

@ -1,6 +1,6 @@
<template>
<view class="c_card">
<view class="f_card">
<view class="f_card" @click="naviTo('/subpkg/topUp/topUp')">
<view class="item">
<view>公司账户余额(元)</view>
<view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
@ -17,6 +17,7 @@
<view class="right">
<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" @click="naviTo('/subpkg/companyFinance/companyFinance')">更多</view>
</view>
</view>
<view class="f_list">
@ -45,6 +46,7 @@
<script>
import { accountMonthList, accountDateList } from "@/api/company.js"
import { Toast } from "../../libs/uniApi";
export default {
name: "companyFinance",
data() {
@ -70,6 +72,12 @@
})
},
methods:{
naviTo(url) {
url ?
uni.navigateTo({
url: url,
}) : Toast('暂未开放')
},
initLoad(){
this.loadConfig.page = 1;
this.loadConfig.status = "loadmore";

2
manifest.json
View File

@ -1,6 +1,6 @@
{
"name" : "供销综合平台",
"appid" : "__UNI__3A527D1",
"appid" : "__UNI__EA9FCAF",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",

29
pages.json
View File

@ -11,6 +11,16 @@
}
}
},
{
"path": "pages/business/business",
"style": {
"navigationBarTitleText": "商机信息",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white"
}
},
{
"path": "pages/index/index",
"style": {
@ -364,6 +374,15 @@
"navigationBarTextStyle": "white"
}
}, {
"path": "companyFinance/companyFinance",
"style": {
"navigationBarTitleText": "公司财务",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white"
}
}]
}],
"globalStyle": {
@ -395,9 +414,15 @@
"iconPath": "/static/tabs-icon/approval.png",
"selectedIconPath": "/static/tabs-icon/approval-a.png"
},
// {
// "pagePath": "pages/oaManager/oaManager",
// "text": "片区经理",
// "iconPath": "/static/tabs-icon/manager.png",
// "selectedIconPath": "/static/tabs-icon/manager-a.png"
// },
{
"pagePath": "pages/oaManager/oaManager",
"text": "片区经理",
"pagePath": "pages/business/business",
"text": "商机",
"iconPath": "/static/tabs-icon/manager.png",
"selectedIconPath": "/static/tabs-icon/manager-a.png"
},

3
pages/oaExamine/oaExamine.vue
View File

@ -24,7 +24,8 @@
<view class="approval_time">{{item.create_time}}</view>
</view>
</view>
<u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
<u-empty icon="/static/img/empty/data.png"></u-empty>
<!-- <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> -->
<!-- <tabbar></tabbar> -->
</view>
</template>

1
pages/oaHome/oaHome.vue
View File

@ -301,7 +301,6 @@
}
},
login() {
console.log('ss');
uni.navigateTo({
url: '/pages/oaLogin/oaLogin'
})

5
pages/oaTask/oaTask.vue
View File

@ -26,8 +26,9 @@
<!-- 事件列表 -->
<view class="task_list">
<!-- <taskCard class="task_card" v-for="item in 10" :key="item"></taskCard> -->
<u-empty icon="/static/img/empty/data.png"></u-empty>
</view>
<u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" />
<!-- <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText" :nomore-text="nomoreText" /> -->
<!-- <tabbar></tabbar> -->
</view>
</template>
@ -262,7 +263,7 @@
justify-content: space-between;
align-items: center;
flex-direction: column;
padding-top: 21rpx;
// padding-top: 21rpx;
.task_card{
margin-bottom: 21rpx;
}

8
store/modules/app.js
View File

@ -15,6 +15,14 @@ const mutations = {
LOGOUT(state) {
Cache.clear('USER_INFO')
Cache.clear('TOKEN')
uni.showModal({
content: '登录已过期,是否重新登录?',
success(e) {
if(e.confirm)uni.redirectTo({
url:'/pages/oaLogin/oaLogin'
})
}
})
},
UPDATE_USERINFO(state, data) {
let time = res.data.result.expires_time - Cache.time();

10
subpkg/archives/archives.vue
View File

@ -28,7 +28,7 @@
<view class="bottom">
<view class="circle"></view>
<view class="green">所属片区</view>
<view>{{item.address}}</view>
<view class="tips">{{item.address}}</view>
</view>
</view>
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
@ -231,6 +231,14 @@
margin-right: 18rpx;
-webkit-background-clip: text;
}
.tips{
width: 480rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}

16
subpkg/companyInfo/companyInfo.vue
View File

@ -1,12 +1,14 @@
<template>
<view class="">
<view class="fixed_box">
<view class="top_box">
<view class="item" :class="current==0?'active':''" @click="current=0">我的公司</view>
<view class="item" :class="current==1?'active':''" @click="current=1">签约公司</view>
<view class="item" :class="current==2?'active':''" @click="current=2">公司财务</view>
<!-- <view class="item" :class="current==3?'active':''" @click="current=3">公司财务</view> -->
</view>
<scroll-view :scroll-x="true" style="background-color: #fff;">
<view class="top_box">
<view class="item" :class="current==0?'active':''" @click="current=0">我的公司</view>
<view class="item" :class="current==1?'active':''" @click="current=1">签约公司</view>
<view class="item" :class="current==2?'active':''" @click="current=2">公司财务</view>
<view class="item" :class="current==3?'active':''" @click="naviTo()">任务情况</view>
</view>
</scroll-view>
<view class="top_box top_box2" v-if="current==1">
<view class="item" :class="currentChild==0?'active':''" @click="currentChild=0;initLoad()">已签约</view>
<view class="item" :class="currentChild==1?'active':''" @click="currentChild=1;initLoad()">未签约</view>
@ -145,11 +147,13 @@
left: 0;
z-index: 999;
}
.top_box{
background-color: #fff;
display: flex;
.item{
flex-shrink: 0; /* 禁止缩小 */
width: 155rpx;
height: 53rpx;
background: #F5F5F5FF;

6
subpkg/newPersonnel/newPersonnel.vue
View File

@ -225,9 +225,9 @@
icon: "none",
title: "添加成功",
success: () => {
// setTimeout(() => {
// uni.navigateBack()
// }, 1000)
setTimeout(() => {
uni.navigateBack()
}, 1000)
}
})
}

2
subpkg/topUp/topUp.vue
View File

@ -6,7 +6,7 @@
<view class="title">充值信息</view>
<view class="item">
<text>充值账户</text>
<text>{{$store.state.app.userInfo.account||''}}</text>
<text>{{$store.state.app.userInfo.company.company_name||''}}</text>
</view>
</view>
</view>