Skip to content

J
jiedao-app-operator-master
Commit 80870cb3 authored by zhoutong's avatar zhoutong
Browse files
Options

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

parents 779d33c6 29a25edf
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 15 deletions
src/views/ecw/order/prepayDeal.vue
View file @ 80870cb3
......@@ -518,13 +518,13 @@
<!-- 不可出渠道异常 -->
<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">
<el-table-column :label="$t('序号')" align="center" prop="id" type="index" min-width="30">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" min-width="60" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" min-width="60" />
<el-table-column :label="$t('中文名')" align="center" prop="prodTitleZh" min-width="50" />
<el-table-column :label="$t('英文名')" align="center" prop="prodTitleEn" min-width="50" />
<el-table-column :label="$t('品牌')" align="center" min-width="50" prop="brandType">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType"></dict-tag>
......@@ -532,7 +532,7 @@
</el-table-column>
<el-table-column :label="$t('填单箱数')" prop="num" min-width="60" />
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('填单特性')" prop="prodAttrIds" min-width="100">
<el-table-column :label="$t('填单特性')" prop="prodAttrIds" min-width="60">
<template slot-scope="scope">
{{getProdAtrr(scope.row.prodAttrIds)}}
</template>
......@@ -543,35 +543,35 @@
</template>
</el-table-column>
<!-- v2.0 入仓特性异常 -->
<el-table-column :label="$t('入仓特性')" prop="num" min-width="100">
<el-table-column :label="$t('入仓特性')" prop="num" min-width="60">
<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" min-width="50">
<el-table-column :label="$t('方数')" prop="volume" min-width="30">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}
</template>
</el-table-column>
<el-table-column :label="$t('重量')" prop="weight" min-width="50">
<el-table-column :label="$t('重量')" prop="weight" min-width="30">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}
</template>
</el-table-column>
<el-table-column :label="$t('数量')" prop="quantity" min-width="50">
<el-table-column :label="$t('数量')" prop="quantity" min-width="30">
<template slot-scope="scope">
{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.quantityAll:0}}
</template>
</el-table-column>
<el-table-column :label="$t('货值')" prop="worth" min-width="50" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" min-width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'">
<el-table-column :label="$t('货值')" prop="worth" min-width="30" />
<el-table-column :label="$t('运费/全包价')" prop="quantity" min-width="260" 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" />
<inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<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>
......@@ -582,7 +582,7 @@
<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" />
<inputor default2="0" v-model.number="scope.row.oneSeaFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<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>
......@@ -590,19 +590,19 @@
</div>
</template>
</el-table-column>
<el-table-column :label="$t('清关费')" prop="quantity" min-width="360" v-if="handlerParams.orderExceptionHandlerResult=='continue_channel'">
<el-table-column :label="$t('清关费')" prop="quantity" min-width="180" 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" />
<inputor default2="0" v-model.number="scope.row.oneClearanceFreight" type="number" :placeholder="$t('整数或者两位小数')" class="w100" />
<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" min-width="260" v-if="handlerParams.orderExceptionHandlerResult=='change_channel'">
<el-table-column :label="$t('运费/全包价')" prop="quantity" min-width="220" 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>
......@@ -1310,4 +1310,13 @@
display: flex;
flex-direction: column
}
::v-deep .el-input--medium .el-input__inner {
padding: 0 4px;
}
::v-deep .el-table th.el-table__cell > .cell{
padding:0 2px !important;
}
::v-deep .el-table td.el-table__cell div{
padding:0 2px !important;
}
</style>
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