Commit b4d61bf4 authored by Facius's avatar Facius

Merge branch 'dev-1.4.3' into test

parents 96955176 29b2120c
...@@ -196,7 +196,8 @@ let orderApiFun = function(vm){ ...@@ -196,7 +196,8 @@ let orderApiFun = function(vm){
let receiveParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/' + partOrderId +'/receive',{}, formType); let receiveParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/' + partOrderId +'/receive',{}, formType);
// 配件申请单-取消申请 // 配件申请单-取消申请
let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType); let cancelParts = async (partOrderId) => await vm.$u.put(prefix + 'parts/' + vm.vuex_token + '/orders/'+ partOrderId +'/cancel',{}, formType);
// 点击了异常单去处理
let workerDealWithError = async (orderId, params = {}) => await vm.$u.post( prefix + vm.vuex_token + '/order/' + orderId + '/workerDealWithError', params)
const orderApi = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
listOrderCount, listOrderCount,
...@@ -247,7 +248,8 @@ let orderApiFun = function(vm){ ...@@ -247,7 +248,8 @@ let orderApiFun = function(vm){
getLogistics, getLogistics,
getOrderPartsSum, getOrderPartsSum,
receiveParts, receiveParts,
cancelParts cancelParts,
workerDealWithError
} }
return orderApi return orderApi
} }
......
...@@ -300,7 +300,10 @@ export default { ...@@ -300,7 +300,10 @@ export default {
} }
}) })
}, },
handleClickCellButton(item) { handleClickCellButton(item, type) {
if (type == 'exception') {
this.$u.api.workerDealWithError(item.orderId).then(() => {})
}
// 去完工 // 去完工
uni.navigateTo({ uni.navigateTo({
url: url:
......
...@@ -649,10 +649,8 @@ export default { ...@@ -649,10 +649,8 @@ export default {
// this.showTab = this.list.length > 1 // this.showTab = this.list.length > 1
// 异常单处理 // 异常单处理
if ( if (this.orderStatus === '88' || this.orderStatus === '86')
this.auditResults.length > 0 && {
(this.orderStatus === '88' || this.orderStatus === '86')
) {
this.checkCompleteError(list) this.checkCompleteError(list)
} else { } else {
this.list = list this.list = list
...@@ -809,7 +807,6 @@ export default { ...@@ -809,7 +807,6 @@ export default {
if (!hasMate || !this.$u.test.isEmpty(mateRow)) { if (!hasMate || !this.$u.test.isEmpty(mateRow)) {
panelResult.submitted++ panelResult.submitted++
} }
panelResult.submitted++
} else { } else {
panelResult.submitted++ panelResult.submitted++
} }
......
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