| pages/order/order-detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/order/order-sale/order-sale-detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/order/order-sale/order-sale.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/order/order.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pages/order/order-detail.vue
@@ -29,12 +29,17 @@ await this.getItemList() this.submitForm = { orderId: this.id, imageList: [], // imageList: [], videoList: [], reason: '', orderItems: [] // orderItems: [], orderItemId: options.flowerId || '', num: 0, pictureList: [] } this.showSales = options.showsales && true || false if (this.dto.statusBackend === 'PENDING') { this.timer = setInterval(() => { //倒计时 @@ -218,19 +223,19 @@ } } break case 'sales': { //新增售后单 //去新的页面加上这些选择？ this.submitForm = { orderId: this.id, imageList: [], videoList: [], reason: '', orderItems: [], } this.showSales = true // case 'sales': { // //新增售后单 // //去新的页面加上这些选择？ // this.submitForm = { // orderId: this.id, // imageList: [], // videoList: [], // reason: '', // orderItems: [], // } // this.showSales = true } // } default: break } @@ -298,7 +303,7 @@ 0] .url || '' that.$message.hideLoading() that.submitForm.imageList.push(pic) that.submitForm.pictureList.push(pic) that.$forceUpdate() }).catch(res => { @@ -312,15 +317,23 @@ }, async submitSales() { if (this.submitForm.orderItems.length < 1) { this.$message.showToast('未选择需要售后的商品') // if (this.submitForm.orderItems.length < 1) { // this.$message.showToast('未选择需要售后的商品') // return // } // if (this.submitForm.orderItems.length < 1) { // this.$message.showToast('未选择需要售后的商品') // return // } if (isNaN(parseFloat(this.submitForm.num)) || this.submitForm.num <= 0) { this.$message.showToast('售后数量需要大于0') return } if (!this.submitForm.reason) { this.$message.showToast('未填写理由') return } if (!this.submitForm.imageList || this.submitForm.imageList.length < 1) { if (!this.submitForm.pictureList || this.submitForm.pictureList.length < 1) { this.$message.showToast('未上传图片') return } @@ -382,8 +395,9 @@ {{ item.supplierName || ''}} </view> <view class="flex m-t-12"> <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio> <radio v-if="showSales" disabled :checked="submitForm.orderItemId == item.id"></radio> <!-- @click="changeSalesOrderItem(item)" --> <!-- :checked="submitForm.orderItems.indexOf(item.id)>=0" --> <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"> @@ -535,6 +549,15 @@ <!-- 表单更新 --> <view class="form-item"> <view class="form-item-label"> 售后数量 </view> <view class="form-item-value"> <input v-model="submitForm.num" clearable placeholder="请输入售后数量" type="number" class="form-input"></input> </view> </view> <view class="form-item"> <view class="form-item-label"> 理由 </view> <view class="form-item-value"> @@ -549,11 +572,11 @@ <view class="t-red" @click="uploadIcon('image')">上传</view> </view> </view> <view class="flex p20" v-if="submitForm.imageList&&submitForm.imageList.length>0"> <view class="m-t-12 m-r-10 " v-for="(timg,index) of submitForm.imageList" :key="index"> <view class="flex p20" v-if="submitForm.pictureList&&submitForm.pictureList.length>0"> <view class="m-t-12 m-r-10 " v-for="(timg,index) of submitForm.pictureList" :key="index"> <image class="check-img" :src="timg" @click.stop="previewImg(timg)"> </image> <view class="t-red text-center" @click.stop="deleteCheckImage('imageList',index)">删除</view> <view class="t-red text-center" @click.stop="deleteCheckImage('pictureList',index)">删除</view> </view> </view> <view class="form-item"> @@ -588,15 +611,17 @@ <view class="button button-1" @click="buttonClick('evaluate')" v-if=" dto.status === 'EVALUATE'"> 评价 </view> <!-- ||dto.status=='COMPLETED' --> <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后 </view> <!-- 在外面申请了，里面不允许了 --> <!-- <view class="button button-1" @click="buttonClick('sales')" v-if=" dto.status === 'RECEIVE'"> 申请售后 </view> --> </view> <view v-if="showSales"> <view style="min-height:200rpx"> </view> <view class="bottom-price flex"> <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitSales"> 提交售后申请({{submitForm.orderItems&&submitForm.orderItems.length||0}}) 提交售后申请 <!-- ({{submitForm.orderItems&&submitForm.orderItems.length||0}}) --> </view> </view> </view> pages/order/order-sale/order-sale-detail.vue
@@ -62,69 +62,71 @@ </view> --> <view class="info"> <view class="title"> {{ dto.customer }} {{ dto.customer }}<span class="tel">{{ dto.customerTel }}</span> </view> <view class="content">{{ dto.customerTel }}</view> <view class="content"> {{ ((dto.customerProvince||'')+ (dto.customerCity&&'-'||'') + (dto.customerCity||'')+ (dto.customerRegion&&'-'||'')+(dto.customerRegion||'')) ||dto.customerAddress || '暂无详细地址'}} </view> </view> </view> </view> <view class="flower-info m-b-20 m-t-12 br-4" v-for="(item,index) of dto.items" :key="index"> <view class="flower-info m-b-20 m-t-12 br-4" :key="index"> <view class="supplier-name "> <image class="icon-dp" src="/static/common/icon-dp.png"></image> {{ item.supplierName }} {{ dto.supplierName }} </view> <view class="flex m-t-12 flex-wrap-normal"> <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"> <image class="flower-img img100 br-4 m-r-6" :src="dto.flowerCover" @click="previewImg(dto.flowerCover)"> </image> <view class="flex1"> <view class=" flex"> <view class="title"><span class="level">{{ item.flowerCategory }}</span><span class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }} <view class="title"><span class="level">{{ dto.flowerCategory }}</span><span class="level">{{ dto.flowerLevelStr }}</span>{{ dto.flowerName }} </view> </view> <view class="each-list"> <view class="each-item"> <view class="label">颜色</view> <view class="value">{{ item.flowerColor || '-' }}</view> <view class="value">{{ dto.flowerColor || '-' }}</view> </view> <view class="each-item"> <view class="label">规格</view> <view class="value">{{ item.flowerUnit || '-' }}</view> <view class="value">{{ dto.flowerUnit || '-' }}</view> </view> <view class="each-item"> <view class="label">数量</view> <view class="value">{{ item.num || 0 }}</view> <view class="value">{{ dto.flowerNum || 0 }}</view> </view> <view class="each-item"> <view class="label">售价</view> <view class="value">￥{{ item.price || 0 }}</view> <view class="value">￥{{ dto.price || 0 }}</view> </view> <view class="each-item"> <view class="label">商品总金额</view> <view class="value">￥{{ item.total || 0 }}</view> <view class="value">￥{{ dto.total || 0 }}</view> </view> <view class="each-item"> <!-- <view class="each-item"> <view class="label">责任方</view> <view class="value">{{ item.personInChargeStr || '-' }}</view> </view> <view class="value">{{ dto.personInChargeStr || '-' }}</view> </view> --> <view class="each-item"> <!-- <view class="each-item"> <view class="label">赔付金额</view> <view class="value t-red">￥{{ item.amount || '-' }}</view> </view> </view> --> </view> </view> </view> <view class=" m-t-12 flex-wrap-normal" v-if="item.remarks"> <view class="each-list"> <view class="each-item" style="max-width: 90%;text-align: left;"> <view class="label">备注</view> <view class="label">平台回复</view> <view class="value">{{ item.remarks || '-' }}</view> </view> </view> @@ -145,17 +147,21 @@ <view class="value">{{ dto.statusStr || '-' }}</view> </view> <view class="form-item"> <view class="label">集货站:</view> <view class="value">{{ dto.stationName || '-' }}</view> </view> <!-- <view class="form-item"> <view class="label">订单金额:</view> <view class="value">{{ dto.totalOrderAmount || '-' }}</view> </view> </view> --> <view class="form-item"> <view class="label">理由:</view> <view class="value">{{ dto.reason || '-' }}</view> </view> <view class="form-item"> <!-- <view class="form-item"> <view class="label">提交人:</view> <view class="value">{{ dto.createName || '-' }}</view> </view> </view> --> <view class="form-item"> <view class="label">提交时间:</view> <view class="value">{{ dto.createTime || '-' }}</view> @@ -170,45 +176,73 @@ <view class="button m-l-a m-r-0" @click="copyTxt(dto.salesNo)">复制 </view> </view> <view class="form-item"> <view class="label">申请数量:</view> <view class="value">{{ dto.num || '-' }}</view> </view> <view class="form-item" v-if="dto.feeSupplier"> <view class="label">供应商扣款:</view> <view class="value">{{ dto.feeSupplier || '-' }}</view> </view> <view class="form-item" v-if="dto.feePartner"> <view class="label">合伙人扣款:</view> <view class="value">{{ dto.feePartner || '-' }}</view> </view> <view class="form-item" v-if="dto.feePlatform"> <view class="label">平台扣款:</view> <view class="value">{{ dto.feePlatform || '-' }}</view> </view> <view class="form-item" v-if="dto.feePlatformPack"> <view class="label">平台打包扣款:</view> <view class="value">{{ dto.feePlatformPack || '-' }}</view> </view> <view class="form-item" v-if="dto.feePlatformCheck"> <view class="label">平台质检扣款:</view> <view class="value">{{ dto.feePlatformCheck || '-' }}</view> </view> <view class="form-item" v-if="dto.feePlatformTransport"> <view class="label">物流扣款:</view> <view class="value">{{ dto.feePlatformTransport || '-' }}</view> </view> <!-- <view class="form-item"> <view class="label">审核时间:</view> <view class="value">{{ dto.auditTime || '-' }}</view> </view> <view class="form-item"> </view> --> <!-- <view class="form-item"> <view class="label">审核状态:</view> <view class="value">{{ dto.auditStatusStr || '-' }}</view> </view> <view class="form-item"> </view> --> <!-- <view class="form-item"> <view class="label">审核备注:</view> <view class="value">{{ dto.auditRemarks || '-' }}</view> </view> </view> --> <view class="form-item"> <view class="label">总赔付金额:</view> <view class="value">{{ dto.totalAmount || '-' }}</view> <view class="label">实际退款:</view> <view class="value">{{ dto.totalFee || '-' }}</view> </view> <view class="form-item"> <!-- <view class="form-item"> <view class="label">转账状态:</view> <view class="value">{{ dto.transferStatusStr || '-' }}</view> </view> </view> --> </view> <view class="info-container bg-white m-t-12 br-4"> <view v-if="dto.imageList&&dto.imageList.length>0"> <view v-if="dto.pictureList&&dto.pictureList.length>0"> <view class="form-item"> <view class="label">图片: </view> </view> <view class="flex p20"> <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.imageList" :key="index"> <view class="m-t-12 m-r-10 " v-for="(timg,index) of dto.pictureList" :key="index"> <image class="check-img" :src="timg" @click.stop="previewImg(timg)"> </image> </view> </view> </view> <view v-if="dto.imageList&&dto.imageList.length>0"> <view v-if="dto.videoList&&dto.videoList.length>0"> <view class="form-item"> <view class="label">视频: </view> pages/order/order-sale/order-sale.vue
@@ -6,14 +6,60 @@ </view> --> <view class="p15" style="min-height: calc(100vh - 160rpx);"> <no-data v-if="!list||list.length==0" style="width: 100%;"></no-data> <view v-for="(item,index) in list" :key="index" @click="toDetail(item)" class="m-b-24 order-sale-list list-container"> <!-- @click.stop="toDetail(item)" --> <view v-for="(item,index) in list" :key="index" class="m-b-24 order-sale-list list-container"> <view class="order-sale-item br-4 list-item bg-white"> <view class="title flex"> <view class="top-title flex"> <view>售后单号:{{item.salesNo}}</view> <view class="m-l-a m-r-0 status">审核状态：{{item.auditStatusStr||'-'}}</view> <view class="m-l-a m-r-0 status">审核状态：{{item.statusStr||'-'}}</view> </view> <view class="line"></view> <view class="supplier-name"> <image class="icon-dp br-4" src="/static/common/icon-dp.png"></image> {{ item.supplierName }} </view> <view class="flex m-t-12 flex-wrap-normal flower-item"> <image class="flower-img img100 m-r-6" :src="item.flowerCover" @click.stop="previewImg(item.flowerCover)"> </image> <view class="flex1"> <view class=" flex"> <view class="title"><span class="level">{{ item.flowerCategory }}</span><span class="level">{{ item.flowerLevelStr }}</span>{{ item.flowerName }} </view> </view> <view class="each-list"> <view class="each-item"> <view class="label">颜色</view> <view class="value">{{ item.flowerColor || '-' }}</view> </view> <view class="each-item"> <view class="label">规格</view> <view class="value">{{ item.flowerUnit || '-' }}</view> </view> <view class="each-item"> <view class="label">数量</view> <view class="value">{{ item.flowerNum || 0 }}</view> </view> <view class="each-item"> <view class="label">售价</view> <view class="value">￥{{ item.price || 0 }}</view> </view> <view class="each-item"> <view class="label">商品总金额</view> <view class="value">￥{{ item.total || 0 }}</view> </view> </view> </view> </view> <view class="line-gray"></view> <view class="sale-form"> <view class="form-item"> <view class="label" @click="copyTxt(item.orderNo)">订单单号</view> @@ -21,8 +67,8 @@ </view> <view class="flex"> <view class="form-item flex1"> <view class="label">状态</view> <view class="value">{{item.statusStr}}</view> <view class="label">申请数量</view> <view class="value">{{item.num}}</view> </view> <view class="form-item flex1"> <view class="label">订单金额</view> @@ -39,10 +85,6 @@ <view class="value">{{item.customerTel}}</view> </view> </view> <view class="form-item"> <view class="label">提交人</view> <view class="value">{{item.createName}}</view> </view> <view class="form-item width100"> <view class="label">提交时间</view> <view class="value">{{item.createTime}}</view> @@ -51,12 +93,17 @@ <view class="label">理由</view> <view class="value">{{item.reason}}</view> </view> <!-- #ifdef PUB_CUSTOMER --> <view class="line-gray" v-if="item.status=='PENDING'"></view> <view class="flex buttons" v-if="item.status=='PENDING'"> <view class="button button-1 m-l-15 m-r-0" @click="cancelSale(item)">取消售后</view> <view class="form-item"> <view class="label">平台回复</view> <view class="value">{{item.remarks}}</view> </view> <!-- #endif --> <view class="line-gray"></view> <view class="flex buttons"> <view v-if="item.status=='PENDING'" class="button button-1 m-l-15 m-r-0" @click.stop="cancelSale(item)">取消售后</view> <view class="button button-0 m-l-15 m-r-0" @click.stop="toDetail(item)">查看详情</view> </view> </view> </view> </view> @@ -135,7 +182,7 @@ margin-bottom: 20rpx; padding: 22rpx; .title { .top-title { font-weight: 600; font-size: 28rpx; color: #000000; @@ -217,6 +264,79 @@ } } .supplier-name { border-bottom: 2rpx solid #EEEEEE; font-weight: 600; font-size: 28rpx; color: #000000; padding-bottom: 10rpx; line-height: 40rpx; .icon-dp { width: 27rpx; height: 27rpx; display: inline-block; vertical-align: middle; } } .flower-item{ .title { font-weight: 600; font-size: 28rpx; color: #000000; line-height: 40rpx; .level { font-weight: 400; font-size: 28rpx; color: #20613D; line-height: 40rpx; margin-right: 20rpx; } } .flower-img { width: 128rpx; height: 118rpx; min-width: 128rpx; min-height: 118rpx; } .each-list { display: flex; flex-wrap: wrap; margin-top: 6rpx; .each-item { min-width: 40%; max-width: 50%; text-align: center; margin-left: 0rpx; margin-right: auto; display: flex; .label { font-weight: 400; font-size: 24rpx; color: #666666; text-align: left; padding-right: 10rpx; } .label::after { content: ": " } .value { font-weight: 400; font-size: 24rpx; color: #666666; } } } } } } </style> pages/order/order.vue
@@ -61,10 +61,10 @@ item.statusBackend = '已取消' item.status = 'CANCEL' item.statusStr = '已取消' item.bctime = '' change = true } else { //相差 var alltime = parseInt(diff / 1000) @@ -100,9 +100,9 @@ url: '/pages/order/order-detail?id=' + item.id }) }, toDetailSale(item) { toDetailSale(dto, flower) { uni.navigateTo({ url: '/pages/order/order-detail?showsales=1&id=' + item.id url: '/pages/order/order-detail?showsales=1&id=' + dto.id + '&flowerId=' + flower.id }) }, async buttonClick(item, buttontype) { @@ -372,6 +372,13 @@ </view> </view> </view> <view class="line-gray"></view> <view class="flex buttons"> <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto,item)" v-if="dto.statusBackend === 'RECEIVE'"> 申请售后 </view> </view> </view> <view class="line-gray"></view> @@ -392,9 +399,9 @@ v-if="dto.statusBackend ==='RECEIVE'"> 确认收货 </view> <!-- ||item.statusBackend=='COMPLETED' --> <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)" <!-- <view class="button button-1 m-l-a m-r-15" @click="toDetailSale(dto)" v-if="dto.statusBackend === 'RECEIVE'"> 申请售后 </view> </view> --> <view class="button button-0 m-l-a m-r-15" @click="buttonClick(dto,'evaluate')" v-if="dto.statusBackend === 'EVALUATE'"> 评价 </view>
