wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

结束卷 2022年4月2日 sxm

master
[li_she] 4 years ago
parent
55cd9c894b
commit
197f7a39f3
8 changed files with 325 additions and 257 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/modules/yieldReport/com_finish_roll.vue
  2. 31
      src/views/modules/yieldReport/com_produce_report_normal.vue
  3. 533
      src/views/modules/yieldReport/not_over_finish_roll.vue
  4. 2
      src/views/modules/yieldReport/otherReport/change_packaging.vue
  5. 3
      src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
  6. 2
      src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
  7. 3
      src/views/modules/yieldReport/otherReport/rework_inspect_report.vue
  8. 2
      src/views/modules/yieldReport/produce_order.vue

6
src/views/modules/yieldReport/com_finish_roll.vue
View File

@ -43,7 +43,8 @@
</el-form-item>
<el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
<!--<el-input v-model="pageData.approvedQty" type="number" @blur="checkValidApprovedQty"-->
<el-input v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
<el-input v-if="this.preItemNo<=0" v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
<el-input v-if="this.preItemNo>0" class="customer-input-color-red" v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
<el-input v-model="pageData.defectedQty" :disabled="showNumFlag" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
@ -262,6 +263,7 @@ export default {
showShiftFlag: false,
showNumFlag:false,
sfdcTimeList: [],
preItemNo: 0,
scheduleData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
@ -543,6 +545,8 @@ export default {
this.pageData.resourceId = scheduleData.resourceId;
this.pageData.operatorId = operatorData.operatorId;
this.pageData.operatorName = operatorData.operatorName;
this.preItemNo = scheduleData.preItemNo
//this.scheduleData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
//重置时间
this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');

31
src/views/modules/yieldReport/com_produce_report_normal.vue
View File

@ -168,7 +168,8 @@
width="75"
:label="'操作'">
<template slot-scope="scope">
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.rollNo != '*'"
<a class="customer-a"
v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.rollNo != '*'"
@click="replaceToolModal(scope.row)"
>刀模替换</a>
<a class="customer-a"
@ -467,7 +468,8 @@
未生产下机拆卷
</el-button>
</div>
<el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
<el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
slot="reference">其它操作
</el-button>
</el-popover>
@ -2837,13 +2839,14 @@ export default {
planStartTime: '',
planFinishTime: '',
qtyRequiredOriginal: 0,
preItemNo: '',
preItemDesc: '',
nextItemDesc: '',
nextItemNo: 0,
operatorId: '',
functionName: '',
currentRollFlag: false,
repairOrderFlag:'',
repairOrderFlag: '',
checkMultipleRoll: ''
},
currentRollOps: {
@ -2899,15 +2902,15 @@ export default {
},
methods: {
// 不良记录
sfdcDefectListSummaries(param){
const { columns, data } = param;
sfdcDefectListSummaries(param) {
const {columns, data} = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 1) {
sums[index] = "合计: ";
return;
}
if (index == 4){
if (index == 4) {
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@ -2918,25 +2921,25 @@ export default {
return prev;
}
}, 0);
sums[index] ;
sums[index];
}
sums[index] = (sums[index]?sums[index]:0)
sums[index] = (sums[index] ? sums[index] : 0)
}
});
return sums;
},
// 机器下机卷
sfdcRollListSummaries(param){
const { columns, data } = param;
sfdcRollListSummaries(param) {
const {columns, data} = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '下机卷总数：';
return;
}
if (index == 14){
let list = data.filter(item => item.virtualRollFlag!='Y' && item.rollType !='删除卷')
if (index == 14) {
let list = data.filter(item => item.virtualRollFlag != 'Y' && item.rollType != '删除卷')
const values = list.map(item => Number(item[column.property]));
let sum = 0
if (!values.every(value => isNaN(value))) {
@ -2950,7 +2953,7 @@ export default {
}, 0);
}
sums[0]+= sum?sum:0
sums[0] += sum ? sum : 0
}
});
return sums;
@ -3013,6 +3016,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
});
},
// 获取当前卷的信息
@ -3152,6 +3156,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
//设置弹窗的标题
this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
+ data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';

533
src/views/modules/yieldReport/not_over_finish_roll.vue
View File

