Skip to content

J
jiedao-app-operator-master
Commit 33f310fc authored by houjn@hikoon.cn's avatar houjn@hikoon.cn
Browse files
Options

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

parents 71418b61 43a74e0d
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 67 deletions
src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue
View file @ 33f310fc
......@@ -62,6 +62,11 @@
</section>
</template>
</el-table-column>
<el-table-column :label="$t('报关方式')" align="center" prop="customsType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
</template>
</el-table-column>
<el-table-column :label="$t('计划箱数')" align="center" prop="num">
<template slot-scope="scope">
{{getTotlContent(scope.row,['num'])}}
......@@ -311,9 +316,15 @@ export default {
startWarehouseId: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
cabinetId: [{ required: true, message: this.$t("必填"), trigger: "change" }],
qrCode: [{ required: true, message: this.$t("必填"), trigger: "change" }],
orderNo: [{ required: true, message: this.$t("必填"), trigger: "change" }],
cabinetId: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
qrCode: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
orderNo: [
{ required: true, message: this.$t("必填"), trigger: "change" },
],
},
// 当前行
currRow: {},
......@@ -338,7 +349,7 @@ export default {
this.listData = data.map((item, index) => {
return {
...item,
title: this.$t('第{index}部分', {index: 1+index}),
title: this.$t("第{index}部分", { index: 1 + index }),
};
});
if (this.listData.length) {
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 33f310fc
......@@ -45,6 +45,11 @@
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.feeType" />
</template>
</el-table-column>
<el-table-column :label="$t('报关方式')" align="center" prop="customsType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
</template>
</el-table-column>
<el-table-column :label="$t('箱数')" align="center" prop="num">
<template slot-scope="scope">
<el-link type="primary" @click.native="showWarehouseLogs(scope.row)">
......
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @ 33f310fc
......@@ -43,6 +43,11 @@
</section>
</template>
</el-table-column>
<el-table-column :label="$t('报关方式')" align="center" prop="customsType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType" />
</template>
</el-table-column>
<el-table-column :label="$t('实装箱数')" align="center" prop="installNum" />
<el-table-column :label="$t('卸柜箱数')" align="center" prop="unloadNum" />
<el-table-column :label="$t('清关状态')" align="center" prop="">
......@@ -172,7 +177,7 @@ export default {
this.sectionList = res.data.map((item, index) => {
return {
...item,
title: this.$t('第{index}部分', {index: index + 1}),
title: this.$t("第{index}部分", { index: index + 1 }),
};
});
});
......
src/views/ecw/coupon/edit.vue
View file @ 33f310fc
......@@ -534,7 +534,7 @@ export default {
checkPositive(object, field){
const lastChar = object[field].split('').pop()
object[field] = parseFloat(object[field])
if(!object[field] || object[field] < 0) object[field] = ''
if(isNaN(object[field]) || object[field] < 0) object[field] = ''
else object[field] = object[field].toString()
// 如果最后一位是.且没有其他点则补上
......
src/views/ecw/customer/components/Delay.vue
View file @ 33f310fc
......@@ -31,7 +31,7 @@ export default {
return JSON.parse(this.info.details)
},
pictures(){
if(!this.detail) return []
if(!this.detail || !this.detail.voucher) return []
return this.detail.voucher.split(',').filter(item => !!item)
}
},
......
src/views/ecw/customer/edit.vue
View file @ 33f310fc
......@@ -30,7 +30,7 @@
<el-input v-model="form.address" :placeholder="$t('请输入联系地址')" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('出货渠道')" prop="transportType">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" form-type="checkbox" multiple v-model="form.transportType"></dict-selector>
......@@ -46,7 +46,7 @@
<dict-selector :type="DICT_TYPE.ECW_CUSTOMER_RESOURCE_TYPE" v-model="form.resourceType" formatter="number"></dict-selector>
</el-form-item>
</el-col>
<el-col :span="13" v-show="form.type && form.type.indexOf('2') !== -1">
<el-form-item :label="$t('所属代理')" prop="agentId">
<el-select filterable clearable v-model="form.agentId" :placeholder="$t('请选择所属代理')">
......@@ -171,7 +171,7 @@
<el-switch v-model="form.isShowTidanPrice"></el-switch>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item :label="$t('到仓确认')" prop="arrivalConfirm">
<el-switch v-model="form.arrivalConfirm" :active-value="1" :inactive-value="0" />
......@@ -492,7 +492,6 @@ export default {
// 新建客户
this.handleAddContact()
if(this.isCustomerServiceConfirmed){
console.log(this.userId);
this.form.customerService = this.userId
}
}
......@@ -512,7 +511,7 @@ export default {
getWarehouseList().then(r => {
this.warehouseList = r.data
})
listSimpleUsers().then(r => {
listServiceUser().then(r => {
this.serviceUserList = r.data
})
getCountryListAll().then(r => {
......@@ -657,7 +656,7 @@ export default {
return;
}
if (this.form.customerContacts.length === 0){
this.$modal.msgError(this.$t('至少填写一个联系人信息'));
this.$modal.msgError(this.$t('至少填写一个联系人信息'));
return
}
......@@ -700,7 +699,9 @@ export default {
}
// 添加的提交
//我的客户页面跳转直接
form.isCustomerServiceConfirmed = true;
if(this.isCustomerServiceConfirmed){
form.isCustomerServiceConfirmed = this.isCustomerServiceConfirmed;
}
createCustomer(form).then(response => {
this.$modal.msgSuccess(this.$t('新增成功'));
this.open = false;
......
src/views/ecw/customer/index.vue
View file @ 33f310fc
......@@ -121,7 +121,7 @@
</el-table-column>
<el-table-column :label="$t('出货渠道')">
<template slot-scope="{row}">
<dict-tag v-if="row.transportType" v-for="item in row.transportType.split(',')" :type="DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE" :value="item"></dict-tag>
{{channel(row.transportType)}}
</template>
</el-table-column>
<el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
......@@ -517,6 +517,13 @@ import transferCustomer from "@/views/ecw/customer/transferCustomer";
export default {
name: "Customer",
computed:{
channel(){
return (val)=>{
return !!val ? this.getDictDatas(this.DICT_TYPE.ECW_CUSTOMER_TRANSPORT_TYPE).filter(i => (val.split(',') || []).includes(i.value)).map(i => i.label).join('，') :''
}
}
},
components: {
upload,
CustomerFollowList,
......@@ -618,6 +625,7 @@ export default {
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getCustomerPage(params).then(response => {
console.log(response,'response')
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
......
src/views/ecw/customer/query.vue
View file @ 33f310fc
......@@ -31,7 +31,7 @@
<el-descriptions-item :label="$t('客户类别')">{{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (customer.type||'').split(',')).map(e => e.label).join(', ') }}</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('联系方式')">{{ customer }}</el-descriptions-item>-->
<el-descriptions-item :label="$t('推介人')">{{ promoter }}</el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')">{{ customerService }}</el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')">{{customerService }}</el-descriptions-item>
<el-descriptions-item :label="$t('公司名称')">{{ customer.company }}</el-descriptions-item>
<el-descriptions-item :label="$t('联系地址')">{{ customer.address }}</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">{{ parseTime(customer.createTime) }}</el-descriptions-item>
......@@ -469,6 +469,7 @@ export default {
getCustomerSelect().then(r => {
this.customerSelect = r.data.list
})
listServiceUser().then(r => {
this.serviceUserList = r.data
})
......@@ -601,6 +602,7 @@ export default {
return this.customerSelect.find(e => e.id === this.customer.promoter)?.name || ''
},
customerService() {
console.log(this.serviceUserList,'this.serviceUserList');
return this.serviceUserList.find(e => e.id === this.customer.customerService)?.nickname || ''
},
id() {
......
src/views/ecw/deptTarget/myAchievement.vue
View file @ 33f310fc
......@@ -46,16 +46,16 @@
<div class="total_num">
<span>开发客户：</span>
<span>总箱数 {{totalData.developNum}}箱 </span>
<span>总方数 {{totalData.developNum}}m³ </span>
<span>总重量 {{totalData.developNum}}KG </span>
<span>总方数 {{totalData.developVolume}}m³ </span>
<span>总重量 {{totalData.developWeight}}KG </span>
<span>公司客户：</span>
<span>总箱数 {{totalData.companyNum}}箱 </span>
<span>总方数 {{totalData.companyNum}}m³ </span>
<span>总重量 {{totalData.companyNum}}KG </span>
<span>总方数 {{totalData.companyVolume}}m³ </span>
<span>总重量 {{totalData.companyWeight}}KG </span>
<span>汇总：</span>
<span>总箱数 {{totalData.sumNum}}箱 </span>
<span>总方数 {{totalData.sumNum}}m³ </span>
<span>总重量 {{totalData.sumNum}}KG </span>
<span>总方数 {{totalData.sumVolume}}m³ </span>
<span>总重量 {{totalData.sumWeight}}KG </span>
</div>
<!-- 列表 -->
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
......@@ -266,11 +266,11 @@
this.totalData.sumWeight =this.myAchievementData.totalWeight
this.totalData.sumVolume =this.myAchievementData.totalVolume
this.totalData.sumNum =this.myAchievementData.totalNum
this.totalData.companyWeight =this.myAchievementData.companyTotaWeight
this.totalData.companyVolume =this.myAchievementData.companyTotaVolume
this.totalData.companyNum =this.myAchievementData.companyTotaNum
this.totalData.developWeight =this.myAchievementData.devTotaWeight
this.totalData.developVolume =this.myAchievementData.devTotaVolume
this.totalData.companyWeight =this.myAchievementData.companyTotalWeight
this.totalData.companyVolume =this.myAchievementData.companyTotalVolume
this.totalData.companyNum =this.myAchievementData.companyTotalNum
this.totalData.developWeight =this.myAchievementData.devTotalWeight
this.totalData.developVolume =this.myAchievementData.devTotalVolume
this.totalData.developNum =this.myAchievementData.devTotalNum
this.loading = false;
});
......@@ -413,11 +413,11 @@
this.totalData.sumWeight =this.myAchievementData.totalWeight
this.totalData.sumVolume =this.myAchievementData.totalVolume
this.totalData.sumNum =this.myAchievementData.totalNum
this.totalData.companyWeight =this.myAchievementData.companyTotaWeight
this.totalData.companyVolume =this.myAchievementData.companyTotaVolume
this.totalData.companyNum =this.myAchievementData.companyTotaNum
this.totalData.developWeight =this.myAchievementData.devTotaWeight
this.totalData.developVolume =this.myAchievementData.devTotaVolume
this.totalData.companyWeight =this.myAchievementData.companyTotalWeight
this.totalData.companyVolume =this.myAchievementData.companyTotalVolume
this.totalData.companyNum =this.myAchievementData.companyTotalNum
this.totalData.developWeight =this.myAchievementData.devTotalWeight
this.totalData.developVolume =this.myAchievementData.devTotalVolume
this.totalData.developNum =this.myAchievementData.devTotalNum
}
},
......
src/views/ecw/offer/components/Commossion.vue
View file @ 33f310fc
......@@ -18,17 +18,17 @@
<el-row v-if="!form.charging">
<el-col :span="12">
<el-form-item :label="$t('运费')">
{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
{{form.seaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('清关费')">
{{form.orgClearanceFreight}} {{ currencyMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
{{form.clearanceFreight}} {{ currencyMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('全包价')" v-if="form.charging">
{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
{{form.seaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
<el-form-item :label="$t('佣金类型')" prop="commissionType">
<dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" formatter="number" />
......@@ -52,7 +52,7 @@
<!-- 明佣+暗佣显示 -->
<div v-if="form.commissionType == 3">
{{$t('成本价')}}：{{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
{{$t('成本价')}}：{{costPrice}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</div>
<!-- 暗佣显示 -->
......@@ -64,7 +64,7 @@
<el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + offer.relationId)">去设置</el-link>
</div>
<div v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
<div v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{ salePrice }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
<div v-if="form.commissionType == 3">{{$t('实际佣金返点')}}：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}</div>
</div>
<div class="page-title">{{$t('审批流程')}}</div>
......@@ -96,6 +96,7 @@ import { getProductTypeList } from '@/api/ecw/productType'
import WorkFlow from '@/components/WorkFlow'
import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
import {cancelProcessInstance} from '@/api/bpm/processInstance'
import Decimal from "decimal.js"
const TYPE = 3
export default {
name: "Commossion",
......@@ -158,6 +159,12 @@ export default {
return s ? '【' + s + '】' : ''
}
},
costPrice(){
return Decimal(this.form.seaFreight || 0).minus(this.form.lightCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
},
salePrice(){
return Decimal(this.form.seaFreight || 0).minus(this.form.orgLightCommissionAmount || 0).plus(this.form.lightCommissionAmount || 0)
},
currencyMap(){
let map = {}
this.currencyList.forEach(item => {
......
src/views/ecw/offer/components/SpecialDetail.vue
View file @ 33f310fc
......@@ -25,13 +25,13 @@
</div>
<div>
原运费：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
原运费：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
</div>
<div>
新运费：{{newSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
新运费：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
</div>
<div>
成本价：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
成本价：{{costPrice}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
</div>
<div>
明佣：{{ form.lightCommissionAmount}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
......@@ -132,8 +132,12 @@ export default {
return map
},
// 新运费
newSeaFreight(){
/* newSeaFreight(){
return Decimal(this.form.seaFreight).plus(this.form.shadeCommissionAmount).plus(this.form.lightCommissionAmount)
}, */
// 成本价
costPrice(){
return Decimal(this.form.seaFreight || 0).minus(this.form.lightCommissionAmount || 0).minus(this.form.shadeCommissionAmount || 0)
}
},
methods: {
......
src/views/ecw/order/components/specialNeeds.vue
View file @ 33f310fc
......@@ -88,13 +88,18 @@ export default {
p1.push(item)
}
})
specialNeedCreate(p1).then(r=>{
if(r.code === 0){
this.$emit('update:show',false)
this.$emit('determine')
this.$message.success('提交成功');
}
})
if(p1.every(i => Number(i.transFee) > 0 )){
specialNeedCreate(p1).then(r=>{
if(r.code === 0){
this.$emit('update:show',false)
this.$emit('determine')
this.$message.success('提交成功');
}
})
}else {
this.$modal.msg("请输入大于0的金额。");
}
},
},
watch:{
......@@ -105,8 +110,8 @@ export default {
advanceType:r.value,
orderId:this.orderId,
transFee:'',//预计金额
transCurrency:'',//运输费币种
payType:''
transCurrency:1,//运输费币种
payType:'1'
})
})
//特需回显
......
src/views/ecw/order/detail.vue
View file @ 33f310fc
......@@ -390,7 +390,7 @@ export default {
});
},
getChannel(){
if(!this.order || !this.order.channelId) return
if(!this.order || !this.order.channelId || this.order.transportId == 1 || this.order.transportId == 2) return
getChannel(this.order.channelId).then(res => {
this.channelName = res.data.nameZh
})
......
src/views/ecw/order/edit.vue
View file @ 33f310fc
......@@ -698,6 +698,7 @@ export default {
totalWorth: new Decimal(0),
totalQuatity: new Decimal(0)
}
if(!this.form || !this.form.orderItemVOList) return sum
this.form.orderItemVOList.forEach(item => {
sum.totalNum = sum.totalNum.plus(item.num || 0)
sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
......@@ -766,6 +767,11 @@ export default {
console.log('重置路线',oldTransportId, transportId, this.selectedRouter?.transportType)
this.$set(this.form, 'lineId', undefined)
}
// 选择海运拼柜和海运整柜清空渠道值
if(transportId == 1 || transportId == 2){
this.$set(this.form, 'channelId', null)
}
this.getOpenedRouterList()
},
......
src/views/ecw/order/exception/index.vue
View file @ 33f310fc
......@@ -112,12 +112,19 @@
<el-table-column :label="$t('总箱数/入仓箱数')" align="center" >
<template slot-scope="scope">
<span>{{scope.row.totalBox+$t('箱/')+scope.row.warehousingBox+$t('箱')}}</span>
<dict-tag style="color:#ff4949" v-if="scope.row.orderExceptionType=='order_doc_exception'" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="scope.row.customsType"></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('体积/重量')" align="center">
<template slot-scope="scope">
<span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
<span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
<div v-if="scope.row.orderExceptionType!='order_heavy_cargo_exception'">
<span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
<span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
</div>
<el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
<span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
<span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('运输方式/目的地')" align="center">
......
src/views/ecw/order/index.vue
View file @ 33f310fc
......@@ -139,7 +139,8 @@
<el-table-column :label="$t('唛头')" align="center" prop="marks" />
<el-table-column :label="$t('总箱数/入仓箱数')" align="center" prop="sumNum">
<template slot-scope="{row}">
{{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}
<div :style="{color:row.customsType != 1 ? 'red' : null}">{{row.totalNum}}{{$t('箱')}}/{{row.sumNum}}{{$t('箱')}}</div>
<dict-tag v-if="row.customsType != 1" style="color:red" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="row.customsType"></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('体积/重量')" align="center" prop="sumWeight">
......@@ -180,12 +181,12 @@
</template>
<template v-else>
<!--操作相关的-->
<el-dropdown v-if="exclude(scope.row.inWarehouseState, [204,205,206])">
<el-dropdown>
<el-button type="text">{{$t('操作')}}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 编辑 -->
<template v-if="
( scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314) ) && !scope.row.abnormalState
( scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314) ) && !scope.row.abnormalState && exclude(scope.row.inWarehouseState, [204,205,206])
">
<el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:update']" >{{$t('编辑')}}</el-dropdown-item>
</template>
......@@ -205,7 +206,7 @@
<!-- 费用申请 -->
<template v-if="
exclude(scope.row.status, [0, 88]) && !scope.row.abnormalState
exclude(scope.row.status, [0, 88]) && !scope.row.abnormalState && exclude(scope.row.inWarehouseState, [204,205,206])
">
<el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId" >{{$t('费用申请')}}</el-dropdown-item>
</template>
......@@ -224,7 +225,8 @@
<!-- 特价 -->
<template v-if="
exclude(scope.row.status, [0]) &&
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
exclude(scope.row.inWarehouseState, [204,205,206])
">
<el-dropdown-item @click.native="$router.push('/order/special/' + scope.row.orderId)" v-hasPermi="['ecw:order:update']" >{{$t('特价')}}</el-dropdown-item>
</template>
......@@ -232,19 +234,24 @@
<!-- 确认提货 -->
<template v-if="
scope.row.status >= 5 &&
!scope.row.abnormalState
!scope.row.abnormalState &&
exclude(scope.row.inWarehouseState, [204,205,206])
">
<el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" >{{$t('确认提货')}}</el-dropdown-item>
</template>
<!-- 合单，拆单 -->
<template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3">
<template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206])">
<el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)" >{{$t('拆单申请')}}</el-dropdown-item>
</template>
<!-- 合单日志，提货日志 -->
<template v-if="scope.row.status >= 5 && scope.row.status < 12 && !scope.row.abnormalState || (scope.row.status == 12 && scope.row.shipmentState == 314) ">
<template v-if="(
scope.row.status > 2 &&
exclude(scope.row.status + '-' + scope.row.shipmentState, ['17-391', '18-392', '15-332', '15-330']) &&
exclude(scope.row.status + '-' + scope.row.inWarehouseState, ['16-202'])
)">
<el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
<el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
</template>
......
src/views/ecw/order/prepayDeal.vue
View file @ 33f310fc
......@@ -510,11 +510,11 @@
this.$modal.msgError(this.$t('请选择处理结果'));
return
}
if(this.orderExceptionData.orderExceptionType=='order_doc_exception'){
if(!this.handlerParams.fileList||this.handlerParams.fileList.length==0){
this.$modal.msgError(this.$t('请上传报关资料'));
return
}
if(this.orderExceptionData.orderExceptionType=='order_doc_exception'&&this.handlerParams.fileList&&this.handlerParams.fileList.length>0){
// if(!this.handlerParams.fileList||this.handlerParams.fileList.length==0){
// this.$modal.msgError(this.$t('请上传报关资料'));
// return
// }
this.handlerParams.files = Array.isArray(this.handlerParams.fileList) ? this.handlerParams.fileList.join(',') : this.handlerParams.fileList
}
......
src/views/ecw/order/special/Preferential.vue
View file @ 33f310fc
......@@ -13,7 +13,7 @@
</template>
<template v-else>
<el-form-item :label="$t('原泡货标准')">
{{form.orgWVolume}} kg
{{form.orgVWeight}} kg
</el-form-item>
<el-form-item :label="$t('现泡货标准')" style="width: 400px" prop="clearanceFreight">
<el-input v-model="form.vweight" type="number" class="w-100" /> kg
......
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