|
|
|
@ -482,7 +482,7 @@ |
|
|
|
<el-input v-model="componentData.printUnitName" disabled style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'消耗项目'" prop="consumptionItem"> |
|
|
|
<el-select v-model="componentData.consumptionItem" style="width: 165px"> |
|
|
|
<el-select v-model="componentData.consumptionItem" style="width: 167px"> |
|
|
|
<el-option label="Consumed" value="Consumed"></el-option> |
|
|
|
<el-option label="Not Consumed" value="Not Consumed"></el-option> |
|
|
|
</el-select> |
|
|
|
@ -507,7 +507,7 @@ |
|
|
|
<el-input v-model="componentData.issueToLocName" readonly style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'生产属性'" prop="issueType"> |
|
|
|
<el-select v-model="componentData.issueType" style="width: 165px"> |
|
|
|
<el-select v-model="componentData.issueType" style="width: 167px"> |
|
|
|
<el-option label="Reserve And Backflush" value="Reserve And Backflush"></el-option> |
|
|
|
<el-option label="Reserve" value="Reserve"></el-option> |
|
|
|
<el-option label="Backflush" value="Backflush"></el-option> |
|
|
|
@ -515,6 +515,58 @@ |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'实际生产数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.productionData" :disabled="!productionDataFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'材料数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialData" :disabled="!materialDataFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'成品数量'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.finishedProductData" :disabled="!finishedProductDataFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'用量损耗'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.consumptionLoss" :disabled="!consumptionLossFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'涂胶长度'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.coatingLength" :disabled="!coatingLengthFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'胶水克重'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.glueWeight" :disabled="!glueWeightFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'材料宽度'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialWidth" :disabled="!materialWidthFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'宽度换算单位'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.widthConversion" :disabled="!widthConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'材料长度1'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialLength" :disabled="!materialLengthFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'材料厚度'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialThickness" :disabled="!materialThicknessFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'面积单位换算'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.areaConversion" :disabled="!areaConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'密度单位换算'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.densityConversion" :disabled="!densityConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px"> |
|
|
|
<el-form-item :label="'材料克重'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialWeight" :disabled="!materialWeightFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'材料长度2'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.materialLength2" :disabled="!materialLength2Family.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'单位换算'"> |
|
|
|
<el-input-number :controls="false" :step="0" min="0" v-model="componentData.unitConversion" :disabled="!unitConversionFamily.includes(componentData.familyID)" style="width: 115px"></el-input-number> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
|
|
|
|
<el-form :inline="true" label-position="top" :model="componentData" style="margin-left: 5px"> |
|
|
|
<el-form-item label="备注"> |
|
|
|
<el-input type="textarea" v-model="componentData.noteText" :rows="3" resize='none' show-word-limit style="width: 759px;height: 20px"></el-input> |
|
|
|
@ -1188,7 +1240,23 @@ export default { |
|
|
|
updateBy: '', |
|
|
|
lineSequence: '', |
|
|
|
consumptionItem: '', |
|
|
|
productFlag: '' |
|
|
|
productFlag: '', |
|
|
|
familyID: '', |
|
|
|
productionData: undefined, |
|
|
|
materialData: undefined, |
|
|
|
finishedProductData: undefined, |
|
|
|
consumptionLoss: undefined, |
|
|
|
coatingLength: undefined, |
|
|
|
glueWeight: undefined, |
|
|
|
materialWidth: undefined, |
|
|
|
widthConversion: undefined, |
|
|
|
materialLength: undefined, |
|
|
|
materialThickness: undefined, |
|
|
|
areaConversion: undefined, |
|
|
|
densityConversion: undefined, |
|
|
|
materialWeight: undefined, |
|
|
|
materialLength2: undefined, |
|
|
|
unitConversion: undefined |
|
|
|
}, |
|
|
|
partData: { |
|
|
|
site: '', |
|
|
|
@ -2077,7 +2145,23 @@ export default { |
|
|
|
copyAlternativeModelFlag: false, |
|
|
|
headerSaveFlag: false, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
batchComponentPartModelFlag: false |
|
|
|
batchComponentPartModelFlag: false, |
|
|
|
// ======== 子物料字段分类集合 ======== |
|
|
|
productionDataFamily: ['RFID003', 'RFID004', 'RFID005', 'RFID006', 'RFID007', 'RFID008', 'RFID009', 'RFID012', 'RFID023', 'RFID024', 'RFID025', 'RFID027'], |
|
|
|
materialDataFamily: ['RFID011', 'RFID020', 'RFID021', 'RFID022'], |
|
|
|
finishedProductDataFamily: ['RFID020', 'RFID021', 'RFID022'], |
|
|
|
consumptionLossFamily: ['RFID001', 'RFID002', 'RFID014', 'RFID015', 'RFID016', 'RFID017', 'RFID018', 'RFID019'], |
|
|
|
coatingLengthFamily: ['RFID013'], |
|
|
|
glueWeightFamily: ['RFID013'], |
|
|
|
materialWidthFamily: ['RFID014', 'RFID015'], |
|
|
|
widthConversionFamily: ['RFID014', 'RFID015'], |
|
|
|
materialLengthFamily: ['RFID016', 'RFID017'], |
|
|
|
materialThicknessFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'], |
|
|
|
areaConversionFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'], |
|
|
|
densityConversionFamily: ['RFID016', 'RFID017', 'RFID018', 'RFID019'], |
|
|
|
materialWeightFamily: ['RFID018', 'RFID019'], |
|
|
|
materialLength2Family: ['RFID018', 'RFID019'], |
|
|
|
unitConversionFamily: ['RFID018', 'RFID019'], |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2554,10 +2638,6 @@ export default { |
|
|
|
this.$message.warning('请先选择替代！') |
|
|
|
return |
|
|
|
} |
|
|
|
// if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { |
|
|
|
// this.$message.warning('不可编辑的替代状态!') |
|
|
|
// return |
|
|
|
// } |
|
|
|
this.componentData = { |
|
|
|
flag: '1', |
|
|
|
site: this.modalData.site, |
|
|
|
@ -2583,7 +2663,23 @@ export default { |
|
|
|
createBy: this.$store.state.user.name, |
|
|
|
lineSequence: '', |
|
|
|
consumptionItem: 'Consumed', |
|
|
|
productFlag: 'component' |
|
|
|
productFlag: 'component', |
|
|
|
familyID: '', |
|
|
|
productionData: undefined, |
|
|
|
materialData: undefined, |
|
|
|
finishedProductData: undefined, |
|
|
|
consumptionLoss: undefined, |
|
|
|
coatingLength: undefined, |
|
|
|
glueWeight: undefined, |
|
|
|
materialWidth: undefined, |
|
|
|
widthConversion: undefined, |
|
|
|
materialLength: undefined, |
|
|
|
materialThickness: undefined, |
|
|
|
areaConversion: undefined, |
|
|
|
densityConversion: undefined, |
|
|
|
materialWeight: undefined, |
|
|
|
materialLength2: undefined, |
|
|
|
unitConversion: undefined |
|
|
|
} |
|
|
|
// 获取子料的序号 |
|
|
|
getComponentLineSequence(this.componentData).then(({data}) => { |
|
|
|
@ -2699,10 +2795,6 @@ export default { |
|
|
|
* 子明细编辑模态框 |
|
|
|
*/ |
|
|
|
updateComponentModal (row) { |
|
|
|
// if (this.detailData.status != null && this.detailData.status !== '' && this.detailData.status !== 'Tentative') { |
|
|
|
// this.$message.warning('不可编辑的替代状态!') |
|
|
|
// return |
|
|
|
// } |
|
|
|
this.componentData = { |
|
|
|
flag: '2', |
|
|
|
site: row.site, |
|
|
|
@ -2728,7 +2820,23 @@ export default { |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
lineSequence: row.lineSequence, |
|
|
|
consumptionItem: row.consumptionItem, |
|
|
|
productFlag: 'component' |
|
|
|
productFlag: 'component', |
|
|
|
familyID: row.familyID, |
|
|
|
productionData: row.productionData == null ? undefined : row.productionData, |
|
|
|
materialData: row.materialData == null ? undefined : row.materialData, |
|
|
|
finishedProductData: row.finishedProductData == null ? undefined : row.finishedProductData, |
|
|
|
consumptionLoss: row.consumptionLoss == null ? undefined : row.consumptionLoss, |
|
|
|
coatingLength: row.coatingLength == null ? undefined : row.coatingLength, |
|
|
|
glueWeight: row.glueWeight == null ? undefined : row.glueWeight, |
|
|
|
materialWidth: row.materialWidth == null ? undefined : row.materialWidth, |
|
|
|
widthConversion: row.widthConversion == null ? undefined : row.widthConversion, |
|
|
|
materialLength: row.materialLength == null ? undefined : row.materialLength, |
|
|
|
materialThickness: row.materialThickness == null ? undefined : row.materialThickness, |
|
|
|
areaConversion: row.areaConversion == null ? undefined : row.areaConversion, |
|
|
|
densityConversion: row.densityConversion == null ? undefined : row.densityConversion, |
|
|
|
materialWeight: row.materialWeight == null ? undefined : row.materialWeight, |
|
|
|
materialLength2: row.materialLength2 == null ? undefined : row.materialLength2, |
|
|
|
unitConversion: row.unitConversion == null ? undefined : row.unitConversion, |
|
|
|
} |
|
|
|
this.componentDisableFlag = true |
|
|
|
this.componentSaveModal = true |
|
|
|
@ -3002,6 +3110,7 @@ export default { |
|
|
|
this.componentData.componentPartDesc = row.partDesc |
|
|
|
this.componentData.printUnit = row.printUnit |
|
|
|
this.componentData.printUnitName = row.printUnitName |
|
|
|
this.componentData.familyID = row.familyID |
|
|
|
this.componentPartModelFlag = false |
|
|
|
}, |
|
|
|
|
|
|
|
|
yuejiayang
1 year ago