feat: 新增业务员列并调整部分表格列宽,注释操作记录标签页
1. 在CoilSelector相关数据和报表设置列配置中新增业务员字段 2. 调整逻辑库位、实际库区的表格列宽 3. 注释crm合同页的操作记录标签页
This commit is contained in:
@@ -224,4 +224,5 @@ export const optionalColumns = [
|
|||||||
{ label: '发货绑定负责人', value: 'bindPrincipal' },
|
{ label: '发货绑定负责人', value: 'bindPrincipal' },
|
||||||
{ label: '发货配卷时间', value: 'bindDeliveryTime' },
|
{ label: '发货配卷时间', value: 'bindDeliveryTime' },
|
||||||
{ label: '发货时间', value: 'exportTime' },
|
{ label: '发货时间', value: 'exportTime' },
|
||||||
|
{ label: '业务员', value: 'saleName' },
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -57,12 +57,11 @@
|
|||||||
<FileList :oss-ids="form.annexFiles" />
|
<FileList :oss-ids="form.annexFiles" />
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="操作记录" name="record" v-hasPermi="['crm:order:record']">
|
<!-- <el-tab-pane label="操作记录" name="record" v-hasPermi="['crm:order:record']">
|
||||||
<div class="order-record" v-if="activeTab === 'record'">
|
<div class="order-record" v-if="activeTab === 'record'">
|
||||||
<!-- 操作记录内容 -->
|
|
||||||
<OrderRecord :orderId="currentOrder.orderId" />
|
<OrderRecord :orderId="currentOrder.orderId" />
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane> -->
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</div>
|
</div>
|
||||||
<div v-else class="no-selection" style="display: flex; align-items: center; justify-content: center; height: 100%;">
|
<div v-else class="no-selection" style="display: flex; align-items: center; justify-content: center; height: 100%;">
|
||||||
|
|||||||
@@ -177,8 +177,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="净重" align="center" prop="netWeight" v-if="!hideWarehouseQuery" />
|
<el-table-column label="净重" align="center" prop="netWeight" v-if="!hideWarehouseQuery" />
|
||||||
<el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
|
<el-table-column label="逻辑库位" width="120" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
|
||||||
<el-table-column label="实际库区" align="center" prop="actualWarehouseName"
|
<el-table-column label="实际库区" width="100" align="center" prop="actualWarehouseName"
|
||||||
v-if="!hideWarehouseQuery && !showExportTime" />
|
v-if="!hideWarehouseQuery && !showExportTime" />
|
||||||
<el-table-column label="产品类型" align="center" width="180" v-if="!moreColumn">
|
<el-table-column label="产品类型" align="center" width="180" v-if="!moreColumn">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -186,6 +186,7 @@
|
|||||||
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
|
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="业务员" align="center" prop="saleName" width="60" />
|
||||||
<el-table-column v-if="showAbnormal" label="异常数量" align="center" prop="abnormalCount"></el-table-column>
|
<el-table-column v-if="showAbnormal" label="异常数量" align="center" prop="abnormalCount"></el-table-column>
|
||||||
<el-table-column label="长度 (米)" align="center" prop="length" v-if="showLength" />
|
<el-table-column label="长度 (米)" align="center" prop="length" v-if="showLength" />
|
||||||
<el-table-column label="发货时间" v-if="showExportTime" align="center" prop="exportTime" width="205">
|
<el-table-column label="发货时间" v-if="showExportTime" align="center" prop="exportTime" width="205">
|
||||||
@@ -215,8 +216,6 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" />
|
<el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" />
|
||||||
|
|
||||||
<el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
|
<el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
|
||||||
|
|||||||
@@ -186,6 +186,7 @@ export default {
|
|||||||
{ label: '发货绑定负责人', value: 'bindPrincipal' },
|
{ label: '发货绑定负责人', value: 'bindPrincipal' },
|
||||||
{ label: '发货配卷时间', value: 'bindDeliveryTime' },
|
{ label: '发货配卷时间', value: 'bindDeliveryTime' },
|
||||||
{ label: '发货时间', value: 'exportTime' },
|
{ label: '发货时间', value: 'exportTime' },
|
||||||
|
{ label: '业务员', value: 'saleName' },
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user