Skip to content

I
integral-mall
Commit 8c3f53e6 by damodmg
Options

add:核销

parent afda34a7
Showing with 53 additions and 5 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.0f3d9d4c8cc86ba3c9366103057b37ba.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.12d4a4b11545ca6321a0.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.e49d4b4a7802cad2fbefa1f77c4ca7e1.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.03.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.04.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bf93010d9b9b1322a27b.js></script><script type=text/javascript src=./static/js/app.92298d7ec6c20adbee4c.js></script></body></html>
\ No newline at end of file
dist/static/js/app.12d4a4b11545ca6321a0.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.92298d7ec6c20adbee4c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/order/giftExchange.vue
......@@ -711,7 +711,7 @@ export default {
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('发货核销成功');
this.dialogVisible = false;
this.shopDialogVisible = false;
this.getList();
this.submitLoading = false;
} else {
......
src/views/order/refundList.vue
......@@ -107,7 +107,8 @@
<p style="line-height:18px;" v-if="scope.row.refundStatus === 2">退款关闭</p>
<p style="line-height:18px">
<el-button type="text" v-if="scope.row.refundStatus === 0" @click="handleArgeeRefund(scope.row)">同意</el-button>
<el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0" @click="handleDeliver(scope.row)">发货</el-button>
<el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0 && scope.row.changeType !== 4" @click="handleDeliver(scope.row)">发货</el-button>
<el-button type="text" v-if="scope.row.refundType === 1 && scope.row.refundStatus === 0 && scope.row.changeType === 4" @click="deliverShop(scope.row)">核销</el-button>
<el-button type="text" v-if="scope.row.refundType === 2 && scope.row.refundStatus === 0" @click="handleCloseRefund(scope.row)">关闭</el-button>
</p>
</template>
......@@ -129,6 +130,17 @@
</div>
</el-tabs>
</div>
<!-- 门店自提核销 -->
<el-dialog title="发货并核销" :visible.sync="shopDialogVisible" width="450px">
<p style="margin-bottom:20px">
请确认买家出示的提货码为：<span style="color:#f5222d">{{ writeOffCode }}</span>
</p>
<p style="margin-bottom:20px">确认无误后，将商品交付给买家，确认核销，则订单交易完成</p>
<span slot="footer" class="dialog-footer">
<el-button @click="shopDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="hanhdleShopDeliver" :loading="submitLoading">确 定</el-button>
</span>
</el-dialog>
<!-- 关闭退款单 -->
<closeRefund :refundModal="refundModal" @getList="getList"></closeRefund>
<!-- 同意退款 -->
......@@ -192,7 +204,11 @@ export default {
logisticsCompanyId: '',
logisticsCode: '',
otherLogisticsCompanyName: ''
}
},
shopDialogVisible: false, //门店自提
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false //门店自提确认按钮
};
},
created() {
......@@ -309,6 +325,38 @@ export default {
this.$message.error(res.data.message);
}
});
},
// 门店自提发货
deliverShop(item) {
this.shopDialogVisible = true;
this.shopIntegralMallProExchangeId = item.integralMallProExchangeId;
this.writeOffCode = item.writeOffCode;
},
// 确认门店自提
hanhdleShopDeliver(item) {
let params = {
optType: 1,
integralMallProExchangeId: this.shopIntegralMallProExchangeId,
logisticsCompanyId: '',
logisticsCompanyCode: '',
logisticsCompanyName: '',
courierNumber: '',
cancelReason: '',
deliveryContent: '',
changeType: 4
};
this.submitLoading = true;
request.get('/api-integral-mall/order-opt', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('发货核销成功');
this.shopDialogVisible = false;
this.getList();
this.submitLoading = false;
} else {
this.$message.error(res.data.message);
this.submitLoading = false;
}
});
}
},
components: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment