From d3e6dd6b3032c119676efa1e9fcee3a8a8043fc5 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期五, 07 三月 2025 13:40:44 +0800
Subject: [PATCH] ‘’
---
src/pages/delivergoods/feedback.vue | 106 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 72 insertions(+), 34 deletions(-)
diff --git a/src/pages/delivergoods/feedback.vue b/src/pages/delivergoods/feedback.vue
index 3cc9ccc..8edafcf 100644
--- a/src/pages/delivergoods/feedback.vue
+++ b/src/pages/delivergoods/feedback.vue
@@ -17,7 +17,8 @@
</up-sticky>
<view class="c-p-b-100">
<view class="c-p-l-20 c-p-r-20" v-if="orderList&&orderList.length>0">
- <view class="listrecord c-p-t-20" v-for="(item,index) in orderList" :key="item.keyid">
+ <view class="listrecord c-p-t-20" v-for="(item,index) in orderList" :key="item.keyid"
+ @click='goDetail(item)'>
<view class="coreshop-ff chuany-bradius20">
<view class="chuany-font26">
<view class="chuany-flex chuany-justify-between">
@@ -31,8 +32,9 @@
</view>
<view class="chuany-width11 chuany-flex chuany-justify-between">
<up-icon v-if="item.deliveredstatus=='Undeliver'" name="play-right"
- @click='startOrder(item)'></up-icon>
- <up-icon name="checkbox-mark" @click="editOrder(item)"></up-icon>
+ @tap.stop='startOrder(item)'></up-icon>
+ <up-icon v-else-if="item.deliveredstatus=='Deliver'" name="checkbox-mark"
+ @tap.stop="editOrder(item)"></up-icon>
</view>
</view>
</view>
@@ -55,7 +57,7 @@
</up-form-item> -->
<up-form-item label="鏀惰揣鍗曚綅" prop="buyerId" :borderBottom='false' ref="item1">
- <up-input v-model="buyerName" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" border="none" readonly>
+ <up-input v-model="arrangeInfo.companyName" placeholder="璇烽�夋嫨鏀惰揣鍗曚綅" border="none" readonly>
<!-- <template #suffix>
<up-button @tap="clickAction" text="鐐瑰嚮閫夋嫨" type="primary" size="mini"></up-button>
</template> -->
@@ -78,9 +80,9 @@
<up-textarea v-model="arrangeInfo.wentifankui" border="none" placeholder="璇疯緭鍏ユ剰瑙佸弽棣�"></up-textarea>
</up-form-item>
- <up-form-item label="涓婁紶閫佽揣鍗�" prop="idCardFace">
+ <up-form-item label="閫佽揣鍗�" prop="idCardFace">
<tem-upload-file immediate :url="`https://appimchat.oss-cn-chengdu.aliyuncs.com`" ref="uploadB"
- fileType="all" @success="success('File',$event)" @error="errorInvoice"
+ :isSource='true' fileType="all" @success="success('File',$event)" @error="errorInvoice"
@complete="completeInvoice('',$event)">
</tem-upload-file>
<!-- <template #right>
@@ -123,24 +125,26 @@
driverName: '',
actions: [{
name: '鏈畬鎴�',
- id: '鎷掓敹'
+ id: 'Reject'
}, {
name: '宸插畬鎴�',
- id: '瀹屾垚'
+ id: 'Delivered'
}],
selectAc: '宸插畬鎴�',
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))),
arrangeInfo: {
- deliverTime: this.$util.formatDate(new Date(), null, 1),
- driverId: '',
- buyerId: '',
- dianhua: '',
+ keyid: '',
+ // deliverTime: this.$util.formatDate(new Date(), null, 1),
+ // driverId: '',
+ // buyerId: '',
+ // dianhua: '',
wentifankui: '',
- lianxiren: '',
- Deliveredstatus: '瀹屾垚',
- attachments: {}
+ // lianxiren: '',
+ Deliveredstatus: 'Delivered ',
+ attachments: [],
+ companyName:''
},
rules: {
'deliverTime': {
@@ -186,7 +190,8 @@
timeEnd: '',
sevenDaysDriver: [],
deliverKeyID: '',
- deliverKeyName: ''
+ deliverKeyName: '',
+ companyName:''
}
},
onShow() {
@@ -206,8 +211,8 @@
}
},
onPullDownRefresh() {
- this.startDate = ''
- this.endDate = ''
+ this.timeStart = ''
+ this.timeEnd = ''
this.workTime = ''
this.deliverKeyName = ''
this.init()
@@ -220,10 +225,9 @@
let obj = {}
let res = e.res
if (res.statusCode == 200) {
- obj.attachmentName = res.data
+ obj.PlanAttachment = res.data
} else {
uni.$u.toast(res.error)
-
this.$refs.uploadB.deleteImage()
}
this.arrangeInfo.attachments.push(obj)
@@ -241,7 +245,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);
@@ -279,21 +283,26 @@
},
editOrder(item) {
this.isEdit = true
+ this.$refs.uploadB.urls = []
+ this.$refs.uploadB.status = []
this.arrangeInfo = {
- deliverTime: this.$util.formatDate(new Date(), null, 1),
- driverId: item.driverId,
- buyerId: item.buyerId,
- dianhua: item.dianhua,
- wentifankui: item.wentifankui,
- lianxiren: item.lianxiren,
- dizhi: item.dizhi,
- keyid: item.keyid
+ // deliverTime: this.$util.formatDate(new Date(), null, 1),
+ // driverId: item.driverId,
+ // buyerId: item.buyerId,
+ // dianhua: item.dianhua,
+ // wentifankui: item.wentifankui,
+ // lianxiren: item.lianxiren,
+ // dizhi: item.dizhi,
+ Deliveredstatus: 'Delivered',
+ attachments: item.attachments || [],
+ keyid: item.keyid,
+ companyName: item.companyName
}
this.show7 = true
- let obj = this.customerList.find(ite => {
- return ite.keyid == item.buyerId
- })
- this.buyerName = obj.companyName
+ // let obj = this.customerList.find(ite => {
+ // return ite.keyid == item.buyerId
+ // })
+ // this.buyerName = obj.companyName
},
startOrder(item) {
let that = this
@@ -329,7 +338,32 @@
this.contentVal = ''
this.getList()
},
+ //閫夋嫨鍥剧墖鎴栦笂浼犲畬鎴愭椂瑙﹀彂
+ completeInvoice(val, e) {
+ if (e.action == 'delete') {
+ // 鍒犻櫎澶勭悊
+ console.log(e, '0-0-0-');
+ // state.publicJob.workPlanAttachments = state.publicJob.workPlanAttachments.filter(item => {
+ // return item.attachmentType == (val == "Invoice" ? 2 : 1)
+ // })
+ // e.urls.forEach(item => {
+ // let obj = {}
+ // obj.attachmentType = val == "Invoice" ? 1 : 2
+ // obj.planAttachment = item //鍙戠エ
+ // state.publicJob.workPlanAttachments.push(obj)
+ // })
+ return
+ }
+ // $util.pathToBase64(e.urls[0]).then(res => {
+ // idCardFaceBase64.value = res
+ // console.log(idCardFaceBase64, idCardFaceBase64.value);
+ // })
+ },
+ errorInvoice(e) {
+ console.log(e, '--------------');
+ },
confirmSave() {
+ console.log(this.arrangeInfo);
this.$api.FinishDeliverPlan(this.arrangeInfo).then(res => {
if (res.code == 1) {
this.arrangeInfo = {
@@ -351,7 +385,6 @@
})
}
})
-
},
cancelModal() {
this.arrangeInfo = {
@@ -444,6 +477,11 @@
if (e.index == 0) {
this.contentVal = item.wentifankui
}
+ },
+ goDetail(item) {
+ uni.navigateTo({
+ url: `/pages/delivergoods/feedbackdetail?KeyId=${item.keyid}`
+ });
}
}
}
--
Gitblit v1.9.1