|
@@ -6,11 +6,11 @@
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
<a-row :gutter="24">
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="单据号">
|
|
|
<a-input placeholder="请输入订单号" v-model="queryParam.documentNo"></a-input>
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="订单号">
|
|
|
<a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
|
|
@@ -22,7 +22,11 @@
|
|
|
<a-input placeholder="请输入款号" v-model="queryParam.itemNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
-
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="分销点">
|
|
|
+ <a-input placeholder="请输入小分销点" v-model="queryParam.distributionPoint"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
|
|
|
|
|
|
<template v-if="toggleSearchStatus">
|
|
@@ -31,19 +35,25 @@
|
|
|
<a-input placeholder="请输入托书号" v-model="queryParam.shippingOrderNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col> -->
|
|
|
- <a-col :md="6" :sm="8">
|
|
|
+ <!-- <a-col :md="6" :sm="8">
|
|
|
<a-form-item label="品名">
|
|
|
<a-input placeholder="请输入品名" v-model="queryParam.productName"></a-input>
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col> -->
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="小po">
|
|
|
<a-input placeholder="请输入小po" v-model="queryParam.smallPo"></a-input>
|
|
|
</a-form-item>
|
|
|
</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.depositaryReceiptNo"></a-input>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :md="6" :sm="8">
|
|
|
+ <a-form-item label="供应商">
|
|
|
+ <a-input placeholder="请输入供应商" v-model="queryParam.garmentFactory"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="8">
|
|
@@ -104,7 +114,7 @@
|
|
|
:scroll="{ x: 1500 }"
|
|
|
>
|
|
|
<!-- 集装箱号 输入框-->
|
|
|
- <a-form-model
|
|
|
+ <!-- <a-form-model
|
|
|
slot="containerNo"
|
|
|
slot-scope="text, record"
|
|
|
:ref="record.index"
|
|
@@ -114,10 +124,10 @@
|
|
|
<a-form-model-item prop="containerNo">
|
|
|
<a-input style="width:100%" v-model="record.containerNo" />
|
|
|
</a-form-model-item>
|
|
|
- </a-form-model>
|
|
|
+ </a-form-model> -->
|
|
|
|
|
|
<!-- 预托书号 -->
|
|
|
- <a-form-model
|
|
|
+ <!-- <a-form-model
|
|
|
slot="preBookNum"
|
|
|
slot-scope="text, record"
|
|
|
:ref="record.index"
|
|
@@ -127,7 +137,7 @@
|
|
|
<a-form-model-item prop="preBookNum">
|
|
|
<a-input style="width:100%" v-model="record.preBookNum" readOnly/>
|
|
|
</a-form-model-item>
|
|
|
- </a-form-model>
|
|
|
+ </a-form-model> -->
|
|
|
|
|
|
<!-- 状态 -->
|
|
|
<!-- slot-scope="text, record" -->
|
|
@@ -223,90 +233,77 @@ export default {
|
|
|
// 表头
|
|
|
clothesListColumns: [
|
|
|
{
|
|
|
- title: '订单号',
|
|
|
- dataIndex: 'orderNumber',
|
|
|
- width: 120,
|
|
|
- fixed: 'left',
|
|
|
+ title: '预托书号',
|
|
|
+ dataIndex: 'depositaryReceiptNo',
|
|
|
+ width: 160,
|
|
|
+ // scopedSlots: { customRender: 'preBookNum' },
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
- {
|
|
|
- title: '款号',
|
|
|
- dataIndex: 'itemNumber',
|
|
|
+ {
|
|
|
+ title: '托书号',
|
|
|
+ dataIndex: 'shippingOrderNumber',
|
|
|
width: 120,
|
|
|
- fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
|
- },
|
|
|
+ },
|
|
|
{
|
|
|
- title: '单据号',
|
|
|
- dataIndex: 'documentNo',
|
|
|
+ title: '集装箱代号',
|
|
|
+ dataIndex: 'containerCode',
|
|
|
width: 120,
|
|
|
- fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '客户简称',
|
|
|
- dataIndex: 'customerAbbreviation',
|
|
|
- width: 120,
|
|
|
- fixed: 'left',
|
|
|
+ title: '集装箱号',
|
|
|
+ dataIndex: 'containerNumber',
|
|
|
+ width: 140,
|
|
|
+ // scopedSlots: { customRender: 'containerNo' },
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '预发货日期',
|
|
|
- dataIndex: 'hod',
|
|
|
+ title: '集装箱代单据号号',
|
|
|
+ dataIndex: 'documentNo',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
- {
|
|
|
- title: '小po',
|
|
|
- dataIndex: 'smallPo',
|
|
|
+ {
|
|
|
+ title: '订单号',
|
|
|
+ dataIndex: 'orderNumber',
|
|
|
width: 120,
|
|
|
+ // fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
- {
|
|
|
- title: '分销点',
|
|
|
- dataIndex: 'distributionPoint',
|
|
|
+ {
|
|
|
+ title: '款号',
|
|
|
+ dataIndex: 'itemNumber',
|
|
|
width: 120,
|
|
|
+ // fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
-
|
|
|
{
|
|
|
- title: '存货名称',
|
|
|
- dataIndex: 'inventoryName',
|
|
|
+ title: '客户简称',
|
|
|
+ dataIndex: 'customerAbbreviation',
|
|
|
width: 120,
|
|
|
+ // fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '颜色',
|
|
|
- dataIndex: 'colour',
|
|
|
+ title: '预发货日期',
|
|
|
+ dataIndex: 'hod',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '采购/委外订单号',
|
|
|
- dataIndex: 'purchase',
|
|
|
- width: 160,
|
|
|
+ title: '小po',
|
|
|
+ dataIndex: 'smallPo',
|
|
|
+ width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '成衣工厂',
|
|
|
- dataIndex: 'garmentFactory',
|
|
|
- width: 140,
|
|
|
- customRender: t => ellipsis(t),
|
|
|
+ title: '分销点',
|
|
|
+ dataIndex: 'distributionPoint',
|
|
|
+ width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
- // {
|
|
|
- // title: '订单类型',
|
|
|
- // dataIndex: 'orderType',
|
|
|
- // width: 120,
|
|
|
- // className: 'replacecolor'
|
|
|
- // },
|
|
|
- // {
|
|
|
- // title: '工厂单价',
|
|
|
- // dataIndex: 'factoryUnitPrice',
|
|
|
- // width: 120,
|
|
|
- // className: 'replacecolor'
|
|
|
- // },
|
|
|
- {
|
|
|
+ {
|
|
|
title: '数量(按合并规则累计)',
|
|
|
dataIndex: 'total',
|
|
|
width: 200,
|
|
@@ -340,33 +337,54 @@ export default {
|
|
|
},
|
|
|
|
|
|
// {
|
|
|
- // title: '总价',
|
|
|
- // dataIndex: 'totalPrice',
|
|
|
+ // title: '存货名称',
|
|
|
+ // dataIndex: 'inventoryName',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '颜色',
|
|
|
+ // dataIndex: 'colour',
|
|
|
// width: 120,
|
|
|
// className: 'replacecolor'
|
|
|
// },
|
|
|
-
|
|
|
{
|
|
|
- title: '集装箱代号',
|
|
|
- dataIndex: 'containerCode',
|
|
|
- width: 120,
|
|
|
+ title: '采购/委外订单号',
|
|
|
+ dataIndex: 'purchase',
|
|
|
+ width: 160,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '集装箱号',
|
|
|
- dataIndex: 'containerNumber',
|
|
|
+ title: '成衣工厂',
|
|
|
+ dataIndex: 'garmentFactory',
|
|
|
width: 140,
|
|
|
- scopedSlots: { customRender: 'containerNo' },
|
|
|
+ customRender: t => ellipsis(t),
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
+ // {
|
|
|
+ // title: '订单类型',
|
|
|
+ // dataIndex: 'orderType',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '工厂单价',
|
|
|
+ // dataIndex: 'factoryUnitPrice',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+
|
|
|
|
|
|
- {
|
|
|
- title: '预托书号',
|
|
|
- dataIndex: 'depositaryReceiptNo',
|
|
|
- width: 160,
|
|
|
- scopedSlots: { customRender: 'preBookNum' },
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: '总价',
|
|
|
+ // dataIndex: 'totalPrice',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
{
|
|
|
title: '推送状态',
|
|
@@ -399,12 +417,7 @@ export default {
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
- {
|
|
|
- title: '托书号',
|
|
|
- dataIndex: 'shippingOrderNumber',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+
|
|
|
|
|
|
{
|
|
|
title: '外销发票号',
|
|
@@ -558,7 +571,8 @@ export default {
|
|
|
totalNetWeight:editData.totalNetWeight,
|
|
|
totalVolume:editData.totalVolume,
|
|
|
totalPrice:editData.totalPrice,
|
|
|
- total:editData.total
|
|
|
+ depositaryReceiptNo:data.depositaryReceiptNo,
|
|
|
+ total:editData.total,
|
|
|
};
|
|
|
this.$refs.detailsClothesDrawer.clothesAddData = editData.syPackingListTailoringItemList
|
|
|
for (var i=0; i<res.result.syPackingListTailoringItemList.length;i++){
|