From b934f9f9a59e84a1af40ff139418a7d30dd68402 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期五, 07 三月 2025 17:30:34 +0800
Subject: [PATCH] =
---
src/pages/delivergoods/query.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/pages/delivergoods/query.vue b/src/pages/delivergoods/query.vue
index 52ffe24..e4c1554 100644
--- a/src/pages/delivergoods/query.vue
+++ b/src/pages/delivergoods/query.vue
@@ -24,7 +24,7 @@
<view class="chuany-flex chuany-justify-between">
<text class="chuany-width7">{{index+1}}</text>
<view class="chuany-width15">
- {{$util.formatDate(item.createTime,'riqi')}}
+ {{$util.formatDate(item.deliverTime,'riqi')}}
</view>
<view class="chuany-width73">
<u-text size='14' :text="item.remark" lines="1">
@@ -102,7 +102,7 @@
orderList: [],
loadStatus: 'loadmore',
pageIndex: 1,
- pageSize: 20,
+ pageSize: 30,
contentVal: '',
customerList: [],
isEdit: false,
@@ -174,11 +174,14 @@
deliverKeyName: ''
}
},
-
+
computed: {
...mapGetters(['userInfo']),
isAdmin() {
- return this.userInfo.userCompany ? this.userInfo.userCompany.isAdmin : false
+ if (this.userInfo.oaPermissions) {
+ return this.userInfo.oaPermissions.bF_IsDeliverManage ? true : false
+ }
+ return false
},
},
onShow() {
@@ -187,7 +190,9 @@
onReady() {
this.$refs.formRef.setRules(this.rules);
},
- onLoad() {
+ onLoad(options) {
+ // this.isAdmin = options.isAdmin
+ // console.log(options);
this.Getdrivers()
this.getCustomer()
this.GetDriversOfWithin7days()
@@ -314,7 +319,7 @@
companyName: item.companyName
}
this.show7 = true
- this.driverName = item.driver.name
+ this.driverName = item.driver && item.driver.name
// let obj = this.customerList.find(ite => {
// return ite.keyid == item.buyerId
// })
@@ -350,7 +355,7 @@
},
init() {
this.pageIndex = 1
- this.pageSize = 20
+ this.pageSize = 30
this.loadStatus = 'loadmore'
this.orderList = []
this.contentVal = ''
@@ -448,8 +453,9 @@
if (this.deliverKeyID) {
data.deliverKeyID = this.deliverKeyID
}
+ console.log(this.isAdmin);
let getListApi = null
- if (this.isAdmmin) {
+ if (this.isAdmin) {
getListApi = this.$api.GetDeliverPlans
} else {
getListApi = this.$api.workerGetDeliverPlans
--
Gitblit v1.9.1