|
|
@@ -20,13 +20,13 @@
|
|
|
|
|
|
|
|
|
|
|
|
- <template v-slot:orderCode="{ row }">
|
|
|
+ <template v-slot:orderNo="{ row }">
|
|
|
<el-link
|
|
|
type="primary"
|
|
|
:underline="false"
|
|
|
- @click="openorderDetail(row, 'orderCode')"
|
|
|
+ @click="openorderDetail(row, 'orderNo')"
|
|
|
>
|
|
|
- {{ row.orderCode }}
|
|
|
+ {{ row.orderNo }}
|
|
|
</el-link>
|
|
|
</template>
|
|
|
|
|
|
@@ -45,6 +45,7 @@
|
|
|
import orderDetailDialog from '@/views/saleManage/saleOrder/components/detailDialog.vue';
|
|
|
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
+ import { getTableList } from '@/api/saleManage/palletManagement';
|
|
|
|
|
|
export default {
|
|
|
mixins: [dictMixins],
|
|
|
@@ -69,21 +70,22 @@
|
|
|
showOverflowTooltip: true,
|
|
|
fixed: 'left'
|
|
|
},
|
|
|
+
|
|
|
{
|
|
|
- prop: 'orderCode',
|
|
|
- label: '销售订单编码',
|
|
|
+ prop: 'projectName',
|
|
|
+ label: '项目名称',
|
|
|
align: 'center',
|
|
|
- sortable: true,
|
|
|
- slot: 'orderCode',
|
|
|
showOverflowTooltip: true,
|
|
|
- minWidth: 200
|
|
|
+ minWidth: 180
|
|
|
},
|
|
|
{
|
|
|
- prop: 'projectName',
|
|
|
- label: '项目名称',
|
|
|
+ prop: 'orderNo',
|
|
|
+ label: '销售订单编码',
|
|
|
align: 'center',
|
|
|
+ sortable: true,
|
|
|
+ // slot: 'orderNo',
|
|
|
showOverflowTooltip: true,
|
|
|
- minWidth: 180
|
|
|
+ minWidth: 200
|
|
|
},
|
|
|
{
|
|
|
prop: 'productName',
|
|
|
@@ -101,33 +103,33 @@
|
|
|
},
|
|
|
|
|
|
{
|
|
|
- prop: 'receiveCount',
|
|
|
+ prop: 'resviceNum',
|
|
|
label: '已回收数量',
|
|
|
align: 'center',
|
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 140
|
|
|
},
|
|
|
{
|
|
|
- prop: 'noReceiveCount',
|
|
|
+ prop: 'noResviceNum',
|
|
|
label: '未回收数量',
|
|
|
align: 'center',
|
|
|
showOverflowTooltip: true,
|
|
|
minWidth: 140
|
|
|
},
|
|
|
- {
|
|
|
- prop: 'createUserName',
|
|
|
- label: '创建人',
|
|
|
- align: 'center',
|
|
|
- showOverflowTooltip: true,
|
|
|
- minWidth: 80
|
|
|
- },
|
|
|
- {
|
|
|
- prop: 'createTime',
|
|
|
- label: '创建时间',
|
|
|
- align: 'center',
|
|
|
- showOverflowTooltip: true,
|
|
|
- minWidth: 170
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // prop: 'createUserName',
|
|
|
+ // label: '创建人',
|
|
|
+ // align: 'center',
|
|
|
+ // showOverflowTooltip: true,
|
|
|
+ // minWidth: 80
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // prop: 'createTime',
|
|
|
+ // label: '创建时间',
|
|
|
+ // align: 'center',
|
|
|
+ // showOverflowTooltip: true,
|
|
|
+ // minWidth: 170
|
|
|
+ // },
|
|
|
|
|
|
]
|
|
|
};
|
|
|
@@ -137,8 +139,7 @@
|
|
|
methods: {
|
|
|
/* 表格数据源 */
|
|
|
datasource({ page, limit, where, order }) {
|
|
|
- return []
|
|
|
- return getSendTableList({
|
|
|
+ return getTableList({
|
|
|
pageNum: page,
|
|
|
size: limit,
|
|
|
...where
|
|
|
@@ -156,7 +157,7 @@
|
|
|
if (type === 'docNo') {
|
|
|
this.$refs.DetailDialogRef.open(row);
|
|
|
}
|
|
|
- if (type === 'orderCode') {
|
|
|
+ if (type === 'orderNo') {
|
|
|
this.$refs.orderDetailDialogRef.open({ id: row.orderId });
|
|
|
}
|
|
|
}
|