Commit 6674dc0e authored by 我在何方's avatar 我在何方

新增商品异常商品同步

parent 1e4a69f5
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
</el-row> </el-row>
<el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'"> <el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
<el-form-item :label="$t('处理结果')+':'" required> <el-form-item :label="$t('处理结果')+':'" required>
<el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable> <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable @change="handlerResultChange">
<template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"> <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
<el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/> <el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template> </template>
...@@ -349,7 +349,8 @@ ...@@ -349,7 +349,8 @@
> >
<product-selector <product-selector
@hook:mounted="onTableMounted" @hook:mounted="onTableMounted"
v-model="handlerParams.productId" v-model="productId2"
@change = "onProductChange($event)"
/> />
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -367,8 +368,8 @@ ...@@ -367,8 +368,8 @@
> >
<product-selector <product-selector
lang="En" lang="En"
@hook:mounted="onTableMounted" v-model="productId1"
v-model="handlerParams.productId" @change = "onProductChange($event)"
/> />
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -522,6 +523,8 @@ ...@@ -522,6 +523,8 @@
region:'', region:'',
customerData:{},//归属客户 customerData:{},//归属客户
customerServiceList:[],//客户经理 customerServiceList:[],//客户经理
productId1:null,
productId2:null
}; };
}, },
created() { created() {
...@@ -571,6 +574,8 @@ ...@@ -571,6 +574,8 @@
if(this.orderExceptionData.orderItemId && this.orderData && this.orderData.orderItemVOList){ if(this.orderExceptionData.orderItemId && this.orderData && this.orderData.orderItemVOList){
if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&!this.handlerParams.productId){ if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&!this.handlerParams.productId){
this.handlerParams.productId = this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId).prodId this.handlerParams.productId = this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId).prodId
this.productId1 = this.handlerParams.productId
this.productId2 = this.handlerParams.productId
} }
console.log(this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)) console.log(this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId))
return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId) return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
...@@ -661,6 +666,13 @@ ...@@ -661,6 +666,13 @@
} }
return this.$t('') return this.$t('')
}, },
//新增异常处理结果切换
handlerResultChange(){
if(this.orderExceptionData.orderExceptionType=='goods_add_exception'){
this.productId1 = this.handlerParams.productId
this.productId2 = this.handlerParams.productId
}
},
submitForm(){ submitForm(){
if(!this.handlerParams.orderExceptionHandlerResult){ if(!this.handlerParams.orderExceptionHandlerResult){
this.$modal.msgError(this.$t('请选择处理结果')); this.$modal.msgError(this.$t('请选择处理结果'));
...@@ -677,6 +689,9 @@ ...@@ -677,6 +689,9 @@
this.$redirect('/product/product-list?prodId=' + this.handlerParams.productId) this.$redirect('/product/product-list?prodId=' + this.handlerParams.productId)
return return
} }
if(this.productId1){
this.handlerParams.productId = this.productId1
}
handlerExceptionByExceptionId(this.handlerParams).then(res=>{ handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess(this.$t('提交成功')); this.$modal.msgSuccess(this.$t('提交成功'));
this.$redirect('/order/pending?id=' + this.orderData.orderId) this.$redirect('/order/pending?id=' + this.orderData.orderId)
...@@ -740,6 +755,15 @@ ...@@ -740,6 +755,15 @@
onClickClosePreview(val){ onClickClosePreview(val){
this.IsPreview = val // 由组件内部传入的关闭数据赋值关闭 this.IsPreview = val // 由组件内部传入的关闭数据赋值关闭
}, },
onProductChange(product){
if(!product){
this.productId1 = null
this.productId2 = null
return false
}
this.productId1 = product.id
this.productId2 = product.id
},
} }
}; };
</script> </script>
......
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