diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js
index 289b133..2c7daf6 100644
--- a/src/api/orderIssure/soIssueNotify.js
+++ b/src/api/orderIssure/soIssueNotify.js
@@ -54,3 +54,5 @@ export const saveIssueNoOrderDetail = data => createAPI(`/orderIssure/issureNoti
export const updateNotifyDetail = data => createAPI(`/orderIssure/issureNotify/updateNotifyDetail`,'post',data)
export const saveSOIssueNotifyOrderMateria = data => createAPI(`/orderIssure/issureNotify/saveSOIssueNotifyOrderMateria`,'post',data)
+
+export const getBomAlternativeParts = data => createAPI(`/orderIssure/issureNotify/getBomAlternativeParts`,'post',data)
\ No newline at end of file
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index f09db08..f773cb3 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -9,10 +9,14 @@
-
-
-
+
+
+
+
+
+
+
@@ -270,6 +274,16 @@
![]()
+
+
+ 替代料
+
+
@@ -1020,6 +1034,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1043,7 +1079,8 @@
, editNotifyMaterial
, deleteNotify,
updateNotifyDetail,
- saveSOIssueNotifyOrderMateria
+ saveSOIssueNotifyOrderMateria,
+ getBomAlternativeParts
} from "@/api/orderIssure/soIssueNotify.js"
import {
searchShopOrderByPaging
@@ -1102,19 +1139,22 @@
bomSeqNo: '',
warehouseId: ''
},
+ alternativePartsModalFlag: false,
+ alternativePartsList: [],
+ alternativePartsLoading: false,
orderOptions: [],
searchData: {
page: 1,
limit: 100,
- site:'',
+ site: '',
userName: '',
notifyNo: '',
- status: '',
+ status: '草稿',
issueFlag: '',
loginUserName: this.$store.state.user.name,
issueResult: '',
- startDate: this.dayjs().format("YYYY-MM-DD"),
- endDate: this.dayjs().format("YYYY-MM-DD"),
+ startDate: '',
+ endDate: '',
sql: "",
},
notifyData:{
@@ -1329,14 +1369,14 @@
columnProp: 'needDate',
headerAlign: "center",
align: "left",
- columnLabel: '要求发料时间',
+ columnLabel: '要求发料日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80,
+ columnWidth: 120,
},{
userId: this.$store.state.user.name,
functionId: 701002,
@@ -1479,6 +1519,24 @@
},
],
columnList3:[
+ {
+ userId: this.$store.state.user.name,
+ functionId: 701002,
+ serialNumber: '701002Table3OrderNo',
+ tableId: "701002Table3",
+ tableName: "申请单材料明细表",
+ columnProp: "orderNo",
+ 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,
@@ -1488,14 +1546,14 @@
columnProp: "itemNo",
headerAlign: "center",
align: "right",
- columnLabel: "申请单序号",
+ columnLabel: "序号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 80
+ columnWidth: 60
},{
userId: this.$store.state.user.name,
functionId: 701002,
@@ -1512,7 +1570,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 100
+ columnWidth: 130
},{
userId: this.$store.state.user.name,
functionId: 701002,
@@ -1573,7 +1631,7 @@
tableName: "申请单材料明细表",
columnProp: "issueType",
headerAlign: "center",
- align: "right",
+ align: "left",
columnLabel: "类型",
columnHidden: false,
columnImage: false,
@@ -2539,23 +2597,10 @@
})
},
- // watch: {
- // searchData: {
- // deep: true,
- // handler: function (newV, oldV) {
- // this.searchData.partNo = this.searchData.partNo.toUpperCase()
- // }
- // },
- // },
created () {
- // 动态列
- // this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
- // this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
- // this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
- // this.getTableUserColumn(this.$route.meta.menuId+'table4',4)
- // this.getTableUserColumn(this.$route.meta.menuId+'table5',5)
- // this.getTableUserColumn(this.$route.meta.menuId+'table6',6)
+ this.searchTable()
},
+
methods: {
// 批量编辑模态框
@@ -3782,6 +3827,46 @@
})
},
+ // 查询替代料
+ getAlternativePart(row) {
+ if (!this.currentRow || !this.currentRow.notifyNo) {
+ this.$message.warning('请先选择一条申请单记录！');
+ return;
+ }
+
+ if (!row.orderNo) {
+ this.$message.warning('该记录没有关联工单，无法查询替代料！');
+ return;
+ }
+
+ const params = {
+ site: row.site,
+ notifyNo: row.notifyNo,
+ orderNo: row.orderNo,
+ componentPart: row.componentPartNo
+ };
+
+ this.alternativePartsLoading = true;
+ this.alternativePartsModalFlag = true;
+
+ getBomAlternativeParts(params).then(({data}) => {
+ if (data && data.code === 0) {
+ this.alternativePartsList = data.rows || [];
+ if (this.alternativePartsList.length === 0) {
+ this.$message.info('未找到该物料的替代料');
+ }
+ } else {
+ this.$message.error(data.msg || '查询替代料失败');
+ this.alternativePartsList = [];
+ }
+ }).catch(err => {
+ this.$message.error('查询替代料失败: ' + err.message);
+ this.alternativePartsList = [];
+ }).finally(() => {
+ this.alternativePartsLoading = false;
+ });
+ },
+
// 获取基础数据列表S
getBaseList (val, type) {
this.tagNo = val