Skip to content

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

bugs

parent e4d9dbbc
Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 521 deletions
src/views/ecw/offer/components/Commossion.vue
View file @ 45296f86
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</el-form> </el-form>
<div v-if="!form.applyStatus"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
<div v-else> <div v-else>
......
src/views/ecw/offer/components/SpecialDiscount.vue
View file @ 45296f86
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">审批流程</div>
<work-flow xmlkey="sheet_sale" v-model="ccIdArr" /> <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
<div v-if="!form.applyStatus"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
<div v-else> <div v-else>
......
src/views/ecw/order/components/Release.vue
View file @ 45296f86
...@@ -106,6 +106,7 @@ import {createPick, getReleaseInfo} from '@/api/ecw/orderCargoControl' ...@@ -106,6 +106,7 @@ import {createPick, getReleaseInfo} from '@/api/ecw/orderCargoControl'
import AreaCodeSelector from '@/components/AreaCodeSelector' import AreaCodeSelector from '@/components/AreaCodeSelector'
import SendSmsCode from '@/views/ecw/order/components/SendSmsCode' import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
import NeedKnow from '@/components/NeedKnow' import NeedKnow from '@/components/NeedKnow'
import Decimal from 'decimal.js'
export default { export default {
props:{ props:{
orderId: [String, Number] orderId: [String, Number]
...@@ -125,6 +126,12 @@ export default { ...@@ -125,6 +126,12 @@ export default {
agreement: false, // 是否同意协议 agreement: false, // 是否同意协议
} }
}, },
watch:{
'formData.pickNum'(pickNum){
this.$set(this.formData, 'pickVolume', Decimal(this.detail.sumVolume).mul(pickNum).div(this.detail.sumNum).toFixed(2))
this.$set(this.formData, 'pickWeight', Decimal(this.detail.sumWeight).mul(pickNum).div(this.detail.sumNum).toFixed(2))
}
},
computed:{ computed:{
rules(){ rules(){
return { return {
...@@ -161,8 +168,8 @@ export default { ...@@ -161,8 +168,8 @@ export default {
}) })
}, },
closeDialog(){ closeDialog(){
this.show = false this.show = false
this.$emit('close'); this.$emit('close')
}, },
submit(){ submit(){
this.$refs.form.validate(valid => { this.$refs.form.validate(valid => {
......
src/views/ecw/order/components/TransferCargo.vue
View file @ 45296f86
...@@ -137,6 +137,9 @@ export default { ...@@ -137,6 +137,9 @@ export default {
loadData(){ loadData(){
getReleaseInfo(this.orderId).then(res => this.detail = res.data) getReleaseInfo(this.orderId).then(res => this.detail = res.data)
seasoningCondimentsSelect({orderId: this.orderId}).then(res => { seasoningCondimentsSelect({orderId: this.orderId}).then(res => {
res.data.forEach(item => {
item.releaseNum = item.sumNum - item.releaseNum
})
this.orders = res.data this.orders = res.data
}) })
}, },
......
src/views/ecw/order/detail.vue
View file @ 45296f86
...@@ -74,10 +74,10 @@ ...@@ -74,10 +74,10 @@
{{order.sumQuantity}}{{$t('个')}} {{order.sumQuantity}}{{$t('个')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('收款数据')"> <el-descriptions-item :label="$t('收款数据')">
{{order.entryNum}}{{$t('箱')}} {{order.sumNum}}{{$t('箱')}}
{{order.entryWeight}}Kg {{order.vweight}}Kg
{{order.entryVolume}}m³ {{order.wvolume}}m³
{{order.entryQuantity}}{{$t('个')}} {{order.sumQuantity}}{{$t('个')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('入仓类型')"> <el-descriptions-item :label="$t('入仓类型')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" /> <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
......
src/views/ecw/order/index.vue
View file @ 45296f86
...@@ -155,186 +155,193 @@ ...@@ -155,186 +155,193 @@
{{scope.row.statusMsg}} {{scope.row.statusMsg}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<!--操作相关的--> <!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html -->
<el-dropdown> <template v-if="scope.row.status == 88">
<el-button type="text">{{$t('操作')}}</el-button> <el-button type="text" @click.native="oprateOrder(scope.row.orderId, 'deleteOrder')" v-hasPermi="['ecw:order:delete']" >{{$t('删除')}}</el-button>
<el-dropdown-menu slot="dropdown"> </template>
<!-- 编辑 --> <template v-else>
<template v-if=" <!--操作相关的-->
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) && <el-dropdown>
exclude(scope.row.status, [20,21]) && <el-button type="text">{{$t('操作')}}</el-button>
exclude(scope.row.shipmentState, [320,322,323]) && <el-dropdown-menu slot="dropdown">
(exclude(scope.row.inWarehouseState, [ 212, 218, 213, 214, 215]) && exclude(scope.row.status, [5,8]) ) <!-- 编辑 -->
"> <template v-if="
<el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:update']" >{{$t('编辑')}}</el-dropdown-item> exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
</template> exclude(scope.row.status, [20,21]) &&
exclude(scope.row.shipmentState, [320,322,323]) &&
<!-- 删除 --> (exclude(scope.row.inWarehouseState, [ 212, 218, 213, 214, 215]) && exclude(scope.row.status, [5,8]) )
<template v-if="include(scope.row.status, [0,2])"> ">
<el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'deleteOrder')" v-hasPermi="['ecw:order:delete']" >{{$t('删除')}}</el-dropdown-item> <el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:update']" >{{$t('编辑')}}</el-dropdown-item>
</template> </template>
<!-- 取消 --> <!-- 删除 -->
<template v-if="include(scope.row.status, [2])"> <template v-if="include(scope.row.status, [0,2])">
<el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'cancelOrder')" >{{$t('取消订单')}}</el-dropdown-item> <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'deleteOrder')" v-hasPermi="['ecw:order:delete']" >{{$t('删除')}}</el-dropdown-item>
</template> </template>
<!-- 恢复 --> <!-- 取消 -->
<!-- <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'recoveryOrder')" >{{$t('恢复订单')}}</el-dropdown-item>--> <template v-if="include(scope.row.status, [2])">
<el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'cancelOrder')" >{{$t('取消订单')}}</el-dropdown-item>
<!-- 费用申请 --> </template>
<template v-if="
exclude(scope.row.status, [0]) && <!-- 恢复 -->
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) && <!-- <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'recoveryOrder')" >{{$t('恢复订单')}}</el-dropdown-item>-->
exclude(scope.row.shipmentState, [320,322,323])
"> <!-- 费用申请 -->
<el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId" >{{$t('费用申请')}}</el-dropdown-item> <template v-if="
</template> exclude(scope.row.status, [0]) &&
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
<!-- 特需,互斥，关联 --> exclude(scope.row.shipmentState, [320,322,323])
<template v-if=" ">
exclude(scope.row.status, [0]) && <el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId" >{{$t('费用申请')}}</el-dropdown-item>
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) && </template>
exclude(scope.row.inWarehouseState, [204])
"> <!-- 特需,互斥，关联 -->
<el-dropdown-item @click.native="orderId = scope.row.orderId;orderNo = scope.row.orderNo;isShow = true" >{{$t('特需')}}</el-dropdown-item> <template v-if="
<el-dropdown-item @click.native="$router.push(`/order/associated-order/${scope.row.orderId}`)" >{{$t('关联')}}</el-dropdown-item> exclude(scope.row.status, [0]) &&
<el-dropdown-item @click.native="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >{{$t('互斥')}}</el-dropdown-item> exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
</template> exclude(scope.row.inWarehouseState, [204])
">
<!-- 特价 --> <el-dropdown-item @click.native="orderId = scope.row.orderId;orderNo = scope.row.orderNo;isShow = true" >{{$t('特需')}}</el-dropdown-item>
<template v-if=" <el-dropdown-item @click.native="$router.push(`/order/associated-order/${scope.row.orderId}`)" >{{$t('关联')}}</el-dropdown-item>
exclude(scope.row.status, [0]) && <el-dropdown-item @click.native="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >{{$t('互斥')}}</el-dropdown-item>
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) && </template>
exclude(scope.row.shipmentState, [320,322,323])
"> <!-- 特价 -->
<el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item> <template v-if="
</template> exclude(scope.row.status, [0]) &&
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
<!-- 确认提货 --> exclude(scope.row.shipmentState, [320,322,323])
<template v-if=" ">
exclude(scope.row.status, [0,2]) && <el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item>
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) && </template>
exclude(scope.row.shipmentState, [320,322,323])
<!-- 确认提货 -->
<template v-if="
exclude(scope.row.status, [0,2]) &&
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
exclude(scope.row.shipmentState, [320,322,323])
">
<el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" >{{$t('确认提货')}}</el-dropdown-item>
</template>
<!-- 合单，拆单 -->
<template v-if="
exclude(scope.row.status, [0,2]) &&
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
scope.row.shipmentState < 320
">
<el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)" >{{$t('拆单申请')}}</el-dropdown-item>
</template>
<!-- 合单日志，提货日志 -->
<template v-if="scope.row.status > 2">
<el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
<el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
<el-divider direction="vertical"></el-divider>
<!--仓库相关的-->
<el-dropdown>
<el-button type="text">{{$t('仓库')}}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 入仓操作 -->
<template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1])">
<el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓操作')}}</el-dropdown-item>
</template>
<!-- 入仓补充 -->
<template v-if="
include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
scope.row.abnormalState != 1 &&
include(scope.row.status, [2,3,5,10,9,8])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
</template>
<!-- 入仓修改 -->
<template v-if="
include(scope.row.inWarehouseState, [202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
</template>
<!-- 退仓 -->
<template v-if="
include(scope.row.inWarehouseState, [201, 202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216]) &&
exclude(scope.row.abnormalState, [1])
">
<el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
</template>
<!-- 调仓 -->
<template v-if="
include(scope.row.inWarehouseState, [201, 202, 208, 202, 210, 202, 211, 202, 213, 215, 216])
">
<el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
</template>
<!-- 取消调仓 -->
<!-- <template v-if="
include(scope.row.inWarehouseState, [212,213,214])
">
<el-dropdown-item @click.native="$alert('// TODO')" >{{$t('取消调仓')}}</el-dropdown-item>
</template> -->
<!-- 调拨出仓 -->
<template v-if="
include(scope.row.inWarehouseState, [213])
">
<el-dropdown-item @click.native="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/' + 1 })" >{{$t('调拨出仓')}}</el-dropdown-item>
</template>
<!-- 调拨到仓 -->
<template v-if="
include(scope.row.inWarehouseState, [214])
">
<el-dropdown-item @click.native="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/' + 2 })" >{{$t('调拨到仓')}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
<el-divider direction="vertical"></el-divider>
<!--打印相关的-->
<el-dropdown>
<el-button type="text">{{$t('打印')}}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 打印标签 -->
<template v-if="
exclude(scope.row.status, [0]) &&
exclude(scope.row.shipmentState, [320,322,323]) &&
exclude(scope.row.abnormalState, [5,6,7,8])
"> ">
<el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" >{{$t('确认提货')}}</el-dropdown-item> <el-dropdown-item @click.native="printTagOrderId=scope.row.orderId">{{$t('打印标签')}}</el-dropdown-item>
</template> </template>
<!-- 合单，拆单 --> <!-- 打印入仓单 -->
<template v-if=" <template v-if="
exclude(scope.row.status, [0,2]) && exclude(scope.row.status, [0, 2]) &&
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) && exclude(scope.row.shipmentState, [320,322,323]) &&
scope.row.shipmentState < 320 exclude(scope.row.abnormalState, [1, 5,6,7,8])
">
<el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)" >{{$t('拆单申请')}}</el-dropdown-item>
</template>
<!-- 合单日志，提货日志 -->
<template v-if="scope.row.status > 2">
<el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
<el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
<el-divider direction="vertical"></el-divider>
<!--仓库相关的-->
<el-dropdown>
<el-button type="text">{{$t('仓库')}}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 入仓操作 -->
<template v-if="include(scope.row.status, [0,2]) || include(scope.row.abnormalState, [1])">
<el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓操作')}}</el-dropdown-item>
</template>
<!-- 入仓补充 -->
<template v-if="
include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
scope.row.abnormalState != 1 &&
include(scope.row.status, [2,3,5,10,9,8])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
</template>
<!-- 入仓修改 -->
<template v-if="
include(scope.row.inWarehouseState, [202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
</template>
<!-- 退仓 -->
<template v-if="
include(scope.row.inWarehouseState, [201, 202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216]) &&
exclude(scope.row.abnormalState, [1])
">
<el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
</template>
<!-- 调仓 -->
<template v-if="
include(scope.row.inWarehouseState, [201, 202, 208, 202, 210, 202, 211, 202, 213, 215, 216])
">
<el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
</template>
<!-- 取消调仓 -->
<!-- <template v-if="
include(scope.row.inWarehouseState, [212,213,214])
">
<el-dropdown-item @click.native="$alert('// TODO')" >{{$t('取消调仓')}}</el-dropdown-item>
</template> -->
<!-- 调拨出仓 -->
<template v-if="
include(scope.row.inWarehouseState, [213])
">
<el-dropdown-item @click.native="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/' + 1 })" >{{$t('调拨出仓')}}</el-dropdown-item>
</template>
<!-- 调拨到仓 -->
<template v-if="
include(scope.row.inWarehouseState, [214])
"> ">
<el-dropdown-item @click.native="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/' + 2 })" >{{$t('调拨到仓')}}</el-dropdown-item> <el-dropdown-item @click.native="printWarehouseReceiptOrderId=scope.row.orderId">{{$t('打印入仓单')}}</el-dropdown-item>
</template> </template>
</el-dropdown-menu> <!-- 打印提单 -->
</el-dropdown> <el-dropdown-item @click.native="printLadingBillOrderId=scope.row.orderId" :disabled="!scope.row.tidanNo">{{$t('打印提单')}}</el-dropdown-item>
</el-dropdown-menu>
<el-divider direction="vertical"></el-divider> </el-dropdown>
</template>
<!--打印相关的-->
<el-dropdown>
<el-button type="text">{{$t('打印')}}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 打印标签 -->
<template v-if="
exclude(scope.row.status, [0]) &&
exclude(scope.row.shipmentState, [320,322,323]) &&
exclude(scope.row.abnormalState, [5,6,7,8])
">
<el-dropdown-item @click.native="printTagOrderId=scope.row.orderId">{{$t('打印标签')}}</el-dropdown-item>
</template>
<!-- 打印入仓单 -->
<template v-if="
exclude(scope.row.status, [0, 2]) &&
exclude(scope.row.shipmentState, [320,322,323]) &&
exclude(scope.row.abnormalState, [1, 5,6,7,8])
">
<el-dropdown-item @click.native="printWarehouseReceiptOrderId=scope.row.orderId">{{$t('打印入仓单')}}</el-dropdown-item>
</template>
<!-- 打印提单 -->
<el-dropdown-item @click.native="printLadingBillOrderId=scope.row.orderId" :disabled="!scope.row.tidanNo">{{$t('打印提单')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
......
src/views/ecw/order/special/Commission.vue
View file @ 45296f86
...@@ -22,18 +22,18 @@ ...@@ -22,18 +22,18 @@
<el-row v-if="!orderItem.charging"> <el-row v-if="!orderItem.charging">
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('运费')"> <el-form-item :label="$t('运费')">
{{form.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }} {{orderItem.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('清关费')"> <el-form-item :label="$t('清关费')">
{{form.oneClearanceFreight}} {{ currencyMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }} {{orderItem.oneClearanceFreight}} {{ currencyMap[orderItem.clearanceFreightCurrency] }} / {{ unitMap[orderItem.clearanceFreightVolume] }}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item :label="$t('全包价')" v-if="orderItem.charging"> <el-form-item :label="$t('全包价')" v-if="orderItem.charging">
{{orderItem.oneSeaFreight}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }} {{orderItem.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item> </el-form-item>
<el-form-item :label="$t('佣金类型')" prop="commissionType"> <el-form-item :label="$t('佣金类型')" prop="commissionType">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<!-- 明佣+暗佣才显示 --> <!-- 明佣+暗佣才显示 -->
<el-form-item label="暗佣佣金" v-if="form.commissionType == 3"> <el-form-item label="暗佣佣金" v-if="form.commissionType == 3">
<el-input v-model.number="form.shadeCommissionAmount" placeholder="" class="w-100"></el-input> <el-input v-model.number="form.shadeCommissionAmount" placeholder="" class="w-100"></el-input>
{{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
</el-form-item> </el-form-item>
<!-- 无佣金不显示 --> <!-- 无佣金不显示 -->
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<!-- 明佣+暗佣显示 --> <!-- 明佣+暗佣显示 -->
<div v-if="form.commissionType == 3"> <div v-if="form.commissionType == 3">
{{$t('成本价')}}：{{form.freight}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }} {{$t('成本价')}}：{{Decimal(form.freight).minus(form.shadeCommissionAmount)}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
</div> </div>
<!-- 暗佣显示 --> <!-- 暗佣显示 -->
...@@ -70,14 +70,14 @@ ...@@ -70,14 +70,14 @@
<el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">{{$t('去设置')}}</el-link> <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">{{$t('去设置')}}</el-link>
</div> </div>
<div v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{form.freight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div> <div v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{Decimal(form.freight).plus(form.lightCommissionAmount) }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
<div v-if="form.commissionType == 3">{{$t('实际佣金返点')}}：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div> <div v-if="form.commissionType == 3">{{$t('实际佣金返点')}}：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
</div> </div>
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">审批流程</div>
<work-flow xmlkey="commission_config" v-model="ccIdArr" /> <work-flow xmlkey="commission_config" v-model="ccIdArr" />
<div v-if="!form.applyStatus"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
<div v-else> <div v-else>
...@@ -96,6 +96,7 @@ import { getCurrencyList } from '@/api/ecw/currency' ...@@ -96,6 +96,7 @@ import { getCurrencyList } from '@/api/ecw/currency'
import { getProductType } from '@/api/ecw/productType' import { getProductType } from '@/api/ecw/productType'
import WorkFlow from '@/components/WorkFlow' import WorkFlow from '@/components/WorkFlow'
import {getDarkReturnCommission} from '@/api/ecw/customerCommission' import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
import Decimal from 'decimal.js'
export default { export default {
name: "OrderSpecialCommission", name: "OrderSpecialCommission",
...@@ -158,6 +159,9 @@ export default { ...@@ -158,6 +159,9 @@ export default {
} }
}, },
methods: { methods: {
Decimal(n){
return new Decimal(n)
},
handleSubmit(){ handleSubmit(){
this.$refs.form.validate().then(res => { this.$refs.form.validate().then(res => {
createOrderSpecial(Object.assign({}, this.form, {applyType: this.applyType})).then(res => { createOrderSpecial(Object.assign({}, this.form, {applyType: this.applyType})).then(res => {
......
src/views/ecw/order/special/Discount.vue
View file @ 45296f86
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">审批流程</div>
<work-flow xmlkey="special_apply" v-model="ccIdArr" /> <work-flow xmlkey="special_apply" v-model="ccIdArr" />
<div v-if="!form.applyStatus"> <div v-if="form.applyStatus != 1">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
<div v-else> <div v-else>
......
src/views/ecw/order/special/light.vue deleted 100644 → 0
View file @ e4d9dbbc
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">{{$t('申请泡货优惠')}}-{{queryParams.orderNo||''}}</div>
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row >
<el-form-item :label="$t('原泡货标准:')" label-width="150px">
<span>{{queryParams.orgVWeight}}kg/cbm</span>
</el-form-item>
</el-row>
<el-row :span="8" >
<el-form-item :label="$t('现泡货申请标准:')" size="medium" label-width="150px" required>
<el-input style="width: 100px;" type="text" v-model="queryParams.vweight" />
<span style="margin-left: 10px;">kg/cbm</span>
</el-form-item>
</el-row>
<el-row :span="8">
<el-form-item :label="$t('备注:')" size="medium" label-width="150px">
<el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" />
</el-form-item>
</el-row>
</el-form>
</el-card>
<work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn">
<el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">{{$t('提交')}}</el-button>
<el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div>
<el-dialog
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">{{$t('申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？')}}</span>
<div class="cancel_content">
<span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
import WorkFlow from '@/components/WorkFlow'
import {getOrderSpecial,createOrderSpecial,cancelOrderSpecial} from '@/api/ecw/order'
export default {
name: "specialLight",
components: {
WorkFlow
},
props: {
orderId: [String, Number]
},
data() {
return {
reason:'',
dialogVisible:false,
loading:false,
queryParams:{
orderId:7,
lang:0
},
selectedUsers:[],
orderData:{},
};
},
created() {
if (this.orderId) {
this.queryParams.orderId = this.orderId
this.getOrderSpecialData()
}
// this.getList()
},
computed:{
getDictData(){
return (type, value) => getDictData(type, value) || {}
},
getDictDatas(){
return getDictDatas
}
},
methods: {
getOrderSpecialData(){
getOrderSpecial(this.queryParams.orderId,5).then(r => {
this.queryParams = r.data
})
},
submitForm(){
this.queryParams.applyType = 5
this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error(this.$t("请输入取消原因"));
return
}
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
}
}
</script>
<style scoped>
.card-title{
font-size: 18px;
font-weight: bold;
margin-top: 10px;
}
.card-info{
font-size: 16px;
}
.card{
margin-top: 20px;
}
.btn-header{
width: 90%;
display: flex;
align-items: center;
justify-content: space-between;
margin: 20px 0;
}
.red{
color:#ff3430;
font-size: 15px;
}
.footer_btn{
padding-bottom: 60px;
}
.cancel_notice{
font-size: 16px;
font-weight: 600;
}
.cancel_content{
display: flex;
align-items: center;
padding-top: 20px;
}
.cancel_content span{
width: 100px;
}
</style>
src/views/ecw/order/special/weight.vue deleted 100644 → 0
View file @ e4d9dbbc
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">{{$t('申请重货优惠')}}-{{queryParams.orderNo||''}}</div>
<el-form :model="queryParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row >
<el-form-item :label="$t('原重货标准:')" label-width="150px">
<span>{{queryParams.orgWVolume}}kg/cbm</span>
</el-form-item>
</el-row>
<el-row :span="8" >
<el-form-item :label="$t('现重货申请标准:')" size="medium" label-width="150px" required>
<el-input style="width: 100px;" type="text" v-model="queryParams.wvolume" />
<span style="margin-left: 10px;">kg/cbm</span>
</el-form-item>
</el-row>
<el-row :span="8">
<el-form-item :label="$t('备注:')" size="medium" label-width="150px">
<el-input style="width: 500px;" type="textarea" v-model="queryParams.remarks" />
</el-form-item>
</el-row>
</el-form>
</el-card>
<work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn">
<el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
<el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div>
<el-dialog
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">{{$t('申请重货优惠正在审核中，你确定取消申请重货优惠吗？')}}</span>
<div class="cancel_content">
<span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
import WorkFlow from '@/components/WorkFlow'
import {getOrderSpecial,createOrderSpecial,cancelOrderSpecial} from '@/api/ecw/order'
export default {
name: "specialWeight",
components: {
WorkFlow
},
props: {
orderId: [String, Number]
},
data() {
return {
reason:'',
dialogVisible:false,
loading:false,
queryParams:{
orderId:7,
lang:0
},
selectedUsers:[],
orderData:{}
};
},
created() {
if (this.orderId) {
this.queryParams.orderId = this.orderId
this.getOrderSpecialData()
}
// this.getList()
},
computed:{
getDictData(){
return (type, value) => getDictData(type, value) || {}
},
getDictDatas(){
return getDictDatas
}
},
methods: {
/** 查询列表 */
getOrderSpecialData(){
getOrderSpecial(this.queryParams.orderId,'4').then(r => {
this.queryParams = r.data
})
},
submitForm(){
this.queryParams.applyType = 4
this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error(this.$t("请输入取消原因"));
return
}
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
}
}
</script>
<style scoped>
.card-title{
font-size: 18px;
font-weight: bold;
margin-top: 10px;
}
.card-info{
font-size: 16px;
}
.card{
margin-top: 20px;
}
.btn-header{
width: 90%;
display: flex;
align-items: center;
justify-content: space-between;
margin: 20px 0;
}
.red{
color:#ff3430;
font-size: 15px;
}
.footer_btn{
padding-bottom: 60px;
}
.cancel_notice{
font-size: 16px;
font-weight: 600;
}
.cancel_content{
display: flex;
align-items: center;
padding-top: 20px;
}
.cancel_content span{
width: 100px;
}
</style>
src/views/ecw/productPrice/edit.vue
View file @ 45296f86
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</span> </span>
</div> </div>
<el-form-item :label="$t('单价模式')" prop="priceType"> <el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" defaultable /> <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter="number" defaultable />
</el-form-item> </el-form-item>
<!--阶梯订单--> <!--阶梯订单-->
<template v-if="form.stepPrice==1" > <template v-if="form.stepPrice==1" >
...@@ -474,6 +474,10 @@ export default { ...@@ -474,6 +474,10 @@ export default {
// 添加的提交 // 添加的提交
data.productId = this.product.id; data.productId = this.product.id;
data.lineChannelList = this.selectedRoutes data.lineChannelList = this.selectedRoutes
if((this.form.priceType == 0 && !this.form.transportPrice) || (this.form.priceType == 1 && !this.form.allPrice)){
return this.$message.error('运费/全包价不能为0')
}
createProductPrice(data).then(response => { createProductPrice(data).then(response => {
this.$modal.msgSuccess(this.$t("请求成功")); this.$modal.msgSuccess(this.$t("请求成功"));
this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString()) this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString())
......
src/views/ecw/supplier/edit.vue
View file @ 45296f86
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div> <div>
<el-form-item :label="$t('供应商类别')" prop="companyType"> <el-form-item :label="$t('供应商类别')" prop="companyType">
<dict-selector v-model="formData.companyType" type="company_type" multiple /> <dict-selector v-model="formData.companyTypeArr" type="company_type" multiple />
</el-form-item> </el-form-item>
<el-form-item :label="$t('合作类型')" prop="cooperationType"> <el-form-item :label="$t('合作类型')" prop="cooperationType">
<dict-selector v-model="formData.cooperationType" type="cooperation_type" /> <dict-selector v-model="formData.cooperationType" type="cooperation_type" />
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<el-form-item <el-form-item
class="mb-0 mr-0" class="mb-0 mr-0"
:prop="`contactList.${scope.$index}.name`" :prop="`contactList.${scope.$index}.name`"
:rules="{required: true, message: $t('不能为空'), trigger: 'blur'}" :rules="{required: true, message: $t('联系人名称不能为空'), trigger: 'blur'}"
> >
<el-input v-model="scope.row.name"></el-input> <el-input v-model="scope.row.name"></el-input>
</el-form-item> </el-form-item>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<el-form-item <el-form-item
class="mb-0 mr-0" class="mb-0 mr-0"
:prop="`contactList.${scope.$index}.phone`" :prop="`contactList.${scope.$index}.phone`"
:rules="{required: true, message: $t('不能为空'), trigger: 'blur'}" :rules="{required: true, message: $t('联系人电话不能为空'), trigger: 'blur'}"
> >
<el-input v-model="scope.row.phone"></el-input> <el-input v-model="scope.row.phone"></el-input>
</el-form-item> </el-form-item>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<el-form-item <el-form-item
class="mb-0 mr-0" class="mb-0 mr-0"
:prop="`bankList.${scope.$index}.accountName`" :prop="`bankList.${scope.$index}.accountName`"
:rules="{required: true, message: $t('不能为空'), trigger: 'blur'}" :rules="{required: true, message: $t('银行账户名称不能为空'), trigger: 'blur'}"
> >
<el-input v-model="scope.row.accountName" placeholder=""></el-input> <el-input v-model="scope.row.accountName" placeholder=""></el-input>
</el-form-item> </el-form-item>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<el-form-item <el-form-item
class="mb-0 mr-0" class="mb-0 mr-0"
:prop="`bankList.${scope.$index}.currency`" :prop="`bankList.${scope.$index}.currency`"
:rules="{required: true, message: $t('不能为空'), trigger: 'blur'}" :rules="{required: true, message: $t('币别不能为空'), trigger: 'blur'}"
> >
<selector :options="currencyList" v-model="scope.row.currency" value-field="id" :label-field="'title' + $l()"></selector> <selector :options="currencyList" v-model="scope.row.currency" value-field="id" :label-field="'title' + $l()"></selector>
</el-form-item> </el-form-item>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<el-form-item <el-form-item
class="mb-0 mr-0" class="mb-0 mr-0"
:prop="`bankList.${scope.$index}.bankName`" :prop="`bankList.${scope.$index}.bankName`"
:rules="{required: true, message: $t('不能为空'), trigger: 'blur'}" :rules="{required: true, message: $t('银行名称不能为空'), trigger: 'blur'}"
> >
<el-input v-model="scope.row.bankName"></el-input> <el-input v-model="scope.row.bankName"></el-input>
</el-form-item> </el-form-item>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<el-form-item <el-form-item
class="mb-0 mr-0" class="mb-0 mr-0"
:prop="`bankList.${scope.$index}.bankAccount`" :prop="`bankList.${scope.$index}.bankAccount`"
:rules="{required: true, message: $t('不能为空'), trigger: 'blur'}" :rules="{required: true, message: $t('银行账户不能为空'), trigger: 'blur'}"
> >
<el-input v-model="scope.row.bankAccount"></el-input> <el-input v-model="scope.row.bankAccount"></el-input>
</el-form-item> </el-form-item>
...@@ -226,7 +226,7 @@ export default { ...@@ -226,7 +226,7 @@ export default {
address: "", address: "",
remark: undefined, remark: undefined,
field110: undefined, field110: undefined,
companyType: [], companyTypeArr: [],
cooperationType: undefined, cooperationType: undefined,
license: null, license: null,
contract: null, contract: null,
...@@ -280,6 +280,9 @@ export default { ...@@ -280,6 +280,9 @@ export default {
this.cityList = item.children || [] this.cityList = item.children || []
} }
}) })
},
'formData.companyTypeArr'(val){
this.$set(this.formData, 'companyType', val.join(","))
} }
}, },
created() { created() {
...@@ -338,9 +341,9 @@ export default { ...@@ -338,9 +341,9 @@ export default {
this.$set(this.formData, type, val) this.$set(this.formData, type, val)
}, },
submitForm() { submitForm() {
this.$refs["elForm"].validate(valid => { this.$refs["elForm"].validate((valid, errors) => {
if (!valid) { if (!valid) {
return; return this.$showFormValidateErrors(errors)
} }
let data = Object.assign({}, this.formData) let data = Object.assign({}, this.formData)
......
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