Skip to content

J
jiedao-app-operator-master
Commit 9459956b authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

修复快速创建客户异常

parent f3327bf5
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 10 deletions
src/api/ecw/box.js
View file @ 9459956b
......@@ -218,4 +218,13 @@ export function downloadByOrderId(orderId) {
params: {orderId},
responseType: 'arraybuffer'
});
}
// 获得出货审核
export function getBoxApproval(params) {
return request({
url: "/ecw/box-approval/get",
method: "get",
params,
});
}
\ No newline at end of file
src/components/QuickCreateCustomer/index.vue
View file @ 9459956b
......@@ -120,7 +120,9 @@ export default {
return;
}
// 添加的提交
createCustomer(this.form).then(res => {
let data = {...this.form}
data.type = this.form.type.join(",")
createCustomer(data).then(res => {
this.$modal.msgSuccess("新增成功");
return getCustomerContactsSelect({customerId: res.data})
}).then(res => {
......
src/views/bpm/processInstance/detail.vue
View file @ 9459956b
......@@ -131,23 +131,25 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig
import {getDate} from "@/utils/dateUtils";
import {listSimpleUsers} from "@/api/system/user";
import {getActivityList} from "@/api/bpm/activity";
import SpecialDetail from "@/views/ecw/offer/components/SpecialDetail"
import OfferSpecialDetail from "@/views/ecw/offer/components/SpecialDetail"
import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
import shippingDetail from '@/views/ecw/box/shippingDetail'
import SplitDetail from '@/views/ecw/order/components/SplitDetail'
import MergeDetail from '@/views/ecw/order/components/MergeDetail'
import CargoControlDetail from '@/views/ecw/order/components/CargoControlDetail'
import BoxSplitDetail from '@/views/ecw/order/components/BoxSplitDetail'
// 流程实例的详情页，可用于审批
export default {
name: "ProcessInstanceDetail",
components: {
Parser,
SpecialDetail,
OfferSpecialDetail,
warehouseDetails,
shippingDetail,
SplitDetail,
MergeDetail,
CargoControlDetail
CargoControlDetail,
BoxSplitDetail
},
computed:{
matterNum(){
......@@ -160,18 +162,18 @@ export default {
const map = {
// 报价单特价审核，原来配置的组件名
"special-discount": {
component: 'SpecialDetail',
component: 'OfferSpecialDetail',
id: this.processInstance.businessKey,
type: 1
},
// 报价单特价审核，符合命名规则的组件名
offer_special: {
component: 'SpecialDetail',
component: 'OfferSpecialDetail',
id: this.processInstance.businessKey,
type: 1
},
offer_commission: {
component: 'SpecialDetail',
component: 'OfferSpecialDetail',
id: this.processInstance.businessKey,
type: 2
},
......@@ -266,7 +268,7 @@ export default {
},
// 出货拆单审核
shipment_split_detail: {
component: "SplitDetail",
component: "BoxSplitDetail",
id: this.processInstance.businessKey,
},
merge_detail: {
......@@ -291,7 +293,7 @@ export default {
id: this.processInstance.businessKey,
applyType: 9
},
// 取消放货审核 // TODO 接口待完善，applyType待完善
// 取消放货审核
order_cancel_release: {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
......
src/views/ecw/order/components/BoxSplitDetail.vue 0 → 100644
View file @ 9459956b
<!--拆单审核中的申请信息部分-->
<template>
<div v-if="detail">
<el-descriptions :column="4" v-if="order">
<el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
<el-descriptions-item :label="$t('运输方式')">
<dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item>
<el-descriptions-item :label="$t('出货方式')">
{{channel ? channel.nameZh : '/'}}
</el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')">
<el-tag size="small">
<!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" /> -->
{{order.statusMsg}}
</el-tag>
</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('始发仓')">
{{order.logisticsInfoDto.startTitleZh}}
</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">
{{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item>
</el-descriptions>
<template v-for="item in detail.orderSplitBackVOList">
<div class="title mt-20" :key="item.orderNo">
<span class="mr-10">{{item.orderNo}}</span>
<dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
<span class="mr-10" v-if="item.channelName">{{item.channelName}}</span>
<span>{{$t('发往')}}{{item.dstWarehouseName}}</span>
</div>
<el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
<el-table-column :label="$t('序号')">
<template slot-scope="scope">{{scope.$index+1}}</template>
</el-table-column>
<el-table-column :label="$t('中文品名')">
<template slot-scope="{row}">{{row.prodTitleZh}}</template>
</el-table-column>
<el-table-column :label="$t('英文品名')">
<template slot-scope="{row}">{{row.prodTitleEn}}</template>
</el-table-column>
<el-table-column :label="$t('品牌')">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
</template>
</el-table-column>
<el-table-column :label="$t('体积')">
<template slot-scope="{row}">{{row.volume}} m³</template>
</el-table-column>
<el-table-column :label="$t('重量')">
<template slot-scope="{row}">{{row.weight}}kg</template>
</el-table-column>
<el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template></el-table-column>
</el-table>
</template>
</div>
</template>
<script>
import {getOrder} from '@/api/ecw/order'
import {getBoxApproval} from '@/api/ecw/box'
import {getChannel} from '@/api/ecw/channel'
export default {
props:{
id: [String, Number]
},
data(){
return {
detail: null,
order: null,
channel: null
}
},
watch:{
id(){
this.getData()
},
detail(){
this.getOrder()
},
order(){
if(this.order.channelId){
this.getChannel()
}
}
},
created(){
if(this.id){
this.getData()
}
},
methods:{
getData(){
getBoxApproval({id: this.id}).then(res => {
this.detail = JSON.parse(res.data.details)
})
},
getOrder(){
getOrder(this.detail.orderId).then(res => {
this.order = res.data
})
},
getChannel(){
getChannel(this.order.channelId).then(res => {
this.channel = res.data
})
}
}
}
</script>
<style scoped lang="scss">
.title{
padding: 10px 0;
span{
font-size: 14px;
font-weight: bold;
}
}
</style>
\ No newline at end of file
src/views/ecw/order/components/SplitDetail.vue
View file @ 9459956b
......@@ -11,7 +11,7 @@
</el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')">
<el-tag size="small">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" />
{{order.statusMsg}}
</el-tag>
</el-descriptions-item>
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
......
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