Skip to content

L
linshenxs-shop
Commit ca282633 by cpa
Options

商家端-立即发货修改

parent 35c0e0c4
Showing with 98 additions and 60 deletions
src/api/mall/merchantMallorder.js
import request from '@/router/axios' import request from '@/router/axios'
export function cancelOrderApi(parameter) {
return request({
url: '/admin/merchantMallOrder/cancelOrder',
method: 'get',
params:parameter
})
}
export function delObj(parameter) {
return request({
url: '/admin/merchantMallOrder',
method: 'delete',
params:parameter
})
}
export function fetchList(query) { export function fetchList(query) {
return request({ return request({
url: '/admin/merchantMallOrder/page', url: '/admin/merchantMallOrder/page',
...@@ -72,13 +90,7 @@ export function cancelOrderMethod(query) { ...@@ -72,13 +90,7 @@ export function cancelOrderMethod(query) {
// } // }
// //
//
// export function delObj(ids) {
// return request({
// url: '/general/mallOrder/' + ids,
// method: 'delete'
// })
// }
// //
// export function confirmPayObj(obj) { // export function confirmPayObj(obj) {
// return request({ // return request({
......
src/const/crud/mall/merchantMallorder.js
...@@ -26,19 +26,19 @@ export const tableOption = { ...@@ -26,19 +26,19 @@ export const tableOption = {
"label": "订单编号", "label": "订单编号",
"prop": "orderNo", "prop": "orderNo",
"search": true, "search": true,
span: 5
}, },
{ {
"type": "select", "type": "select",
"label": "状态", "label": "状态",
"prop": "state", "prop": "state",
"search": true, "search": true,
"dicUrl": "/general/mallOrder/getStateOptions", "dicUrl": "/general/mallOrder/getOrderStateOptions",
}, },
{ {
"type": "date", "type": "input",
"label": "下单用户", "label": "下单用户",
"prop": "takeName", // "prop": "takeName",
"prop": "realName",
search: true, search: true,
}, },
......
src/views/businessOrder/index.vue
...@@ -21,36 +21,33 @@ ...@@ -21,36 +21,33 @@
<el-button type="button" size="small" <el-button type="button" size="small"
@click="checkTheDetails(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button> @click="checkTheDetails(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
<el-button type="button" size="small" <el-button type="button" size="small"
v-if="scope.row.state == 8" v-if="scope.row.state == 4"
@click="viewLogistics(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">查看物流</el-button> @click="viewLogistics(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">查看物流</el-button>
<el-button type="button" size="small" <el-button type="button" size="small"
v-if="scope.row.state == 1" v-if="scope.row.state == 3"
@click="shipsImmediately(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">立即发货</el-button> @click="shipsImmediately(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">立即发货</el-button>
<el-button type="button" size="small" <el-button type="button" size="small"
v-if="contains(scope.row)!=-1"
@click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button> @click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button>
<el-button type="button" size="small"
v-if="cancelOrderButAuth(scope.row)>=0"
@click="cancelOrder(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">取消订单</el-button>
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
<!-- 1.取消订单 --> <!-- 1.取消订单 -->
<el-dialog <el-dialog
title="取消订单" :visible.sync="dialogVisible" width="40%" title="取消订单" :visible.sync="cancelOrderDialog" width="40%"
:before-close="handleClose"> :before-close="handleClose">
<p>快递单号 :{{this.form.waybillNo}}</p><p></p> <el-form ref="form" :model="orderForm">
<div class="block"> <el-input type="textarea" v-model="orderForm.orderNo" v-show="false">1111111111</el-input>
<el-timeline> <el-input type="textarea" v-model="orderForm.mark"></el-input>
<el-timeline-item <el-form-item>
v-for="(activity, index) in activities" <el-button type="primary" :loading="loading" @click="cancelOrder_cancel" style="float: left;margin-left: 20%;margin-top: 30px">取 消</el-button>
:key="index" <el-button type="primary" :loading="loading" @click="cancelOrder_submit" style="float: right;margin-right: 20%;margin-top: 30px">确 认</el-button>
:icon="activity.icon" </el-form-item>
:type="activity.type" </el-form>
:color="activity.color"
:size="activity.size"
:timestamp="activity.timestamp">
{{activity.content}}
</el-timeline-item>
</el-timeline>
</div>
</el-dialog> </el-dialog>
<!-- 2.查看物流对话框 --> <!-- 2.查看物流对话框 -->
...@@ -106,7 +103,7 @@ ...@@ -106,7 +103,7 @@
</template> </template>
<script> <script>
import {fetchList,shipsImmediately} from '@/api/mall/merchantMallorder' import {fetchList,shipsImmediately,delObj,cancelOrderApi} from '@/api/mall/merchantMallorder'
import {tableOption} from '@/const/crud/mall/merchantMallorder' import {tableOption} from '@/const/crud/mall/merchantMallorder'
import {mapGetters} from 'vuex' import {mapGetters} from 'vuex'
export default { export default {
...@@ -117,7 +114,12 @@ ...@@ -117,7 +114,12 @@
activities: [],// 查看物流当前状态 activities: [],// 查看物流当前状态
options:[],// 快递公司下拉 options:[],// 快递公司下拉
loading:false, loading:false,
orderForm:{
orderNo:'',
mark:"请输入取消原因",
},
form:{ form:{
orderNo:0, orderNo:0,
expressCompany:2,//快递公司 expressCompany:2,//快递公司
waybillNo:'',//快递单号 waybillNo:'',//快递单号
...@@ -125,13 +127,12 @@ ...@@ -125,13 +127,12 @@
dialogVisibleShipsImmediately:false,//立即发货对话框 dialogVisibleShipsImmediately:false,//立即发货对话框
dialogVisible: false,// 查看物流对话框 dialogVisible: false,// 查看物流对话框
dialogVisibleConfirmPayment:false,// 确认支付对话框 dialogVisibleConfirmPayment:false,// 确认支付对话框
cancelOrderVue:false, cancelOrderDialog:false,
nowRow:undefined,
searchForm: {}, searchForm: {},
tableData: [], tableData: [],
page: { page: {
total: 0, // 总页数 total: 0, // 总页数
currentPage: 0, // 当前页数 currentPage: 1, // 当前页数
pageSize: 20 // 每页显示多少条 pageSize: 20 // 每页显示多少条
}, },
tableLoading: false, tableLoading: false,
...@@ -140,6 +141,7 @@ ...@@ -140,6 +141,7 @@
}, },
// 自定义的组件 // 自定义的组件
components: { components: {
'cancel-order': () => import('./components/cancelOrder.vue'),
}, },
computed: { computed: {
initDropDownBox(){ initDropDownBox(){
...@@ -157,36 +159,60 @@ ...@@ -157,36 +159,60 @@
} }
}, },
methods: { methods: {
// 取消订单
cancelOrder(row){
this.orderForm.orderNo=row.orderNo
this.cancelOrderDialog=true
},
// 取消订单-取消
cancelOrder_cancel(){
this.cancelOrderDialog=false
},
// 取消订单-确认
cancelOrder_submit(){
this.cancelOrderDialog=false
cancelOrderApi(this.orderForm).then(r => {
this.$message.success('发货成功')
this.getList(this.page)
}).catch(e =>{
console.log('错误', e.message)
})
},
// 取消订单
cancelOrderButAuth: function (row) {
let str=row.state
let text='0,1,2,3,4'
return text.search(str)
},
contains: function (row) { contains: function (row) {
let str=row.state let str=row.state
let text='1,6,3,5' let text='1,6,3,5'
return text.search(str) return text.search(str)
}, },
// 立即发货-对话框 // 立即发货-对话框
shipsImmediately(row){ shipsImmediately(row){
this.form.orderNo=row.orderNo this.form.orderNo=row.orderNo
this.$axios.get("/admin/merchantMallOrder/isVirtualGoods",{ this.$axios.get("/admin/merchantMallOrder/isVirtualGoods",{
params:{orderNo:row.orderNo}, params:{orderNo:row.orderNo},
}).then(response => { }).then(response => {
if(response.data.data){ // if(response.data.data){
this.form.orderNo=row.orderNo // this.form.orderNo=row.orderNo
this.dialogVisibleShipsImmediately = true // this.dialogVisibleShipsImmediately = true
}else { // }else {
// 虚拟商品 二次确认直接发货 // // 虚拟商品 二次确认直接发货
this.$confirm('是否确认发货？', '提示', { // this.$confirm('是否确认发货？', '提示', {
confirmButtonText: '确定', // confirmButtonText: '确定',
cancelButtonText: '取消', // cancelButtonText: '取消',
type: 'warning' // type: 'warning'
}).then(data => { // }).then(data => {
shipsImmediately(this.form).then(r => { // shipsImmediately(this.form).then(r => {
this.$message.success('发货成功') // this.$message.success('发货成功')
this.getList(this.page) // this.getList(this.page)
}).catch(e =>{ // }).catch(e =>{
console.log('错误', e.message) // console.log('错误', e.message)
}) // })
}) // })
} // }
}, error => { }, error => {
console.log('错误', error.message) console.log('错误', error.message)
}) })
...@@ -221,18 +247,18 @@ ...@@ -221,18 +247,18 @@
,{color: '#0bbd87',content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'} ,{color: '#0bbd87',content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}
,{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}] ,{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}]
}, },
// 取消订单
cancelOrder(row){
this.cancelOrderVue=true
this.nowRow=row
},
// 查看详情 // 查看详情
checkTheDetails(row){ checkTheDetails(row){
this.$router.push('/businessOrder/details?id=' + row.orderNo) this.$router.push('/businessOrder/details?id=' + row.orderNo)
}, },
// 列表查询 // 列表查询
getList(page, params) { getList(page, params) {
this.tableLoading = true this.tableLoading = true
if(page.currentPage=1){
page.currentPage=0
}
fetchList(Object.assign({ fetchList(Object.assign({
current: page.currentPage, current: page.currentPage,
size: page.pageSize size: page.pageSize
...@@ -251,7 +277,7 @@ ...@@ -251,7 +277,7 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(function () { }).then(function () {
return delObj(row.orderNo) return delObj({ids:row.orderNo})
}).then(data => { }).then(data => {
this.$message.success('删除成功') this.$message.success('删除成功')
this.getList(this.page) this.getList(this.page)
...@@ -311,7 +337,7 @@ ...@@ -311,7 +337,7 @@
// 查询事件 // 查询事件
searchChange(form, done) { searchChange(form, done) {
this.searchForm = form this.searchForm = form
// this.page.currentPage = 0 this.page.currentPage = 0
this.getList(this.page, form) this.getList(this.page, form)
done() done()
}, },
......
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