diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js index 47f6fad..a110ab3 100644 --- a/src/api/orderIssure/soIssueNotify.js +++ b/src/api/orderIssure/soIssueNotify.js @@ -23,3 +23,5 @@ export const searchNotifyHeader= data => createAPI(`/orderIssure/issureNotify/se export const searchNotifyOrderList= data => createAPI(`/orderIssure/issureNotify/searchNotifyOrderList`,'post',data) export const searchNotifyMaterialList= data => createAPI(`/orderIssure/issureNotify/searchNotifyMaterialList`,'post',data) + +export const searchSumNotifyMaterialList= data => createAPI(`/orderIssure/issureNotify/searchSumNotifyMaterialList`,'post',data) diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue index e02f0db..55690cf 100644 --- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue +++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue @@ -159,6 +159,41 @@ + + + + + + + + + + + + + + + + + @@ -171,6 +206,7 @@ searchNotifyHeader ,searchNotifyOrderList ,searchNotifyMaterialList + ,searchSumNotifyMaterialList }from "@/api/orderIssure/soIssueNotify.js" import Chooselist from '@/views/modules/common/Chooselist' export default { @@ -185,6 +221,7 @@ dataList: [], dataList2: [], dataList3: [], + dataList4: [], addOrUpdateVisible:false, searchData: { page: 1, @@ -654,6 +691,77 @@ columnWidth: 80 }, ], + columnList4:[ + { + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table3ComponentPartNo', + tableId: "701002Table4", + tableName: "申请单材料明细表", + columnProp: "componentPartNo", + headerAlign: "center", + align: "center", + columnLabel: "材料编码", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 100 + },{ + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table3PartDesc', + tableId: "701002Table4", + tableName: "申请单材料明细表", + columnProp: "partDesc", + headerAlign: "center", + align: "left", + columnLabel: "材料名称", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 130 + },{ + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table3QtyToIssue', + tableId: "701002Table4", + tableName: "申请单材料明细表", + columnProp: "qtyToIssue", + headerAlign: "center", + align: "right", + columnLabel: "合计申请数量", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + },{ + userId: this.$store.state.user.name, + functionId: 701002, + serialNumber: '701002Table3QtyToIssueOriginal', + tableId: "701002Table4", + tableName: "申请单材料明细表", + columnProp: "qtyToIssueOriginal", + headerAlign: "center", + align: "right", + columnLabel: "合计已发数量", + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 80 + }, + ], dataRole: { partTypeDesc: [ { @@ -742,12 +850,22 @@ this.dataList2 = []; } }); - }else { + }else if(this.activeName==='sub'){ searchNotifyMaterialList(this.currentRow).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code == 0) { this.dataList3 = data.rows + } else { + this.dataList3 = []; + } + }); + }else { + searchSumNotifyMaterialList(this.currentRow).then(({data}) => { + //区分请求成功和失败的状况 + if (data && data.code == 0) { + this.dataList3 = data.rows + } else { this.dataList3 = []; }