|
|
|
@ -24,7 +24,7 @@ |
|
|
|
刷新</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item class="customer-button"> |
|
|
|
<el-button type="primary" @click="finishRollOperation" style="margin-left: 10px; margin-bottom: 5px;"> |
|
|
|
<el-button type="primary" @click="finishRollBun" style="margin-left: 10px; margin-bottom: 5px;"> |
|
|
|
结束卷</el-button> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item class="customer-button"> |
|
|
|
@ -41,7 +41,7 @@ |
|
|
|
<el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N" |
|
|
|
v-model="pageData.reportedFlag">是否报告产量</el-checkbox> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item class="customer-item" label="良品总数量:" style="margin-top: -10px;"> |
|
|
|
<el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;"> |
|
|
|
<el-input v-model="pageData.approvedQty" type="number" @blur="checkValidApprovedQty" |
|
|
|
style="width: 80px;" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -123,6 +123,7 @@ |
|
|
|
<!-- 产量报告 --> |
|
|
|
<fieldset class="customer-fieldset" |
|
|
|
style="margin-left: 325px; margin-top: -165px; width: 575px;"> |
|
|
|
|
|
|
|
<legend>产量报告</legend> |
|
|
|
<!-- 开工时间 --> |
|
|
|
<el-row> |
|
|
|
@ -213,10 +214,20 @@ |
|
|
|
|
|
|
|
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 异常原因录入的组件 --> |
|
|
|
<comExceptionReason ref="comExceptionReason" :close-on-click-modal="false" |
|
|
|
:visible.sync="showExceptionFlag" |
|
|
|
@initExceptionReason = "initExceptionReason"> |
|
|
|
|
|
|
|
</comExceptionReason> |
|
|
|
</div> |
|
|
|
|
|
|
|
</template> |
|
|
|
|
|
|
|
<script> |
|
|
|
/*添加组件*/ |
|
|
|
import comExceptionReason from "./com_exception_reason";//异常远远 |
|
|
|
import { |
|
|
|
getCurrentRollReportedQty, |
|
|
|
countSfdcTimeQty, |
|
|
|
@ -225,13 +236,15 @@ import { |
|
|
|
getSfdcTimeData, |
|
|
|
getSfdcReportedData, |
|
|
|
getSfdcMaterialByRollNo, |
|
|
|
finishRoll, |
|
|
|
checkFinishRollWithNoFqc, |
|
|
|
finishRollWithNoFqc |
|
|
|
} from '@/api/yieldReport/com_finish_roll.js'; |
|
|
|
export default { |
|
|
|
name: "com_finish_roll", |
|
|
|
data() { |
|
|
|
return { |
|
|
|
titleCon: '', |
|
|
|
titleCon: '结束卷', |
|
|
|
showExceptionFlag: false, |
|
|
|
sfdcTimeList: [], |
|
|
|
scheduleData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -272,6 +285,7 @@ export default { |
|
|
|
approvedQty: 0, |
|
|
|
defectedQty: 0, |
|
|
|
totalQty: 0, |
|
|
|
editNewRollQty: 0, |
|
|
|
otherRollQty: '', |
|
|
|
shiftDesc: '', |
|
|
|
totalSetupTime: 0, |
|
|
|
@ -295,6 +309,8 @@ export default { |
|
|
|
sfdcDefectedQty: 0, |
|
|
|
sfdcReportedQty: 0, |
|
|
|
remark: '', |
|
|
|
exceptionFlag: 'N', |
|
|
|
exceptionReason: '', |
|
|
|
}, |
|
|
|
operatorData: { |
|
|
|
site: this.$store.state.user.site, |
|
|
|
@ -486,6 +502,9 @@ export default { |
|
|
|
dataListLoading: false, |
|
|
|
} |
|
|
|
}, |
|
|
|
components: { |
|
|
|
comExceptionReason,/*异常原因的组件*/ |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
/*初始化页面参数*/ |
|
|
|
init(scheduleData, operatorData) { |
|
|
|
@ -499,6 +518,7 @@ export default { |
|
|
|
this.pageData.scheduledDate = scheduleData.scheduledDate; |
|
|
|
this.pageData.shiftNo = scheduleData.shiftNo; |
|
|
|
this.pageData.resourceId = scheduleData.resourceId; |
|
|
|
this.pageData.operatorId = operatorData.operatorId; |
|
|
|
//重置时间 |
|
|
|
this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'); |
|
|
|
//初始化操作员对象 |
|
|
|
@ -514,6 +534,17 @@ export default { |
|
|
|
this.$emit('update:visible', false); |
|
|
|
}, |
|
|
|
|
|
|
|
/*生产过程的停机组件*/ |
|
|
|
exceptionReasonModal() { |
|
|
|
//1.首先调用菜单判断方式 打开生产过程的停机的页面 |
|
|
|
//checkProduceButton('produceDownFlag'); |
|
|
|
//打开生产过程的工具的页面 |
|
|
|
this.$nextTick(() => { |
|
|
|
this.show = true; |
|
|
|
this.$refs.comProduceDown.init(this.scheduleData, this.operatorData) |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
/*刷新当前的页面参数*/ |
|
|
|
refreshPageData(){ |
|
|
|
//1.刷新当前卷的报工数据 |
|
|
|
@ -542,7 +573,7 @@ export default { |
|
|
|
//制造时间=总制造时间 |
|
|
|
this.pageData.sfdcManufactureTime = this.pageData.totalManufactureTime; |
|
|
|
//调机停机=总调机过程停机时间 |
|
|
|
this.pageData.sfdcDownTime = this.pageData.totalDowntimeTimeSetup; |
|
|
|
this.pageData.sfdcSetupDownTime = this.pageData.totalDowntimeTimeSetup; |
|
|
|
//生产调机=总生产过程停机时间 |
|
|
|
this.pageData.sfdcProdSetupTime = this.pageData.totalDowntimeTimeProd; |
|
|
|
//停机时间=总制造过程停机时间 |
|
|
|
@ -551,7 +582,8 @@ export default { |
|
|
|
}).then(() => { |
|
|
|
//3.刷新派工单的班次信息 |
|
|
|
getScheduleShiftData(this.scheduleData).then(({data}) => { |
|
|
|
this.pageData.shiftDesc = data.row.shiftDesc; |
|
|
|
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次 |
|
|
|
this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期 |
|
|
|
}); |
|
|
|
}).then(() => { |
|
|
|
//4.刷新当前卷的最早和最晚时间 |
|
|
|
@ -621,7 +653,8 @@ export default { |
|
|
|
//刷新派工单的班次信息 |
|
|
|
refreshScheduleShiftData(){ |
|
|
|
getScheduleShiftData(this.scheduleData).then(({data}) => { |
|
|
|
this.pageData.shiftDesc = data.row.shiftDesc; |
|
|
|
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次 |
|
|
|
this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期 |
|
|
|
}); |
|
|
|
}, |
|
|
|
|
|
|
|
@ -707,7 +740,7 @@ export default { |
|
|
|
}, |
|
|
|
|
|
|
|
/*结束当前的操作*/ |
|
|
|
finishRollOperation(){ |
|
|
|
finishRollBun(){ |
|
|
|
//首先判断数值是否通过判断 |
|
|
|
let approvedQty = this.pageData.approvedQty; |
|
|
|
if(approvedQty == null || approvedQty == ''){ |
|
|
|
@ -725,9 +758,29 @@ export default { |
|
|
|
this.$message.error('该时间段内没有匹配的班次信息,请联系相关人员！!'); |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
//验证通过提交到后台 |
|
|
|
let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)}; |
|
|
|
finishRoll(postData).then(({data}) => { |
|
|
|
|
|
|
|
//先调用检查方法 |
|
|
|
checkFinishRollWithNoFqc(postData).then(({data}) => { |
|
|
|
//判断是否成功 |
|
|
|
if(data.code == 500){ |
|
|
|
this.$message.error(data.msg); |
|
|
|
}else if (data.resultMap.resultCode == '201'){ |
|
|
|
//打开异常原因录入的界面 |
|
|
|
|
|
|
|
}else{ |
|
|
|
//执行结束卷操作 |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
/*结束卷的具体操作*/ |
|
|
|
finishRollOperation(){ |
|
|
|
//处理信息 |
|
|
|
finishRollWithNoFqc(postData).then(({data}) => { |
|
|
|
this.$message.error('qty_reported找不到!'); |
|
|
|
//判断操作是否成功 |
|
|
|
if(data.code == 500){ |
|
|
|
@ -741,14 +794,14 @@ export default { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*处理异常的原因*/ |
|
|
|
initExceptionReason(exceptionReason){ |
|
|
|
//处理异常的原因 |
|
|
|
this.pageData.exceptionFlag = 'Y'; |
|
|
|
this.pageData.exceptionReason = exceptionReason; |
|
|
|
//然后提交结束卷的数据 |
|
|
|
this.finishRollOperation(); |
|
|
|
} |
|
|
|
}, |
|
|
|
created() { |
|
|
|
// this.factoryList() |
|
|
|
|
