Browse Source

生产查询

master
常熟吴彦祖 5 months ago
parent
commit
63b479acbf
  1. 19
      src/views/modules/yieldReport/com_produce_report_normal.vue
  2. 24
      src/views/modules/yieldReport/produce_order.vue

19
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -450,7 +450,8 @@
<el-form> <el-form>
<el-form-item style="margin-top: -5px;"> <el-form-item style="margin-top: -5px;">
<el-button class="customer-bun-mid controller-bun" type="primary" @click="produceToolModal" <el-button class="customer-bun-mid controller-bun" type="primary" @click="produceToolModal"
:disabled="buttonTags.toolFlag" style="margin-left: 15px; margin-top: 20px;">
disabled="disabled" style="margin-left: 15px; margin-top: 20px;">
<!-- :disabled="buttonTags.toolFlag"-->
{{ buttons.toolButton }} {{ buttons.toolButton }}
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -509,10 +510,10 @@
<!-- {{ buttons.scannerRoll || '扫描卷' }}--> <!-- {{ buttons.scannerRoll || '扫描卷' }}-->
<!-- </el-button>--> <!-- </el-button>-->
</div> </div>
<el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
slot="reference">{{ labels.otherButtons }}
</el-button>
<!-- <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"-->
<!-- style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"-->
<!-- slot="reference">{{ labels.otherButtons }}-->
<!-- </el-button>-->
</el-popover> </el-popover>
</el-form-item> </el-form-item>
<el-form-item style="margin-top: 10px ; margin-left: 5px"> <el-form-item style="margin-top: 10px ; margin-left: 5px">
@ -533,10 +534,10 @@
{{ labels.scannerMaterial }} {{ labels.scannerMaterial }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" class="controller-bun" :disabled="buttonTags.materialMalformedFlag "
style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag2=true"
slot="reference">{{ labels.materialMalformed }}
</el-button>
<!-- <el-button type="primary" class="controller-bun" :disabled="buttonTags.materialMalformedFlag "-->
<!-- style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag2=true"-->
<!-- slot="reference">{{ labels.materialMalformed }}-->
<!-- </el-button>-->
</el-popover> </el-popover>
</el-form-item> </el-form-item>
</el-form> </el-form>

24
src/views/modules/yieldReport/produce_order.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="customer-css"> <div class="customer-css">
<!-- 菜单按钮区域 --> <!-- 菜单按钮区域 -->
<fieldset class="customer-field" style="width: 300px; padding: 0.35em 0.75em 0.425em;">
<fieldset class="customer-field" style="width: 200px; padding: 0.35em 0.75em 0.425em;">
<legend>菜单</legend> <legend>菜单</legend>
<el-form :inline="true" label-position="top" label-width="100px" style=""> <el-form :inline="true" label-position="top" label-width="100px" style="">
<el-form-item :label="''"> <el-form-item :label="''">
@ -15,12 +15,12 @@
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.reportButton }} style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.reportButton }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="switchOperatorModal(1)" class="customer-bun-mid"
:disabled="reportButton.fqcReportButton"
style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.fqcReportButton }}
</el-button>
</el-form-item>
<!-- <el-form-item :label="''">-->
<!-- <el-button type="primary" @click="switchOperatorModal(1)" class="customer-bun-mid"-->
<!-- :disabled="reportButton.fqcReportButton"-->
<!-- style="margin-left: 10px; margin-bottom: 5px;">{{ buttons.fqcReportButton }}-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="''">--> <!-- <el-form-item :label="''">-->
<!-- <el-button type="primary" @click="switchOperatorModal(2)" class="customer-bun-mid"--> <!-- <el-button type="primary" @click="switchOperatorModal(2)" class="customer-bun-mid"-->
<!-- :disabled="reportButton.reworkReportButton"--> <!-- :disabled="reportButton.reworkReportButton"-->
@ -1971,11 +1971,11 @@ export default {
if (val == 0) { if (val == 0) {
let orderType = this.currentRow.orderType let orderType = this.currentRow.orderType
let workCenterNo = this.currentRow.workCenterNo let workCenterNo = this.currentRow.workCenterNo
if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) {
//
this.$message.error(this.labels.thisScheduleCantReport)
return false
}
// if (orderType != 'S' || workCenterNo === 'FQC' || nextItemNo == 0) {
// //
// this.$message.error(this.labels.thisScheduleCantReport)
// return false
// }
let data = { let data = {
site: this.currentRow.site, site: this.currentRow.site,
resourceId: this.currentRow.resourceId, resourceId: this.currentRow.resourceId,

Loading…
Cancel
Save