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

样式修改和BUG修改

master
Rui_Li 4 years ago
parent
136aec4fff
commit
922812c593
6 changed files with 64 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/views/modules/yieldReport/com_defect_roll.vue
  2. 7
      src/views/modules/yieldReport/com_end_tuning.vue
  3. 58
      src/views/modules/yieldReport/com_finish_roll.vue
  4. 21
      src/views/modules/yieldReport/com_produce_report_normal.vue
  5. 1
      src/views/modules/yieldReport/com_replace_material.vue
  6. 4
      src/views/modules/yieldReport/com_start_produce.vue

20
src/views/modules/yieldReport/com_defect_roll.vue
View File

@ -9,7 +9,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="'不良代码:'"> <el-form-item :label="'不良代码:'">
<el-input ref="defectCode" v-model="pageData.defectCode"
<el-input ref="defectCode" v-model="pageData.defectCode" @blur="getDefectDesc"
style="width: 120px" @keyup.enter.native="getDefectDesc" ></el-input> style="width: 120px" @keyup.enter.native="getDefectDesc" ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -343,10 +343,6 @@ export default {
/*检查不良代码*/ /*检查不良代码*/
getDefectDesc(){ getDefectDesc(){
if(this.pageData.defectCode == null || this.pageData.defectCode == ''){
this.$message.error('请扫描不良代码!');
return false;
}
checkDefectCode(this.pageData).then(({data}) => { checkDefectCode(this.pageData).then(({data}) => {
//判断是否存在异常 //判断是否存在异常
if(data.code == 500){ if(data.code == 500){
@ -360,6 +356,10 @@ export default {
/*报告不良代码*/ /*报告不良代码*/
reportDefectFun(){ reportDefectFun(){
if(this.pageData.defectCode == null || this.pageData.defectCode == ''){
this.$message.error('请扫描不良代码!');
return false;
}
reportDefectCode(this.pageData).then(({data}) => { reportDefectCode(this.pageData).then(({data}) => {
if(data.code == 500){ if(data.code == 500){
this.$message.error(data.msg); this.$message.error(data.msg);
@ -374,16 +374,6 @@ export default {
}); });
}, },
}, },
created() { created() {
// this.factoryList() // this.factoryList()

7
src/views/modules/yieldReport/com_end_tuning.vue
View File

@ -19,7 +19,7 @@
<el-col :span="3" style="margin-top: 27px;"> <el-col :span="3" style="margin-top: 27px;">
<el-form-item :label="''"> <el-form-item :label="''">
<el-form-item :label="''"> <el-form-item :label="''">
<el-time-picker style="width: 80px;"
<el-time-picker style="width: 100px;"
v-model="pageData.reportTime" v-model="pageData.reportTime"
format="HH:mm:ss" format="HH:mm:ss"
value-format="HH:mm:ss" value-format="HH:mm:ss"
@ -65,8 +65,9 @@
:width="item.columnWidth" :width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"
v-if="item.columnHidden" v-model="scope.row[item.columnProp]"></el-input>
<!--<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]" <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span> style="width: 100px; height: 80px"/></span>

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

@ -42,17 +42,17 @@
v-model="pageData.reportedFlag">是否报告产量</el-checkbox> v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
</el-form-item> </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-input v-model="pageData.approvedQty" type="number" @blur="checkValidApprovedQty"-->
<el-input v-model="pageData.approvedQty" type="number" style="width: 80px;" ></el-input>
</el-form-item> </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.defectedQty" disabled="disabled" 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>
<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.totalQty" disabled="disabled" 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>
<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.otherRollQty" disabled="disabled" 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>
</fieldset> </fieldset>
<!-- 操作员信息和班次信息 --> <!-- 操作员信息和班次信息 -->
@ -63,13 +63,13 @@
<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>
<el-form-item class="customer-item" label="操作员姓名:"> <el-form-item class="customer-item" label="操作员姓名:">
<el-input v-model="operatorData.operatorName" disabled="disabled" 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>
<el-form-item class="customer-item" label="排产日期:"> <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>
<el-form-item class="customer-item" label="班次:"> <el-form-item class="customer-item" label="班次:">
<el-input v-model="pageData.shiftDesc" disabled="disabled" 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-form-item>
</fieldset> </fieldset>
</el-form> </el-form>
@ -81,13 +81,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="总调机时间:"> <el-form-item label="总调机时间:">
<el-input v-model="pageData.totalSetupTime" disabled="disabled" style="width: 80px;" ></el-input>
<el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="总调机过程停机时间:"> <el-form-item label="总调机过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeSetup" disabled="disabled" style="width: 100px;"></el-input>
<el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="净调机时间:" > <el-form-item label="净调机时间:" >
<el-input v-model="pageData.totalPureSetupTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -95,13 +95,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="总生产时间"> <el-form-item label="总生产时间">
<el-input v-model="pageData.totalProdTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="总生产过程停机时间:"> <el-form-item label="总生产过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeProd" disabled="disabled" style="width: 100px;"></el-input>
<el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="净生产时间:" > <el-form-item label="净生产时间:" >
<el-input v-model="pageData.totalPureProdTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -109,13 +109,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="总制造时间:"> <el-form-item label="总制造时间:">
<el-input v-model="pageData.totalManufactureTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="总制造过程停机时间:"> <el-form-item label="总制造过程停机时间:">
<el-input v-model="pageData.totalManufactureDowntimeTime" disabled="disabled" style="width: 100px;"></el-input>
<el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="净制造时间:" > <el-form-item label="净制造时间:" >
<el-input v-model="pageData.totalPureManufactureTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -135,13 +135,13 @@
<el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input> <el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="生产时间" > <el-form-item label="生产时间" >
<el-input v-model="pageData.sfdcProdTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="调机时间" > <el-form-item label="调机时间" >
<el-input v-model="pageData.sfdcSetupTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制造时间" > <el-form-item label="制造时间" >
<el-input v-model="pageData.sfdcManufactureTime" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -149,13 +149,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合格数量"> <el-form-item label="合格数量">
<el-input v-model="pageData.sfdcApprovedQty" disabled="disabled" style="width: 130px;"></el-input>
<el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="不合格数量"> <el-form-item label="不合格数量">
<el-input v-model="pageData.defectedQty" disabled="disabled" style="width: 130px;"></el-input>
<el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报告数量" > <el-form-item label="报告数量" >
<el-input v-model="pageData.sfdcReportedQty" disabled="disabled" style="width: 80px;"></el-input>
<el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="调机停机"> <el-form-item label="调机停机">
<el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input> <el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
@ -168,8 +168,8 @@
<!-- 备注 --> <!-- 备注 -->
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="remark">
<el-input v-model="pageData.remark" disabled="disabled" style="width: 430px;"></el-input>
<el-form-item label="备注">
<el-input v-model="pageData.remark" style="width: 430px;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="停机时间"> <el-form-item label="停机时间">
<el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input> <el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
@ -200,8 +200,9 @@
:width="item.columnWidth" :width="item.columnWidth"
:label="item.columnLabel"> :label="item.columnLabel">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"
v-if="item.columnHidden" v-model="scope.row[item.columnProp]"></el-input>
<!--<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]" <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span> style="width: 100px; height: 80px"/></span>
@ -891,4 +892,9 @@ div.table-input /deep/ input.el-input__inner{
padding: 5px 5px; padding: 5px 5px;
} }
/*统一的input内容颜色样式*/
.customer-input-color-red /deep/ .el-input__inner {
color: red;
}
</style> </style>

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

@ -60,7 +60,7 @@
<span>{{ this.currentRollOps.rollNo }}</span> <span>{{ this.currentRollOps.rollNo }}</span>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="createNewRollFun" :disabled="buttonTags.createNewRollFlag"
<el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag"
style="margin-left: 5px; margin-bottom: 5px;"> style="margin-left: 5px; margin-bottom: 5px;">
创建新卷 创建新卷
</el-button> </el-button>
@ -3136,6 +3136,21 @@ export default {
}); });
}, },
/*提示是否创建新卷*/
warnCreateNewRollConfirm(){
//禁用当按钮 操作完成 恢复
this.buttonTags.createNewRollFlag = true;
//提示操作
this.$confirm('确实要创建一个新卷吗?', '提示', {
confirmButtonText: '确认',
celButtonText: '取消',
type: 'warning'
}).then(() =>{
//执行创建新卷的操作
this.createNewRollFun();
});
},
//创建新卷的功能 //创建新卷的功能
createNewRollFun() { createNewRollFun() {
//校验当前的功能是否可用 //校验当前的功能是否可用
@ -3148,6 +3163,8 @@ export default {
//调用创建卷的方法 //调用创建卷的方法
this.createNewRollDo(); this.createNewRollDo();
} else { } else {
// 操作完成 恢复
this.buttonTags.createNewRollFlag = false;
this.$message.error(resultMap.msg) this.$message.error(resultMap.msg)
} }
}); });
@ -3336,6 +3353,8 @@ export default {
//刷新当的按钮 //刷新当的按钮
this.refreshPageData(); this.refreshPageData();
} else { } else {
//打开当前创建新卷的按钮
this.buttonTags.createNewRollFlag = false;
this.$message.error(data.msg); this.$message.error(data.msg);
} }
}); });

1
src/views/modules/yieldReport/com_replace_material.vue
View File

@ -168,6 +168,7 @@ export default {
//重置时间 //重置时间
this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD'); this.pageData.reportDate = this.dayjs(new Date()).format('YYYY-MM-DD');
this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss'); this.pageData.reportTime = this.dayjs(new Date()).format('HH:mm:ss');
this.pageData.downTimeQty = 0;
this.pageData.rmRollNo = ''; this.pageData.rmRollNo = '';
//自动获取焦点 //自动获取焦点
this.$nextTick(() => { this.$nextTick(() => {

4
src/views/modules/yieldReport/com_start_produce.vue
View File

@ -16,10 +16,10 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" style="margin-top: 26px;">
<el-col :span="10" style="margin-top: 26px;">
<el-form-item :label="''"> <el-form-item :label="''">
<el-form-item :label="''"> <el-form-item :label="''">
<el-time-picker style="width: 80px;"
<el-time-picker style="width: 100px;"
v-model="pageData.reportTime" v-model="pageData.reportTime"
format="HH:mm:ss" format="HH:mm:ss"
value-format="HH:mm:ss" value-format="HH:mm:ss"

Write Preview
Loading…
Cancel
Save