|
@@ -17,13 +17,13 @@
|
|
|
<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.name"></a-input>
|
|
|
+ <a-input placeholder="请输入品名" v-model="queryParam.chineseName"></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
|
|
@@ -46,7 +46,7 @@
|
|
|
:columns="referShipDetailsColumns"
|
|
|
:data-source="referShipDetailsData"
|
|
|
:loading="loading"
|
|
|
- :pagination="ipagination"
|
|
|
+ :pagination="pagination"
|
|
|
:row-key="record => record.id"
|
|
|
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
|
|
|
@change="handleTableChange"
|
|
@@ -61,6 +61,7 @@
|
|
|
<script>
|
|
|
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
|
|
import JEllipsis from '@/components/jeecg/JEllipsis'
|
|
|
+import { referenceList} from '@api/document/packing-list/packinglist-fabrics'
|
|
|
import moment from 'moment'
|
|
|
export default {
|
|
|
name: 'ReferShipmentDetailsModal',
|
|
@@ -76,14 +77,14 @@ export default {
|
|
|
referShipDetailsColumns: [
|
|
|
{
|
|
|
title: '单据号',
|
|
|
- dataIndex: 'documentNum',
|
|
|
+ dataIndex: 'documentNo',
|
|
|
width: 120,
|
|
|
fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '销售订单号',
|
|
|
- dataIndex: 'saleOrderNo',
|
|
|
+ dataIndex: 'orderNumber',
|
|
|
width: 120,
|
|
|
fixed: 'left',
|
|
|
className: 'replacecolor'
|
|
@@ -91,13 +92,13 @@ export default {
|
|
|
|
|
|
{
|
|
|
title: '客户简称',
|
|
|
- dataIndex: 'customerShortName',
|
|
|
+ dataIndex: 'customerAbbreviation',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '部门',
|
|
|
- dataIndex: 'department',
|
|
|
+ dataIndex: 'pushState',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -128,7 +129,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '款号',
|
|
|
- dataIndex: 'styleNum',
|
|
|
+ dataIndex: 'itemNumber',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -143,14 +144,14 @@ export default {
|
|
|
// },
|
|
|
{
|
|
|
title: '预发货日期',
|
|
|
- dataIndex: 'scheduledShipDate',
|
|
|
+ dataIndex: 'preDeliveryDate',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
{
|
|
|
title: '计划到货日期',
|
|
|
- dataIndex: 'plannedArrivalDate',
|
|
|
+ dataIndex: 'preCompletionDate',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -162,20 +163,20 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '数量(合计)',
|
|
|
- dataIndex: 'quantity',
|
|
|
+ dataIndex: 'shipmentQuantity',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
{
|
|
|
title: '单价(销售)',
|
|
|
- dataIndex: 'price',
|
|
|
+ dataIndex: 'salesUnitPrice',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '采购/委外订单号',
|
|
|
- dataIndex: 'purchaseAboardOrderNum',
|
|
|
+ dataIndex: 'purOrSubOrder',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
@@ -187,13 +188,13 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: '工厂单价(采购/委外单价)',
|
|
|
- dataIndex: 'factoryPrice',
|
|
|
+ dataIndex: 'factoryUnitPrice',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '申报要素(单证维护)',
|
|
|
- dataIndex: 'declareElements',
|
|
|
+ dataIndex: 'declarationElements',
|
|
|
width: 140,
|
|
|
customRender: t => ellipsis(t),
|
|
|
className: 'replacecolor'
|
|
@@ -201,7 +202,7 @@ export default {
|
|
|
|
|
|
{
|
|
|
title: '套装件数(存货自定义项)',
|
|
|
- dataIndex: 'suitQuantity',
|
|
|
+ dataIndex: 'numberOfSets',
|
|
|
width: 120,
|
|
|
|
|
|
className: 'replacecolor'
|
|
@@ -214,45 +215,47 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
title: 'HScode',
|
|
|
- dataIndex: 'HScode',
|
|
|
+ dataIndex: 'hsCode',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
|
|
|
{
|
|
|
title: '中文品名',
|
|
|
- dataIndex: 'chineseProName',
|
|
|
+ dataIndex: 'chineseName',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '英文品名',
|
|
|
- dataIndex: 'englishProName',
|
|
|
+ dataIndex: 'englishProductName',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '成衣工厂',
|
|
|
- dataIndex: 'clothesFactory',
|
|
|
+ dataIndex: 'garmentFactory',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
title: '报关单价',
|
|
|
- dataIndex: 'declarationPrice',
|
|
|
+ dataIndex: 'customsDeclarationUnitPrice',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
}
|
|
|
],
|
|
|
- referShipDetailsData: [{}, {}, {}],
|
|
|
+ referShipDetailsData: [],
|
|
|
confirmLoading: false,
|
|
|
referShipDetailsModVis: false,
|
|
|
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
|
- orderNum: '',
|
|
|
- name: ''
|
|
|
- }
|
|
|
+ orderNumber: '',
|
|
|
+ chineseName: '',
|
|
|
+ pageNo: '' // 初始页
|
|
|
+ },
|
|
|
+ pagination: {}
|
|
|
}
|
|
|
},
|
|
|
// 接收父组件 方法
|
|
@@ -264,32 +267,61 @@ export default {
|
|
|
},
|
|
|
created() {},
|
|
|
methods: {
|
|
|
+ getReferenceList() {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ referenceList(this.queryParam).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ this.referShipDetailsData = res.result.records;
|
|
|
+ this.pagination = {
|
|
|
+ total: res.result.total,
|
|
|
+ current: res.result.current,
|
|
|
+ pageSize: res.result.size
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ this.$message.error(res.message);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
// 弹框查询按钮
|
|
|
- searchQuery() {},
|
|
|
+ searchQuery() {
|
|
|
+ this.queryParam.pageNo = ''
|
|
|
+ this.getReferenceList()
|
|
|
+ },
|
|
|
// 重置
|
|
|
searchReset() {
|
|
|
this.queryParam = {}
|
|
|
+ this.getReferenceList()
|
|
|
// this.getShipmentList()
|
|
|
},
|
|
|
// 弹框确定
|
|
|
- onSubmit() {},
|
|
|
+ onSubmit() {
|
|
|
+ if (this.selectedRowKeys.length == 0) {
|
|
|
+ this.$message.error('请选择数据');
|
|
|
+ } else{
|
|
|
+ this.$emit('callback', this.selectedRowKeys);
|
|
|
+ this.referShipDetailsModVis = false;
|
|
|
+ var msg = "选中记录后,会清除编辑的内容。";
|
|
|
+ this.$message.info(msg);
|
|
|
+ this.selectedRowKeys = [];
|
|
|
+ }
|
|
|
+ },
|
|
|
close() {
|
|
|
this.$emit('close')
|
|
|
- this.visible = false
|
|
|
+ this.referShipDetailsModVis = false
|
|
|
},
|
|
|
handleCancel() {
|
|
|
+ this.selectedRowKeys = []
|
|
|
this.close()
|
|
|
},
|
|
|
// 选中行
|
|
|
onSelectChange(keys, rows) {
|
|
|
this.selectedRowKeys = keys
|
|
|
- this.selectedRows = rows
|
|
|
+ },
|
|
|
+ handleTableChange(pagination, filters, sorter) {
|
|
|
+ this.queryParam.pageNo = pagination.current
|
|
|
+ this.getReferenceList()
|
|
|
}
|
|
|
- // handleTableChange(pagination, filters, sorter) {
|
|
|
- // // console.log('当前页信息>>>>',pagination)
|
|
|
- // this.queryParam.pageNo = pagination.current
|
|
|
- // this.getAnnList()
|
|
|
- // }
|
|
|
},
|
|
|
computed: {
|
|
|
// 选中项
|