|
|
@@ -1,7 +1,7 @@
|
|
|
<template>
|
|
|
<!-- 发运明细 列表 -->
|
|
|
<div id="ShipmentList">
|
|
|
- <!-- 查询 -->
|
|
|
+ <!-- 查询 回显 且 可编辑 -->
|
|
|
<a-card :bordered="false">
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
@@ -125,6 +125,10 @@
|
|
|
<a @click="edit(record)">编辑</a>
|
|
|
</a-menu-item>
|
|
|
|
|
|
+ <a-menu-item>
|
|
|
+ <a href="javascript:void(0);" @click="itemNumberElement(record)">维护款号成分</a>
|
|
|
+ </a-menu-item>
|
|
|
+
|
|
|
<a-menu-item>
|
|
|
<a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
|
|
|
<a href="javascript:void(0);" style="color:green;">提交</a>
|
|
|
@@ -136,6 +140,10 @@
|
|
|
<a href="javascript:void(0);" style="color:red;">删除</a>
|
|
|
</a-popconfirm>
|
|
|
</a-menu-item>
|
|
|
+
|
|
|
+ <!-- <a-menu-item>
|
|
|
+ <a href="javascript:void(0);" @click="itemNumberElement(record)">维护款号成分</a>
|
|
|
+ </a-menu-item> -->
|
|
|
</a-menu>
|
|
|
|
|
|
<!-- 已提交 且 推送成功 -->
|
|
|
@@ -203,6 +211,9 @@
|
|
|
<detailsShipDet-drawer ref="detailsShipDetDrawer" @ok="modalFormOk"></detailsShipDet-drawer>
|
|
|
<!-- 申报要素 弹框 -->
|
|
|
<declareElements-modal ref="declareElementsModal"></declareElements-modal>
|
|
|
+
|
|
|
+ <!-- 维护款号成分 -->
|
|
|
+ <itemNumEle-modal ref="itemNumEleModal" :fatherList="getShipmentList"></itemNumEle-modal>
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -216,6 +227,7 @@ import addShipDetDrawer from '@views/shipment-details/addShipDetDrawer.vue'
|
|
|
import detailsShipDetDrawer from '@views/shipment-details/detailsShipDetDrawer.vue'
|
|
|
import editShipDetDrawer from '@views/shipment-details/editShipDetDrawer.vue'
|
|
|
import declareElementsModal from '@views/shipment-details/declareElementsModal.vue'
|
|
|
+import itemNumEleModal from '@views/shipment-details/itemNumEleModal.vue'
|
|
|
|
|
|
import {
|
|
|
shipmentList,
|
|
|
@@ -240,7 +252,8 @@ export default {
|
|
|
declareElementsModal,
|
|
|
cancelSubmitShipment,
|
|
|
pushShipment,
|
|
|
- rePushShipment
|
|
|
+ rePushShipment,
|
|
|
+ itemNumEleModal
|
|
|
},
|
|
|
|
|
|
data() {
|
|
|
@@ -308,6 +321,12 @@ export default {
|
|
|
width: 180,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
+ {
|
|
|
+ title: '物料成分',
|
|
|
+ dataIndex: 'materialComposition',
|
|
|
+ width: 180,
|
|
|
+ className: 'replacecolor'
|
|
|
+ },
|
|
|
{
|
|
|
title: '预发货日期',
|
|
|
dataIndex: 'preDeliveryDate',
|
|
|
@@ -365,19 +384,21 @@ export default {
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
{
|
|
|
- title: '工厂单价(采购/委外单价）',
|
|
|
+ // (采购/委外单价）
|
|
|
+ title: '工厂单价',
|
|
|
dataIndex: 'factoryUnitPrice',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
+ // {
|
|
|
+ // title: '申报要素(单证维护)',
|
|
|
+ // dataIndex: 'declarationElements',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
{
|
|
|
- title: '申报要素(单证维护)',
|
|
|
- dataIndex: 'declarationElements',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '套装件数（存货自定义项）',
|
|
|
+ // （存货自定义项）
|
|
|
+ title: '套装件数',
|
|
|
dataIndex: 'numberOfSets',
|
|
|
width: 120,
|
|
|
className: 'replacecolor'
|
|
|
@@ -387,27 +408,27 @@ export default {
|
|
|
dataIndex: 'isTc',
|
|
|
width: 90,
|
|
|
customRender: function(text) {
|
|
|
- if (text == '0') {
|
|
|
+ if (text === '0') {
|
|
|
return '否'
|
|
|
}
|
|
|
- if (text == '1') {
|
|
|
+ if (text === '1') {
|
|
|
return '是'
|
|
|
}
|
|
|
},
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
- {
|
|
|
- title: 'HScode',
|
|
|
- dataIndex: 'hsCode',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
- {
|
|
|
- title: '中文品名',
|
|
|
- dataIndex: 'chineseName',
|
|
|
- width: 120,
|
|
|
- className: 'replacecolor'
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: 'HScode',
|
|
|
+ // dataIndex: 'hsCode',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // title: '中文品名',
|
|
|
+ // dataIndex: 'chineseName',
|
|
|
+ // width: 120,
|
|
|
+ // className: 'replacecolor'
|
|
|
+ // },
|
|
|
|
|
|
{
|
|
|
title: '成衣工厂',
|
|
|
@@ -421,7 +442,12 @@ export default {
|
|
|
width: 90,
|
|
|
className: 'replacecolor'
|
|
|
},
|
|
|
-
|
|
|
+ {
|
|
|
+ title: '账套',
|
|
|
+ dataIndex: 'account',
|
|
|
+ width: 90,
|
|
|
+ className: 'replacecolor'
|
|
|
+ },
|
|
|
{
|
|
|
title: '推送结果',
|
|
|
dataIndex: 'pushState',
|
|
|
@@ -499,7 +525,11 @@ export default {
|
|
|
// 申报要素
|
|
|
declareElements(record) {
|
|
|
this.$refs.declareElementsModal.declareElementsModVis = true
|
|
|
- queryDeclarationElements({ hsCode: record.hsCode, id: record.id }).then(res => {
|
|
|
+ queryDeclarationElements({
|
|
|
+ inventoryName: record.inventoryName,
|
|
|
+ itemNumber: record.itemNumber,
|
|
|
+ account: record.account
|
|
|
+ }).then(res => {
|
|
|
if (res.success) {
|
|
|
console.log('申报要素主子表数据', res.result)
|
|
|
// console.log('申报要素子表数据', res.result.syDeclarationElementsItemList)
|
|
|
@@ -509,7 +539,27 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 维护款号成分
|
|
|
+ itemNumberElement(record) {
|
|
|
+ this.$refs.itemNumEleModal.itemNumEleModVis = true
|
|
|
+
|
|
|
+ this.$refs.itemNumEleModal.editItemNumber.itemIds = record.itemIds
|
|
|
+ this.$refs.itemNumEleModal.editItemNumber.itemNumber = record.itemNumber
|
|
|
+ this.$refs.itemNumEleModal.editItemNumber.materialComposition = record.materialComposition
|
|
|
+ this.$refs.itemNumEleModal.editItemNumber.isTc = record.isTc
|
|
|
+ },
|
|
|
|
|
|
+ // 编辑
|
|
|
+ edit(record) {
|
|
|
+ this.$refs.editShipDetDrawer.visible = true
|
|
|
+ shipmentQueryById({ id: record.id }).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ // console.log('编辑对象', res.result)
|
|
|
+ this.$refs.editShipDetDrawer.editShipDet = res.result
|
|
|
+ this.$refs.editShipDetDrawer.syShippingDetailsItemList = res.result.syShippingDetailsItemList
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 详情
|
|
|
details(record) {
|
|
|
this.$refs.detailsShipDetDrawer.visible = true
|
|
|
@@ -524,19 +574,6 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- // 编辑
|
|
|
- edit(record) {
|
|
|
- this.$refs.editShipDetDrawer.visible = true
|
|
|
- shipmentQueryById({ id: record.id }).then(res => {
|
|
|
- if (res.success) {
|
|
|
- console.log('编辑对象', res.result)
|
|
|
- // console.log('子表信息', res.result.syShippingDetailsItemList)
|
|
|
- this.$refs.editShipDetDrawer.editShipDet = res.result
|
|
|
- this.$refs.editShipDetDrawer.syShippingDetailsItemList = res.result.syShippingDetailsItemList
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
-
|
|
|
// 提交
|
|
|
submit(record) {
|
|
|
console.log('点击id:', record.id)
|
|
|
@@ -637,6 +674,7 @@ export default {
|
|
|
this.queryParam.salesman = ''
|
|
|
this.queryParam.itemNumber = ''
|
|
|
this.queryParam.refer = ''
|
|
|
+ this.queryParam.is = ''
|
|
|
this.getShipmentList() // 渲染 发运明细列表
|
|
|
},
|
|
|
|
|
|
@@ -664,6 +702,6 @@ export default {
|
|
|
// background-color: #ccc;
|
|
|
// }
|
|
|
/deep/ .ant-form-item {
|
|
|
- margin-bottom: 0 !important;
|
|
|
+ // margin-bottom: 0 !important;
|
|
|
}
|
|
|
</style>
|
zengtx