Skip to content

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

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

parents 3d8dea1d 905f9c75
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 34 deletions
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @ 0bf9a091
......@@ -3,7 +3,15 @@
<!-- 自编号 -->
<el-row>
<p style="color:#D9001B;">{{$t('过机重量异常')}}:机场误差3%以内/我司误差超10kg/超过机场重量《N》kg</p>
<p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.weightMisreport==1">
{{$t('过机重量异常')}}:{{$t('机场误差3%以内')}}
</p>
<p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.weightMisreport==2">
{{$t('过机重量异常')}}:{{$t('我司误差超10kg')}}
</p>
<p style="color:#D9001B;" v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2&&pageData.boxCustomsBackVO.overWeight>0">
{{$t('过机重量异常')}}:{{$t('超过机场重量')}}{{pageData.boxCustomsBackVO.overWeight}}kg
</p>
</el-row>
<el-row class="number-area">
<p class="label-font">{{$t('自编号')}}：</p>
......@@ -81,7 +89,7 @@
<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>
<el-button v-if="pageData.boxCustomsBackVO&&pageData.boxCustomsBackVO.overMachineStatus==2&&pageData.boxCustomsBackVO.overMachineAbnormalStatus==2" plain type="primary" size="small" @click="$router.push('/order/warehousing-update?id='+scope.row.orderId)">{{$t('入仓修改 ')}}</el-button>
</div>
</template>
</el-table-column>
......
src/views/ecw/box/shippingAir/nodePage/unloading/unloadingError.vue
View file @ 0bf9a091
......@@ -3,7 +3,7 @@
<el-form ref="errorForm" :model="errorObj" label-width="100px" :rules="rules">
<el-form-item :label="$t('异常')" prop="exceptionType">
<el-radio-group v-model="errorObj.exceptionType">
<el-radio v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_UNLOADING_ERROR)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
<el-radio class="exception-list" v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_UNLOADING_ERROR)" :key="item.value" :label="item.value">{{$l(item, 'label')}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('品名')">
......@@ -85,4 +85,7 @@ export default {
</script>
<style lang="scss" scoped>
.exception-list{
margin-bottom: 20px;
}
</style>
src/views/ecw/box/shippingAir/seaProcess.vue
View file @ 0bf9a091
......@@ -139,14 +139,14 @@ export default {
},
/** 节点点击 */
nodeClick(currIndex, node) {
// if (!checkPermi(['box:'+node.type+':action'])) {
// this.$message.error(this.$t("没有此操作的权限"));
// return;
// }
// if (currIndex > this.currIndex) {
// this.$message.error(this.errorMsg);
// return;
// }
if (!checkPermi(['box:'+node.type+':action'])) {
this.$message.error(this.$t("没有此操作的权限"));
return;
}
if (currIndex > this.currIndex) {
this.$message.error(this.errorMsg);
return;
}
this.currNode = node;
this.currentComponent = `${node.type}Widget`;
this.$set(this.dialogConfig, "width", "500px");
......
src/views/ecw/order/edit.vue
View file @ 0bf9a091
......@@ -941,7 +941,7 @@ export default {
this.getOrder()
}
if(this.$route.query.transportType != this.transportId){
this.set(this.form.transportId, +this.$route.query.transportType)
this.set(this.form.transportId, +this.$route.query.transportType || null)
}
// 变更出货渠道
......@@ -1289,13 +1289,17 @@ export default {
if(this.calculating || !calcable) return false
this.calculating = true
console.log('calculating ---> ')
calculationPrice({
const data = {
lineId: this.form.lineId,
transportId: this.form.transportId,
channelId: [3,4].indexOf(this.form.transportId) > -1 ? this.form.channelId : undefined,
prodConditionParamList: this.getProductListWithDefaultValue(),
orderType: this.form.orderType
}).then(res => {
}
if(this.form.channelId){
data.channelId = this.form.channelId
}
calculationPrice(data).then(res => {
this.$set(this, 'fee', res.data.costDto)
this.form.orderItemVOList.map((item, index) => {
this.$set(item, 'fee', res.data.prodCostDtoList[index] || null)
......
src/views/ecw/order/prepayDeal.vue
View file @ 0bf9a091
......@@ -26,11 +26,17 @@
<el-row>
<el-form-item :label="$t('运输路线')+':'" >
<span v-if="orderData">{{ $t('【') }}<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />{{ $t('】') }}</span>
<span v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">{{ $t('【') }}{{channelName}}{{ $t('】') }}</span>
<span v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, orderData.transportId).cssClass == 'channel'">{{ $t('【') }}{{orderData.channelName}}{{ $t('】') }}</span>
{{orderData?getRouterNameById():''}}
</el-form-item>
</el-row>
<el-row :span="12" v-if="orderExceptionData.orderExceptionType=='overweight_exception'">
<el-form-item :label="$t('异常描述')+':'">
<!-- <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" /> -->
<!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
{{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
</el-form-item>
</el-row>
<!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
<div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception','line_loop_exception','overweight_exception','stock_up_exception','in_warehousing_diff_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
<!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
......@@ -320,6 +326,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row :span="12" v-if="orderExceptionData.orderExceptionType=='order_doc_exception'">
<el-form-item v-if="orderExceptionData.orderExceptionStatus!=2" :label="$t('报关资料')+':'" size="medium" :require="true">
<file-upload v-model="handlerParams.fileList" :value="orderExceptionData.orderExceptionAttr" ></file-upload>
......@@ -558,7 +565,45 @@
</template>
</el-table-column>
<el-table-column :label="$t('货值')" prop="worth" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" width="260">
<el-table-column :label="$t('运费/全包价')" prop="quantity" width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'">
<template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel">
<!-- <span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span> -->
<div class="channel">
<div style="width:80px">{{$t('全包价')}}:</div>
<div style="width:88%" class="channel">
<inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
</div>
</div>
<div v-else>
<!-- <span v-if="!scope.row.oneSeaFreight">{{$t('运费')}}:{{$t('未报价')}}</span> -->
<div class="channel">
<div style="width:80px">{{$t('运费')}}:</div>
<div style="width:88%" class="channel">
<inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="scope.row.seaFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.seaFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'">
<template slot-scope="scope">
<div class="channel">
<!-- <span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span> -->
<div class="channel">
<inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" />
<selector v-model="scope.row.clearanceFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
/ <selector v-model="scope.row.clearanceFreightVolume" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w100" />
</div>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('运费/全包价')" prop="quantity" width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'">
<template slot-scope="scope" >
<div v-if="scope.row.charging ==1" class="channel">
<span v-if="!scope.row.oneSeaFreight">{{$t('全包价')}}:{{$t('未报价')}}</span>
......@@ -572,7 +617,7 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" width="260">
<el-table-column :label="$t('清关费')" prop="quantity" width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'">
<template slot-scope="scope">
<div class="channel">
<span v-if="!scope.row.oneClearanceFreight">{{$t('未报价')}}</span>
......@@ -660,11 +705,12 @@
import { getUnitList } from '@/api/ecw/unit';
import {getProduct} from '@/api/ecw/product'
import {getProductPriceGetPrice} from '@/api/ecw/productPrice'
import Inputor from '@/components/Inputor'
export default {
name: "EcwOrderPrepaydeal",
components: {
FileUpload, WorkFlow,FilePreview,ProductSelector,Selector
FileUpload, WorkFlow,FilePreview,ProductSelector,Selector,Inputor
},
data() {
return {
......@@ -718,11 +764,7 @@
}
},
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
this.productAttrList = (await getProductAttrList()).data
......@@ -732,6 +774,11 @@
getCurrencyList().then(res => this.currencyList = res.data)
this.tradeCityList = (await getTradeCityList()).data
if(this.$route.query.id){
this.orderExceptionId = this.$route.query.id
this.handlerParams.orderExceptionId = this.$route.query.id
this.getList()
}
},
watch:{
'handlerParams.orderExceptionHandlerResult'(val){
......@@ -835,7 +882,7 @@
let attrIds = ids.split(',')
this.productAttrList.forEach(item=>{
if(attrIds.indexOf(item.id) > -1||attrIds.indexOf(item.id+'')){
if(attrIds.indexOf(item.id) > -1||attrIds.indexOf(item.id+'')>-1){
attr.push(this.$l(item, 'attrName'))
}
})
......@@ -922,6 +969,19 @@
if(response.data.customerId){
this.getCustomerData(response.data.customerId)
}
if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'){
console.log(this.curreynList)
this.orderData.orderItemVOList.map(v=>{
if(!v.oneSeaFreight){
v.seaFreightCurrency = this.currencyList[0]['id']
v.seaFreightVolume = this.unitList[0]['id']
}
if(!v.oneClearanceFreight){
v.clearanceFreightCurrency = this.currencyList[0]['id']
v.clearanceFreightVolume = this.unitList[0]['id']
}
})
}
});
},
getCustomerData(id){
......@@ -1025,6 +1085,9 @@
return
}
}
if(this.orderExceptionData.orderExceptionType=='not_shipping_channel_exception'&&this.handlerParams.orderExceptionHandlerResult=='continue_channel'){
this.handlerParams.orderItemVOList = this.orderData.orderItemVOList
}
handlerExceptionByExceptionId(this.handlerParams).then(res=>{
this.$modal.msgSuccess(this.$t('提交成功'));
this.$redirect('/order/pending?id=' + this.orderData.orderId)
......
src/views/ecw/productPrice/edit.vue
View file @ 0bf9a091
......@@ -251,8 +251,8 @@
</el-form-item>
</template>
<el-form-item :label="$t('是否単询')" prop="inquiry">
<dict-selector :type="DICT_TYPE.NEED_ORDER_INQUIRY" v-model="form.needOrderInquiry" form-type="radio"></dict-selector>
<el-form-item :label="$t('是否单询')" prop="inquiry">
<dict-selector :type="DICT_TYPE.NEED_ORDER_INQUIRY" v-model="form.needOrderInquiry" form-type="radio" formatter="number"></dict-selector>
</el-form-item>
</el-card>
</el-form>
......@@ -373,7 +373,9 @@ export default {
form: {
minWeightUnit: 0,
priceStepList: [], // 阶梯价格
specialList: []
specialList: [],
// 是否单询，默认否
needOrderInquiry: '0'
},
needPay: false, // 是否需要预付
stepPrice: false, // 是否阶梯订单
......@@ -608,7 +610,9 @@ export default {
clearancePrice: 0,
transportPrice: 0,
minWeight: 0,
minWeightUnit: null
minWeightUnit: null,
// 是否单询，默认否
needOrderInquiry: 0
}
// 默认体积单位（立方米）
this.setDefaultVolumeUnit(7)
......
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