Browse Source

fqc sxm 2022-3-8

master
[li_she] 4 years ago
parent
commit
f71b120bd7
  1. 2
      config/index.js
  2. 6
      src/views/common/login.vue
  3. 10
      src/views/modules/yieldReport/otherReport/defectList.vue
  4. 31
      src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue
  5. 5
      src/views/modules/yieldReport/otherReport/other_switch_roll.vue
  6. 26
      src/views/modules/yieldReport/otherReport/rework_inspect_report.vue

2
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,

6
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 {

10
src/views/modules/yieldReport/otherReport/defectList.vue

@ -7,7 +7,7 @@
<el-row >
<el-col :span="24">
<el-form :inline="true" label-position="top">
<el-form-item label="检验日期:">
<el-form-item label="报告日期:">
<el-date-picker style="width: 120px"
format = "yyyy-MM-dd"
value-format="yyyy-MM-dd hh:mm:ss" v-model="harmful.reportedDate">
@ -31,11 +31,13 @@
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="item.columnProp!='inspectqty'"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnProp=='inspectqty'"><input
<span v-if="item.columnProp=='inspectqty'">
<input type="number" v-model="scope.row[item.columnProp]"
class="sl-input"
oninput="value=value.replace(/[^0-9]/g,'')"
v-model="scope.row[item.columnProp]" type="text"
clearable></input></span>
style="margin-top: -3px;background-color: transparent; width: 100%;">
</input>
</span>
</template>
</el-table-column>

31
src/views/modules/yieldReport/otherReport/fqc_produce_report_normal.vue

@ -172,7 +172,7 @@
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 0px ;">
<span slot="label" type="label">不良代码</span>
<a slot="label" type="label" @click="getBaseList(89)">不良代码</a>
<el-input style="width: 90px" v-model="harmful.defectCode">
</el-input>
</el-form-item>
@ -188,7 +188,7 @@
</el-input>
</el-form-item>
<el-form-item style="margin-top: 0px ;">
<span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px"> </span>
<span slot="label" type="label" style="margin-top: -10px ;margin-left: 10px" @click="getBaseList(89)"> </span>
<el-button class="customer-bun-mid" type="primary" @click="saveHarmful">
保存
</el-button>
@ -411,6 +411,7 @@
<bulkInspection ref="bulkInspection" ></bulkInspection>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -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');

5
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, '提示', {

26
src/views/modules/yieldReport/otherReport/rework_inspect_report.vue

@ -172,7 +172,7 @@
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 0px ;">
<span slot="label" type="label">不良代码</span>
<a slot="label" type="label" @click="getBaseList(89)">不良代码</a>
<el-input style="width: 90px" v-model="harmful.defectCode">
</el-input>
</el-form-item>
@ -410,7 +410,7 @@
<defectList ref="defectList" @getSfdcDefectList='getSfdcDefectList' ></defectList>
<bulkInspection ref="bulkInspection" ></bulkInspection>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -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(() => {

Loading…
Cancel
Save