|
|
@@ -54,7 +54,6 @@
|
|
|
style="margin-bottom: 16px"
|
|
|
>
|
|
|
<fileMain v-model="detailData.sendFiles" type="view"></fileMain>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="回执附件:"
|
|
|
@@ -65,7 +64,6 @@
|
|
|
v-model="detailData.repliedFiles"
|
|
|
type="view"
|
|
|
></fileMain>
|
|
|
-
|
|
|
</el-form-item>
|
|
|
<!-- <el-form-item label="计价方式:" style="margin-bottom: 22px">
|
|
|
{{ form.pricingWay == 1 ? '按数量计费' : '按重量计费' }}
|
|
|
@@ -164,7 +162,7 @@
|
|
|
</ele-pro-table>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
- <el-tab-pane label="托盘清单" >
|
|
|
+ <el-tab-pane label="托盘清单">
|
|
|
<ele-pro-table
|
|
|
ref="table"
|
|
|
:needPage="false"
|
|
|
@@ -409,10 +407,18 @@
|
|
|
label: '包装单位',
|
|
|
showOverflowTooltip: true
|
|
|
},
|
|
|
+ {
|
|
|
+ minWidth: 100,
|
|
|
+ prop: 'saleCount',
|
|
|
+ label: '发货数量',
|
|
|
+ showOverflowTooltip: true,
|
|
|
+ align: 'center'
|
|
|
+ },
|
|
|
{
|
|
|
minWidth: 100,
|
|
|
prop: 'totalCount',
|
|
|
- label: '计量数量',
|
|
|
+ label: '确认数量',
|
|
|
+ slot: 'totalCount',
|
|
|
showOverflowTooltip: true,
|
|
|
align: 'center'
|
|
|
},
|
|
|
@@ -464,7 +470,7 @@
|
|
|
prop: 'taxRate',
|
|
|
label: '税率',
|
|
|
formatter: (row, column) => {
|
|
|
- return row.taxRate?row.taxRate+'%':''
|
|
|
+ return row.taxRate ? row.taxRate + '%' : '';
|
|
|
},
|
|
|
align: 'center'
|
|
|
},
|
|
|
@@ -509,7 +515,8 @@
|
|
|
prop: 'goodsLevel',
|
|
|
label: '物品级别',
|
|
|
formatter: (_row, _column, cellValue) => {
|
|
|
- return levelList.find(item=>item.value==_row.goodsLevel)?.label
|
|
|
+ return levelList.find((item) => item.value == _row.goodsLevel)
|
|
|
+ ?.label;
|
|
|
},
|
|
|
align: 'center'
|
|
|
},
|
|
|
@@ -526,7 +533,7 @@
|
|
|
label: '收货状态',
|
|
|
slot: 'isException',
|
|
|
formatter: (row, column) => {
|
|
|
- return row.isException == 1 ? '未收货' : '已收货';
|
|
|
+ return row.isException == 1 ? '有异常' : '无异常';
|
|
|
},
|
|
|
fixed: 'right',
|
|
|
align: 'center'
|