Commit c8ad0322 authored by dragondean@qq.com's avatar dragondean@qq.com

订单列表拆单申请,但是接口异常没调通

parent aec4b6ec
import request from '@/utils/request' import request from '@/utils/request'
import {param} from "@/utils";
// 创建订单 // 创建订单
export function createOrder(data) { export function createOrder(data) {
...@@ -676,3 +675,12 @@ export function operateLogPage(params){ ...@@ -676,3 +675,12 @@ export function operateLogPage(params){
params: params params: params
}) })
} }
// 取消拆单申请
export function splitCancelApply(data){
return request({
url: '/order/split/cancel-apply',
method: 'put',
data
})
}
...@@ -316,6 +316,12 @@ ...@@ -316,6 +316,12 @@
<el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)" v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item> <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)" v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
</template> </template>
<!--撤销拆单,拆单的子订单,预装前显示,预装后变灰不可点击-->
<template v-if="scope.row.parentOrderId">
<el-dropdown-item @click.native="cancelSplit(scope.row)" v-hasPermi="['ecw:order:cancel_split']">{{$t('撤销拆单')}}</el-dropdown-item>
</template>
<!-- 合单日志,提货日志 --> <!-- 合单日志,提货日志 -->
<template v-if="( <template v-if="(
scope.row.status > 2 && scope.row.status > 2 &&
...@@ -491,7 +497,7 @@ import { ...@@ -491,7 +497,7 @@ import {
exportCustomsDatas, exportCustomsDatas,
exportShippingDatas, exportShippingDatas,
exportShipFee, exportShipFee,
exportUnload exportUnload, splitCancelApply
} from "@/api/ecw/order"; } from "@/api/ecw/order";
/* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */ /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
import PrintTag from './components/PrintTag' import PrintTag from './components/PrintTag'
...@@ -652,6 +658,15 @@ export default { ...@@ -652,6 +658,15 @@ export default {
getCurrencyPage(this.params).then(res => this.currencyList = res.data.list) getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
}, },
methods: { methods: {
// 取消拆单申请
cancelSplit(row){
this.$prompt('请输入撤销理由').then(res =>{
console.log("res", res)
return splitCancelApply({ orderId: row.orderId, reason: res.value})
}).then(() => {
this.getList()
})
},
// 获得导出函数 // 获得导出函数
getExportFunc(){ getExportFunc(){
let func = orderExportSearch let func = orderExportSearch
...@@ -744,10 +759,10 @@ export default { ...@@ -744,10 +759,10 @@ export default {
return this.$alert('不支持此操作') return this.$alert('不支持此操作')
} }
this.$confirm(action.confirm) this.$confirm(action.confirm)
.then(res => { .then(() => {
return action.callable(orderId) return action.callable(orderId)
}) })
.then(res => { .then(() => {
this.getList() this.getList()
}) })
}, },
...@@ -844,14 +859,13 @@ export default { ...@@ -844,14 +859,13 @@ export default {
specialRendering(val){ specialRendering(val){
if(val !== undefined){ if(val !== undefined){
let i = val.split(',') let i = val.split(',')
let special = this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => { return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
return i.indexOf(e.value) > -1 return i.indexOf(e.value) > -1
}) })
return special
} }
}, },
deleteSpecial(id,orderId){ deleteSpecial(id,orderId){
this.$confirm(this.$t('确定删除此特需么?')).then(res => { this.$confirm(this.$t('确定删除此特需么?')).then(() => {
return orderSpecialNeed({orderId:orderId,advanceType:id}) return orderSpecialNeed({orderId:orderId,advanceType:id})
}).then(() => { }).then(() => {
this.getList() this.getList()
......
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