Skip to content

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

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents ba3d1434 6653bd1e
Hide whitespace changes
Inline Side-by-side
Showing with 620 additions and 542 deletions
src/views/ecw/offer/detail.vue
View file @ dc4dfb23
......@@ -18,14 +18,14 @@
</div>
<div>
<div class="title-font">
<label>报价单所属：发件人</label>
<label>报价单所属：{{list.relation?list.relation==1?'发货人':'收货人':'发货人'}}</label>
</div>
<el-descriptions :column="3" border class="card">
<el-descriptions-item label="发货人:">
{{consigneeData.length>0?consigneeData[0].name||'无':'无'}}
{{consigneeData.length>0?consigneeData[0].customerName||'无':'无'}}
</el-descriptions-item>
<el-descriptions-item label="手机号：">
{{consigneeData.length>0?consigneeData[0].defaultContactPhone||'无':'无'}}
{{consigneeData.length>0?(consigneeData[0].areaCode+consigneeData[0].phoneNew)||'无':'无'}}
</el-descriptions-item>
<el-descriptions-item label="联系地址：">
{{consigneeData.length>0?consigneeData[0].address||'无':'无'}}
......@@ -37,16 +37,16 @@
{{consigneeData.length>0?consigneeData[0].company||'无':'无'}}
</el-descriptions-item>
<el-descriptions-item label="社交软件：">
{{consigneeData.length>0?consigneeData[0].defaultSocial||'无':'无'+' '+consigneeData.length>0?consigneeData[0].defaultSocialNumber||'':''}}
{{consigneeData.length>0?consigneeData[0].social||'无':'无'+' '+consigneeData.length>0?consigneeData[0].socialNumber||'':''}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="3" border class="card">
<el-descriptions-item label="收货人:">
{{consigneeData.length>1?consigneeData[1].name||'无':'无'}}
{{consigneeData.length>1?consigneeData[1].customerName||'无':'无'}}
</el-descriptions-item>
<el-descriptions-item label="手机号：">
{{consigneeData.length>1?consigneeData[1].defaultContactPhone||'无':'无'}}
{{consigneeData.length>1?(consigneeData[1].areaCode+consigneeData[1].customerName)||'无':'无'}}
</el-descriptions-item>
<el-descriptions-item label="联系地址：">
{{consigneeData.length>1?consigneeData[1].address||'无':'无'}}
......@@ -58,14 +58,30 @@
{{consigneeData.length>1?consigneeData[1].company||'无':'无'}}
</el-descriptions-item>
<el-descriptions-item label="社交软件：">
{{consigneeData.length>1?consigneeData[1].defaultSocial||'无':'无'+' '+consigneeData.length>1?consigneeData[1].defaultSocialNumber||'':''}}
{{consigneeData.length>1?consigneeData[1].social||'无':'无'+' '+consigneeData.length>1?consigneeData[1].socialNumber||'':''}}
</el-descriptions-item>
</el-descriptions>
<div class="title-font">
<label>始发地：{{list.departureName||'无'}}</label>
<label>目的地：{{list.objectiveName||'无'}}</label>
</div>
<el-descriptions :column="4" class="card">
<el-descriptions-item label="*运输方式">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="list.transportId" />
</el-descriptions-item>
<el-descriptions-item label="*出货渠道">
{{channelName}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4" class="card">
<el-descriptions-item label="*始发城市">
{{getCity(list.departureId)}}
</el-descriptions-item>
<el-descriptions-item label="*目的城市">
{{getCity(list.objectiveId)}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4" class="card">
<el-descriptions-item label="*线路">
{{getRouterNameById(list.lineId)}}
</el-descriptions-item>
</el-descriptions>
</div>
</el-card>
......@@ -78,9 +94,9 @@
{{scope.$index + 1}}
</template>
</el-table-column>
<el-table-column label="商品类型" align="center" prop="goodsType" />
<el-table-column label="中文名" align="center" prop="prodTitleZh" />
<el-table-column label="英文名" align="center" prop="prodTitleEn" />
<!-- <el-table-column label="商品类型" align="center" prop="goodsType" /> -->
<el-table-column label="中文品名" align="center" prop="prodTitleZh" />
<el-table-column label="英文品名" align="center" prop="prodTitleEn" />
<el-table-column label="品牌" width="100px">
<template slot-scope="scope">
<dict-tag :value="scope.row.brand" :type="DICT_TYPE.ECW_IS_BRAND" defaultable />
......@@ -95,13 +111,9 @@
<el-table-column label="箱规(m)" width="120px" prop="boxGauge" />
<el-table-column label="体积(m³)" width="100px" prop="volume" />
<el-table-column label="重量(kg)" width="100px" prop="weight" />
<el-table-column label="货值(RMB)" width="100px" prop="worth">
<template slot-scope="scope">
{{scope.row.worth+scope.row.worthCurrency}}
</template>
</el-table-column>
<el-table-column label="货值(RMB)" width="100px" prop="worth" />
<el-table-column label="商品特性" width="200px" prop="prodAttrName" />
<el-table-column label="运输方式" width="100px">
<!-- <el-table-column label="运输方式" width="100px">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId" />
</template>
......@@ -111,10 +123,17 @@
<template slot-scope="scope">
{{getRouterNameById(scope.row.lineId)}}
</template>
</el-table-column>
<el-table-column label="运费">
</el-table-column> -->
<el-table-column label="是否预付">
<template slot-scope="scope">
{{scope.row.isPayAdvance==1?'预付':'到付'}}
</template>
</el-table-column>
<el-table-column label="运费" width="200px">
<template slot-scope="scope">
{{'运费'+scope.row.seaFreight+scope.row.seaFreightCurrency+'/'+ scope.row.seaFreightVolume+' 清关费'+scope.row.clearanceFreight+scope.row.clearanceFreightCurrency+'/'+ scope.row.clearanceFreightVolume}}
<div>{{'运费:'+scope.row.seaFreight}}{{currentcyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</div>
<div>{{'清关费:'+scope.row.clearanceFreight}}{{currentcyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</div>
</template>
</el-table-column>
</el-table>
......@@ -122,16 +141,25 @@
</el-card>
<el-card class="card">
<div slot="header" class="card-title">费用小计</div>
<el-descriptions border class="card">
<el-descriptions border class="card" :column="5">
<el-descriptions-item label="总件数:">
{{list.estCostVO?list.estCostVO.totalNum||'0':0}}
</el-descriptions-item>
<el-descriptions-item label="总货值：">
<el-descriptions-item label="总体积：">
{{list.estCostVO?(list.estCostVO.totalVolume+'m³')||'0':0}}
</el-descriptions-item>
<el-descriptions-item label="总重量：">
{{list.estCostVO?(list.estCostVO.totalWeight+'kg')||'0':0}}
</el-descriptions-item>
<el-descriptions-item label="总数量：">
{{list.estCostVO?list.estCostVO.totalQuantity||'0':0}}
</el-descriptions-item>
<el-descriptions-item label="总货值(RMB)：">
{{list.estCostVO?list.estCostVO.totalWorth||'0':0}}
</el-descriptions-item>
<el-descriptions-item label="报价费：">
<!-- <el-descriptions-item label="报价费：">
{{list.estCostVO?list.estCostVO.insuranceFee||'0':0}}
</el-descriptions-item>
</el-descriptions-item> -->
</el-descriptions>
<!-- <el-descriptions border class="card">
<el-descriptions-item label="佣金类型" :span="2" class="card">
......@@ -139,74 +167,74 @@
</el-descriptions-item>
</el-descriptions> -->
</el-card>
<el-card class="card" v-for="(item, i) in list.transportRespVOList">
<el-card class="card">
<div slot="header" class="card-title">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId"></dict-tag>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="list.transportId"></dict-tag>
</div>
<div class="line">
<el-descriptions v-for="(lineItem,k) in item.lineData">
<el-descriptions-item :label="[3,4].indexOf(item.transportId)>-1?('空运路线'+(k+1)):('海运路线'+(k+1))">
{{getRouterNameById(lineItem)}}
<el-descriptions>
<el-descriptions-item :label="[3,4].indexOf(list.transportId)>-1?'空运路线':'海运路线'">
{{getRouterNameById(list.lineId)}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-for="(channelItem,k) in item.channelData">
<el-descriptions-item :label="出货渠道+key">
{{channelItem.nameZh}}
<el-descriptions>
<el-descriptions-item :label="$t('出货渠道')">
{{channelName}}
</el-descriptions-item>
</el-descriptions>
</div>
<el-descriptions class="card" v-if="[2,3,4].indexOf(item.transportId) > -1">
<el-descriptions class="card" v-if="[2,3,4].indexOf(list.transportId) > -1">
<el-descriptions-item label="是否双清">
<dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="item.doubleClear"></dict-tag>
<dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="list.doubleClear"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="[3,4].indexOf(item.transportId) > -1">
<el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
<el-descriptions-item label="航空公司">
{{item.airlineCompany}}
{{list.airlineCompany}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="item.transportId==2">
<el-descriptions v-if="list.transportId==2">
<el-descriptions-item label="船公司">
{{item.shippingCompany}}
{{list.shippingCompany}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="[2,3,4].indexOf(item.transportId) > -1">
<el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
<el-descriptions-item label="清关证书">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="item.customsClearCert"></dict-tag>
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="list.customsClearCert"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="[2,3,4].indexOf(item.transportId) > -1">
<el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
<el-descriptions-item label="清关证书备注">
{{item.remarks}}
{{list.remarks}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions class="card" v-if="[3,4].indexOf(item.transportId) > -1">
<el-descriptions class="card" v-if="[3,4].indexOf(list.transportId) > -1">
<el-descriptions-item label="是否拆包">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="item.isUnpack"></dict-tag>
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="list.isUnpack"></dict-tag>
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="[3,4].indexOf(item.transportId) > -1">
<el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
<el-descriptions-item label="单票立刻转运">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="item.isSingleTicketTransport"></dict-tag>
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="list.isSingleTicketTransport"></dict-tag>
<span style="margin-left:10px;color: #0000FF;">注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”</span>
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="[3,4].indexOf(item.transportId) > -1">
<el-descriptions-item label="包装类型">
<dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_PACKAGE_TYPE" multiple v-model="item.packageType" />
<el-descriptions>
<el-descriptions-item label="特殊要求">
<dict-selector form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple v-model="list.packageType" :disabled="true" />
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-if="[3,4].indexOf(item.transportId) > -1">
<el-descriptions-item label="特需备注">
{{item.packageRemarks}}
<el-descriptions>
<el-descriptions-item label="特殊要求备注">
{{list.packageRemarks}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card" :column="4">
<el-card class="card">
<div slot="header" class="card-title">通用信息</div>
<el-descriptions >
<el-descriptions :column="4">
<el-descriptions-item label="唛头1">
{{list.marks}}
</el-descriptions-item>
......@@ -234,7 +262,7 @@
</el-descriptions-item>
<el-descriptions-item label="交货方式">
<dict-tag :type="DICT_TYPE.ECW_TRADE_TYPE" :value="list.tradeType"></dict-tag>
{{list.tradeAdress}}
<span style="margin-left: 10px;">{{list.tradeAdress}}</span>
</el-descriptions-item>
</el-descriptions>
<el-descriptions >
......@@ -252,12 +280,14 @@
import {getProductAttrList} from '@/api/ecw/productAttr'
import {getCustomerList,getCustomer} from '@/api/ecw/customer'
import {getChannelList,getChannel} from '@/api/ecw/channel'
import {getTradeCityList} from '@/api/ecw/region'
import {getUnitList} from '@/api/ecw/unit'
import { getOrder } from '@/api/ecw/order'
import {getCurrencyList} from '@/api/ecw/currency'
import {getCustomerContactsSelect} from '@/api/ecw/customerContacts'
import {openedRouterList as getOpenedRouterList} from '@/api/ecw/warehouse'
export default {
name: "detail",
components: {
},
data() {
return {
// 遮罩层
......@@ -269,10 +299,34 @@
offerId:0,
//发货/收货人信息
consigneeData:[],
routerList:[]
routerList:[],
channelName:'/',
tradeCityList:[],
currencyList:[],
unitList:[],
orderData:[]
};
},
computed:{
currentcyMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = item.titleZh
})
return map
},
unitMap(){
let map = {}
this.unitList.forEach(item => {
map[item.id] = item.titleZh
})
return map
}
},
created() {
getCurrencyList().then(res => this.currencyList = res.data)
getUnitList().then(res => this.unitList = res.data)
getTradeCityList().then(res => this.tradeCityList = res.data)
getProductAttrList().then(res => this.productAttrList = res.data)
if(this.$route.query.offerId){
this.offerId = this.$route.query.offerId
......@@ -280,6 +334,14 @@
}
},
methods: {
getOrderData(id) {
let that = this
that.loading = true;
// 执行查询
getOrder(id).then(response => {
that.orderDat = response.data;
});
},
/** 查询列表 */
getList() {
let that = this
......@@ -287,29 +349,18 @@
// 执行查询
getOffer(that.offerId).then(response => {
that.list = response.data;
that.list.transportRespVOList.forEach((item)=>{
if(item.channelIds){
getChannelList({ids:item.channelIds}).then(res=>{
item.channelData = res.data
})
}
if(item.lineIds){
let lineIdList = []
if(item.lineIds.indexOf(',')>-1){
lineIdList = item.lineIds.split(',')
}else{
lineIdList.push(item.lineIds)
}
item.lineData = lineIdList
}
if(that.list.channelId){
that.getChannelData()
}
if(that.list.orderId){
that.getOrderData(that.list.orderId)
}
getCustomerContactsSelect({ids: [that.list.consigneeId, that.list.consignorId].join(',')}).then((res) => {
that.consigneeData.push(res.data.list.find(item => item.customerContactsId == that.list.consignorId))
that.consigneeData.push(res.data.list.find(item => item.customerContactsId == that.list.consigneeId))
that.getCnsigneeData()
})
that.list.offerProdRespVOList.forEach((item)=>{
if(item.channelId){
getChannel(item.channelId).then(res=>{
item.channelName = res.data.nameZh
})
}
var arr = item.prodAttrIds.split(',')
var prodAttrName = []
arr.forEach((itemValue)=>{
......@@ -318,15 +369,34 @@
prodAttrName.push(prodAttrCenter[0].attrName)
}
})
item.prodAttrName = prodAttrName.join(',')
// num += item.num
if(prodAttrName.length>1){
item.prodAttrName = prodAttrName.join(',')
}else if(prodAttrName.length==1){
item.prodAttrName = prodAttrName[0]
}else{
item.prodAttrName = ''
}
})
that.loading = false;
that.getCnsigneeData()
that.getOpenedRouterList()
});
},
getCity(id){
var city = ''
this.tradeCityList.forEach((item)=>{
if(item.id == id){
city = item.titleZh
}
})
return city
},
getChannelData(){
getChannel(this.list.channelId).then(res=>{
this.channelName = res.data.nameZh
})
},
// 获取路线
getOpenedRouterList(){
let params = {}
......@@ -340,28 +410,23 @@
},
// 根据线路id显示线路名称
getRouterNameById(routerId){
// return routerId => {
let router = this.routerList.find(item => item.id == routerId)
console.log({router})
if(router){
return router.startTitleZh + ' >>>' + router.destTitleZh
}
return '-'
// }
let router = this.routerList.find(item => item.id == routerId)
if(router){
return router.startTitleZh + ' >>>' + router.destTitleZh
}
return '-'
},
// 获取发货/收货人
getCnsigneeData(){
let that = this
let ids = that.list.consignorId+','+ that.list.consigneeId
getCustomerList({ids:ids}).then(res => {
that.consigneeData = res.data
getCustomer(that.list.consignorId).then(res=>{
that.consigneeData[0] = Object.assign(that.consigneeData[0],res.data)
})
getCustomer(that.list.consigneeId).then(res=>{
that.consigneeData[1] = Object.assign(that.consigneeData[1],res.data)
})
})
if(that.consigneeData.length>0){
getCustomer(that.consigneeData[0].customerId).then(result=>{
that.consigneeData[0] = Object.assign(that.consigneeData[0],result.data)
})
getCustomer(that.consigneeData[1].customerId).then(ress=>{
that.consigneeData[1] = Object.assign(that.consigneeData[1],ress.data)
})
}
},
/** 跟进按钮操作 */
handleAdd() {
......
src/views/ecw/order/exception/index.vue
View file @ dc4dfb23
......@@ -5,63 +5,63 @@
<el-row>
<el-form-item >
<el-select v-model="queryParams.dateType" style="width: 172px;">
<el-option label="入仓时间" value="1"/>
<el-option label="处理时间" value="2"/>
<el-option :label="$t('入仓时间')" value="1"/>
<el-option :label="$t('处理时间')" value="2"/>
</el-select>
<el-date-picker clearable v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="请选择开始日期" />
<span>到</span>
<el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="请选择结束日期" />
<el-date-picker clearable v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择开始日期')" />
<span>{{$t('到')}}</span>
<el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
</el-form-item>
<el-form-item label="始发地:">
<el-select v-model="queryParams.originId" placeholder="请选择始发地">
<el-form-item :label="$t('始发地:')">
<el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')">
<el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="目的地:" >
<el-select v-model="queryParams.destinationId" placeholder="请选择目的地">
<el-form-item :label="$t('目的地:')" >
<el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')">
<el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="运输方式:" >
<el-form-item :label="$t('运输方式:')" >
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="控货:">
<el-form-item :label="$t('控货:')">
<dict-selector :type="DICT_TYPE.ECW_YESNO" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="异常状态:">
<el-form-item :label="$t('异常状态:')">
<dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="异常类型">
<el-form-item :label="$t('异常类型:')">
<dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="订单号">
<el-input v-model="queryParams.orderNo" placeholder="请输入订单号" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('订单号:')">
<el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="发货人:">
<el-form-item :label="$t('发货人:')">
<customer-selector v-model="queryParams.consignor" @change="consignor = $event" />
</el-form-item>
<el-form-item label="唛头:">
<el-input v-model="queryParams.marks" placeholder="请输入唛头" clearable @keyup.enter.native="handleQuery"/>
<el-form-item :label="$t('唛头:')">
<el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="品名:">
<el-form-item :label="$t('品名:')">
<product-selector v-model="queryParams.goodsName" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="备案:">
<el-form-item :label="$t('备案:')">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="跟进业务">
<el-select v-model="queryParams.salesmanId" placeholder="请选择跟进业务">
<el-form-item :label="$t('跟进业务:')">
<el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')">
<el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
<!-- <el-button icon="el-icon-refresh" @click="reset">重置</el-button> -->
</el-form-item>
</el-row>
......@@ -75,62 +75,62 @@
<!-- 列表 -->
<el-table v-loading="loading" border :data="list">
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="订单号" align="center">
<el-table-column :label="$t('订单号')" align="center">
<template slot-scope="scope">
<span>{{scope.row.orderNo}}</span>
<span>{{specialNeedTag(scope.row.specialNeed)}}</span>
</template>
</el-table-column>
<el-table-column label="唛头" align="center" >
<el-table-column :label="$t('唛头')" align="center" >
<template slot-scope="scope">
<span>{{scope.row.marks||'无'}}</span>
<span>{{scope.row.marks||$t('无')}}</span>
</template>
</el-table-column>
<el-table-column label="总箱数/入仓箱数" align="center" >
<el-table-column :label="$t('总箱数/入仓箱数')" align="center" >
<template slot-scope="scope">
<span>{{scope.row.totalBox+'箱/'+scope.row.warehousingBox+"箱"}}</span>
<span>{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
</template>
</el-table-column>
<el-table-column label="体积/重量" align="center">
<el-table-column :label="$t('体积/重量')" align="center">
<template slot-scope="scope">
<span>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
</template>
</el-table-column>
<el-table-column label="运输方式/目的地" align="center">
<el-table-column :label="$t('运输方式/目的地')" align="center">
<template slot-scope="scope">
<span><dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportId"></dict-tag>
{{'/'+scope.row.destinationZh}}</span>
</template>
</el-table-column>
<el-table-column label="控货" align="center">
<el-table-column :label="$t('控货')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isCargoControl" />
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="orderExceptionAmount" >
<el-table-column :label="$t('订单状态')" align="center" prop="orderExceptionAmount" >
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.orderStatus" />
</template>
</el-table-column>
<el-table-column label="异常状态" align="center">
<el-table-column :label="$t('异常状态')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
</template>
</el-table-column>
<el-table-column label="异常类型" align="center">
<el-table-column :label="$t('异常类型')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="scope.row.orderExceptionType" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.orderExceptionStatus<2" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">处理</el-button>
<el-button size="mini" type="text" icon="el-icon-share" @click="handEdit(scope.row.orderId)">查看</el-button>
<el-button v-if="scope.row.orderExceptionStatus<2" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
<el-button size="mini" type="text" icon="el-icon-share" @click="handEdit(scope.row.orderId)">{{$t('查看')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -228,22 +228,22 @@ export default {
return
}
if(value.indexOf("1")!=-1||value.indexOf("2")!=-1){
tag += '(木)'
tag += this.$t('(木)')
}
if(value.indexOf("3")!=-1){
tag += '(箱)'
tag += this.$t('(箱)')
}
if(value.indexOf("4")!=-1){
tag += '(袋)'
tag += this.$t('(袋)')
}
if(value.indexOf("5")!=-1){
tag += '(纸)'
tag += this.$t('(纸)')
}
if(value.indexOf("6")!=-1){
tag += '(垫)'
tag += this.$t('(垫)')
}
if(value.indexOf("7")!=-1){
tag += '(空)'
tag += this.$t('(空)')
}
return tag
}
......
src/views/ecw/order/pending.vue
View file @ dc4dfb23
......@@ -2,96 +2,95 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">查看</div>
<div slot="header" class="card-title">{{$t('查看')}}</div>
<el-descriptions :column="4">
<el-descriptions-item label="唛头">
{{orderData.marks?orderData.marks:'无'}}
<el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">
<el-descriptions-item :label="$t('已到箱数/总箱数')">
{{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
</el-descriptions-item>
<el-descriptions-item label="送货日期">
{{orderData.deliveryDate||'无'}}
<!-- <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?parseTime(orderData.orderItemVOList[0].warehouseInInfoVO.firstInTime):'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span> -->
<el-descriptions-item :label="$t('送货日期')">
{{orderData.deliveryDate||$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
</el-descriptions-item>
<el-descriptions-item label="始发地" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
<el-descriptions-item :label="$t('始发地')" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="目的地">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
<el-descriptions-item :label="$t('目的地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
<el-descriptions-item label="发货人">
{{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
<el-descriptions-item :label="$t('发货人')">
{{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货公司">
{{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
<el-descriptions-item :label="$t('发货公司')">
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货电话">
{{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}}
<el-descriptions-item :label="$t('发货电话')">
{{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
<el-descriptions-item label="收货人">
{{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
<el-descriptions-item :label="$t('收货人')">
{{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货公司">
{{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
<el-descriptions-item :label="$t('收货公司')">
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货电话">
{{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}}
<el-descriptions-item :label="$t('收货电话')">
{{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card">
<!-- 列表 -->
<div slot="header" class="card-title">问题详情</div>
<div slot="header" class="card-title">{{$t('问题详情')}}</div>
<el-table v-loading="loading" border :data="list">
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="异常类型" align="center" >
<el-table-column :label="$t('异常类型')" align="center" >
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="scope.row.orderExceptionType" />
</template>
</el-table-column>
<el-table-column label="异常描述" align="center">
<el-table-column :label="$t('异常描述')" align="center">
<template slot-scope="scope">
<span>{{scope.row.orderExceptionDescVO.descZh}}</span>
</template>
</el-table-column>
<el-table-column label="金额" align="center" scope="orderExceptionAmount" />
<el-table-column label="状态" align="center">
<el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount" />
<el-table-column :label="$t('状态')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
</template>
</el-table-column>
<el-table-column label="附件" align="center">
<el-table-column :label="$t('附件')" align="center">
<template slot-scope="scope">
<div class="filelist">
<span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{item}}</span>
<span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{'附件'+(index+1)}}</span>
</div>
</template>
</el-table-column>
<el-table-column label="处理人" align="center" prop="userName" />
<el-table-column label="处理时间" align="center">
<el-table-column :label="$t('处理人')" align="center" prop="userName" />
<el-table-column :label="$t('处理时间')" align="center">
<template slot-scope="scope">
<span>{{parseTime(scope.row.handlerTime)}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderExceptionStatus>0">已完成</el-tag>
<el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">处理</el-button>
<el-tag v-if="scope.row.orderExceptionStatus>0">{{$t('已完成')}}</el-tag>
<el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -141,6 +140,13 @@ export default {
// 执行查询
getExceptionListByOrderId(this.orderId).then(response => {
this.list = response.data;
this.list.forEach((item)=>{
if(item.orderExceptionAttr){
item.orderExceptionAttr = item.orderExceptionAttr.split(',')
}else{
item.orderExceptionAttr = []
}
})
this.loading = false;
});
},
......@@ -189,10 +195,7 @@ export default {
url: val, // 预览地址
downUrl:"", // 下载地址
} // 目标对象
if(this.list[index].orderExceptionAttr.indexOf(',')==-1){
this.FilePreAll.push(this.TragetPic)
}else{
var fileArr = this.list[index].orderExceptionAttr.split(',')
var fileArr = this.list[index].orderExceptionAttr
fileArr.forEach(item =>{ // 需要预览的文件数组（可以传空数组就是单张预览）
let obj = {
FileName: this.getFileName(item),
......@@ -203,7 +206,6 @@ export default {
}
this.FilePreAll.push(obj)
})
}
this.IsPreview = true // 打开预览弹窗
this.timers = new Date().getTime() // 刷新预览地址
},
......@@ -219,10 +221,9 @@ export default {
display: flex;
flex-wrap: wrap;
align-items: center;
flex-direction: column
}
.filelist span{
width: 48%;
margin-right: 2%;
color: #1E98D7;
}
.card-title{
......
src/views/ecw/order/prepayDeal.vue
View file @ dc4dfb23
......@@ -2,53 +2,53 @@
<div class="app-container">
<el-card>
<div slot="header" class="header">
<div class="card-title">查看</div>
<div class="card-title">{{$t('查看')}}</div>
<el-button type="primary" icon="el-icon-arrow-left" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
</div>
<el-form :model="orderData" ref="queryForm" size="small" :inline="true" label-width="120px" class="card">
<el-row>
<el-form-item label="订单号:">
<el-form-item :label="$t('订单号:')">
{{orderData?orderData.orderNo:''}}
</el-form-item>
</el-row>
<div v-if="orderExceptionData.orderExceptionType=='order_superfluous_box_exception'||orderExceptionData.orderExceptionType=='order_lack_box_exception'||orderExceptionData.orderExceptionType=='order_miss_exception'||orderExceptionData.orderExceptionType=='order_superfluous_goods_exception'||orderExceptionData.orderExceptionType=='order_in_water_exception'||orderExceptionData.orderExceptionType=='order_damage_exception'">
<el-row>
<el-form-item label="产品名称:" >
<el-form-item :label="$t('产品名称:')" >
{{shopData?shopData.prodTitleZh:''}}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="产品英文名称:">
<el-form-item :label="$t('产品英文名称:')">
{{shopData?shopData.prodTitleEn:''}}
</el-form-item>
</el-row>
</div>
<el-row>
<el-form-item label="运输路线:" >
<el-form-item :label="$t('运输路线:')" >
<span v-if="orderData">【<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />】</span>
{{orderData?getRouterNameById():''}}
</el-form-item>
</el-row>
<div v-if="orderExceptionData.orderExceptionType!='order_doc_exception'&&orderExceptionData.orderExceptionType!='order_consignor_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'">
<el-row>
<el-form-item label="填单参数:">
{{(shopData.num||0)+'箱 '+(shopData.volume||0)+'m³ '+(shopData.weight||0)+'kg '+(shopData.quantity||0)+'个'}}
<el-form-item :label="$t('填单参数:')">
{{(shopData.num||0)+$t('箱 ')+(shopData.volume||0)+'m³ '+(shopData.weight||0)+'kg '+(shopData.quantity||0)+$t('个')}}
</el-form-item>
</el-row>
<el-row>
<el-form-item label="入仓参数:">
{{(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.cartonsNum:0)+'箱 '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.volume:0)+'m³ '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.weight:0)+'kg '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.quantityAll:0)+'个'}}
<el-form-item :label="$t('入仓参数:')">
<span>{{(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.cartonsNum:0)+$t('箱')+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.volume:0)+'m³ '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.weight:0)+'kg '+(shopData.warehouseInInfoVO?shopData.warehouseInInfoVO.quantityAll:0) +$t('个')}}</span>
</el-form-item>
</el-row>
<el-row :span="12">
<el-form-item label="异常描述:">
<el-form-item :label="$t('异常描述:')">
{{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}}
</el-form-item>
<el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;" @click="handleAdd">新增收款单</el-button>
</el-row>
<el-row>
<el-form-item label="收费参数:">
<span>{{orderData.entryNum||0}}箱 {{orderData.entryVolume||0}}m³ {{orderData.entryWeight||0}}Kg {{orderData.entryQuantity||0}}个</span>
<el-form-item :label="$t('收费参数:')">
<span>{{orderData.entryNum||0}}{{$t('箱')}} {{orderData.entryVolume||0}}m³ {{orderData.entryWeight||0}}Kg {{orderData.entryQuantity||0}}{{$t('个')}}</span>
</el-form-item>
</el-row>
<!-- <el-row :span="12">
......@@ -60,28 +60,28 @@
</div>
</el-form>
<el-table v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" v-loading="loading" border :data="preException">
<el-table-column label="品名" align="center">
<el-table-column :label="$t('品名')" align="center">
<template slot-scope="scope">
{{scope.row.titleZh+'('+scope.row.titleEn+')'}}
</template>
</el-table-column>
<el-table-column label="箱数" prop="num" />
<el-table-column label="体积/重量">
<el-table-column :label="$t('箱数')" prop="num" />
<el-table-column :label="$t('体积/重量')">
<template slot-scope="scope">
{{scope.row.volume+'/'+scope.row.weight}}
</template>
</el-table-column>
<el-table-column label="收款类型">
<el-table-column :label="$t('收款类型')">
<template >
'预付'
{{$t('预付')}}
</template>
</el-table-column>
<el-table-column label="收入类型">
<el-table-column :label="$t('收入类型')">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.feeType"></dict-tag>
</template>
</el-table-column>
<el-table-column label="应收金额" prop="totalAmount" />
<el-table-column :label="$t('应收金额')" prop="totalAmount" />
<!-- <el-table-column label="总金额美元" align="center" prop="totalAmount">
<template slot-scope="{row}">
{{row.totalAmount}}({{row.exchangeRate}})
......@@ -93,96 +93,96 @@
</template>
</el-table-column>
<el-table-column label="实收金额" prop="volume" /> -->
<el-table-column label="付款人">
<el-table-column :label="$t('付款人')">
<template slot-scope="scope">
<span>{{srope.row.consigneeName}}(收货人)</span>
<span>{{srope.row.consigneeName}}({{$t('收货人')}})</span>
</template>
</el-table-column>
<el-table-column label="付款状态" prop="worth">
<el-table-column :label="$t('付款状态')" prop="worth">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_RECEIPT_STATE" :value="scope.row.state"></dict-tag>
</template>
</el-table-column>
</el-table>
<el-table v-if="orderExceptionData.orderExceptionType=='order_doc_exception'||orderExceptionData.orderExceptionType=='order_consignor_exception'||orderExceptionData.orderExceptionType=='order_other_exception'" v-loading="loading" border :data="orderData.orderItemVOList">
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="中文名" align="center" prop="prodTitleZh" />
<el-table-column label="英文名" align="center" prop="prodTitleEn" />
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="填单箱数" prop="num" />
<el-table-column label="入仓箱数">
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" />
<el-table-column :label="$t('品牌')" align="center" prop="brand" />
<el-table-column :label="$t('填单箱数')" prop="num" />
<el-table-column :label="$t('入仓箱数')">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO.cartonsNum}}
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
</template>
</el-table-column>
<el-table-column label="方数" prop="volume" />
<el-table-column label="重量" prop="weight" />
<el-table-column label="数量" prop="quantity" />
<el-table-column label="货值" prop="worth" />
<el-table-column :label="$t('方数')" prop="volume" />
<el-table-column :label="$t('重量')" prop="weight" />
<el-table-column :label="$t('数量')" prop="quantity" />
<el-table-column :label="$t('货值')" prop="worth" />
</el-table>
<el-form :model="handlerParams" ref="queryForms" size="small" :inline="true" label-width="120px" class="card">
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item label="订单总金额:">
<el-form-item :label="$t('订单总金额:')">
{{orderFee.totalAmount||0}}
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item label="应付预付金额:">
<el-form-item :label="$t('应付预付金额:')">
{{orderFee.totalPaymentAmount}}
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-col :span="6">
<el-form-item label="已核销预付金额:">
<el-form-item :label="$t('已核销预付金额:')">
{{orderFee.writeOffAmount}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="已核销预付金额占总金额比例:" label-width="200px">
<el-form-item :label="$t('已核销预付金额占总金额比例:')" label-width="200px">
{{orderFee.writeOffAmountScale}}
</el-form-item>
</el-col>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" >
<el-col :span="6">
<el-form-item label="预付商品货值:">
<el-form-item :label="$t('预付商品货值:')">
{{orderFee.paymentGoodsWorth}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预付商品货值占佣金额比例:" label-width="200px">
<el-form-item :label="$t('预付商品货值占佣金额比例:')" label-width="200px">
{{orderFee.paymentGoodsWorthScale}}
</el-form-item>
</el-col>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-form-item label="预付商品方数:">
<el-form-item :label="$t('预付商品方数:')">
{{orderFee.paymentGoodsVolume}}
</el-form-item>
</el-row>
<el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
<el-col :span="6">
<el-form-item label="订单总方数:">
<el-form-item :label="$t('订单总方数:')">
{{orderFee.totalVolume}}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="预付商品方数占总方数比例:" label-width="200px">
<el-form-item :label="$t('预付商品方数占总方数比例:')" label-width="200px">
{{orderFee.paymentGoodsVolumeScale}}
</el-form-item>
</el-col>
</el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_doc_exception'">
<el-form-item label="报关资料:" size="medium">
<el-form-item :label="$t('报关资料:')" size="medium">
<file-upload v-model="handlerParams.fileList" :value="orderExceptionData.file" ></file-upload>
</el-form-item>
</el-row>
<el-row v-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="*处理结果:" >
<el-form-item :label="$t('*处理结果:')" >
<el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择">
<el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
:key="dict.value" :label="dict.label" :value="dict.value"/>
......@@ -190,7 +190,7 @@
</el-form-item>
</el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_pick_up_exception'&&handlerParams.orderExceptionHandlerResult=='cost_required'">
<el-form-item label="送货费用:" size="medium">
<el-form-item :label="$t('送货费用:')" size="medium">
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" />
<el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;">
<el-option v-for="dict in getDictDatas('shipping_price_unit')"
......@@ -199,25 +199,25 @@
</el-form-item>
</el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType!='order_lack_box_exception'&&orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'&&orderExceptionData.orderExceptionType!='order_lack_box_exception'">
<el-form-item label="备注:" size="medium">
<el-form-item :label="$t('备注:')" size="medium">
<el-input style="width: 500px;" type="textarea" v-model="handlerParams.orderExceptionHandlerRemark" />
</el-form-item>
</el-row>
<div v-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>
<el-form-item label="详细内容:">
<el-form-item :label="$t('详细内容:')">
{{orderExceptionData.orderExceptionDetails||'无'}}
</el-form-item>
</el-row>
<el-row >
<el-form-item label="状态:">
<el-form-item :label="$t('状态:')">
<el-radio v-model="handlerParams.orderExceptionStatus" label="1">处理中</el-radio>
<el-radio v-model="handlerParams.orderExceptionStatus" label="2">已处理</el-radio>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="*查明原因:">
<el-form-item :label="$t('*查明原因:')">
<el-select v-model="handlerParams.orderExceptionHandlerResult">
<el-option v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
:key="dict.value" :label="dict.label" :value="dict.value"/>
......@@ -228,11 +228,18 @@
</el-form>
</el-card>
<div slot="footer" class="dialog-footer">
<div>
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<div v-if="orderExceptionData.orderExceptionStatus!='order_pay_exception'">
<el-button type="primary" @click="submitForm">{{$t('提交')}}</el-button>
<el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
</div>
<el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'" type="primary" @click="submitForm">转交</el-button>
<div v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&!orderExceptionData.bpmId">
<el-button type="primary" @click="submitForm">{{$t('提交')}}</el-button>
<el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
</div>
<!-- <el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'" type="primary" @click="submitForm">转交</el-button> -->
<el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&orderExceptionData.bpmId" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('审核中<')}}</el-button>
<el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&orderExceptionData.bpmId" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&orderExceptionData.bpmId" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div>
</div>
</template>
......@@ -297,8 +304,12 @@
if(response.data.hasOwnProperty('orderItemId')){
that.getShopData(response.data.orderItemId)
}
that.getPreExceptionData()
that.getOrderFeeByIdData()
if(that.orderExceptionData.orderExceptionType == 'order_pay_exception'){
that.getOrderFeeByIdData()
that.getPreExceptionData()
}
});
},
getOrderData(){
......@@ -309,17 +320,18 @@
getOrderFeeByIdData(){
getOrderFeeById({id:this.orderId}).then(response => {
this.orderFee = response.data
this.handlerParams.orderExceptionHandlerResult = this.orderFee.result
})
},
getPreExceptionData(){
getFirstReceivableListByOrderId({id:this.orderId}).then(response => {
this.preException = response.data
this.preException.forEach(item=>{
var curr = getDictData('shipping_price_unit', item.currencyId)
if(curr.label == '美元'){
item.doller = item.totalAmount
}
})
// this.preException.forEach(item=>{
// var curr = getDictData('shipping_price_unit', item.currencyId)
// if(curr.label == this.$t('美元')){
// item.doller = item.totalAmount
// }
// })
});
},
getShopData(id){
......@@ -333,16 +345,16 @@
// 根据线路id显示线路名称
getRouterNameById(){
if(this.orderData.logisticsInfoDto) {
return ' 从【'+this.orderData.logisticsInfoDto.startTitleZh + '】发往【' + this.orderData.logisticsInfoDto.destTitleZh+'】'
return this.$t('从')+'【'+this.orderData.logisticsInfoDto.startTitleZh + '】'+this.$t('发往')+'【' + this.orderData.logisticsInfoDto.destTitleZh+'】'
}
return '无'
return this.$t('无')
},
submitForm(){
if(!this.handlerParams.orderExceptionHandlerResult){
this.$modal.msgError("请选择处理结果");
this.$modal.msgError(this.$t('请选择处理结果'));
}
handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess("提交成功");
this.$modal.msgSuccess(this.$t('提交成功'));
this.$store.dispatch('tagsView/delCurrentView')
})
},
......
src/views/ecw/order/singleApply.vue
View file @ dc4dfb23
......@@ -2,89 +2,89 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">合单申请-{{orderData.orderNo||''}}</div>
<div slot="header" class="card-title">{{$t('合单申请')}}-{{orderData.orderNo||''}}</div>
<el-descriptions :column="4">
<el-descriptions-item label="唛头">
{{orderData.marks||'无'}}
<el-descriptions-item :label="$t('唛头')">
{{orderData.marks||$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">
<el-descriptions-item :label="$t('已到箱数/总箱数')">
<span>{{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}</span>
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" /> -->
{{orderData.status==99?'异常':'正常'}}
{{orderData.abnormalState!=0?$t('异常'):$t('正常')}}
</el-descriptions-item>
<el-descriptions-item label="送货日期">
{{orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无'}}
<el-descriptions-item :label="$t('送货日期')">
{{orderData.deliveryDate||$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
</el-descriptions-item>
<el-descriptions-item label="出货渠道">
<el-descriptions-item :label="$t('出货渠道')">
{{orderData.channelId?getChannelName(orderData.channelId):'/'}}
</el-descriptions-item>
<el-descriptions-item label="始发地" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
<el-descriptions-item :label="$t('始发地')" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="目的地">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
<el-descriptions-item :label="$t('目的地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货人姓名">
{{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
<el-descriptions-item :label="$t('发货人姓名')">
{{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货公司">
{{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
<el-descriptions-item :label="$t('发货公司')">
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货电话">
{{!orderData.consignorVO?"无":!orderData.consignorVO.phone?'无':(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
<el-descriptions-item :label="$t('发货电话')">
{{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
<el-descriptions-item label="收货人姓名">
{{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
<el-descriptions-item :label="$t('收货人姓名')">
{{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货公司">
{{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
<el-descriptions-item :label="$t('收货公司')">
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货电话">
{{!orderData.consigneeVO?"无":!orderData.consigneeVO.phone?'无':(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
<el-descriptions-item :label="$t('收货电话')">
{{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card">
<!-- 列表 -->
<div slot="header" class="card-title">已合单订单</div>
<div slot="header" class="card-title">{{$t('已合单订单')}}</div>
<el-table v-loading="loading" border :data="mergedList" style="width: 200px;">
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="订单号" align="center">
<el-table-column :label="$t('订单号')" align="center">
<template slot-scope="scope">
<span>{{scope.row.mergedOrder.orderNo}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="唛头" align="center">
<!-- <el-table-column :label="唛头" align="center">
<template slot-scope="scope">
<span>{{scope.row.mergedOrder.marks}}</span>
</template>
</el-table-column>
<el-table-column label="始发地" align="center">
<el-table-column :label="始发地" align="center">
<template slot-scope="scope">
<span>{{importCityName(scope.row.mergedOrder.orderDepartureVO.departureId)}}</span>
</template>
</el-table-column>
<el-table-column label="入仓货物属性" align="center">
<el-table-column :label="入仓货物属性" align="center">
<template slot-scope="scope">
<span>合计：</span>
<span>{{scope.row.mergedOrder.sumNum+'箱 '+scope.row.mergedOrder.sumVolume+'m³ '+scope.row.mergedOrder.sumWeight+'kg'}}</span>
</template>
</el-table-column>
<el-table-column label="入仓时间" align="center" prop='createTime' />
<el-table-column label="状态" align="center">
<el-table-column :label="入仓时间" align="center" prop='createTime' />
<el-table-column :label="状态" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.status" />
</template>
......@@ -93,44 +93,44 @@
</el-card>
<el-card class="card">
<!-- 列表 -->
<div slot="header" class="card-title">待合单订单</div>
<div slot="header" class="card-title">{{$t('待合单订单')}}</div>
<el-table border :data="singleData" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="订单号" align="center">
<el-table-column :label="$t('订单号')" align="center">
<template slot-scope="scope">
<span>{{scope.row.orderNo}}</span>
</template>
</el-table-column>
<el-table-column label="唛头" align="center">
<el-table-column :label="$t('唛头')" align="center">
<template slot-scope="scope">
<span>{{scope.row.marks}}</span>
</template>
</el-table-column>
<el-table-column label="始发地" align="center">
<el-table-column :label="$t('始发地')" align="center">
<template slot-scope="scope">
<span>{{scope.row.orderDepartureDO.departure}}</span>
</template>
</el-table-column>
<el-table-column label="入仓货物属性" align="center">
<el-table-column :label="$t('入仓货物属性')" align="center">
<template slot-scope="scope">
<span>合计：</span>
<span>{{scope.row.sumNum+'箱 '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
<span>{{$t('合计')}}：</span>
<span>{{scope.row.sumNum+this.$t('箱')+' '+scope.row.sumVolume+'m³ '+scope.row.sumWeight+'kg'}}</span>
</template>
</el-table-column>
<el-table-column label="入仓时间" align="center">
<el-table-column :label="$t('入仓时间')" align="center">
<template slot-scope="scope">
<span>{{parseTime(scope.row.rucangTime)}}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<el-table-column :label="$t('状态')" align="center">
<template slot-scope="scope">
{{scope.row.status==99?'异常':'正常'}}
{{scope.row.abnormalState!=0?$t('异常'):$t('正常')}}
</template>
</el-table-column>
</el-table>
......@@ -142,24 +142,24 @@
</el-card>
<work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow>
<div slot="footer" class="card footer_btn" v-if="singleData.length>0">
<el-button v-if="orderData.inWarehouseState!=209" type="primary" @click="submitForm">提交申请</el-button>
<el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="orderData.inWarehouseState==209" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+bpmProcessId)">审核中</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
<el-button v-if="orderData.inWarehouseState!=209" type="primary" @click="submitForm">{{$t('提交申请')}}</el-button>
<el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="orderData.inWarehouseState==209" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+bpmProcessId)">{{$t('审核中')}}</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="orderData.inWarehouseState==209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div>
<el-dialog
title="提示"
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">合单申请正在审核中，你确定取消合单申请吗？</span>
<span class="cancel_notice">{{$t('合单申请正在审核中，你确定取消合单申请吗？')}}</span>
<div class="cancel_content">
<span>取消原因：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input>
<span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="cancelMerge">确 定</el-button>
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelMerge">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
......@@ -239,7 +239,7 @@ export default {
},
importCityName(id){
var arr = this.tradeCityList.filter(item => item.id == id)
return arr.length>0?arr[0].titleZh:'无'
return arr.length>0?arr[0].titleZh:this.$t('无')
},
getChannelName(id){
getChannel(id).then(res=>{
......@@ -253,7 +253,7 @@ export default {
// return
// }
if(!that.reason){
that.$message.error("请输入取消原因");
that.$message.error(this.$t("请输入取消原因"));
return
}
var params = {
......@@ -262,14 +262,14 @@ export default {
reason:that.reason
}
cancelMerge(params).then(res=>{
that.$message.success("取消成功");
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
submitForm(){
let that = this
if(!that.orderNos){
that.$message.error("请选择待合单的订单");
that.$message.error(this.$t("请选择待合单的订单"));
return
}
var params = []
......@@ -283,7 +283,7 @@ export default {
params.push(data)
})
createMerge(params).then(res=>{
that.$message.success("修改成功");
that.$message.success(this.$t("修改成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
}
......
src/views/ecw/order/special/commission.vue
View file @ dc4dfb23
......@@ -2,76 +2,76 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">修改佣金规则-{{form.orderNo||''}}</div>
<div slot="header" class="card-title">{{$t('修改佣金规则')}}-{{form.orderNo||''}}</div>
<el-form :model="form" ref="queryForms" label-width="120px" class="card">
<el-form-item label="商品类型:">
<el-form-item :label="$t('商品类型:')">
<span>{{getProductAttrNameById(form.prodType) }}</span>
</el-form-item>
<el-form-item label="商品名称:">
<el-form-item :label="$t('商品名称:')">
<span>{{ form.prodTitleZh }}</span>
</el-form-item>
<el-form-item label="英文名称:">
<el-form-item :label="$t('英文名称:')">
<span>{{ form.prodTitleEn }}</span>
</el-form-item>
<el-form-item label="线路:">
<el-form-item :label="$t('线路:')">
{{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${startTitleZh}】发往【${destTitleZh}】`}}
</el-form-item>
<el-form-item label="运费:" >
<el-form-item :label="$t('运费:')" >
<span>{{ form.subtotalFreight }} {{ currentMap[form.freightCurrency] }}</span>
</el-form-item>
<el-form-item label="清关费:">
<el-form-item :label="$t('清关费:')">
<span>{{ form.subtotalClearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}</span>
</el-form-item>
<el-form-item label="佣金类型:">
<el-form-item :label="$t('佣金类型:')">
<el-radio-group v-model="form.commissionType" >
<el-radio :label="dict.value" v-for="dict in getDictDatas('commission_type')">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.commissionType==3" label="暗佣佣金:">
<el-form-item v-if="form.commissionType==3" :label="$t('暗佣佣金:')">
<el-input style="width: 100px;" type="number" v-model="shadeCommissionAmount" />
<span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span>
<span>/{{ volumeMap[form.freightVolume] }}</span>
</el-form-item >
<el-form-item v-if="form.commissionType==1||form.commissionType==3" label="明佣佣金:">
<el-form-item v-if="form.commissionType==1||form.commissionType==3" :label="$t('明佣佣金:')">
<el-input style="width: 100px;" type="number" v-model="lightCommissionAmount" />
<span style="margin-left: 10px;">{{ currentMap[form.freightCurrency] }}</span>
<span>/{{ volumeMap[form.freightVolume] }}</span>
</el-form-item >
<el-form-item v-if="form.commissionType!=0" label="商品:">
<el-form-item v-if="form.commissionType!=0" :label="$t('商品:')">
<span>{{form.prodTitleZh }}</span>
<span style="margin-left: 10px;" v-if="form.commissionType==3">成本价：{{parseInt(form.freight)-parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;"> 销售价：{{form.commissionType!=2?(parseInt(form.freight)+parseInt(lightCommissionAmount)):form.freight}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;color: #1E98D7;" v-if="form.commissionType==2" @click="$router.push(`/customer/customerCommission`)">去设置</span>
<span style="margin-left: 10px;" v-if="form.commissionType==3">实际佣金返点：{{parseInt(lightCommissionAmount)+parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;" v-if="form.commissionType==3">{{$t('成本价')}}：{{parseInt(form.freight)-parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;"> {{$t('销售价')}}：{{form.commissionType!=2?(parseInt(form.freight)+parseInt(lightCommissionAmount)):form.freight}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
<span style="margin-left: 10px;color: #1E98D7;" v-if="form.commissionType==2" @click="$router.push(`/customer/customerCommission`)">{{$t('去设置')}}</span>
<span style="margin-left: 10px;" v-if="form.commissionType==3">{{$t('实际佣金返点')}}：{{parseInt(lightCommissionAmount)+parseInt(shadeCommissionAmount)}}{{ currentMap[form.freightCurrency] }}/{{ volumeMap[form.freightVolume] }}</span>
</el-form-item>
<el-form-item label="审核状态:">
<el-form-item :label="$t('审核状态:')">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus"></dict-tag>
<span>{{form.applyResult?('('+form.applyResult+')'):''}}</span>
</el-form-item>
</el-form>
</el-card>
<div slot="header" class="card-title">审批流程</div>
<div slot="header" class="card-title">{{$t('审批流程')}}</div>
<work-flow xmlkey="commission_config" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
<div slot="footer" class="card footer_btn">
<el-button type="primary" v-if="form.applyStatus==0" @click="submitForm">提交</el-button>
<el-button plain type="primary" v-if="form.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="form.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+form.formId)">审核中</el-button>
<el-button v-if="form.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="form.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
<el-button type="primary" v-if="form.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
<el-button plain type="primary" v-if="form.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="form.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+form.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="form.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="form.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div>
<el-dialog
title="提示"
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">特价申请正在审核中，你确定取消特价申请吗？</span>
<span class="cancel_notice">{{$t('特价申请正在审核中，你确定取消特价申请吗？')}}</span>
<div class="cancel_content">
<span>取消原因：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input>
<span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button>
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
......@@ -203,18 +203,18 @@ export default {
}
this.form.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.form).then(r => {
this.$message.success(r.msg || '提交成功')
this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error("请输入取消原因");
that.$message.error(this.$t("请输入取消原因"));
return
}
cancelOrderSpecial(that.form.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
......
src/views/ecw/order/special/light.vue
View file @ dc4dfb23
......@@ -2,21 +2,21 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">申请泡货优惠-{{queryParams.orderNo||''}}</div>
<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="原泡货标准:" label-width="150px">
<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="* 现泡货申请标准:" size="medium" label-width="150px">
<el-form-item :label="$t('*现泡货申请标准:')" size="medium" label-width="150px">
<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="备注:" size="medium" label-width="150px">
<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>
......@@ -24,25 +24,25 @@
</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">提交</el-button>
<el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
<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="提示"
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？</span>
<span class="cancel_notice">{{$t('申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？')}}</span>
<div class="cancel_content">
<span>取消原因：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input>
<span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button>
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
......@@ -99,18 +99,18 @@ export default {
this.queryParams.applyType = 5
this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || '提交成功')
this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error("请输入取消原因");
that.$message.error(this.$t("请输入取消原因"));
return
}
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
......
src/views/ecw/order/special/weight.vue
View file @ dc4dfb23
......@@ -2,21 +2,21 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">申请重货优惠-{{queryParams.orderNo||''}}</div>
<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="原重货标准:" label-width="150px">
<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="* 现重货申请标准:" size="medium" label-width="150px">
<el-form-item :label="$t('*现重货申请标准:')" size="medium" label-width="150px">
<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="备注:" size="medium" label-width="150px">
<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>
......@@ -24,25 +24,25 @@
</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">提交</el-button>
<el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">审核中</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
<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="提示"
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">申请重货优惠正在审核中，你确定取消申请重货优惠吗？</span>
<span class="cancel_notice">{{$t('申请重货优惠正在审核中，你确定取消申请重货优惠吗？')}}</span>
<div class="cancel_content">
<span>取消原因：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input>
<span>{{$t('取消原因')}}：</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button>
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
......@@ -100,18 +100,18 @@ export default {
this.queryParams.applyType = 4
this.queryParams.ccIds = this.selectedUsers.join(',')
createOrderSpecial(this.queryParams).then(r => {
this.$message.success(r.msg || '提交成功')
this.$message.success(r.msg || this.$t('提交成功'))
this.$store.dispatch('tagsView/delCurrentView')
})
},
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error("请输入取消原因");
that.$message.error(this.$t("请输入取消原因"));
return
}
cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
......
src/views/ecw/order/splitApply.vue
View file @ dc4dfb23
......@@ -2,116 +2,116 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">拆单申请-{{orderData.orderNo||''}}</div>
<div slot="header" class="card-title">{{$t('拆单申请')}}-{{orderData.orderNo||''}}</div>
<div class="btn-header">
<span class="card-title">原单信息</span>
<span class="card-title">{{$t('原单信息')}}</span>
<div>
<span v-if="orderData.status==99" class="red">异常无法拆单</span>
<el-button v-else type="primary" @click="addSplit">新建拆单 </el-button>
<span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
<el-button v-else type="primary" @click="addSplit">{{$t('新建拆单')}} </el-button>
</div>
</div>
<el-descriptions :column="4">
<el-descriptions-item label="唛头">
{{orderData.marks?orderData.marks:'无'}}
<el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">
<el-descriptions-item :label="$t('已到箱数/总箱数')">
<span>{{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}</span>
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" /> -->
{{orderData.status==99?'异常':'正常'}}
{{orderData.abnormalState!=0?$t('异常'):$t('正常')}}
</el-descriptions-item>
<el-descriptions-item label="送货日期">
{{orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无'}}
<el-descriptions-item :label="$t('送货日期')">
{{orderData.deliveryDate||$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
</el-descriptions-item>
<el-descriptions-item label="始发地" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
<el-descriptions-item :label="$t('始发地')" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="目的地">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
<el-descriptions-item :label="$t('目的地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货人姓名">
{{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
<el-descriptions-item :label="$t('发货人姓名')">
{{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货公司">
{{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
<el-descriptions-item :label="$t('发货公司')">
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货电话">
{{!orderData.consignorVO?"无":!orderData.consignorVO.phone?'无':(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
<el-descriptions-item :label="$t('发货电话')">
{{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
<el-descriptions-item label="收货人姓名">
{{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
<el-descriptions-item :label="$t('收货人姓名')">
{{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货公司">
{{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
<el-descriptions-item :label="$t('收货公司')">
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货电话">
{{!orderData.consigneeVO?"无":!orderData.consigneeVO.phone?'无':(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
<el-descriptions-item :label="$t('收货电话')">
{{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card">
<!-- 列表 -->
<div slot="header" class="card-title">货物信息</div>
<div slot="header" class="card-title">{{$t('货物信息')}}</div>
<el-table id='table' v-loading="loading" border :data="orderData.orderItemVOList" :summary-method="getSummaries" show-summary>
<el-table-column label="序号" align="center" prop="id" type="index" width="60">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index" width="60">
<template slot-scope="scope" >
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="品名" align="center">
<el-table-column :label="$t('品名')" align="center">
<template slot-scope="scope">
<el-row>{{scope.row.prodTitleEn}}</el-row>
<el-row>{{scope.row.prodTitleZh}}</el-row>
</template>
</el-table-column>
<el-table-column label="填单货物属性" align="center" width="200">
<el-table-column :label="$t('填单货物属性')" align="center" width="200">
<template slot-scope="scope">
<el-row>
<span>品牌：
<span>{{$t('品牌')}}：
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
</span>
</el-row>
<el-row>
<span>箱数：{{scope.row.num||'未填'}}</span>
<span>{{$t('箱数')}}：{{scope.row.num||$t('未填')}}</span>
</el-row>
<el-row>
<span>体积：{{scope.row.volume||'未填'}}m³</span>
<span>{{$t('体积')}}：{{scope.row.volume||$t('未填')}}m³</span>
</el-row>
<el-row>
<span>重量：{{scope.row.weight||'未填'}}kg</span>
<span>{{$t('重量')}}：{{scope.row.weight||t('未填')}}kg</span>
</el-row>
</template>
</el-table-column>
<el-table-column label="入库货物属性" align="center" width="400">
<el-table-column :label="$t('入库货物属性')" align="center" width="400">
<template slot-scope="scope">
<el-row>
<span>规格：{{scope.row.boxGauge}}</span>
<span>{{$t('规格')}}：{{scope.row.boxGauge}}</span>
</el-row>
<el-row>
<span>品牌：
<span>{{$t('品牌')}}：
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
</span>
<span style="margin-left: 10px;">箱数：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.cartonsNum}}</span>
<span style="margin-left: 10px;">体积：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.volume}}m³</span>
<span style="margin-left: 10px;">重量：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.weight}}kg</span>
<span style="margin-left: 10px;">{{$t('箱数')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.cartonsNum}}</span>
<span style="margin-left: 10px;">{{$t('体积')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.volume}}m³</span>
<span style="margin-left: 10px;">{{$t('重量')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.weight}}kg</span>
</el-row>
</template>
</el-table-column>
<el-table-column label="最后操作时间" align="center">
<el-table-column :label="$t('最后操作时间')" align="center">
<template slot-scope="scope">
<span>{{parseTime(scope.row.updateTime)}}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<el-table-column :label="$t('状态')" align="center">
<template slot-scope="scope">
{{orderData.status==99?'异常':'正常'}}
{{orderData.abnormalState!=0?$t('异常'):$t('正常')}}
<!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
</template>
</el-table-column>
......@@ -119,7 +119,7 @@
</el-card>
<el-card class="card" v-if="splitData.length>0">
<!-- 列表 -->
<div slot="header" class="card-title">拆单信息</div>
<div slot="header" class="card-title">{{$t('拆单信息')}}</div>
<div v-for="(item, index) in splitData" :key="index">
<div class="btn-header">
<div>
......@@ -128,76 +128,76 @@
{{item.orderNo}}
</span>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
<span>发往：{{importCityName(item.dstWarehouseId)}}</span>
<span>{{$t('发往')}}：{{importCityName(item.dstWarehouseId)}}</span>
</p>
</div>
<div>
<el-button v-if="index==0" disabled type="primary" @click="addShop(index)">放入</el-button>
<el-button v-if="index!=0" type="primary" @click="addShop(index)">放入</el-button>
<el-button type="primary" plain @click="deleteSplit(item.id)">删除</el-button>
<el-button v-if="index==0" disabled type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
<el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('移出')}}</el-button>
<el-button type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
</div>
</div>
<el-table border :data="item.orderSplitItemBackVOList">
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="中文名" align="center" prop="prodTitleZh" />
<el-table-column label="英文名" align="center" prop="prodTitleEn" />
<el-table-column label="品牌" align="center">
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" />
<el-table-column :label="$t('品牌')" align="center">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
</template>
</el-table-column>
<el-table-column label="体积" align="center" >
<el-table-column :label="$t('体积')" align="center" >
<template slot-scope="scope">
<span>{{scope.row.volume}}m³</span>
</template>
</el-table-column>
<el-table-column label="重量" align="center">
<el-table-column :label="$t('重量')" align="center">
<template slot-scope="scope">
<span>{{scope.row.weight}}m³</span>
</template>
</el-table-column>
<el-table-column label="箱数" align="center">
<el-table-column :label="$t('箱数')" align="center">
<template slot-scope="scope">
<span>{{scope.row.num}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column :label="$t('操作')" align="center">
<template slot-scope="scope">
<el-button v-if="index==0" disabled size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">移出</el-button>
<el-button v-else size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">移出</el-button>
<el-button v-if="index==0" disabled size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
<el-button v-else size="mini" type="text" icon="el-icon-delete" @click="removeShop(scope.row.id)">{{$t('移出')}}</el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-card>
<work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow>
<div slot="footer" class="card footer_btn" v-if="orderData.status!=99">
<el-button v-if="orderData.inWarehouseState!=207" type="primary" @click="submitForm">提交申请</el-button>
<el-button v-if="orderData.inWarehouseState!=207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">取消</el-button>
<el-button v-if="orderData.inWarehouseState==207" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.formId)">审核中</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">取消审核</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
<div slot="footer" class="card footer_btn" v-if="orderData.abnormalState==0">
<el-button v-if="orderData.inWarehouseState!=207" type="primary" @click="submitForm">{{$t('提交申请')}}</el-button>
<el-button v-if="orderData.inWarehouseState!=207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="orderData.inWarehouseState==207" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderApprovalBackVO.formId)">{{$t('审核中')}}</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
<el-button v-if="orderData.inWarehouseState==207" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
</div>
<!-- 对话框(添加 / 修改) -->
<el-dialog title="新建拆单" :visible.sync="open" width="400px" append-to-body>
<el-dialog :title="$t('新建拆单')" :visible.sync="open" width="400px" append-to-body>
<el-form ref="formSplit" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-form-item label="运输方式">
<el-form-item :label="$t('运输方式')">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"/>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="目的仓库:" >
<el-select v-model="form.destWarehouseId" placeholder="请选择目的仓库" >
<el-form-item :label="$t('目的仓库:')" >
<el-select v-model="form.destWarehouseId" :placeholder="$t('请选择目的仓库')" >
<el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="出货渠道" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" >
<el-select v-model="form.channelId" placeholder="请选择出货渠道">
<el-form-item :label="$t('出货渠道')" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'" >
<el-select v-model="form.channelId" :placeholder="$t('请选择出货渠道')">
<el-option :disabled="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass != 'channel'" v-for="item in channelData" :key="item.channelId" :label="item.nameZh" :value="item.channelId"/>
</el-select>
</el-form-item>
......@@ -205,55 +205,55 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="haddleAdd">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="haddleAdd">{{$t('确定')}}</el-button>
<el-button @click="cancel">{{$t('取消')}}</el-button>
</div>
</el-dialog>
<!-- 对话框(添加 / 修改) -->
<el-dialog title="放入品名" :visible.sync="shopOpen" width="400px" append-to-body>
<el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
<el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="80px">
<el-row>
<el-form-item label="中文品名:">
<el-select v-model="shopForm.prodTitleZh" placeholder="请选择中文品名" @change="changeProdTitleZh">
<el-form-item :label="$t('中文品名:')">
<el-select v-model="shopForm.prodTitleZh" :placeholder="$t('请选择中文品名')" @change="changeProdTitleZh">
<el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="英文品名:" >
<el-select v-model="shopForm.prodTitleEn" placeholder="请选择英文品名" @change="changeProdTitleEn">
<el-form-item :label="$t('英文品名:')" >
<el-select v-model="shopForm.prodTitleEn" :placeholder="$t('请选择英文品名')" @change="changeProdTitleEn">
<el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
</el-select>
</el-form-item>
<el-form-item label="剩余箱数:">
<el-form-item :label="$t('剩余箱数:')">
{{shopForm.sum||0}}
</el-form-item>
<el-form-item label="放入箱数:">
<el-form-item :label="$t('放入箱数:')">
<el-input-number v-model="shopForm.num" controls-position="right" :min="1" :max="shopForm.sum"></el-input-number>
</el-form-item>
<el-form-item label="备注信息:">
<el-form-item :label="$t('备注信息:')">
<el-input v-model="shopForm.remarks"></el-input>
</el-form-item>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="shopAdd">确 定</el-button>
<el-button @click="shopCancel">取 消</el-button>
<el-button type="primary" @click="shopAdd">{{$t('确定')}}</el-button>
<el-button @click="shopCancel">{{$t('取消')}}</el-button>
</div>
</el-dialog>
<el-dialog
title="提示"
:title="$t('提示')"
:visible.sync="dialogVisible"
width="30%">
<span class="cancel_notice">拆单申请正在审核中，你确定取消拆单申请吗？</span>
<span class="cancel_notice">{{$t('拆单申请正在审核中，你确定取消拆单申请吗？')}}</span>
<div class="cancel_content">
<span>取消原因：</span>
<el-input v-model="reason" placeholder="请输入取消原因"></el-input>
<span>{{$t('取消原因：')}}</span>
<el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="cancelSplit">确 定</el-button>
<el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
<el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
</span>
</el-dialog>
</div>
......@@ -296,14 +296,14 @@ export default {
shopForm:{},
// 表单校验
rules: {
transportId: [{ required: true, message: "请选择运输方式", trigger: "change" }],
warehouseIds: [{ required: true, message: "请选择目的仓库", trigger: "change" }],
channelId: [{ required: true, message: "请选择出货渠道", trigger: "change" }],
transportId: [{ required: true, message: this.$t("请选择运输方式"), trigger: "change" }],
warehouseIds: [{ required: true, message: this.$t("请选择目的仓库"), trigger: "change" }],
channelId: [{ required: true, message: this.$t("请选择出货渠道"), trigger: "change" }],
},
// 表单校验
shopRules: {
prodTitleZh: [{ required: true, message: "请选择中文品名", trigger: "change" }],
prodTitleEn: [{ required: true, message: "请选择英文品名", trigger: "change" }],
prodTitleZh: [{ required: true, message: this.$t("请选择中文品名"), trigger: "change" }],
prodTitleEn: [{ required: true, message: this.$t("请选择英文品名"), trigger: "change" }],
},
queryParams:{
orderId:7,
......@@ -399,7 +399,7 @@ export default {
getSummaries(){
const sums = [];
sums[0] = '小计'
sums[0] = this.$t('小计')
if(!this.orderData || !this.orderData.orderItemVOList ||this.orderData.length==0){
return sums
}
......@@ -417,18 +417,18 @@ export default {
leviteV += column.warehouseInInfoVO?column.warehouseInInfoVO.volume:0
leviteW += column.warehouseInInfoVO?column.warehouseInInfoVO.weight:0
});
sums[1] = '下单统计：'+ orderSum+' 箱 '+ orderV +' m³ ' + orderW + ' kg ' + ' 入仓统计：'+ leviteSum+' 箱 '+ leviteV +' m³ ' + leviteW + ' kg'
sums[1] = this.$t('下单统计')+' '+ orderSum+' '+this.$t('箱')+' '+ orderV +' m³ ' + orderW + ' kg ' + ' '+this.$t('入仓统计：')+ leviteSum+' '+this.$t('箱')+' '+ leviteV +' m³ ' + leviteW + ' kg'
return sums;
},
importCityName(id){
var arr = this.tradeCityList.filter(item => item.id == id)
return arr.length>0?arr[0].titleZh:'无'
return arr.length>0?arr[0].titleZh:this.$t('无')
},
submitForm(){
if(this.splitData.length==0){
this.$modal.msgError("请先新建拆单")
this.$modal.msgError(this.$t("请先新建拆单"))
return
}
// if(this.selectedUsers.length==0){
......@@ -440,7 +440,7 @@ export default {
copyUserId:this.selectedUsers
}
splitApply(params).then(res=>{
this.$modal.msgSuccess("申请成功");
this.$modal.msgSuccess(this.$t("申请成功"));
this.$store.dispatch('tagsView/delCurrentView')
})
},
......@@ -467,10 +467,10 @@ export default {
haddleAdd(){
let that = this
if(!that.form.transportId){
that.$message.error("请选择运输方式");
that.$message.error(this.$t("请选择运输方式"));
}
if(!that.form.destWarehouseId){
that.$message.error("请选择目的仓库");
that.$message.error(this.$t("请选择目的仓库"));
}
// if(!this.form.channelId){
// this.$modal.msgError("请选择出货渠道");
......@@ -504,7 +504,7 @@ export default {
remarks:this.shopForm.remarks
}
createSplitItem(params).then(res=>{
this.$message.success("放入成功");
this.$message.success(this.$t("放入成功"));
this.getList()
this.shopForm = {}
})
......@@ -512,9 +512,9 @@ export default {
},
removeShop(id){
let that = this
that.$confirm('是否移除货物吗?').then(function () {
that.$confirm(this.$t('是否移除货物吗?')).then(function () {
deleteSplitItem(id).then(res=>{
that.$message.success("移除成功");
that.$message.success(this.$t("移除成功"));
that.getList()
})
})
......@@ -522,11 +522,11 @@ export default {
cancelSplit(){
let that = this
if(!that.reason){
that.$message.error("请输入取消原因");
that.$message.error(this.$t("请输入取消原因"));
return
}
cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
that.$message.success("取消成功");
that.$message.success(this.$t("取消成功"));
that.$store.dispatch('tagsView/delCurrentView')
})
},
......@@ -537,9 +537,9 @@ export default {
/** 删除按钮操作 */
deleteSplit(id) {
let that = this
that.$confirm('是否确认删除新拆的订单吗?').then(function () {
that.$confirm(this.$t('是否确认删除新拆的订单吗?')).then(function () {
deleteSplit(id).then(res=>{
that.$message.success("删除成功");
that.$message.success(this.$t("删除成功"));
that.getList()
})
})
......
src/views/ecw/order/weightDeal.vue
View file @ dc4dfb23
......@@ -2,106 +2,106 @@
<div class="app-container">
<!-- 搜索工作栏 -->
<el-card>
<div slot="header" class="card-title">查看</div>
<div slot="header" class="card-title">{{$t('查看')}}</div>
<el-descriptions :column="4">
<el-descriptions-item label="唛头">
{{orderData.marks?orderData.marks:'无'}}
<el-descriptions-item :label="$t('唛头')">
{{orderData.marks?orderData.marks:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">
<el-descriptions-item :label="$t('已到箱数/总箱数')">
{{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<el-descriptions-item :label="$t('订单状态')">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
</el-descriptions-item>
<el-descriptions-item label="送货日期">
<span>{{orderData.deliveryDate||'无'}}</span>
<el-descriptions-item :label="$t('送货日期')">
<span>{{orderData.deliveryDate||$t('无')}}</span>
</el-descriptions-item>
<el-descriptions-item label="运输方式">
<el-descriptions-item :label="$t('运输方式')">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
</el-descriptions-item>
<el-descriptions-item label="始发地" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:'无'}}
<el-descriptions-item :label="$t('始发地')" :span="2">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startAddressZh:$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="目的地">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:'无'}}
<el-descriptions-item :label="$t('目的地')">
{{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destAddressZh:$t('无')}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
<el-descriptions-item label="发货人">
{{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
<el-descriptions-item :label="$t('发货人')">
{{orderData.consignorVO?orderData.consignorVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货公司">
{{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
<el-descriptions-item :label="$t('发货公司')">
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="发货电话">
{{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}}
<el-descriptions-item :label="$t('发货电话')">
{{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}}
</el-descriptions-item>
</el-descriptions>
<el-descriptions :column="4">
<el-descriptions-item label="收货人">
{{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
<el-descriptions-item :label="$t('收货人')">
{{orderData.consigneeVO?orderData.consigneeVO.name||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货公司">
{{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
<el-descriptions-item :label="$t('收货公司')">
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item>
<el-descriptions-item label="收货电话">
{{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}}
<el-descriptions-item :label="$t('收货电话')">
{{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}}
</el-descriptions-item>
</el-descriptions>
</el-card>
<el-card class="card">
<!-- 列表 -->
<div slot="header" class="card-title">货物信息</div>
<div slot="header" class="card-title">{{$t('货物信息')}}</div>
<el-table v-loading="loading" border :data="orderData.orderItemVOList" :summary-method="getSummaries" show-summary>
<el-table-column label="序号" align="center" prop="id" type="index">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="品名" align="center" >
<el-table-column :label="$t('品名')" align="center" >
<template slot-scope="scope">
<p>{{scope.row.prodTitleEn||''}}</p>
<p>{{scope.row.prodTitleZh||''}}</p>
</template>
</el-table-column>
<el-table-column label="填单货物信息">
<el-table-column :label="$t('填单货物信息')">
<template slot-scope="scope">
<p>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p>
<p>箱数：{{scope.row.num||0}}</p>
<p>体积：{{scope.row.volume||0}}CBM</p>
<p>重量：{{scope.row.weight||0}}KG</p>
<p>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p>
<p>{{$t('箱数')}}：{{scope.row.num||0}}</p>
<p>{{$t('体积')}}：{{scope.row.volume||0}}CBM</p>
<p>{{$t('重量')}}：{{scope.row.weight||0}}KG</p>
</template>
</el-table-column>
<el-table-column label="入库货物属性" align="center" >
<el-table-column :label="$t('入库货物属性')" align="center" >
<template slot-scope="scope">
<span>规格：{{scope.row.boxGauge||0}}</span>
<span>{{$t('品牌')}}：{{scope.row.boxGauge||0}}</span>
<p>
<span>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
<span>箱数：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
<span>体积：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
<span>重量：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
<span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
<span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
<span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
</p>
</template>
</el-table-column>
<el-table-column label="重货方数" align="center" v-if="type=='order_heavy_cargo_exception'">
<el-table-column :label="$t('重货方数')" align="center" v-if="type=='order_heavy_cargo_exception'">
<template slot-scope="scope">
<span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.heavyNumber||0):0}}CBM</span>
</template>
</el-table-column>
<el-table-column label="泡货方数" align="center" v-else >
<el-table-column :label="$t('泡货方数')" align="center" v-else >
<template slot-scope="scope">
<span>{{ scope.row.warehouseInInfoVO?(scope.row.warehouseInInfoVO.lightNumber||0):0}}CBM</span>
</template>
</el-table-column>
<el-table-column label="最后操作时间" scope="handlerTime" />
<el-table-column :label="$t('最后操作时间')" scope="handlerTime" />
</el-table>
</el-card>
<div slot="footer" class="dialog-footer">
<div>
<el-button type="primary" @click="submit('general_cargo')">设为普货</el-button>
<el-button plain type="primary" @click="submit('process')">设为已处理</el-button>
<el-button type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
<el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
</div>
</div>
</div>
......@@ -157,7 +157,7 @@ export default {
if(!this.orderData || !this.orderData.list ||ths.orderData.length==0){
return sums
}
sums[0] = '小计'
sums[0] = this.$t('小计')
var orderSum = 0
var orderV = 0
var orderW = 0
......@@ -173,15 +173,15 @@ export default {
leviteW += column.weight
});
sums[1] = ''
sums[2] = '下单统计：'+ orderSum+' 箱 '+ orderV +' m³ ' + orderW + ' kg'
sums[3] = '入仓统计：'+ leviteSum+' 箱 '+ leviteV +' m³ ' + leviteW + ' kg'
sums[2] = this.$t('下单统计：')+ orderSum+this.$t(' 箱 ')+ orderV +' m³ ' + orderW + ' kg'
sums[3] = this.$t('入仓统计：')+ leviteSum+this.$t(' 箱 ')+ leviteV +' m³ ' + leviteW + ' kg'
sums[4] = ''
sums[5] = ''
return sums;
},
submit(result){
handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result}).then(res=>{
this.$modal.msgSuccess("提交成功");
this.$modal.msgSuccess(this.$t("提交成功"));
this.$router.back()
})
}
......
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