|
@@ -39,11 +39,11 @@
|
|
|
|
|
|
<template v-if="toggleSearchStatus">
|
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="Po">
|
|
|
- <a-input placeholder="请输入Po" v-model="queryParam.smallPo"></a-input>
|
|
|
+ <a-form-item label="订单号">
|
|
|
+ <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="客户">
|
|
|
<j-search-select-tag
|
|
|
placeholder="请选择客户"
|
|
@@ -51,13 +51,13 @@
|
|
|
dict="view_customer,customername,customername">
|
|
|
</j-search-select-tag>
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
<a-col :md="6" :sm="8">
|
|
|
- <a-form-item label="分销点">
|
|
|
- <a-input placeholder="请输入分销点" v-model="queryParam.distributionPoint"></a-input>
|
|
|
+ <a-form-item label="出运明细制单人">
|
|
|
+ <a-input placeholder="请输入出运明细制单人" v-model="queryParam.createBy"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="预发货日期">
|
|
|
<a-range-picker
|
|
|
:placeholder="['开始时间', '结束时间']"
|
|
@@ -67,7 +67,7 @@
|
|
|
@change="onDateChange"
|
|
|
/>
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
|
|
|
</template>
|
|
|
|
|
@@ -127,28 +127,37 @@ export default {
|
|
|
{
|
|
|
title: '单据号',
|
|
|
dataIndex: 'documentNo',
|
|
|
- width: 120,
|
|
|
+ width: 140,
|
|
|
fixed: 'left',
|
|
|
+ customRender: t => ellipsis(t),
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '销售订单号',
|
|
|
dataIndex: 'orderNumber',
|
|
|
- width: 120,
|
|
|
+ width: 140,
|
|
|
fixed: 'left',
|
|
|
+ customRender: t => ellipsis(t),
|
|
|
+ className: 'replacecolor'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title: '款号',
|
|
|
+ dataIndex: 'itemNumber',
|
|
|
+ width: 130,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '成衣工厂',
|
|
|
dataIndex: 'garmentFactory',
|
|
|
- width: 120,
|
|
|
+ width: 130,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
{
|
|
|
title: '客户简称',
|
|
|
dataIndex: 'customerAbbreviation',
|
|
|
- width: 120,
|
|
|
+ customRender: t => ellipsis(t),
|
|
|
+ width: 130,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
@@ -164,30 +173,25 @@ export default {
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
- {
|
|
|
- title: '小po',
|
|
|
- dataIndex: 'smallPo',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: 'Pack Id',
|
|
|
- dataIndex: 'packId',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '分销点',
|
|
|
- dataIndex: 'distributionPoint',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '款号',
|
|
|
- dataIndex: 'itemNumber',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: '小po',
|
|
|
+ // dataIndex: 'smallPo',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: 'Pack Id',
|
|
|
+ // dataIndex: 'packId',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '分销点',
|
|
|
+ // dataIndex: 'distributionPoint',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+
|
|
|
// {
|
|
|
// title: '创建时间',
|
|
|
// dataIndex: 'createTime',
|
|
@@ -197,23 +201,24 @@ export default {
|
|
|
// return moment(text).format('YYYY-MM-DD')
|
|
|
// }
|
|
|
// },
|
|
|
- {
|
|
|
- title: '预发货日期',
|
|
|
- dataIndex: 'preDeliveryDate',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: '预发货日期',
|
|
|
+ // dataIndex: 'preDeliveryDate',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
|
|
|
- {
|
|
|
- title: '计划到货日期',
|
|
|
- dataIndex: 'preCompletionDate',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: '计划到货日期',
|
|
|
+ // dataIndex: 'preCompletionDate',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
{
|
|
|
title: '存货名称',
|
|
|
dataIndex: 'inventoryName',
|
|
|
- width: 120,
|
|
|
+ customRender: t => ellipsis(t),
|
|
|
+ width: 180,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
@@ -223,76 +228,77 @@ export default {
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
- {
|
|
|
- title: '单价(销售)',
|
|
|
- dataIndex: 'salesUnitPrice',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: '单价(销售)',
|
|
|
+ // dataIndex: 'salesUnitPrice',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
{
|
|
|
title: '采购/委外订单号',
|
|
|
dataIndex: 'purOrSubOrder',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '订单类型',
|
|
|
- dataIndex: 'orderType',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '工厂单价(采购/委外单价)',
|
|
|
- dataIndex: 'factoryUnitPrice',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '申报要素(单证维护)',
|
|
|
- dataIndex: 'declarationElements',
|
|
|
- width: 140,
|
|
|
+ // width: 120,
|
|
|
customRender: t => ellipsis(t),
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
+ // {
|
|
|
+ // title: '订单类型',
|
|
|
+ // dataIndex: 'orderType',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '工厂单价(采购/委外单价)',
|
|
|
+ // dataIndex: 'factoryUnitPrice',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '申报要素(单证维护)',
|
|
|
+ // dataIndex: 'declarationElements',
|
|
|
+ // width: 140,
|
|
|
+ // customRender: t => ellipsis(t),
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
|
|
|
- {
|
|
|
- title: '套装件数(存货自定义项)',
|
|
|
- dataIndex: 'numberOfSets',
|
|
|
- width: 120,
|
|
|
+ // {
|
|
|
+ // title: '套装件数(存货自定义项)',
|
|
|
+ // dataIndex: 'numberOfSets',
|
|
|
+ // width: 120,
|
|
|
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '是否TC',
|
|
|
- dataIndex: 'isTC',
|
|
|
- width: 90,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: 'HScode',
|
|
|
- dataIndex: 'hsCode',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '是否TC',
|
|
|
+ // dataIndex: 'isTC',
|
|
|
+ // width: 90,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: 'HScode',
|
|
|
+ // dataIndex: 'hsCode',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
|
|
|
- {
|
|
|
- title: '中文品名',
|
|
|
- dataIndex: 'chineseName',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '英文品名',
|
|
|
- dataIndex: 'englishProductName',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '报关单价',
|
|
|
- dataIndex: 'customsDeclarationUnitPrice',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- }
|
|
|
+ // {
|
|
|
+ // title: '中文品名',
|
|
|
+ // dataIndex: 'chineseName',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '英文品名',
|
|
|
+ // dataIndex: 'englishProductName',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '报关单价',
|
|
|
+ // dataIndex: 'customsDeclarationUnitPrice',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // }
|
|
|
],
|
|
|
referShipDetailsData: [],
|
|
|
confirmLoading: false,
|
|
@@ -300,14 +306,6 @@ export default {
|
|
|
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
|
- garmentFactory:'',//成衣工厂
|
|
|
- documentNo: '',
|
|
|
- chineseName: '',
|
|
|
- status:'',
|
|
|
- smallPo:'',
|
|
|
- distributionPoint:'',
|
|
|
- startDate:'',
|
|
|
- endDate:'',
|
|
|
pageNo: '' // 初始页
|
|
|
},
|
|
|
pagination: {}
|