From 37dd5f570a06bded3563ec8ffad86c7625f50585 Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期六, 31 八月 2024 01:34:39 +0800 Subject: [PATCH] update 供应商和质检 --- sub_pages/partner/delivery/delivery-detail.vue | 105 ++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 76 insertions(+), 29 deletions(-) diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue index cae20ce..2dfefd8 100644 --- a/sub_pages/partner/delivery/delivery-detail.vue +++ b/sub_pages/partner/delivery/delivery-detail.vue @@ -15,8 +15,8 @@ form: { id: '', status: '', - checkImageList: [], - checkRemarks: '', + pictureList: [], + remarks: '', deductAmount: 0, }, check_status: [ @@ -43,6 +43,12 @@ ], target_levels: [], }; + }, + async onShow() { + if (this.sign['delivery']) { + await this.$store.dispatch('sign_clear', 'delivery'); + this.refreshList() + } }, async onLoad(options) { this.id = options.id || '' @@ -82,10 +88,11 @@ }) this.$message.hideLoading() if (code === 0) { - this.$message.showToast('操作成功') - setTimeout(() => { - this.init() - }, 500) + await this.$message.showToast('操作成功') + this.init() + // setTimeout(() => { + // this.init() + // }, 500) } return } @@ -103,16 +110,16 @@ statusStr: '', num: 0, remarks: '', + pictureList: [], } if (status === 'reduce') { this.form = { ...this.form, - pictureList: [item.id], deductAmount: 0, targetLevel: '', - checkImageList: [], + pictureList: [], } } @@ -136,10 +143,12 @@ }) this.$message.hideLoading() if (code === 0) { - this.$message.showToast('操作成功') this.form = { ...this.form, ...(data || {}) + } + if (!this.form.pictureList) { + this.form.pictureList = [] } //显示 this.$refs.popup_form.open() @@ -153,8 +162,25 @@ this.$message.showToast('扣款金额需要大于等于0') return } + if (this.form.deductAmount) { + if ((parseInt(this.form.deductAmount * 100) / 100) != this.form.deductAmount) { + this.$message.showToast('扣款金额至多2位小数') + return + } + } + if (parseInt(this.form.deductAmount * 100) / 100 != this.form.deductAmount) { + + } if (isNaN(parseInt(this.form.num)) || this.form.num < 0) { this.$message.showToast('数量需要大于等于0') + return + } + if (!this.form.pictureList || this.form.pictureList.length < 1) { + this.$message.showToast('未上传图片') + return + } + if (!this.form.targetLevel) { + this.$message.showToast('未选择降级等级') return } } @@ -177,11 +203,15 @@ }) this.$message.hideLoading() if (code === 0) { - this.$message.showToast('操作成功') this.$refs.popup_form.close() - setTimeout(() => { - this.init() - }, 500) + await this.$store.dispatch('sign_add', 'delivery') + + await this.$message.showToast('操作成功') + this.init() + + // setTimeout(() => { + // this.init() + // }, 500) } }, async init() { @@ -209,7 +239,7 @@ } }, deleteCheckImage(index) { - this.form.checkImageList.splice(index, 1) + this.form.pictureList.splice(index, 1) }, uploadCheckImage() { let that = this @@ -232,7 +262,7 @@ 0] .url || '' that.$message.hideLoading() - that.form.checkImageList.push(pic) + that.form.pictureList.push(pic) console.log('form', that.form) that.$forceUpdate() }).catch(res => { @@ -300,17 +330,34 @@ <view class="value">{{ item.num || 0 }}</view> </view> - <!-- <view class="each-item"> + </view> + <view class="each-list"> + <view class="each-item"> <view class="label">价格</view> - <view class="value">{{ item.price || '-' }}</view> - </view> --> + <view class="value">¥{{ item.price || '-' }}</view> + + </view> + <view class="each-item"> + <view class="label">降级</view> + <view class="value">{{ item.reduceNum || 0 }}</view> + </view> + <view class="each-item"> + <view class="label">缺货</view> + <view class="value">{{ item.lackNum || 0 }}</view> + + </view> + <view class="each-item"> + <view class="label">补货</view> + <view class="value">{{ item.replaceNum || 0 }}</view> + + </view> </view> </view> </view> - <view class="line-gray" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status"> + <view class="line-gray" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status||true"> </view> - <view class="buttons" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status"> + <view class="buttons" v-if="item.status == 'ARRIVED'||item.status == 'PENDING'||!item.status||true"> <view class="button text-center" v-for="button of check_status" :key="button.value" @click.stop="clickCheck(item,button.value)">{{ button.label }} </view> @@ -325,17 +372,17 @@ </view> <uni-popup ref="popup_form" type="top" :mask-click="false"> - <view class="popup-check-form"> + <view class="popup-check-form" style="min-height: 880rpx;height: unset;"> <view class="close-parent"> 质检操作-{{ form.statusStr || '-' }} <uni-icons class="close" type="closeempty" @click="closeCheckForm"></uni-icons> </view> <view class="submit form"> - <view class="form-item" v-if="form.status==='reduce'"> - <view class="form-item-label require"> + <view class="form-item" v-if="form.status==='reduce'" style="height: unset;"> + <view class="form-item-label require" style="min-width: 140rpx;margin-right: 10rpx;"> 降级等级 </view> - <view class="form-item-value"> + <view class="form-item-value flex "> <view class="value-item" @click="()=>{ if(form.targetLevel!==query.value){ form.targetLevel = each.value @@ -368,7 +415,7 @@ </view> <view class="form-item" v-if="form.status==='reduce'||form.status==='replace' || form.status==='lack'"> - <view class="form-item-label require"> + <view class="form-item-label"> 质检备注 </view> <view class="form-item-value"> @@ -383,8 +430,8 @@ <view class="t-red" @click="uploadCheckImage()">上传</view> </view> </view> - <view class="flex p20" v-if="form.checkImageList&&form.checkImageList.length>0"> - <view class="m-t-12 m-r-10 " v-for="(timg,index) of form.checkImageList" :key="index"> + <view class="flex p20" v-if="form.pictureList&&form.pictureList.length>0"> + <view class="m-t-12 m-r-10 " v-for="(timg,index) of form.pictureList" :key="index"> <image class="check-img" :src="timg" @click.stop="previewImg(timg)"> </image> <view class="t-red text-center" @click.stop="deleteCheckImage(index)">删除</view> @@ -524,8 +571,8 @@ line-height: 58rpx; padding: 8rpx 24rpx; color: #33a868; - margin-left: 6rpx; - margin-right: 6rpx; + margin-left: 16rpx; + margin-right: 16rpx; border: 2rpx solid #F1F5F2; } -- Gitblit v1.9.3