Skip to content

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

bugs

parent 4439b1bb
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 81 deletions
src/views/bpm/processInstance/detail.vue
View file @ c945b22f
......@@ -299,6 +299,12 @@ export default {
id: this.processInstance.businessKey,
applyType: 10
},
// 提单审核
order_landing_bill:{
component: () => import('@/views/ecw/order/components/ApprovalDetail'),
id: this.processInstance.businessKey,
path: this.processInstance.processDefinition?.formCustomViewPath
}
}
return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
}
......
src/views/ecw/offer/components/Commossion.vue
View file @ c945b22f
<template>
<el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="$t('佣金规则申请')">
<el-form ref="form" :model="form" label-width="80px" :rules="rules" :disabled="!!form.applyStatus">
<el-form ref="form" :model="form" label-width="80px" :rules="rules" :disabled="form.applyStatus == 1">
<el-form-item :label="$t('商品类型')">
<span>{{ getProductTypeNameById(form.productType) }}</span>
</el-form-item>
......
src/views/ecw/order/cargoControl.vue
View file @ c945b22f
......@@ -124,15 +124,17 @@
<!--已全部放货，但是未复核-->
<template v-if="scope.row.cargoControlStatus == 1 && scope.row.isToReview">
<el-button type="text" size="mini" @click="review(scope.row)">{{$t('放货复核')}}</el-button>
<el-button type="text" size="mini" @click="toDetail(scope.row)" >{{$t('修改')}}</el-button>
<el-button type="text" size="mini" @click="toDetail(scope.row)" >{{$t('取消')}}</el-button>
</template>
<!--已完成放货,切没有待复核；真正的放货完成-->
<!--已完成放货,且没有待复核；真正的放货完成-->
<template v-if="scope.row.cargoControlStatus == 1 && !scope.row.isToReview">
<!-- <el-button type="text" size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button> -->
<el-button type="text" size="mini" @click="cargoTransfer(scope.row)" >{{$t('调货')}}</el-button>
<el-button type="text" size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods">{{$t('反复核')}}</el-button>
</template>
<el-button type="text" size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/order/components/ApprovalDetail.vue 0 → 100644
View file @ c945b22f
<!--拆单审核中的申请信息部分-->
<template>
<div v-if="detail && order">
<el-descriptions :column="4" v-if="order" :colon="false">
<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('订单状态')">
{{order.statusMsg}}
</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('目的仓')" :span="2">
{{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item>
<!-- 提单审核 -->
<el-descriptions-item v-if="path == 'order_landing_bill'">
<el-button type="primary" @click="ShowLandingBill=true">查看提单</el-button>
</el-descriptions-item>
</el-descriptions>
<PrintLandingBill :order-id="order.orderId" v-if="ShowLandingBill" @close="ShowLandingBill=false"/>
</div>
</template>
<script>
import {getOrder, getApproval} from '@/api/ecw/order'
import {getChannel} from '@/api/ecw/channel'
/*
优惠申请 1
管理优惠 2
佣金设置 3
重货优惠 4
泡货优惠 5
拆单申请 6
控货订单放货修改 7
控货订单反复核 8
控货订单已放货记录调货审批 9
控货订单取消放货 10
合单申请 11
费用申请 12
调仓申请 13
订单修改 14
预装审核 18
封柜审核 19
入仓修改 22
退仓 23
*/
export default {
name: 'OrderApprovalDetail',
props:{
id: [String, Number],
path: String
},
components:{
PrintLandingBill: () => import('./PrintLadingBill.vue')
},
data(){
return {
detail: null,
order: null,
channel: null,
ShowLandingBill: false
}
},
watch:{
id(){
this.getData()
},
detail(){
this.getOrder()
},
order(){
if(this.order.channelId){
this.getChannel()
}
}
},
created(){
if(this.id){
this.getData()
}
},
methods:{
getData(){
getApproval(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/PrintLadingBill.vue
View file @ c945b22f
......@@ -22,7 +22,7 @@ export default {
components: {PdfViewer},
filters: {parseTime},
props:{
transportType: Number,
//transportType: Number,
// tidanNO: [String, Number],
orderId: String
},
......@@ -45,11 +45,11 @@ export default {
}
return t
},
type(){
/* type(){
if(this.transportType <= 2) return 1
if(this.transportType == 3) return 3
if(this.transportType == 4) return 2
}
} */
},
created(){
this.show = true
......@@ -60,6 +60,7 @@ export default {
this.loading = true
downloadByOrderId(this.orderId)
.then(arrayBuffer => {
console.log({arrayBuffer})
this.pdfData = arrayBuffer
})
.finally(() => {
......
src/views/ecw/order/detail.vue
View file @ c945b22f
......@@ -148,15 +148,15 @@
<template v-if="row.charging ==1">
<template v-if="!row.seaFreight">未报价</template>
<template>{{$t('全包价')}} {{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
<template>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
</template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
<template v-else>
<div>
{{$t('运费')}}：{{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
{{$t('运费')}}：{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
</div>
<div>
{{$t('清关费')}}：{{row.oneClearanceFreight}} {{currentcyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
{{$t('清关费')}}：{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
</div>
</template>
</template>
......@@ -209,8 +209,16 @@
<dict-tag :type="DICT_TYPE.FEE_TYPE" :value="row.feeType" />
</template>
</el-table-column>
<el-table-column :label="$t('单价金额')" prop="unitPrice"></el-table-column>
<el-table-column :label="$t('总金额')" prop="totalAmount"></el-table-column>
<el-table-column :label="$t('单价金额')" prop="unitPrice">
<template slot-scope="{row}">
{{row.unitPrice}}{{currencyMap[row.currencyId]}}
</template>
</el-table-column>
<el-table-column :label="$t('总金额')" prop="totalAmount">
<template slot-scope="{row}">
{{row.totalAmount}}{{currencyMap[row.currencyId]}}
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
......@@ -270,7 +278,7 @@ export default {
}
},
computed:{
currentcyMap(){
currencyMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = item.titleZh
......
src/views/ecw/order/edit.vue
View file @ c945b22f
......@@ -236,63 +236,6 @@
</el-descriptions>
</el-card>
<el-card class="mt-10" v-if="0">
<div class="card-title" slot="header">{{$t('预计费用')}}</div>
<el-descriptions :column="5" border>
<el-descriptions-item :label="$t('保价费')">
{{fee.insuranceFee || 0}} {{$t('人民币')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('总运费')">
<div>{{fee.seaNGN || 0}}{{$t('奈拉')}}</div>
<div>{{fee.seaRMB || 0}}{{$t('人民币')}}</div>
<div>{{fee.seaUSD || 0}}{{$t('美元')}}</div>
</el-descriptions-item>
<el-descriptions-item :label="$t('总清关费')">
<div>{{fee.clearanceNGN || 0}}{{$t('奈拉')}}</div>
<div>{{fee.clearanceRMB || 0}}{{$t('人民币')}}</div>
<div>{{fee.clearanceUSD || 0}}{{$t('美元')}}</div>
</el-descriptions-item>
<el-descriptions-item :label="$t('其他费用')">
<el-input v-model="form.otherFee" placeholder="" style="width:100px"></el-input>
<selector v-model="form.otherFeeCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
</el-descriptions-item>
<el-descriptions-item :label="$t('原价')" :span="2">
<!--TODO 缺少字段-->
<div>{{fee.clearanceNGN || 0}}{{$t('奈拉')}}</div>
<div>{{fee.clearanceRMB || 0}}{{$t('人民币')}}</div>
<div>{{fee.clearanceUSD || 0}}{{$t('美元')}}</div>
</el-descriptions-item>
</el-descriptions>
<div class="card-title" style="padding:20px 0;">{{$t('优惠信息')}}</div>
<el-row v-for="(item, index) in couponTypeList" :key="item.value" :gutter="10">
<el-col :span="2">{{index+1}}.{{item.label}}</el-col>
<el-col :span="4">
<el-select :placeholder="$t('请选择优惠')" v-model="selectedCoupons[item.value]" :data-type="item.value" clearable>
<template v-for="(coupon, index) in couponList">
<el-option v-if="coupon.type == +item.value" :key="coupon.couponId + '_' + index" :label="coupon.titleZh" :value="coupon.couponId"></el-option>
</template>
</el-select>
</el-col>
<el-col :span="2" v-if="getCoupon(selectedCoupons[item.value])">
-{{getCoupon(selectedCoupons[item.value]).reduceAmount}}
{{currentcyMap[getCoupon(selectedCoupons[item.value]).reduceCurrencyId]}}
</el-col>
<el-col :span="5" v-if="getCoupon(selectedCoupons[item.value])">{{$t('有效期')}}：{{getCoupon(selectedCoupons[item.value]).endTime || $t('永久有效')}}</el-col>
</el-row>
<el-descriptions :column="1" border>
<el-descriptions-item :label="$t('优惠合计')">
{{discount}}{{$t('美元')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('预计费用')">
// TODO
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="mt-10">
<div class="card-title" slot="header">{{$t('通用')}}</div>
<div class="form-section">
......@@ -553,7 +496,6 @@ export default {
unitList:[],
couponList: [],
couponTypeList: [],
selectedCoupons: {},
fee: {}, // 费用
// 表单参数
form: {
......@@ -626,13 +568,13 @@ export default {
return getDictDatas
},
selectedRouter(){
// otherService 1 送货上门，2非控货订单代收货款
// otherService 1 集运服务 2 送货上门 3 非控货订单代收货款 4 海外仓 5 提货异常
if(!this.form.lineId)return null
return this.routerList.find(item => item.id == this.form.lineId)
},
// 送货上门
homeDeliveryService(){
return this.selectedRouter && this.selectedRouter.otherService && this.selectedRouter.otherService.indexOf('1') > -1
return this.selectedRouter && this.selectedRouter.otherService && this.selectedRouter.otherService.indexOf('2') > -1
},
// 代收货款（非控货订单，且路线开通了代收服务）
collectionProxy(){
......@@ -746,7 +688,7 @@ export default {
this.$set(this.form, 'objectiveId', router.destCityId)
},
'form.packageTypeArr'(val){
this.$set(this.form, 'packageType', val.join(','))
this.$set(this.form, 'packageType', val ? val.join(',') : '')
},
// 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
selectedRouter(val){
......@@ -767,10 +709,6 @@ export default {
created() {
defaultFormData = Object.assign({}, this.form)
this.couponTypeList = this.getDictDatas(this.DICT_TYPE.ECW_COUPON_TYPE)
this.couponTypeList.forEach(item => {
this.$set(this.selectedCoupons, item.value, null)
})
if(this.$route.query.id){
this.getOrder()
}else this.addProduct()
......@@ -960,14 +898,12 @@ export default {
item.channelIds = Array.from(item.channelIdSet).join(',')
}
})
let coupons = Object.values(this.selectedCoupons).filter(item => !!item)
// 修改的提交
if (this.form.orderNo != null) {
let data = Object.assign({}, this.form, {
customDraweeVOList: this.customDraweeList,
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
orderItemVOList: this.getProductListWithDefaultValue(),
couponIds: coupons.join(",")
})
data.type = data.type.join(',')
updateOrder(data).then(response => {
......@@ -980,7 +916,7 @@ export default {
consigneeId: this.consigneeContact.customerId,
consignorId: this.consignorContact.customerId,
customerId : this.consignorContact.customerId,
couponIds: coupons.join(","),
// couponIds: coupons.join(","),
}, this.form, {
customDraweeVOList: this.customDraweeList,
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
......
src/views/ecw/order/pending.vue
View file @ c945b22f
......@@ -65,7 +65,7 @@
</el-table-column>
<el-table-column :label="$t('异常描述')" align="center">
<template slot-scope="scope">
<span>{{scope.row.orderExceptionDescVO.descZh}}</span>
<span v-if="scope.row.orderExceptionDescVO">{{$l(scope.row.orderExceptionDescVO, 'desc')}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount" />
......
src/views/ecw/supplier/edit.vue
View file @ c945b22f
......@@ -89,6 +89,9 @@
</template>
</el-table-column>
<el-table-column :label="$t('名称') + '*'">
<template slot="header">
{{$t('名称')}}<span class="red">*</span>
</template>
<template slot-scope="scope">
<el-form-item
class="mb-0 mr-0"
......@@ -100,6 +103,9 @@
</template>
</el-table-column>
<el-table-column :label="$t('电话') + '*'">
<template slot="header">
{{$t('电话')}}<span class="red">*</span>
</template>
<template slot-scope="scope">
<el-form-item
class="mb-0 mr-0"
......@@ -128,6 +134,9 @@
<template slot-scope="scope">{{scope.$index + 1}}</template>
</el-table-column>
<el-table-column :label="$t('账户名称') + '*'">
<template slot="header">
{{$t('账户名称')}}<span class="red">*</span>
</template>
<template slot-scope="scope">
<el-form-item
class="mb-0 mr-0"
......@@ -139,6 +148,9 @@
</template>
</el-table-column>
<el-table-column :label="$t('币别') + '*'">
<template slot="header">
{{$t('币别')}}<span class="red">*</span>
</template>
<template slot-scope="scope">
<el-form-item
class="mb-0 mr-0"
......@@ -150,6 +162,9 @@
</template>
</el-table-column>
<el-table-column :label="$t('银行名称') + '*'">
<template slot="header">
{{$t('银行名称')}}<span class="red">*</span>
</template>
<template slot-scope="scope">
<el-form-item
class="mb-0 mr-0"
......@@ -161,6 +176,9 @@
</template>
</el-table-column>
<el-table-column :label="$t('银行账户') + '*'">
<template slot="header">
{{$t('银行账户')}}<span class="red">*</span>
</template>
<template slot-scope="scope">
<el-form-item
class="mb-0 mr-0"
......@@ -345,6 +363,13 @@ export default {
if (!valid) {
return this.$showFormValidateErrors(errors)
}
if(!this.formData.bankList.length){
return this.$message.error('请添加银行信息')
}
if(!this.formData.contactList.length){
return this.$message.error('请添加联系人信息')
}
let data = Object.assign({}, this.formData)
// 修改的提交
......@@ -385,4 +410,7 @@ export default {
::v-deep .data-list .el-form-item__error{
position: static;
}
.red{
color: red;
}
</style>
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