|
|
|
@ -140,10 +140,10 @@ |
|
|
|
<el-table-column |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="80" |
|
|
|
width="60" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a type="text" size="small" @click="deleteNotifySOSPlus(scope.row)" :class="{ 'disabled-link': currentRow.status !== '草稿' && currentRow.status !== '编辑中' }">删除</a> |
|
|
|
<el-link style="cursor: pointer" @click="deleteNotifySOSPlus(scope.row)" :class="{ 'disabled-link': currentRow.status !== '草稿' && currentRow.status !== '编辑中' }">删除</el-link> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
@ -638,7 +638,7 @@ |
|
|
|
</el-col> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item :label="'工单状态'" > |
|
|
|
<el-select multiple collapse-tags v-model="chooseOrderData.statusList" style="width: 220px"> |
|
|
|
<el-select multiple collapse-tags v-model="chooseOrderData.statusList" clearable style="width: 220px"> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option label="已停工" value="已停工"></el-option> |
|
|
|
<el-option label="已开工" value="已开工"></el-option> |
|
|
|
@ -902,7 +902,7 @@ |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-row :gutter="20"> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item :label="'工单/派工数量'"> |
|
|
|
<el-input v-model="orderDetailData.qtyRequired" disabled style="text-align: right" |
|
|
|
class="text-right"></el-input> |
|
|
|
@ -914,7 +914,7 @@ |
|
|
|
class="text-right"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col>--> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-col :span="4"> |
|
|
|
<el-form-item :label="'此次领料数量'"> |
|
|
|
<el-input-number v-model="orderDetailData.issureQty" style="line-height: 20px;padding: 0;width: 100%" |
|
|
|
:controls="false" :step="0" :min="0" class="text-right"></el-input-number> |
|
|
|
@ -931,6 +931,16 @@ |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="5"> |
|
|
|
<el-form-item :label="'已排产机台总数'"> |
|
|
|
<el-input v-model="orderDetailData.apsResourceTotal" disabled style="text-align: right" class="text-right"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="5"> |
|
|
|
<el-form-item :label="'已排产未开工机台数'"> |
|
|
|
<el-input v-model="orderDetailData.notYetStartedResourceTotal" disabled style="text-align: right" class="text-right"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
</el-form> |
|
|
|
@ -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 = ''; |
|
|
|
|