From 0eab6dcc163bec041d44bc27c9c89ef9c6ec988d Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 26 九月 2024 17:17:39 +0800
Subject: [PATCH] feat:确认装卸bug提交
---
pages/driver-page/delivery-my/delivery-my/delivery-my.vue | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 152 insertions(+), 5 deletions(-)
diff --git a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
index 33c5c44..b5f8841 100644
--- a/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
+++ b/pages/driver-page/delivery-my/delivery-my/delivery-my.vue
@@ -94,7 +94,7 @@
</uni-table>
<u-form-item prop='contactPicture'>
<view class="label-text">
- <text style="color: #f56c6c;">*</text>鍘熷彂鍗曟嵁
+ 鍘熷彂鍗曟嵁
</view>
<u-upload :fileList="fileList1"
@afterRead="afterRead"
@@ -199,6 +199,14 @@
</uni-tr>
</uni-table>
</view>
+ <view class="logoutModel">
+ <u-modal :show="logoutShow"
+ :title="logoutTitle"
+ showCancelButton
+ :content="logoutContent"
+ @confirm="logoutConfirm"
+ @cancel="logoutCancel"></u-modal>
+ </view>
</view>
</template>
@@ -225,9 +233,21 @@
Object.assign(that.registerFormModel, res.data)
}
});
+ uni.getStorage({
+ key: 'isshow',
+ success: function (res) {
+ that.isshow=res.data
+ }
+ });
+ this.ids=null
},
data() {
return {
+ ids:null,
+ logoutShow: false,
+ logoutTitle: '鎻愮ず',
+ logoutContent: '鍏ュ満闇�瑕佹壂鎻忚溅鐗岀収鍜屽埛韬唤璇佸叆鍦猴紝璇锋惡甯﹁韩浠借瘉鍘熶欢',
+ isshow:true,
scrollTop: 0,
id:"",
value: 0,
@@ -297,6 +317,13 @@
},
message: '鎵嬫満鍙风爜鏍煎紡涓嶆纭�',
trigger: ['change', 'blur']
+ }
+ ],
+ idNumber: [{
+ type: 'string',
+ required: true,
+ message: '璇疯緭鍏ヨ韩浠借瘉鍙�',
+ trigger: ['blur', 'change']
}
],
// carNo: [{
@@ -407,7 +434,7 @@
});
});
},
- yuYueBtnClick(item){
+ logoutConfirm() {
this.$refs.regesterFormRef.validate().then(res => {
if(this.daydata.orderType=='澶栬喘'){
if(this.daydata.isWeighing==1){
@@ -420,7 +447,7 @@
orderTye:this.daydata.orderType,
sendDate:this.daydata.sendDate,
carNumSurplus:this.daydata.carNumSurplus,
- yyId:item.id,
+ yyId:this.ids.id,
...this.registerFormModel,
tmTaskCoalContact:{
coalName:this.daydata.productName,
@@ -434,6 +461,12 @@
key: 'myDelivery',
data: this.registerFormModel,
});
+ uni.setStorage({
+ key: 'isshow',
+ data: false,
+ });
+ this.logoutShow=false
+ this.isshow=false
if (res.code === 0) {
uni.$u.toast('棰勭害鎴愬姛')
this.GetMyDeliverys()
@@ -454,7 +487,7 @@
orderTye:this.daydata.orderType,
sendDate:this.daydata.sendDate,
carNumSurplus:this.daydata.carNumSurplus,
- yyId:item.id,
+ yyId:this.ids.id,
...this.registerFormModel,
tmTaskCoalContact:{
contactPicture:this.contactPicture,
@@ -465,6 +498,12 @@
key: 'myDelivery',
data: this.registerFormModel,
});
+ uni.setStorage({
+ key: 'isshow',
+ data: false,
+ });
+ this.logoutShow=false
+ this.isshow=false
if (res.code === 0) {
uni.$u.toast('棰勭害鎴愬姛')
this.GetMyDeliverys()
@@ -484,13 +523,19 @@
orderTye:this.daydata.orderType,
sendDate:this.daydata.sendDate,
carNumSurplus:this.daydata.carNumSurplus,
- yyId:item.id,
+ yyId:this.ids.id,
...this.registerFormModel
}, 'json').then(res => {
uni.setStorage({
key: 'myDelivery',
data: this.registerFormModel,
});
+ uni.setStorage({
+ key: 'isshow',
+ data: false,
+ });
+ this.logoutShow=false
+ this.isshow=false
if (res.code === 0) {
uni.$u.toast('棰勭害鎴愬姛')
this.GetMyDeliverys()
@@ -501,6 +546,108 @@
}
})
},
+ logoutCancel() {
+ this.logoutShow = false;
+ },
+ yuYueBtnClick(item){
+ this.$refs.regesterFormRef.validate().then(res => {
+ if(this.isshow){
+ this.logoutShow = true;
+ this.ids=item
+ }else{
+ if(this.daydata.orderType=='澶栬喘'){
+ if(this.daydata.isWeighing==1){
+ this.$reqPost('saveMyDelivery',{
+ productName:this.daydata.productName,
+ customerId:this.daydata.customerId,
+ deptId:this.daydata.deptId,
+ filedId:this.daydata.filedId,
+ orderPlanId:this.daydata.id,
+ orderTye:this.daydata.orderType,
+ sendDate:this.daydata.sendDate,
+ carNumSurplus:this.daydata.carNumSurplus,
+ yyId:item.id,
+ ...this.registerFormModel,
+ tmTaskCoalContact:{
+ coalName:this.daydata.productName,
+ contactPicture:this.contactPicture,
+ skin:this.skin,
+ hair:this.hair,
+ clean:this.clean
+ }
+ }, 'json').then(res => {
+ uni.setStorage({
+ key: 'myDelivery',
+ data: this.registerFormModel,
+ });
+ if (res.code === 0) {
+ uni.$u.toast('棰勭害鎴愬姛')
+ this.GetMyDeliverys()
+ } else {
+ uni.$u.toast(res.msg ? res.msg : '棰勭害澶辫触')
+ }
+ })
+ }else{
+ let numDtoList=this.tmTaskCoalList.map(item=>{
+ return {tmId:item.productId,num:item.productQuantity,coalName:item.coalName}
+ })
+ this.$reqPost('saveMyDelivery',{
+ productName:this.daydata.productName,
+ customerId:this.daydata.customerId,
+ deptId:this.daydata.deptId,
+ filedId:this.daydata.filedId,
+ orderPlanId:this.daydata.id,
+ orderTye:this.daydata.orderType,
+ sendDate:this.daydata.sendDate,
+ carNumSurplus:this.daydata.carNumSurplus,
+ yyId:item.id,
+ ...this.registerFormModel,
+ tmTaskCoalContact:{
+ contactPicture:this.contactPicture,
+ numDtoList:numDtoList
+ }
+ }, 'json').then(res => {
+ uni.setStorage({
+ key: 'myDelivery',
+ data: this.registerFormModel,
+ });
+ if (res.code === 0) {
+ uni.$u.toast('棰勭害鎴愬姛')
+ this.GetMyDeliverys()
+ } else {
+ uni.$u.toast(res.msg ? res.msg : '棰勭害澶辫触')
+ }
+ })
+ }
+
+ }else{
+ this.$reqPost('saveMyDelivery',{
+ productName:this.daydata.productName,
+ customerId:this.daydata.customerId,
+ deptId:this.daydata.deptId,
+ filedId:this.daydata.filedId,
+ orderPlanId:this.daydata.id,
+ orderTye:this.daydata.orderType,
+ sendDate:this.daydata.sendDate,
+ carNumSurplus:this.daydata.carNumSurplus,
+ yyId:item.id,
+ ...this.registerFormModel
+ }, 'json').then(res => {
+ uni.setStorage({
+ key: 'myDelivery',
+ data: this.registerFormModel,
+ });
+ if (res.code === 0) {
+ uni.$u.toast('棰勭害鎴愬姛')
+ this.GetMyDeliverys()
+ } else {
+ uni.$u.toast(res.msg ? res.msg : '棰勭害澶辫触')
+ }
+ })
+ }
+ }
+ })
+ },
GetMyDeliverys() {
this.$reqGet('driverYuYueList', {orderPlanId:this.id}).then(res => {
if (res.code == 0) {
--
Gitblit v1.9.1