|
@@ -8,19 +8,19 @@
|
|
|
<a-row :gutter="24">
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="订单号">
|
|
|
- <a-input placeholder="请输入订单号" v-model="queryParam.orderNum"></a-input>
|
|
|
+ <a-input placeholder="请输入订单号" v-model="queryParam.orderNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="集装箱号">
|
|
|
- <a-input placeholder="请输入集装箱号" v-model="queryParam.containerNo"></a-input>
|
|
|
+ <a-input placeholder="请输入集装箱号" v-model="queryParam.containerNumber"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
|
<a-col :md="6" :sm="8">
|
|
|
<a-form-item label="发票号">
|
|
|
- <a-input placeholder="请输入发票号" v-model="queryParam.invoiceNum"></a-input>
|
|
|
+ <a-input placeholder="请输入发票号" v-model="queryParam.invoiceNo"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
@@ -52,7 +52,7 @@
|
|
|
:columns="fabricListColumns"
|
|
|
:data-source="fabricListData"
|
|
|
:loading="loading"
|
|
|
- :pagination="ipagination"
|
|
|
+ :pagination="pagination"
|
|
|
:row-key="record => record.id"
|
|
|
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
|
|
@change="handleTableChange"
|
|
@@ -66,7 +66,7 @@
|
|
|
style="width:100%;height:40px"
|
|
|
>
|
|
|
<a-form-model-item prop="containerNo">
|
|
|
- <a-input style="width:100%" v-model="record.containerNo" />
|
|
|
+ <a-input style="width:100%" v-model="record.containerNumber" />
|
|
|
</a-form-model-item>
|
|
|
</a-form-model>
|
|
|
|
|
@@ -106,6 +106,7 @@ import moment from 'moment'
|
|
|
import addFabricDrawer from '@views/packing-list/packinglist-fabrics/addFabricDrawer.vue'
|
|
|
import detailsFabricDrawer from '@views/packing-list/packinglist-fabrics/detailsFabricDrawer.vue'
|
|
|
import editFabricDrawer from '@views/packing-list/packinglist-fabrics/editFabricDrawer.vue'
|
|
|
+import { fabricList} from '@api/document/packing-list/packinglist-fabrics'
|
|
|
|
|
|
export default {
|
|
|
name: 'FabricList', // 装箱单-面料
|
|
@@ -119,7 +120,7 @@ export default {
|
|
|
fabricListColumns: [
|
|
|
{
|
|
|
title: '订单号',
|
|
|
- dataIndex: 'orderNum',
|
|
|
+ dataIndex: 'orderNumber',
|
|
|
width: 160,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -131,7 +132,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '集装箱号',
|
|
|
- dataIndex: 'containerNo',
|
|
|
+ dataIndex: 'containerNumber',
|
|
|
width: 140,
|
|
|
scopedSlots: { customRender: 'containerNo' },
|
|
|
className: 'replacecolor'
|
|
@@ -139,23 +140,19 @@ export default {
|
|
|
|
|
|
{
|
|
|
title: '装柜日期',
|
|
|
- dataIndex: 'loadingDate ',
|
|
|
+ dataIndex: 'latestDateOfShipment',
|
|
|
width: 120,
|
|
|
- // 有问题,自动显示当日日期
|
|
|
- // customRender: text => {
|
|
|
- // return moment(text).format('YYYY-MM-DD')
|
|
|
- // },
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '成衣工厂',
|
|
|
- dataIndex: 'clothesFactory',
|
|
|
+ dataIndex: 'garmentFactory',
|
|
|
width: 160,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '发票号',
|
|
|
- dataIndex: 'invoiceNum',
|
|
|
+ dataIndex: 'invoiceNo',
|
|
|
width: 160,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -169,7 +166,7 @@ export default {
|
|
|
{
|
|
|
title: '制单日期',
|
|
|
dataIndex: 'preparedDate',
|
|
|
- width: 120,
|
|
|
+ width: 160,
|
|
|
// 有问题,自动显示当日日期
|
|
|
// customRender: text => {
|
|
|
// return moment(text).format('YYYY-MM-DD')
|
|
@@ -178,36 +175,31 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '托书号',
|
|
|
- dataIndex: 'bookNum',
|
|
|
+ dataIndex: 'shippingOrderNumber',
|
|
|
width: 160,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
- {
|
|
|
- title: '预托书号',
|
|
|
- dataIndex: 'preBookNum',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
{
|
|
|
title: '操作',
|
|
|
dataIndex: 'operation',
|
|
|
scopedSlots: { customRender: 'operationSlot' },
|
|
|
width: 160,
|
|
|
- fixed: 'right',
|
|
|
+ // fixed: 'right',
|
|
|
className: 'replacecolor'
|
|
|
}
|
|
|
],
|
|
|
|
|
|
- fabricListData: [{}, {}, {}],
|
|
|
+ fabricListData: [],
|
|
|
|
|
|
selectedRowKeys: [], // 勾选航
|
|
|
loading: false, // 表格加载
|
|
|
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
|
- orderNum: '',
|
|
|
- containerNo: '', // 集装箱号
|
|
|
- invoiceNum: '' // 发票号
|
|
|
+ orderNumber: '',
|
|
|
+ containerNumber: '', // 集装箱号
|
|
|
+ invoiceNo: '', // 发票号
|
|
|
+ pageNo: '' // 初始页
|
|
|
},
|
|
|
url: {
|
|
|
// syncUser: '/act/process/extActProcess/doSyncUser',
|
|
@@ -220,17 +212,36 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
- // this.getAdPaListClothes()
|
|
|
+ this.getFabricList()
|
|
|
},
|
|
|
methods: {
|
|
|
+ //分页查询
|
|
|
+ getFabricList(){
|
|
|
+ this.$nextTick(() => {
|
|
|
+ fabricList(this.queryParam).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ this.fabricListData = res.result.records;
|
|
|
+ this.pagination = {
|
|
|
+ total: res.result.total,
|
|
|
+ current: res.result.current,
|
|
|
+ pageSize: res.result.size
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.$message.error(res.message);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
// 查询按钮
|
|
|
searchQuery() {
|
|
|
- // this.getAnnList() // 装箱单-成衣列表
|
|
|
+ this.queryParam.pageNo = ''
|
|
|
+ this.getFabricList()
|
|
|
},
|
|
|
+
|
|
|
+ //重置查询
|
|
|
searchReset() {
|
|
|
- // console.log('>>>>重置')
|
|
|
this.queryParam = {}
|
|
|
- // this.getAnnList()
|
|
|
+ this.getFabricList()
|
|
|
},
|
|
|
// ------------------------------------
|
|
|
// 推送
|