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 16:02:32 +08:00
parent 7d22e61158
commit 71aa569c95
7 changed files with 139 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/task.js
View File

@ -9,3 +9,9 @@ export const taskLists = (data) => oahttp.get('/task/lists', data)
* 任务:更新档案列表
*/
export const taskInformationgist = (data) => oahttp.get('/task/informationg_list', data)
/**
* 任务:片区交易
*/
export const taskOrderDetail = (data) => oahttp.get('/task/order_detail', data)

5
components/task/taskItem.vue
View File

@ -132,7 +132,10 @@
} else if (this.$props.datas.type == 32) {
// this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
this.navTo(`/subpkg/vehicle/vehicle?task_id=${this.$props.datas?.id}`)
} else this.navTo('');
} else if(this.$props.datas.type == 33){
this.navTo(`/subpkg/blockTransaction/blockTransaction?task_id=${this.$props.datas?.id}`)
}
else this.navTo('');
}
}
}

2
pages.json
View File

@ -462,7 +462,7 @@
"path": "blockTransaction/blockTransaction",
"style": {
"navigationBarTitleText": "任务:片区交易",
"enablePullDownRefresh": false,
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#0122C7",
"navigationBarTextStyle": "white"
}

11
pages/oaHome/oaHome.vue
View File

@ -95,7 +95,7 @@
<view class="fast_track">
<block v-for="(item, index) in oaHomeData" :key="index">
<view class="track_item" @click="navTwo(item.url, index)">
<u--image :showLoading="true" :src="iconList[index]" mode="widthFix" width="77.19rpx"
<u--image :showLoading="true" :src="item.icon" mode="widthFix" width="77.19rpx"
height="77.19rpx"></u--image>
<view class="title">{{ item.text }}</view>
</view>
@ -196,15 +196,6 @@
data() {
return {
is_captain: 0,
iconList: [
"../../static/img/home/GSXX.png",
"../../static/img/home/RYGL.png",
"../../static/img/home/HTGL.png",
"../../static/img/home/RWGL.png",
"../../static/img/home/DAGL.png",
"../../static/img/home/GRCW.png",
],
notArr: [],
orderList: [],
oaHomeData: [],

30
static/server/server.js
View File

@ -194,59 +194,59 @@ export const quickLink = [
export const oaHomeData = [
{
text: '公司信息',
icon: prefix + 'oa/qjsq@2x.png',
icon: '../../static/img/home/GSXX.png',
url: '/subpkg/companyInfo/companyInfo',
admin: true
},
{
text: '人员管理',
icon: prefix + 'oa/ccsq@2x.png',
icon: '../../static/img/home/RYGL.png',
url: '/subpkg/personnel/personnel',
admin: true
},
// {
// text: '固定资产',
// icon: prefix + 'oa/wcsq@2x.png',
// url: '/subpkg/fixedAssets/fixedAssets',
// admin: true
// },
{
text: '固定资产',
icon: '../../static/img/home/GDZC.png',
url: '/subpkg/fixedAssets/fixedAssets',
admin: true
},
{
text: '合同管理',
icon: prefix + 'oa/cgsq@2x.png',
icon: '../../static/img/home/HTGL.png',
url: '/subpkg/contract/contract'
},
// {
// text: '公司管理',
// icon: prefix + 'oa/bxsq@2x.png',
// icon: '../../static/img/home/GSXX.png',
// url: '/subpkg/companyAdmin/companyAdmin',
// admin: true
// },
{
text: '任务管理',
icon: prefix + 'oa/bxsq@2x.png',
icon: '../../static/img/home/RWGL.png',
url: '/subpkg/taskAdmin/taskAdmin',
},
{
text: '档案管理',
icon: prefix + 'oa/bxsq@2x.png',
icon: '../../static/img/home/DAGL.png',
url: '/subpkg/captain/captain',
admin: true
},
{
text: '档案管理',
icon: prefix + 'oa/bxsq@2x.png',
icon: '../../static/img/home/DAGL.png',
url: '/subpkg/archives/archives',
captain: true
},
// {
// text: '片区经理',
// icon: prefix + 'oa/yzsq@2x.png',
// icon: '../../static/img/home/GRCW.png',
// url: '/pages/oaManager/oaManager',
// admin: true
// },
{
text: '个人财务',
icon: prefix + 'oa/gengduo@2x.png',
icon: '../../static/img/home/GRCW.png',
url: '/subpkg/finance/finance'
},
// {

135
subpkg/blockTransaction/blockTransaction.vue
View File

@ -2,28 +2,32 @@
<view class="">
<view class="card">
<view class="item">
<view>片区当日交易额(元)</view>
<view>当日完成金额(元)</view>
<!-- <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
<view class="price" v-else>0.00</view> -->
<view class="price">0.00</view>
<view class="price">{{card.total_price.toFixed(2)}}</view>
</view>
<view class="item">
<view>片区目标交易额(元)</view>
<view>目标完成金额(元)</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">0.00</view>
<view class="price">{{card.day_money.toFixed(2)}}</view>
</view>
</view>
<view class="nav">
<!-- <view class="nav">
<view class="title">账单流水</view>
<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" :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="navTo('/subpkg/companyFinance/companyFinance')">历史账单</view>
</view>
</view>
</view> -->
<view class="list">
<view class="item" v-for="(item, index) in 10" :key="index">
<!-- <view class="item" v-for="(item, index) in 10" :key="index">
<view class="top">
交易时间：2023-06-16 18:07:59
</view>
@ -43,19 +47,36 @@
</view>
</view>
</view>
</view> -->
<view class="item" v-for="(item, index) in list" :key="item.id">
<view class="top">
账单日期：{{item.create_time}}
</view>
<view class="t_bottom">
<view class="order">订单编号：{{item.order_sn}}</view>
<view class="price">交易额: {{item.total_price}}</view>
</view>
</view>
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
</view>
</view>
</template>
<script>
import { Toast } from '../../libs/uniApi'
import { taskOrderDetail } from "@/api/task.js"
export default {
data() {
return {
list:[],
loadConfig:{
card: {
total_price: 0,
status: 1,
day_money: 0
},
list: [],
task_id: '',
loadConfig: {
page: 1,
limit: 15,
lastpage: '',
@ -66,8 +87,14 @@
},
}
},
onLoad() {},
onLoad(options) {
options.task_id ? this.task_id = options.task_id : null;
this.initLoad();
},
onShow() {},
onReachBottom() {
this.loadList();
},
methods: {
navTo(url) {
url ?
@ -75,9 +102,42 @@
url: url,
}) : Toast('暂未开放')
},
async initLoad() {
this.loadConfig.page = 1;
this.loadConfig.status = "loadmore";
this.list = [];
await this.loadList();
},
async loadList() {
try {
let that = this;
if (this.loadConfig.status == "nomore") return;
this.loadConfig.status = "loading"
let res = await taskOrderDetail({
page: this.loadConfig.page,
limit: this.loadConfig.limit,
id: this.task_id,
// company_id: this.$store.state.app.userInfo.company_id
})
this.loadConfig.status = "loadmore"
if (res.data?.list.length < this.loadConfig.limit) {
this.loadConfig.status = "nomore"
} else {
this.loadConfig.page++;
}
Object.keys(this.card).forEach((key)=>{
if(res.data?.arr[key]!=null&&res.data?.arr[key]!=undefined)this.card[key] = res.data.arr[key];
})
this.list = [...this.list, ...res.data?.list]
} catch (e) {
this.loadConfig.status = "nomore"
}
},
},
onPullDownRefresh() {
uni.stopPullDownRefresh()
this.initLoad().then(()=>{
uni.stopPullDownRefresh()
})
}
}
</script>
@ -87,7 +147,7 @@
margin: 28rpx auto;
width: 694rpx;
height: 158rpx;
background: #3175F9;
background: #0122c7;
border-radius: 18rpx 18rpx 18rpx 18rpx;
opacity: 1;
padding: 28rpx;
@ -134,7 +194,7 @@
border-radius: 10rpx;
margin-right: 10rpx;
display: inline-block;
background-color: #3175F9;
background-color: #0122c7;
}
}
@ -146,11 +206,11 @@
}
.active {
color: #3175F9;
color: #0122c7;
}
}
}
.list {
.item {
margin: 0 auto;
@ -161,50 +221,54 @@
border-radius: 14rpx 14rpx 14rpx 14rpx;
opacity: 1;
padding: 28rpx;
.top {
margin-bottom: 28rpx;
font-size: 25rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
&:before {
display: inline-block;
content: '交易信息';
content: '交易明细';
width: 137rpx;
height: 49rpx;
line-height: 49rpx;
text-align: center;
background: #3274F9;
background: #FF7C32;
border-radius: 26rpx 26rpx 26rpx 26rpx;
color: #fff;
margin-right: 28rpx;
}
}
.bottom {
display: flex;
justify-content: space-between;
.text {
font-size: 25rpx;
font-weight: 400;
color: #999999;
line-height: 39rpx;
.t_item{
.t_item {
display: flex;
&:nth-child(1){
&:nth-child(1) {
margin-bottom: 16rpx;
}
.tips{
.tips {
font-size: 28rpx;
font-weight: 400;
color: #333333;
}
}
}
.price{
.price {
display: flex;
align-items: center;
font-size: 32rpx;
@ -212,6 +276,21 @@
color: #F02828;
}
}
.t_bottom {
font-size: 25rpx;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.price {
color: #FF7C32;
flex-shrink: 0;
}
}
}
}
</style>

9
subpkg/finance/finance.vue
View File

@ -299,12 +299,13 @@
// background-color: red;
display: flex;
justify-content: space-between;
width: auto;
line-height: 44px;
.name{
margin-left: 20rpx;
}
}
.name {
margin-left: 20rpx;
}
}
.left {
display: flex;