Skip to content

J
jiedao-app-operator-master
Commit 5237d25b authored by 邓春圆's avatar 邓春圆
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents f3dab415 19497462
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 85 deletions
src/views/ecw/box/shippingAir/nodePage/cabinet/index.vue
View file @ 5237d25b
<template>
<div>
<el-form ref="cabinetForm" :rules="rules" :model="cabinetObj" label-width="80px">
<el-form-item :label="$t('到仓时间')">
<el-form-item :label="$t('到仓时间1')">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="cabinetObj.ldInWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('仓库')">
......
src/views/ecw/box/shippingAir/nodePage/unloading/index.vue
View file @ 5237d25b
......@@ -9,20 +9,20 @@
<el-form-item :label="$t('到仓时间')">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulWarehouseTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('卸柜时间')">
<!-- <el-form-item :label="$t('卸柜时间')">
<el-date-picker type="datetime" :placeholder="$t('请选择日期')" v-model="unloadingObj.ulBoxTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item>
</el-form-item> -->
</el-form>
<el-row class="operate-button">
<el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
<el-button type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
<el-button @click="cancel">{{$t('关闭')}}</el-button>
<el-button type="danger" @click="startUnloading" :disabled="isStartUnloading">{{$t('开始卸柜')}}</el-button>
<el-button type="danger" @click="startUnloading" :disabled="isStartUnloading">{{$t('到仓')}}</el-button>
</el-row>
<!-- 开始卸柜 -->
<el-dialog :title="$t('开始卸柜')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
<el-dialog :title="$t('到仓')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
<startUnloading v-if="dialogVisible" v-bind="$attrs" @closeStart="closeStart" />
</el-dialog>
</div>
......
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @ 5237d25b
......@@ -2,14 +2,17 @@
<div class="app-startUnloading">
<!-- 自编号 -->
<el-row>
<p style="color:#D9001B;">{{$t('过机重量异常')}}:机场误差3%以内/我司误差超10kg/超过机场重量《N》kg</p>
</el-row>
<el-row class="number-area">
<p class="label-font">{{$t('自编号')}}：</p>
<p class="label-font">{{selfNo}}</p>
<el-input v-model="labelNo" :placeholder="$t('请输入')"></el-input>
<div>
<el-button type="primary" @click="modifyUnload">{{$t('提交')}}</el-button>
<!-- <el-button type="primary" @click="modifyUnload">{{$t('提交')}}</el-button> -->
<el-button type="primary" @click="modifyBatchUnload">{{$t('批量输入')}}</el-button>
<el-button type="primary" @click="modifyAllUnload">{{$t('一键卸柜')}}</el-button>
<el-button type="primary" @click="modifyAllUnload">{{$t('全部到仓')}}</el-button>
</div>
</el-row>
......@@ -74,9 +77,12 @@
{{getUnloadError(scope.row.exceptionList)}}
</template>
</el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button>
<el-table-column :label="$t('操作')" align="center" width="170" class-name="small-padding fixed-width">
<template slot-scope="scope" >
<div class="number-area">
<el-button type="danger" size="small" @click="openError(scope.row)">{{$t('异常')}}</el-button>
<el-button plain type="primary" size="small" @click="openError(scope.row)">{{$t('出仓修改 ')}}</el-button>
</div>
</template>
</el-table-column>
</el-table>
......@@ -106,7 +112,7 @@
</div>
<!-- 操作 -->
<div v-if="!isUnderReview">
<el-button type="success" @click="onSubmit">{{$t('卸柜完成')}}</el-button>
<el-button type="success" @click="onSubmit">{{$t('完成到仓')}}</el-button>
<el-button plain type="primary" @click="$emit('closeStart')">{{$t('返回')}}</el-button>
</div>
<div v-if="isUnderReview">
......
src/views/ecw/order/pending.vue
View file @ 5237d25b
......@@ -278,43 +278,46 @@ export default {
if(row.orderItemId){
var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
if(productData){
getProduct(productData.prodId).then(res=>{
let params = {
product_id: productData.prodId,
product_type: res.data.typeId,
transportId: this.orderData.transportId,
exportCity: this.orderData.logisticsInfoDto.startCityId,
importCity: this.orderData.logisticsInfoDto.destCityId,
startWarehouseId: this.orderData.logisticsInfoDto.startWarehouseId,
destWarehouseId: this.orderData.logisticsInfoDto.destWarehouseId,
lineId: this.orderData.logisticsInfoDto.lineId,
channelId: this.orderData.logisticsInfoDto.channelId
}
let queryParams = {
productId: productData.prodId,
lineId: this.orderData.logisticsInfoDto.lineId,
channelId: this.orderData.logisticsInfoDto.channelId
}
let url = ''
if([3,4].indexOf(this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?' + (new URLSearchParams(params)).toString()
}else{
url = '../../lineProject/product-price/edit-sea?' + (new URLSearchParams(params)).toString()
}
getProductPriceGetPrice(queryParams).then(res=>{
console.log(res)
if(res.data){
if([3,4].indexOf(+this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?action=update&id='+res.data.id
}else{
url = '../../lineProject/product-price/edit-sea?action=update&id='+res.data.id
}
if(row.orderExceptionType=='customs_fee_not_quote_exception'&&productData.prodId){
this.$router.push('/product/product-list?prodId=' + productData.prodId)
return
}else{
getProduct(productData.prodId).then(res=>{
let params = {
product_id: productData.prodId,
product_type: res.data.typeId,
transportId: this.orderData.transportId,
exportCity: this.orderData.logisticsInfoDto.startCityId,
importCity: this.orderData.logisticsInfoDto.destCityId,
startWarehouseId: this.orderData.logisticsInfoDto.startWarehouseId,
destWarehouseId: this.orderData.logisticsInfoDto.destWarehouseId,
lineId: this.orderData.logisticsInfoDto.lineId,
channelId: this.orderData.logisticsInfoDto.channelId
}
let queryParams = {
productId: productData.prodId,
lineId: this.orderData.logisticsInfoDto.lineId,
channelId: this.orderData.logisticsInfoDto.channelId
}
return this.$router.push(url)
})
let url = ''
if([3,4].indexOf(this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?' + (new URLSearchParams(params)).toString()
}else{
url = '../../lineProject/product-price/edit-sea?' + (new URLSearchParams(params)).toString()
}
getProductPriceGetPrice(queryParams).then(res=>{
console.log(res)
if(res.data){
if([3,4].indexOf(+this.orderData.transportId) > -1){
url = '../../lineProject/product-price/edit-air?action=update&id='+res.data.id
}else{
url = '../../lineProject/product-price/edit-sea?action=update&id='+res.data.id
}
}
return this.$router.push(url)
})
/* +productData.prodId
+'&product_type='+res.data.typeId
+'&transportId='+this.orderData.transportId
......@@ -322,6 +325,7 @@ export default {
})
}
}
}else{
return this.$confirm(this.$t('数据缺少orderItemId参数，确定要跳转设置路线价格么？')).then(res => {
let url = ''
......
src/views/ecw/order/prepayDeal.vue
View file @ 5237d25b
......@@ -498,42 +498,91 @@
></selector>
</el-form>
</el-form-item>
<el-form-item :label="$t('选择线路')" prop="lineId">
<el-input :value="selectLine ? $l(selectLine, 'startTitle') + ' > ' + $l(selectLine, 'destTitle') : ''" disabled :placeholder="$t('请在右侧选择线路')"></el-input>
</el-form-item>
<!--select是原生组件，不受el-form的disabled控制-->
<select size="5" v-model="handlerParams.lineId" style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px" @change="changeLined">
<option v-for="item in routerList" :value="item.id" :key="item.id">
{{$l(item, 'startTitle')}} >> {{$l(item, 'destTitle')}}
(<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportType"></dict-tag>)
</option>
</select>
<el-form-item :label="$t('选择线路')" prop="lineId">
<el-input :value="selectLine ? $l(selectLine, 'startTitle') + ' > ' + $l(selectLine, 'destTitle') : ''" disabled :placeholder="$t('请在右侧选择线路')"></el-input>
</el-form-item>
<!--select是原生组件，不受el-form的disabled控制-->
<select size="5" v-model="handlerParams.lineId" style="min-width: 300px; border:1px solid #DCDFE6; border-radius:4px" @change="changeLined">
<option v-for="item in routerList" :value="item.id" :key="item.id">
{{$l(item, 'startTitle')}} >> {{$l(item, 'destTitle')}}
(<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportType"></dict-tag>)
</option>
</select>
</div>
<!-- 不可出渠道异常 -->
<div v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&(handlerParams.orderExceptionHandlerResult=='change_channel'||handlerParams.orderExceptionHandlerResult=='continue_channel')">
<div v-for="row in orderData.orderItemVOList" :key="row.orderItemId">
<div v-if="row.charging ==1">
<el-form-item style="margin-left:40px" :label="$t('全包价成交单价')+':'" size="medium">
<span v-if="!row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
<el-button v-if="orderExceptionData.orderExceptionStatus!=2" class="button" type="primary" plain @click="routeToPrice(row,2)">{{!row.oneSeaFreight?$t('报价'):$t('修改报价')}}</el-button>
</el-form-item>
</div>
<div v-else class="feeList">
<el-form-item :label="$t('运费成交单价')+':'" size="medium">
<span v-if="!row.oneSeaFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</span>
<el-button v-if="orderExceptionData.orderExceptionStatus!=2" class="button" type="primary" plain @click="routeToPrice(row,1)">{{!row.oneSeaFreight?$t('报价'):$t('修改报价')}}</el-button>
</el-form-item>
<el-form-item :label="$t('清关费成交单价')+':'" size="medium">
<span v-if="!row.oneClearanceFreight">{{$t('未报价')}}</span>
<span v-else>{{row.oneClearanceFreight}} {{currencyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}</span>
<el-button v-if="orderExceptionData.orderExceptionStatus!=2" class="button" type="primary" plain @click="routeToPrice(row,2)">{{!row.oneClearanceFreight?$t('报价'):$t('修改报价')}}</el-button>
</el-form-item>
</div>
</div>
<div v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&(handlerParams.orderExceptionHandlerResult=='change_channel'||handlerParams.orderExceptionHandlerResult=='continue_channel')" class="card">
<el-table v-loading="loading" border :data="orderData.orderItemVOList">
<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="$t('中文名')" align="center" prop="prodTitleZh" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" />
<el-table-column :label="$t('品牌')" align="center" prop="brandType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType"></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('填单箱数')" prop="num" />
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('填单特性')" prop="prodAttrIds" width="200">
<template slot-scope="scope">
{{getProdAtrr(scope.row.prodAttrIds)}}
</template>
</el-table-column>
<el-table-column :label="$t('入仓箱数')">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}
</template>
</el-table-column>
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" prop="num">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO&&scope.row.warehouseInInfoVO.prodAttrIds?getProdAtrr(scope.row.warehouseInInfoVO.prodAttrIds):''}}
</template>
</el-table-column>
<el-table-column :label="$t('方数')" prop="volume">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
</template>
</el-table-column>
<el-table-column :label="$t('重量')" prop="weight">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
</template>
</el-table-column>
<el-table-column :label="$t('数量')" prop="quantity">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
</template>
</el-table-column>
<el-table-column :label="$t('货值')" prop="worth" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" width="260">
<template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span>
<span v-else>{{$t('全包价')}}:{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
<el-button type="primary" plain @click="routeToPrice(scope.row,1)">{{!scope.row.oneSeaFreight?$t('报价'):$t('修改报价')}}</el-button>
</div>
<div v-else class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span>
<span v-else>{{$t('运费')}}:{{scope.row.oneSeaFreight}} {{currencyMap[scope.row.seaFreightCurrency]}} / {{unitMap[scope.row.seaFreightVolume]}}</span>
<el-button type="primary" plain @click="routeToPrice(scope.row,1)">{{!scope.row.oneSeaFreight?$t('报价'):$t('修改报价')}}</el-button>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" width="260">
<template slot-scope="scope">
<div class="channel">
<span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
<span v-else>{{scope.row.oneClearanceFreight}} {{currencyMap[scope.row.clearanceFreightCurrency]}} / {{unitMap[scope.row.clearanceFreightVolume]}}</span>
<el-button type="primary" plain @click="routeToPrice(scope.row,2)">{{!scope.row.oneClearanceFreight?$t('报价'):$t('修改报价')}}</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
<!-- 渠道异常 -->
<div v-if="orderExceptionData.orderExceptionType=='channel_exception'&&handlerParams.orderExceptionHandlerResult=='set_shipment_channel'">
<div v-for="row in orderData.orderItemVOList" :key="row.orderItemId">
......@@ -555,7 +604,9 @@
</div>
</div>
</div>
<el-form-item v-if="orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&handlerParams.orderExceptionHandlerResult=='change_channel'&&orderExceptionData.reason" :label="$t('审核驳回原因')+':'" size="medium">
<span>{{orderExceptionData.orderExceptionNotes}}</span>
</el-form-item>
</el-form>
</el-card>
<!-- 只有不需要预付才需要审核 -->
......@@ -658,14 +709,19 @@
};
},
activated(){
this.getOrderData()
console.log(111)
if(this.$route.query.id){
console.log(this.$route.query.id)
this.orderExceptionId = this.$route.query.id
this.handlerParams.orderExceptionId = this.$route.query.id
this.getList()
}
},
async created() {
if(this.$route.query.id){
this.orderExceptionId = this.$route.query.id
this.handlerParams.orderExceptionId = this.$route.query.id
this.getList()
}
getUnitList().then(res => this.unitList = res.data)
this.channelList = (await getChannelList()).data
......@@ -860,7 +916,6 @@
this.orderData = response.data
this.handlerParams.channelId = this.orderData.channelId
this.handlerParams.lineId = this.orderData.lineId
this.getOpenedRouterList()
if(response.data.customerId){
this.getCustomerData(response.data.customerId)
}
......@@ -932,6 +987,10 @@
// this.productId1 = this.handlerParams.productId
// this.productId2 = this.handlerParams.productId
// }
if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'){
this.getOpenedRouterList()
}
},
submitForm(){
if(!this.handlerParams.orderExceptionHandlerResult){
......@@ -1123,6 +1182,12 @@
.card{
margin-top: 20px;
}
.channel{
width: 100%;
display: flex;
align-items: center;
justify-content:space-evenly;
}
.dialog-footer{
padding: 40px;
width: 60%;
......
src/views/ecw/productBrank/index.vue
View file @ 5237d25b
......@@ -63,7 +63,7 @@
</el-table-column>
<el-table-column :label="$t('创建人')" align="center" prop="creator" width="180">
<template v-slot="{row}">
{{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator).nickname}}
{{(row.creator && allSimplList.length) && allSimplList.find(i => i.id == row.creator) && allSimplList.find(i => i.id == row.creator).nickname}}
</template>
</el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180">
......@@ -73,7 +73,7 @@
</el-table-column>
<el-table-column :label="$t('修改人')" align="center" prop="updater" width="180">
<template v-slot="{row}">
{{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater).nickname}}
{{ (row.updater && allSimplList.length) && allSimplList.find(i => i.id == row.updater) && allSimplList.find(i => i.id == row.updater).nickname}}
</template>
</el-table-column>
<el-table-column :label="$t('修改时间')" align="center" prop="createTime" width="180">
......
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