diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
index 47d8175..cfbd7b2 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue
@@ -140,10 +140,10 @@
- 删除
+ 删除
-
+
@@ -902,7 +902,7 @@
-
+
@@ -914,7 +914,7 @@
class="text-right">
-->
-
+
@@ -931,6 +931,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -1348,7 +1358,7 @@
tableName: "申请单工单信息明细表",
columnProp: 'needDate',
headerAlign: "center",
- align: "left",
+ align: "center",
columnLabel: '要求发料日期',
columnHidden: false,
columnImage: false,
@@ -1356,7 +1366,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 120,
+ columnWidth: 100,
},{
userId: this.$store.state.user.name,
functionId: 701002,
@@ -1477,7 +1487,42 @@
status: true,
fixed: '',
columnWidth: 80,
-
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 701002,
+ serialNumber: '701002Table2ApsResourceTotal',
+ tableId: "701002Table2",
+ tableName: "申请单工单信息明细表",
+ columnProp: 'apsResourceTotal',
+ headerAlign: "center",
+ align: "right",
+ columnLabel: '已排产机台总数',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 701002,
+ serialNumber: '701002Table2NotYetStartedResourceTotal',
+ tableId: "701002Table2",
+ tableName: "申请单工单信息明细表",
+ columnProp: 'notYetStartedResourceTotal',
+ headerAlign: "center",
+ align: "right",
+ columnLabel: '已排产未开工机台数',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 120,
},
{
userId: this.$store.state.user.name,
@@ -2062,7 +2107,9 @@
workCenterNo:'',
itemNo:0,
materialType:'BOM物料',
- alreadyApplyTotal: 0
+ alreadyApplyTotal: 0,
+ apsResourceTotal: 0,
+ notYetStartedResourceTotal: 0
},
chooseSOSModalFlag: false,
chooseSOSData: {
@@ -3013,7 +3060,9 @@
workCenterNo: '',
needDate: '',
materialType: 'BOM物料',
- alreadyApplyTotal: 0
+ alreadyApplyTotal: 0,
+ apsResourceTotal: 0,
+ notYetStartedResourceTotal: 0
}
this.saveOrderDetailFlag = true
@@ -3074,7 +3123,9 @@
resourceDesc: this.orderDetailData.resourceDesc,
resourceId: this.orderDetailData.resourceId,
workCenterNo: this.orderDetailData.workCenterNo,
- qtyrequired: this.orderDetailData.qtyRequired
+ qtyrequired: this.orderDetailData.qtyRequired,
+ apsResourceTotal: this.orderDetailData.apsResourceTotal,
+ notYetStartedResourceTotal: this.orderDetailData.notYetStartedResourceTotal
}
// 调用API保存派工单数据
@@ -3110,7 +3161,9 @@
workCenterNo: '',
needDate: '',
materialType: 'BOM物料',
- alreadyApplyTotal: 0
+ alreadyApplyTotal: 0,
+ apsResourceTotal: 0,
+ notYetStartedResourceTotal: 0
}
} else {
this.$alert(data.msg || '保存失败', '错误', {
@@ -3350,6 +3403,8 @@
this.orderDetailData.partDesc = row.partDescription || '';
this.orderDetailData.qtyRequired = row.lotSize || '';
this.orderDetailData.alreadyApplyTotal = row.alreadyApplyTotal || 0;
+ this.orderDetailData.apsResourceTotal = row.apsResourceTotal || 0;
+ this.orderDetailData.notYetStartedResourceTotal = row.notYetStartedResourceTotal || 0;
// 清空相关字段
this.orderDetailData.seqNo = '';