From f71b120bd703e020f0035a2dc578d6fdb5922bf1 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Wed, 9 Mar 2022 21:27:39 +0800 Subject: [PATCH] fqc sxm 2022-3-8 --- config/index.js | 2 +- src/views/common/login.vue | 6 ++-- .../yieldReport/otherReport/defectList.vue | 14 +++++---- .../otherReport/fqc_produce_report_normal.vue | 31 ++++++++++++++++--- .../otherReport/other_switch_roll.vue | 5 ++- .../otherReport/rework_inspect_report.vue | 26 ++++++++++++++-- 6 files changed, 66 insertions(+), 18 deletions(-) diff --git a/config/index.js b/config/index.js index 79d8e71..098f040 100644 --- a/config/index.js +++ b/config/index.js @@ -23,7 +23,7 @@ module.exports = { }, // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST + host: '192.168.1.150', // can be overwritten by process.env.HOST port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 99b8c3f..21b81e8 100644 --- a/src/views/common/login.vue +++ b/src/views/common/login.vue @@ -157,16 +157,16 @@ } .login-btn-submit { width: 100%; - margin-top: 38px; + } .login-main .el-input__inner{ margin-top: 10px; height: 45px; } .el-button--medium { - margin-top: 18px; + margin-top: 0px; padding: 5px 11px; - font-size: 25px; + font-size: 16px; border-radius: 4px; } .el-form-item { diff --git a/src/views/modules/yieldReport/otherReport/defectList.vue b/src/views/modules/yieldReport/otherReport/defectList.vue index e77d9f0..4734ef5 100644 --- a/src/views/modules/yieldReport/otherReport/defectList.vue +++ b/src/views/modules/yieldReport/otherReport/defectList.vue @@ -7,7 +7,7 @@ - + @@ -31,11 +31,13 @@ :label="item.columnLabel"> diff --git a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue index 2d3728d..edae0e3 100644 --- a/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue +++ b/src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue @@ -172,7 +172,7 @@ - 不良代码 + 不良代码 @@ -188,7 +188,7 @@ - + 保存 @@ -411,6 +411,7 @@ + @@ -461,6 +462,7 @@ import comProduceDown from "../com_produce_down";/*停机组件*/ import comFinishSchedule from "../com_finish_schedule";/*结束派工单组件*/ import defectList from "./defectList";/*结束派工单组件*/ import bulkInspection from "./bulk_inspection.vue";/*结束派工单组件*/ +import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/ /*生产过程的停机组件*/ export default { @@ -2769,9 +2771,28 @@ export default { comFinishSchedule,/*结束派工单的组件*/ defectList,/*不良信息列表*/ bulkInspection, /**/ + Chooselist, /*基础信息列表*/ }, methods: { - + /*列表方法的回调*/ + getBaseData(val){ + console.log(val) + if (this.tagNo === 89){ + this.harmful.defectCode = val.DefectCode; + this.harmful.defectDesc = val.DefectDesc; + } + }, + // 获取基础数据列表 + getBaseList(val){ + this.tagNo = val + this.$nextTick(() => { + let strVal = ""; + if (val === 89 ){ + strVal = this.harmful.defectCode; + } + this.$refs.baseList.init(val, strVal) + }) + }, // 批量直接送检 bulkInspection(){ this.$nextTick(() => { @@ -2962,6 +2983,8 @@ export default { this.sfdcRollOpsList = []; this.sfdcDefectList = []; this.sfdcRollList = []; + this.harmful.defectCode = '' + this.harmful.defectDesc = '' //设置table页签 this.activeTable = 'sfdc_time'; //刷新当前派工单的信息 @@ -3200,7 +3223,7 @@ export default { otherCreateSplitSfdcRoll(this.createRoll).then(({data}) => { //判断操作是否成功 if (data.code == 500) { - this.$message(data.msg); + this.$message.error(data.msg); } else { //刷新报工的页面 this.$emit('refreshPageData'); diff --git a/src/views/modules/yieldReport/otherReport/other_switch_roll.vue b/src/views/modules/yieldReport/otherReport/other_switch_roll.vue index 98ce4cc..6935469 100644 --- a/src/views/modules/yieldReport/otherReport/other_switch_roll.vue +++ b/src/views/modules/yieldReport/otherReport/other_switch_roll.vue @@ -91,13 +91,14 @@ export default { methods: { //页面的初始化的方法 init(scheduleData, operatorData) { + this.pageData.newRollNo = '' //初始化参数 this.scheduleData = scheduleData; //初始化操作员对象 this.operatorData = JSON.parse(JSON.stringify(operatorData)); //设置对应的参数 this.pageData.orderNo = scheduleData.orderNo; - this.pageData.itemNo = scheduleData.orderNo; + this.pageData.itemNo = scheduleData.itemNo; this.pageData.seqNo = scheduleData.seqNo; this.pageData.operatorId = operatorData.operatorId; this.pageData.repairOrderFlag = scheduleData.repairOrderFlag; @@ -131,6 +132,8 @@ export default { //判断是否成功 if (data.code == 400) { this.$message.error(data.msg); + } else if (data.code == 500){ + this.$message.error(data.msg); } else if (data.resultMap.resultCode == '201') { //打开异常原因录入的界面 this.$confirm(data.resultMap.resultMsg, '提示', { diff --git a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue index daf21ab..a7e1456 100644 --- a/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue +++ b/src/views/modules/yieldReport/otherReport/rework_inspect_report.vue @@ -172,7 +172,7 @@ - 不良代码 + 不良代码 @@ -410,7 +410,7 @@ - + @@ -462,6 +462,7 @@ import comProduceDown from "../com_produce_down";/*停机组件*/ import comFinishSchedule from "../com_finish_schedule";/*结束派工单组件*/ import defectList from "./defectList";/*结束派工单组件*/ import bulkInspection from "./bulk_inspection.vue";/*结束派工单组件*/ +import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/ /*生产过程的停机组件*/ export default { @@ -2770,9 +2771,28 @@ export default { comFinishSchedule,/*结束派工单的组件*/ defectList,/*不良信息列表*/ bulkInspection, /**/ + Chooselist, /*基础信息列表*/ }, methods: { - + /*列表方法的回调*/ + getBaseData(val){ + console.log(val) + if (this.tagNo === 89){ + this.harmful.defectCode = val.DefectCode; + this.harmful.defectDesc = val.DefectDesc; + } + }, + // 获取基础数据列表 + getBaseList(val){ + this.tagNo = val + this.$nextTick(() => { + let strVal = ""; + if (val === 89 ){ + strVal = this.harmful.defectCode; + } + this.$refs.baseList.init(val, val) + }) + }, // 批量直接送检 bulkInspection(){ this.$nextTick(() => {