From 6dc59277cedc8c995b1c68807e40a6ee5903f0f4 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期一, 10 三月 2025 17:18:15 +0800
Subject: [PATCH] 送货受理受理成功生成送货安排
---
src/pages/delivergoods/query.vue | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/pages/delivergoods/query.vue b/src/pages/delivergoods/query.vue
index 10cc789..b6c7d18 100644
--- a/src/pages/delivergoods/query.vue
+++ b/src/pages/delivergoods/query.vue
@@ -24,10 +24,10 @@
<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">
+ <u-text size='14' :text="item.remark||item.companyName" lines="1">
</u-text>
</view>
<!-- <view class="chuany-width5" @tap.stop='editOrder(item)'>
@@ -102,7 +102,7 @@
orderList: [],
loadStatus: 'loadmore',
pageIndex: 1,
- pageSize: 20,
+ pageSize: 30,
contentVal: '',
customerList: [],
isEdit: false,
@@ -113,7 +113,7 @@
driverName: '',
actions: [],
selectAc: '',
- deliveredState:'Undeliver',
+ deliveredState: 'Undeliver',
minDate: this.$util.formatDate(new Date(), null, -7),
maxDate: this.$util.formatDate(new Date(), null, 7),
deliverTime: Number(new Date(this.$util.formatDate(new Date(), null, 1))),
@@ -174,19 +174,25 @@
deliverKeyName: ''
}
},
- onShow() {
- this.init()
- },
+
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() {
+ this.init()
},
onReady() {
this.$refs.formRef.setRules(this.rules);
},
- onLoad() {
+ onLoad(options) {
+ // this.isAdmin = options.isAdmin
+ // console.log(options);
this.Getdrivers()
this.getCustomer()
this.GetDriversOfWithin7days()
@@ -197,8 +203,8 @@
}
},
onPullDownRefresh() {
- this.startDate = ''
- this.endDate = ''
+ this.timeStart = ''
+ this.timeEnd = ''
this.workTime = ''
this.deliverKeyName = ''
this.init()
@@ -237,7 +243,7 @@
this.timeStart = new Date(val.startDate.result) //宸ヤ綔寮�濮嬫椂闂�
this.timeEnd = new Date(val.endDate.result)
this.datePickerShow = !this.datePickerShow
- this.getList()
+ this.init()
},
confirmDate(val) {
console.log(val);
@@ -313,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
// })
@@ -349,7 +355,7 @@
},
init() {
this.pageIndex = 1
- this.pageSize = 20
+ this.pageSize = 30
this.loadStatus = 'loadmore'
this.orderList = []
this.contentVal = ''
@@ -432,7 +438,7 @@
getList() {
this.deliverKeyName == '' ? this.deliverKeyID = '' : null
let data = {
- deliveredState:this.deliveredState,
+ deliveredState: this.deliveredState,
page: {
pageIndex: this.pageIndex,
pageSize: this.pageSize,
@@ -447,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