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

全局样式修改

master
rui_li 4 years ago
parent
29fe60337d
commit
0ba0ee4623
10 changed files with 104 additions and 90 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. 3
      src/api/yieldReport/produce_report_normal.js
  2. 1
      src/assets/scss/global.scss
  3. 77
      src/views/modules/yieldReport/com_finish_roll.vue
  4. 4
      src/views/modules/yieldReport/com_merge_roll.vue
  5. 2
      src/views/modules/yieldReport/com_produce_down.vue
  6. 78
      src/views/modules/yieldReport/com_produce_report_normal.vue
  7. 6
      src/views/modules/yieldReport/com_separate_roll.vue
  8. 2
      src/views/modules/yieldReport/com_start_produce.vue
  9. 2
      src/views/modules/yieldReport/com_start_tuning.vue
  10. 19
      src/views/modules/yieldReport/produce_order.vue

3
src/api/yieldReport/produce_report_normal.js
View File

@ -34,6 +34,9 @@ export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', '
export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWorkPlatformButtons', 'POST', data)
// 获取当前页面的按钮
export const checkProduceButton = data => createAPI('schedule/checkProduceButton', 'POST', data)

1
src/assets/scss/global.scss
View File

@ -241,7 +241,6 @@ input.el-input__inner{
/* 时间框选择样式 */
.customer-css span.el-input__prefix{
top: -3px;
left: 1px;
}
/* 时间HH:MM的样式*/

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

@ -38,19 +38,19 @@
<fieldset class="customer-fieldset" style="width: 505px;">
<legend>卷数量统计</legend>
<el-form-item class="customer-item">
<el-checkbox disabled="disabled" style="margin-top: 28px;" true-label="Y" false-label="N"
<el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
</el-form-item>
<el-form-item class="customer-item" label="良品总数量:">
<el-form-item class="customer-item" label="良品总数量:" style="margin-top: -10px;">
<el-input v-model="pageData.approvedQty" readonly style="width: 80px;" ></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总不良品数量:">
<el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
<el-input v-model="pageData.defectedQty" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总数量" >
<el-form-item class="customer-item" label="总数量" style="margin-top: -10px;">
<el-input v-model="pageData.totalQty" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="其他卷数量:">
<el-form-item class="customer-item" label="其他卷数量:" style="margin-top: -10px;">
<el-input v-model="pageData.otherRollQty" readonly style="width: 80px;"></el-input>
</el-form-item>
</fieldset>
@ -73,47 +73,47 @@
</fieldset>
</el-form>
<!-- 卷生产时间统计产量报告 -->
<el-form>
<el-form style="margin-top: 5px;">
<fieldset class="customer-fieldset" style="width: 320px;">
<legend>卷生产时间统计</legend>
<!-- 调机时间 -->
<el-row style="margin-top: 10px;">
<el-row>
<el-col :span="24">
<el-form-item class="customer-item" label="总调机时间:">
<el-form-item label="总调机时间:">
<el-input v-model="pageData.totalSetupTime" readonly style="width: 80px;" ></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总调机过程停机时间:">
<el-form-item label="总调机过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeSetup" readonly style="width: 100px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="净调机时间:" >
<el-form-item label="净调机时间:" >
<el-input v-model="pageData.totalPureSetupTime" readonly style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 生产时间 -->
<el-row style="margin-top: 15px;">
<el-row>
<el-col :span="24">
<el-form-item class="customer-item" label="总生产时间">
<el-form-item label="总生产时间">
<el-input v-model="pageData.totalProdTime" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总生产过程停机时间:">
<el-form-item label="总生产过程停机时间:">
<el-input v-model="pageData.totalDowntimeTimeProd" readonly style="width: 100px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="净生产时间:" >
<el-form-item label="净生产时间:" >
<el-input v-model="pageData.totalPureProdTime" readonly style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 制造时间 -->
<el-row style="margin-top: 15px;">
<el-row>
<el-col :span="24">
<el-form-item class="customer-item" label="总制造时间:">
<el-form-item label="总制造时间:">
<el-input v-model="pageData.totalManufactureTime" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="总制造过程停机时间:">
<el-form-item label="总制造过程停机时间:">
<el-input v-model="pageData.totalManufactureDowntimeTime" readonly style="width: 100px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="净制造时间:" >
<el-form-item label="净制造时间:" >
<el-input v-model="pageData.totalPureManufactureTime" readonly style="width: 80px;"></el-input>
</el-form-item>
</el-col>
@ -121,55 +121,55 @@
</fieldset>
<!-- 产量报告 -->
<fieldset class="customer-fieldset"
style="margin-left: 325px; margin-top: -177.8px; width: 575px;">
style="margin-left: 325px; margin-top: -165px; width: 575px;">
<legend>产量报告</legend>
<!-- 开工时间 -->
<el-row style="margin-top: 10px;">
<el-row>
<el-col :span="24">
<el-form-item class="customer-item" label="开工时间">
<el-form-item label="开工时间">
<el-input v-model="pageData.eventTime" readonly style="width: 130px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="完工时间">
<el-form-item label="完工时间">
<el-input v-model="pageData.tillTime" readonly style="width: 130px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="生产时间" >
<el-form-item label="生产时间" >
<el-input v-model="pageData.sfdcProdTime" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="调机时间" >
<el-form-item label="调机时间" >
<el-input v-model="pageData.sfdcSetupTime" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="制造时间" >
<el-form-item label="制造时间" >
<el-input v-model="pageData.sfdcManufactureTime" readonly style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 合格数量 -->
<el-row style="margin-top: 15px;">
<el-row>
<el-col :span="24">
<el-form-item class="customer-item" label="合格数量">
<el-form-item label="合格数量">
<el-input v-model="pageData.sfdcApprovedQty" readonly style="width: 130px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="不合格数量">
<el-form-item label="不合格数量">
<el-input v-model="pageData.defectedQty" readonly style="width: 130px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="报告数量" >
<el-form-item label="报告数量" >
<el-input v-model="pageData.sfdcReportedQty" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="调机停机">
<el-form-item label="调机停机">
<el-input v-model="pageData.sfdcSetupDownTime" readonly style="width: 80px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="生产调机" >
<el-form-item label="生产调机" >
<el-input v-model="pageData.sfdcProdSetupTime" readonly style="width: 80px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 备注 -->
<el-row style="margin-top: 15px;">
<el-row>
<el-col :span="24">
<el-form-item class="customer-item" label="remark">
<el-form-item label="remark">
<el-input v-model="pageData.remark" readonly style="width: 430px;"></el-input>
</el-form-item>
<el-form-item class="customer-item" label="停机时间">
<el-form-item label="停机时间">
<el-input v-model="pageData.sfdcDownTime" readonly style="width: 80px;"></el-input>
</el-form-item>
</el-col>
@ -181,7 +181,7 @@
<fieldset class="customer-fieldset" style="width: 830px;">
<legend>主材料</legend>
<el-table
height="160"
height="180"
:data="sfdcMaterialList"
border
v-loading="dataListLoading"
@ -645,11 +645,10 @@ export default {
margin-top: 25px;
}
/*调节fieldset下的样式*/
.customer-fieldset .customer-item{
margin-top: -15px;
/*调节样式*/
.customer-item{
margin-top: -10px;
}
/*fieldset下table的样式*/
.customer-fieldset /deep/ .el-table__header th.is-leaf{
line-height: 16px;

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

@ -2,7 +2,7 @@
<div class="customer-css">
<el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
width="360px" style="height: 680px;" class="customer-dialog">
<el-form :inline="true" label-position="top" style="height: 130px;"
<el-form :inline="true" label-position="top" style="height: 100px;"
label-width="80px">
<!-- 当前卷 -->
<el-row>
@ -40,7 +40,7 @@
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<span slot="footer" class="dialog-footer" style="margin-top: -20px;">
<el-button type="primary" @click="">确 定</el-button>
<el-button type="primary" @click="closeDialog">关闭</el-button>
</span>

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

@ -17,7 +17,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-top: 40px;">
<el-col :span="8" style="margin-top: 27px;">
<el-form-item :label="''">
<el-form-item :label="''">
<el-time-picker style="width: 80px;"

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

@ -297,11 +297,11 @@
<el-button type="primary" @click="switchOperatorModal" style="margin-left: 25px; margin-top: 20px;">
切换用户</el-button>
</el-form-item>
<el-form-item>
<el-form-item style="margin-top: 30px;">
<el-button type="primary" @click="startTuningModal" :disabled="buttonTags.tuningFlag" style="margin-left: 10px; margin-bottom: 5px;">
开始调机</el-button>
</el-form-item>
<el-form-item>
<el-form-item style="margin-top: 30px;">
<el-button type="primary" @click="startProduceModal" :disabled="buttonTags.produceFlag" style="margin-left: 10px; margin-bottom: 5px;">
开始生产</el-button>
</el-form-item>
@ -311,7 +311,7 @@
<fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 60px;">
<legend class="customer-legend">不良</legend>
<el-form>
<el-form-item>
<el-form-item style="margin-top: -5px;">
<el-button @click="defectRollModal" type="primary" :disabled="buttonTags.defectFlag" style="margin-left: 50px; margin-top: 10px;">
报告不良</el-button>
</el-form-item>
@ -322,12 +322,12 @@
<fieldset class="customer-fieldset" style="margin-left: 600px; width: 200px; height: 80px;">
<legend class="customer-legend">扫描</legend>
<el-form>
<el-form-item>
<el-form-item style="margin-top: -5px;">
<el-button type="primary" @click="produceToolModal"
:disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;">
刀模板</el-button>
</el-form-item>
<el-form-item>
<el-form-item style="margin-top: -5px;">
<el-button type="primary" @click="produceMaterialModal"
:disabled="buttonTags.materialFlag" style="margin-left: 10px; margin-top: 20px;">
材料</el-button>
@ -432,6 +432,7 @@ import {
getSfdcDefectByCon,
getSfdcRollByCon,
refreshWorkPlatformButtons,
checkProduceButton,
} from "@/api/yieldReport/produce_report_normal.js";
/*引入组件*/
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
@ -2615,6 +2616,7 @@ export default {
userName: this.$store.state.user.name,
seqNo: '',
orderNo: '',
itemNo: 0,
partNo: '',
workCenterDesc: '',
resourceDesc: '',
@ -2679,6 +2681,7 @@ export default {
getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
this.scheduleData.seqNo = data.row.seqNo;
this.scheduleData.orderNo = data.row.orderNo;
this.scheduleData.itemNo = data.row.itemNo;
this.scheduleData.partNo = data.row.partNo;
this.scheduleData.partDesc = data.row.partDesc;
this.scheduleData.planStartTime = data.row.planStartTime;
@ -2803,6 +2806,7 @@ export default {
getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
this.scheduleData.seqNo= data.row.seqNo;
this.scheduleData.orderNo= data.row.orderNo;
this.scheduleData.itemNo = data.row.itemNo;
this.scheduleData.partNo= data.row.partNo;
this.scheduleData.partDesc= data.row.partDesc;
this.scheduleData.planStartTime= data.row.planStartTime;
@ -2835,58 +2839,58 @@ export default {
//刷新当前页面的菜单
refreshPageButtons(){
refreshWorkPlatformButtons(this.searchData).then(({data}) => {
if(data.resultMap.createNewRollFlag = 'Y'){
this.buttonTags.createNewRollFlag = true;
}else{
/*refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
if(data.resultMap.createNewRollFlag == 'Y'){
this.buttonTags.createNewRollFlag = false;
}
if(data.resultMap.switchRollFlag = 'Y'){
this.buttonTags.switchRollFlag = true;
}else{
this.buttonTags.switchRollFlag = false;
this.buttonTags.createNewRollFlag = true;
}
if(data.resultMap.separateRollFlag = 'Y'){
this.buttonTags.separateRollFlag = true;
if(data.resultMap.switchRollFlag == 'Y'){
this.buttonTags.switchRollFlag = false;
}else{
this.buttonTags.separateRollFlag = false;
this.buttonTags.switchRollFlag = true;
}
if(data.resultMap.finishRollFlag = 'Y'){
this.buttonTags.finishRollFlag = true;
if(data.resultMap.separateRollFlag == 'Y'){
this.buttonTags.separateRollFlag = false;
}else{
this.buttonTags.finishRollFlag = false;
this.buttonTags.separateRollFlag = true;
}
if(data.resultMap.tuningFlag = 'Y'){
this.buttonTags.tuningFlag = true;
if(data.resultMap.finishRollFlag == 'Y'){
this.buttonTags.finishRollFlag = false;
}else{
this.buttonTags.tuningFlag = false;
this.buttonTags.finishRollFlag = true;
}
if(data.resultMap.produceFlag = 'Y'){
this.buttonTags.produceFlag = true;
if(data.resultMap.tuningFlag == 'Y'){
this.buttonTags.tuningFlag = false;
}else{
this.buttonTags.produceFlag = false;
this.buttonTags.tuningFlag = true;
}
if(data.resultMap.defectFlag = 'Y'){
this.buttonTags.defectFlag = true;
if(data.resultMap.produceFlag == 'Y'){
this.buttonTags.produceFlag = false;
}else{
this.buttonTags.defectFlag = false;
this.buttonTags.produceFlag = true;
}
if(data.resultMap.toolFlag = 'Y'){
this.buttonTags.toolFlag = true;
if(data.resultMap.defectFlag == 'Y'){
this.buttonTags.defectFlag = false;
}else{
this.buttonTags.toolFlag = false;
this.buttonTags.defectFlag = true;
}
if(data.resultMap.materialFlag = 'Y'){
this.buttonTags.materialFlag = true;
if(data.resultMap.toolFlag == 'Y'){
this.buttonTags.toolFlag = false;
}else{
this.buttonTags.materialFlag = false;
this.buttonTags.toolFlag = true;
}
if(data.resultMap.downTimeFlag = 'Y'){
this.buttonTags.downTimeFlag = true;
if(data.resultMap.materialFlag == 'Y'){
this.buttonTags.materialFlag = false;
}else{
this.buttonTags.materialFlag = true;
}
if(data.resultMap.downTimeFlag == 'Y'){
this.buttonTags.downTimeFlag = false;
}else{
this.buttonTags.downTimeFlag = true;
}
});
});*/
},
//设置参数

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

@ -16,7 +16,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-top: 40px;">
<el-col :span="8" style="margin-top: 27px;">
<el-form-item :label="''">
<el-form-item :label="''">
<el-time-picker style="width: 80px;"
@ -31,12 +31,12 @@
</el-row>
<!-- 半成品卷卷号 -->
<el-row>
<el-col :span="12" style="margin-top: -15px;">
<el-col :span="12" style="margin-top: -5px;">
<el-form-item :label="'良品数量:'">
<el-input v-model="scheduleData.orderNo" style="width: 120px;" ></el-input>
</el-form-item>
</el-col>
<el-col :span="12" style="margin-top: -15px;">
<el-col :span="12" style="margin-top: -5px;">
<el-form-item :label="'卷数:'">
<el-input v-model="scheduleData.orderNo" style="width: 120px;" ></el-input>
</el-form-item>

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

@ -16,7 +16,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-top: 40px;">
<el-col :span="8" style="margin-top: 26px;">
<el-form-item :label="''">
<el-form-item :label="''">
<el-time-picker style="width: 80px;"

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

@ -16,7 +16,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-top: 40px;">
<el-col :span="8" style="margin-top: 27px;">
<el-form-item :label="''">
<el-form-item :label="''">
<el-time-picker style="width: 80px;"

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

@ -59,7 +59,7 @@
</el-form-item>
<el-form-item :label="''">
<el-date-picker class="el-time-width"
style="margin-top: 30px;"
style="margin-top: 20px;"
v-model="searchData.planStartTime2"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@ -73,7 +73,7 @@
<el-input v-model="searchData.seqNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="''" style="margin-left: -5px;">
<el-checkbox style="margin-top: 28px;" true-label="Y" false-label="N" v-model="searchData.closedFlag">显示已结束派工单
<el-checkbox style="margin-top: 20px;" true-label="Y" false-label="N" v-model="searchData.closedFlag">显示已结束派工单
</el-checkbox>
</el-form-item>
</el-form>
@ -149,7 +149,8 @@ export default {
planStartTime2: this.dayjs(new Date()).format('YYYY-MM-DD'),
closedFlag: 'N',
status: 1,
username: this.$store.state.user.name
username: this.$store.state.user.name,
searchFlag: false
},
currentRow: {},
operatorData: {
@ -957,7 +958,10 @@ export default {
/*查询派工单*/
getProduceScheduleList() {
//开始真的查询;
this.searchData.searchFlag = true;
getProduceScheduleList(this.searchData).then(({data}) => {
//设置查询数据
this.produceScheduleList = data.rows;
})
},
@ -1050,9 +1054,14 @@ export default {
}
},
created() {
//查询工单的数据
this.getProduceScheduleList();
//不查询
getProduceScheduleList(this.searchData).then(({data}) => {
//设置查询数据
this.searchData.searchFlag = false;
this.produceScheduleList = data.rows;
});
}
}
</script>

Write Preview
Loading…
Cancel
Save