@ -19,39 +19,48 @@
</el-date-picker>
</el-form-item>
<el-form-item class="customer-item" label="操作员:">
<el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;" ></el-input>
<el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="操作员姓名:">
<el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
<el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="排产日期:">
<el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
<el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="班次:">
<el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
<el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-button type="info" :disabled="buttonTags.selectShiftFlag" plain @click="selectSchduleShiftModal"
style="margin-left: -10px; margin-top: 10px; height: 20px; padding: 3px 3px;">
<icon-svg name="ellipsis" style="height: 10px; width: 10px;" ></icon-svg>
<icon-svg name="ellipsis" style="height: 10px; width: 10px;"></icon-svg>
</el-button>
</fieldset>
<el-form style="margin-top: -60px;margin-left: 570px">
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" style="margin-left: 10px; margin-bottom: 5px;">
列表</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
刷新</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" @click="finishRollBun" style="margin-left: 10px; margin-bottom: 5px;">
结束卷</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
关闭</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" style="margin-left: 10px; margin-bottom: 5px;">
列表
</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" @click="refreshPageData"
style="margin-left: 10px; margin-bottom: 5px;">
刷新
</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" @click="finishRollBun"
style="margin-left: 10px; margin-bottom: 5px;">
结束卷
</el-button>
</el-form-item>
<el-form-item class="customer-button">
<el-button class="customer-bun-min" type="primary" @click="closeDialog"
style="margin-left: 10px; margin-bottom: 5px;">
关闭
</el-button>
</el-form-item>
</el-form>
</el-col>
</el-row>
@ -61,134 +70,154 @@
<legend>卷数量统计</legend>
<el-form-item class="customer-item">
<el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
v-model="pageData.reportedFlag">是否报告产量
</el-checkbox>
</el-form-item>
<el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
<!--<el-input v-model="pageData.approvedQty" type="number" @blur="checkValidApprovedQty"-->
<el-input v-model="pageData.approvedQty" :disabled="showNumFlag" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
<el-input v-model="pageData.approvedQty" :disabled="showNumFlag" @blur="checkValidApprovedQty"
type="number" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
<el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
<el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总数量" style="margin-top: -10px;">
<el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
<el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="其他卷数量:" style="margin-top: -10px;">
<el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
<el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item :label="'未生产下机拆卷数量'" class="customer-item" >
<el-input style="width: 110px;"
v-model="pageData.newCreateRollQty"
oninput="value=value.replace(/[^0-9]/g,'')"
placeholder="">
<el-form-item :label="'未生产下机拆卷数量'" class="customer-item">
<el-input style="width: 110px;"
v-model="pageData.newCreateRollQty"
oninput="value=value.replace(/[^0-9]/g,'')"
placeholder="">
</el-input>
</el-form-item>
</fieldset>
</el-form>
<!-- 卷生产时间统计产量报告 -->
<el-form style="margin-top: 5px;">
<fieldset class="customer-fieldset" style="width: 320px;">
<legend>卷生产时间统计</legend>
<!-- 调机时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="总调机时间:">
<el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;" ></el-input>
</el-form-item>
<el-form-item label="总调机过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="净调机时间:" >
<el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 生产时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="总生产时间">
<el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="总生产过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="净生产时间:" >
<el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 制造时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="总制造时间:">
<el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="总制造过程停机时间:">
<el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="净制造时间:" >
<el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
</fieldset>
<!-- 产量报告 -->
<fieldset class="customer-fieldset"
style="margin-left: 325px; margin-top: -165px; width: 575px;">
<legend>产量报告</legend>
<!-- 开工时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="开工时间">
<el-input v-model="pageData.eventTime" disabled="disabled" style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="完工时间">
<el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="生产时间" >
<el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="调机时间" >
<el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="制造时间" >
<el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 合格数量 -->
<el-row>
<el-col :span="24">
<el-form-item label="合格数量">
<el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="不合格数量">
<el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="报告数量" >
<el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="调机停机">
<el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="生产调机" >
<el-input v-model="pageData.sfdcProdSetupTime" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 备注 -->
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="pageData.remark" style="width: 430px;"></el-input>
</el-form-item>
<el-form-item label="停机时间">
<el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
</fieldset>
<fieldset class="customer-fieldset" style="width: 320px;">
<legend>卷生产时间统计</legend>
<!-- 调机时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="总调机时间:">
<el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="总调机过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red"
readonly="readonly" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="净调机时间:">
<el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 生产时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="总生产时间">
<el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="总生产过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red"
readonly="readonly" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="净生产时间:">
<el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 制造时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="总制造时间:">
<el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="总制造过程停机时间:">
<el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red"
readonly="readonly" style="width: 100px;"></el-input>
</el-form-item>
<el-form-item label="净制造时间:">
<el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red"
readonly="readonly" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
</fieldset>
<!-- 产量报告 -->
<fieldset class="customer-fieldset"
style="margin-left: 325px; margin-top: -165px; width: 575px;">
<legend>产量报告</legend>
<!-- 开工时间 -->
<el-row>
<el-col :span="24">
<el-form-item label="开工时间">
<el-input v-model="pageData.eventTime" disabled="disabled" style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="完工时间">
<el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="生产时间">
<el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="调机时间">
<el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="制造时间">
<el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 合格数量 -->
<el-row>
<el-col :span="24">
<el-form-item label="合格数量">
<el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly"
style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="不合格数量">
<el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly"
style="width: 130px;"></el-input>
</el-form-item>
<el-form-item label="报告数量">
<el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly"
style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="调机停机">
<el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
</el-form-item>
<el-form-item label="生产调机">
<el-input v-model="pageData.sfdcProdSetupTime" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 备注 -->
<el-row>
<el-col :span="24">
<el-form-item label="备注">
<el-input v-model="pageData.remark" style="width: 430px;"></el-input>
</el-form-item>
<el-form-item label="停机时间">
<el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
</fieldset>
</el-form>
<!-- 主材料 -->
<el-form>
@ -215,7 +244,7 @@
<!--<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"-->
<el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
v-model="scope.row[item.columnProp]"></el-input>
<span v-else>{{scope.row[item.columnProp]}}</span>
<span v-else>{{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
@ -230,24 +259,24 @@
<!-- 异常原因录入的组件 -->
<comExceptionReason ref="comExceptionReason" :close-on-click-modal="false"
:visible.sync="showExceptionFlag"
@initExceptionReason = "initExceptionReason">
:visible.sync="showExceptionFlag"
@initExceptionReason="initExceptionReason">
</comExceptionReason>
<!-- 班次选择组件 -->
<comSelectShift ref="comSelectShift" :close-on-click-modal="false"
:visible.sync="showShiftFlag"
@initScheduleShift = "initScheduleShift">
@initScheduleShift="initScheduleShift">
</comSelectShift>
</div>
</template>
<script>
/*添加组件*/
import comExceptionReason from "./com_exception_reason";//异常远远
import comSelectShift from "./com_select_shift";//班次选择的组件
import {
/*添加组件*/
import comExceptionReason from "./com_exception_reason";//异常远远
import comSelectShift from "./com_select_shift";//班次选择的组件
import {
getCurrentRollReportedQty,
countSfdcTimeQty,
getScheduleShiftData,
@ -259,6 +288,10 @@
finishRollWithNoFqc,
getSORoutingPreviousOperationItemNo
} from '@/api/yieldReport/com_finish_roll.js';
import {
getScheduleDateShift,
} from "@/api/yieldReport/produce_report_normal.js";
export default {
data() {
return {
@ -511,7 +544,7 @@ export default {
fixed: false
}
],
buttonTags:{
buttonTags: {
selectShiftFlag: true,
},
dataListLoading: false,
@ -522,19 +555,28 @@ export default {
comSelectShift,/*班次选择的组件*/
},
methods: {
sORoutingPreviousOperationItemNo(){
sORoutingPreviousOperationItemNo() {
getSORoutingPreviousOperationItemNo( this.pageData).then(({data})=>{
if (data.code==0){
if (data.itemNo>0){
getSORoutingPreviousOperationItemNo(this.pageData).then(({data}) => {
if (data.code == 0) {
if (data.itemNo > 0) {
this.showNumFlag = true
}else {
} else {
this.showNumFlag = false
}
}
})
},
// 获取排产日期
searchScheduleDateShift(scheduleDateShiftDto) {
getScheduleDateShift(scheduleDateShiftDto).then(({data}) => {
if (data.code == 0) {
this.pageData.shiftDesc = data.map.ShiftNo
this.pageData.scheduledDate = this.dayjs(data.map.scheduleddate).format('YYYY-MM-DD')
}
})
},
/*初始化页面参数*/
init(scheduleData, operatorData) {
//初始化参数
@ -544,26 +586,32 @@ export default {
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.rollNo = scheduleData.rollNo;
this.pageData.scheduledDate = scheduleData.scheduledDate;
this.pageData.shiftNo = scheduleData.shiftNo;
// this.pageData.scheduledDate = scheduleData.scheduledDate;
// this.pageData.shiftNo = scheduleData.shiftNo;
this.pageData.resourceId = scheduleData.resourceId;
this.pageData.operatorId = operatorData.operatorId;
this.pageData.operatorName = operatorData.operatorName;
// let scheduleDateShiftDto = {
// site: this.$store.state.user.site,
// resourceId: scheduleData.resourceId,
// currentDateTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss')
// }
// this.searchScheduleDateShift(scheduleDateShiftDto)
//重置时间
this.pageData.reportedTime = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
//初始化操作员对象
this.operatorData = JSON.parse(JSON.stringify(operatorData));
//初始化标题
this.titleCon = '结束卷操作 & 未生产下机 & 派工单号:'+scheduleData.seqNo;
this.titleCon = '结束卷操作 & 未生产下机 & 派工单号:' + scheduleData.seqNo;
//处理异常的原因
this.pageData.exceptionFlag = 'N';
this.pageData.exceptionReason = '';
this.pageData.exceptionReason = '';
//刷新当前派工单的信息
this.refreshPageData();
this.sORoutingPreviousOperationItemNo()
},
/*关闭modal*/
closeDialog(){
closeDialog() {
Object.assign(this.$data, this.$options.data.call(this));
//刷新报工的页面
this.$emit('refreshPageData');
@ -583,7 +631,7 @@ export default {
},
/*刷新当前的页面参数*/
async refreshPageData(){
async refreshPageData() {
//1.刷新当前卷的报工数据
await getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
this.pageData.approvedQty = data.row.approvedQty;
@ -616,63 +664,63 @@ export default {
//停机时间=总制造过程停机时间
this.pageData.sfdcDownTime = this.pageData.totalManufactureDowntimeTime;
});
//3.刷新派工单的班次信息
await getScheduleShiftData(this.scheduleData).then(({data}) => {
//3.刷新派工单的班次信息
await getScheduleShiftData(this.pageData).then(({data}) => {
let specialAuth = 'N';
//区分是否存在班次
if(data.code == 500){
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
this.pageData.scheduledDate = '';//重置排产日期
this.pageData.shiftNo = '';
}else{
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
this.pageData.shiftNo = data.row.shiftNo;
//设置结果
specialAuth = data.row.specialAuth;
}
//区分是否存在班次
if (data.code == 500) {
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
this.pageData.scheduledDate = '';//重置排产日期
this.pageData.shiftNo = '';
} else {
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
this.pageData.shiftNo = data.row.shiftNo;
//设置结果
specialAuth = data.row.specialAuth;
}
//根据不同设置不同的属性
if("Y" === specialAuth){
if ("Y" === specialAuth) {
this.buttonTags.selectShiftFlag = false;
}else{
} else {
this.buttonTags.selectShiftFlag = true;
}
});
//4.刷新当前卷的最早和最晚时间
await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
this.pageData.eventTime = data.row.eventTime;
this.pageData.tillTime = data.row.tillTime;
});
//5.刷新当前卷的Sfdc表的时间
await getSfdcTimeData(this.scheduleData).then(({data}) => {
//先判断是否成功查询
if(data.resultCode == 200){
//判断是否操作成功
this.pageData.eventTime = data.row.finishTime;
this.pageData.sfdcProdTime = data.row.sfdcProdTime;
this.pageData.sfdcSetupTime = data.row.sfdcSetupTime;
this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime;
this.pageData.sfdcDownTime = data.row.sfdcDownTime;
this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime;
this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime;
}else{
//暂时不处理数据
}
});
//6.刷新当前卷的报工数据
await getSfdcReportedData(this.scheduleData).then(({data}) => {
this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
});
//刷新当前卷的时间数据
await getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
this.sfdcMaterialList = data.rows;
});
});
//4.刷新当前卷的最早和最晚时间
await getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
this.pageData.eventTime = data.row.eventTime;
this.pageData.tillTime = data.row.tillTime;
});
//5.刷新当前卷的Sfdc表的时间
await getSfdcTimeData(this.scheduleData).then(({data}) => {
//先判断是否成功查询
if (data.resultCode == 200) {
//判断是否操作成功
this.pageData.eventTime = data.row.finishTime;
this.pageData.sfdcProdTime = data.row.sfdcProdTime;
this.pageData.sfdcSetupTime = data.row.sfdcSetupTime;
this.pageData.sfdcManufactureTime = data.row.sfdcManufactureTime;
this.pageData.sfdcDownTime = data.row.sfdcDownTime;
this.pageData.sfdcSetupDownTime = data.row.sfdcSetupDownTime;
this.pageData.sfdcProdSetupTime = data.row.sfdcProdSetupTime;
} else {
//暂时不处理数据
}
});
//6.刷新当前卷的报工数据
await getSfdcReportedData(this.scheduleData).then(({data}) => {
this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
this.pageData.sfdcReportedQty = this.pageData.sfdcApprovedQty + this.pageData.sfdcDefectedQty;
});
//刷新当前卷的时间数据
await getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
this.sfdcMaterialList = data.rows;
});
},
/*刷新当前卷的报工数据汇总*/
refreshCurrentRollReportedQty(){
refreshCurrentRollReportedQty() {
getCurrentRollReportedQty(this.scheduleData).then(({data}) => {
this.pageData.approvedQty = data.row.approvedQty;
this.pageData.defectedQty = data.row.defectedQty;
@ -682,7 +730,7 @@ export default {
},
//刷新当前卷的时间信息
refreshCurrentRollTimeQty(){
refreshCurrentRollTimeQty() {
countSfdcTimeQty(this.scheduleData).then(({data}) => {
this.pageData.totalSetupTime = data.row.totalSetupTime;
this.pageData.totalDowntimeTimeSetup = data.row.totalDowntimeTimeSetup;
@ -697,14 +745,14 @@ export default {
},
//刷新派工单的班次信息
refreshScheduleShiftData(){
refreshScheduleShiftData() {
getScheduleShiftData(this.scheduleData).then(({data}) => {
//区分是否存在班次
if(data.code == 500){
if (data.code == 500) {
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
this.pageData.scheduledDate = '';//重置排产日期
this.pageData.shiftNo = '';
}else{
} else {
this.pageData.shiftDesc = data.row.shiftDesc;//重置班次
this.pageData.scheduledDate = data.row.scheduledDate.substring(0, 10);//重置排产日期
this.pageData.shiftNo = data.row.shiftNo;
@ -713,7 +761,7 @@ export default {
},
//刷新当前卷的时间信息
refreshCurrentRollMaxAndMinTime(){
refreshCurrentRollMaxAndMinTime() {
getSfdcTimeMaxAndMinTime(this.scheduleData).then(({data}) => {
this.pageData.eventTime = data.row.eventTime;
this.pageData.tillTime = data.row.tillTime;
@ -721,7 +769,7 @@ export default {
},
//刷新当前卷的Sfdc的信息
refreshSfdcTimeData(){
refreshSfdcTimeData() {
getSfdcTimeData(this.scheduleData).then(({data}) => {
//判断是否操作成功
this.pageData.eventTime = data.row.finishTime;
@ -735,7 +783,7 @@ export default {
},
//刷新当前卷的报工数据
refreshSfdcData(){
refreshSfdcData() {
getSfdcReportedData(this.scheduleData).then(({data}) => {
this.pageData.sfdcApprovedQty = this.pageData.approvedQty - data.row.approveQty;
this.pageData.sfdcDefectedQty = this.pageData.defectedQty - data.row.defectQty;
@ -744,29 +792,28 @@ export default {
},
//刷新当前卷的时间数据
refreshSfdcMaterialTable(){
refreshSfdcMaterialTable() {
getSfdcMaterialByRollNo(this.scheduleData).then(({data}) => {
this.sfdcMaterialList = data.rows;
});
},
/*检查数据是否有效*/
checkValidQty(row){
checkValidQty(row) {
//判断当前是否为空
if(row.netIssueQty == ''){
if (row.netIssueQty == '') {
this.$message.error('材料上本卷耗用数量不能为空!');
row.netIssueQty = 0;//重新赋值
return false;
}
//判断当前是否有效
if(row.netIssueQty <= 0){
if (row.netIssueQty <= 0) {
this.$message.error('材料耗用数量必须大于0!');
return false;
}
//判断是否超限
if(row.netIssueQty > row.transQty){
if (row.netIssueQty > row.transQty) {
this.$message.error('材料耗用数量大于发料数量!');
row.netIssueQty = 0;//重新赋值
return false;
@ -776,30 +823,30 @@ export default {
/*添加定制的css类*/
customerCellClassName({row, column, rowIndex, columnIndex}) {
if(column.property == 'netIssueQty'){
if (column.property == 'netIssueQty') {
return 'customer-number-cell';
}
},
/*添加定制的cess样式*/
customerCellStyle({row, column, rowIndex, columnIndex}) {
if(column.property == 'netIssueQty'){
if (column.property == 'netIssueQty') {
return 'padding: 0px 0px;';
}
},
/*检验良品的总数量*/
checkValidApprovedQty(){
checkValidApprovedQty() {
//调用刷新的方法
this.refreshSfdcData();
this.pageData.totalQty = parseFloat(this.pageData.approvedQty) + parseFloat(this.pageData.defectedQty);
},
/*结束当前的操作*/
finishRollBun(){
if(this.pageData.newCreateRollQty <= 0){
finishRollBun() {
if (this.pageData.newCreateRollQty <= 0) {
this.$message.error('未生产下机拆卷数量必须要输入，数量必须大于0！!');
this.pageData.newCreateRollQty=0
this.pageData.newCreateRollQty = 0
return false;
}
//首先判断数值是否通过判断
@ -815,7 +862,7 @@ export default {
// return false;
// }
//班次判断
if(this.pageData.shiftDesc == '无班次'){
if (this.pageData.shiftDesc == '无班次') {
this.$message.error('该时间段内没有匹配的班次信息,请联系相关人员！!');
return false;
}
@ -827,9 +874,9 @@ export default {
//先调用检查方法
checkFinishRollWithNoFqc(postData).then(({data}) => {
//判断是否成功
if(data.code == 500){
if (data.code == 500) {
this.$message.error(data.msg);
}else if (data.resultMap.resultCode == '201'){
} else if (data.resultMap.resultCode == '201') {
//打开异常原因录入的界面
this.$confirm(data.resultMap.resultMsg, '提示', {
confirmButtonText: '确认',
@ -838,7 +885,7 @@ export default {
}).then(() => {
this.showExceptionReasonModal();
});
}else{
} else {
//执行结束卷操作
this.finishRollOperation();
}
@ -847,15 +894,15 @@ export default {
},
/*结束卷的具体操作*/
finishRollOperation(){
finishRollOperation() {
//验证通过提交到后台
let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
//处理信息
finishRollWithNoFqc(postData).then(({data}) => {
//判断操作是否成功
if(data.code == 500){
if (data.code == 500) {
this.$message.error(data.msg);
}else{
} else {
//关闭当前的页面
this.closeDialog();
}
@ -863,7 +910,7 @@ export default {
},
/*打开异常原因录入页面*/
showExceptionReasonModal(){
showExceptionReasonModal() {
//1.首先调用菜单判断方式 打开生产过程的材料的页面
//checkProduceButton('produceMaterialFlag');
//打开生产过程的工具的页面
@ -874,16 +921,16 @@ export default {
},
/*处理异常的原因*/
initExceptionReason(exceptionReason){
initExceptionReason(exceptionReason) {
//处理异常的原因
this.pageData.exceptionFlag = 'Y';
this.pageData.exceptionReason = exceptionReason;
this.pageData.exceptionReason = exceptionReason;
//然后提交结束卷的数据
this.finishRollOperation();
},
/*打开班次选择页面*/
selectSchduleShiftModal(){
selectSchduleShiftModal() {
//1.首先调用菜单判断方式 打开生产过程的材料的页面
//checkProduceButton('produceMaterialFlag');
//打开生产过程的工具的页面
@ -894,11 +941,11 @@ export default {
},
/*修改页面的班次和排产的时间*/
initScheduleShift(scheduleDate, shiftDesc, username){
initScheduleShift(scheduleDate, shiftDesc, username) {
//重置班次和排产的时间
this.pageData.scheduledDate = scheduleDate.substring(0, 10);
this.pageData.shiftDesc = shiftDesc;
this.pageData.remark = username+"更改了班次."
this.pageData.remark = username + "更改了班次."
},
},
@ -912,43 +959,45 @@ export default {
<style scoped lang="scss">
/*调节页面button和input的上下间距*/
.customer-css .customer-button{
.customer-css .customer-button {
margin-top: 25px;
}
/*调节样式*/
.customer-item{
.customer-item {
margin-top: -10px;
}
/*fieldset下table的样式*/
.customer-fieldset /deep/ .el-table__header th.is-leaf{
.customer-fieldset /deep/ .el-table__header th.is-leaf {
line-height: 16px;
}
/deep/ .customer-tab .el-tabs__content{
/deep/ .customer-tab .el-tabs__content {
padding: 0px !important;
}
/*table中input*/
div.table-input /deep/ input.el-input__inner{
div.table-input /deep/ input.el-input__inner {
text-align: right;
}
/*当前按钮的通用样式*/
.customer-css .customer-bun-mid{
.customer-css .customer-bun-mid {
width: 65px;
text-align: center;
}
.customer-css .customer-bun-min{
.customer-css .customer-bun-min {
width: 50px;
text-align: center;
}
.customer-css .customer-bun-max{
.customer-css .customer-bun-max {
width: 80px;
text-align: center;
}
/*当前按钮的通用样式*/
.customer-css .el-button--medium {
padding: 5px 5px;

2
src/views/modules/yieldReport/otherReport/change_packaging.vue
View File

@ -2960,6 +2960,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
});
},
// 获取当前卷的信息
@ -3109,6 +3110,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
//设置弹窗的标题
this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
+ data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';

3
src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
View File

@ -2694,6 +2694,7 @@ export default {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
seqNo: '',
preItemNo: '',
orderNo: '',
itemNo: 0,
resourceId: '',
@ -2965,6 +2966,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
});
},
// 获取当前卷的信息
@ -3113,6 +3115,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
//设置弹窗的标题
this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
+ data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';

2
src/views/modules/yieldReport/otherReport/fqc_split_roll_report.vue
View File

@ -2806,6 +2806,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
});
},
// 获取当前卷的信息
@ -2952,6 +2953,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
//设置弹窗的标题
this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
+ data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';

3
src/views/modules/yieldReport/otherReport/rework_inspect_report.vue
View File

@ -2901,6 +2901,7 @@ export default {
},
// 不良信息列表
getInspectionDefectCodeList(){
this.scheduleData.operatorId = this.operatorData.operatorId
this.$nextTick(() => {
this.$refs.defectList.init(this.scheduleData)
});
@ -2963,6 +2964,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
});
},
// 获取当前卷的信息
@ -3109,6 +3111,7 @@ export default {
this.scheduleData.workCenterNo = data.row.workCenterNo;
this.scheduleData.workCenterDesc = data.row.workCenterDesc;
this.scheduleData.resourceDesc = data.row.resourceDesc;
this.scheduleData.preItemNo = data.row.preItemNo;
//设置弹窗的标题
this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
+ data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）';

2
src/views/modules/yieldReport/produce_order.vue
View File

@ -1719,7 +1719,7 @@ export default {
if (val == 4){
getShopOrder(this.currentRow).then(({data}) =>{
if (data.code == 0){
if (data.orderType == 'P'){
if (data.data == 'P'){
//打开操作员切换功能
this.showOperatorFlag = true;
this.$nextTick(() => {

Write Preview
Loading…
Cancel
Save