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

2026-03-25 

机台工作台优化
master
fengyuan_yang 3 weeks ago
parent
ed6e3a490b
commit
ba8ac4bf92
2 changed files with 40 additions and 33 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. 32
      src/views/modules/yieldReport/com_produce_report_normal.vue
  2. 39
      src/views/modules/yieldReport/com_split_order_report.vue

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

@ -129,35 +129,37 @@
<!-- 卷操作区域 --> <!-- 卷操作区域 -->
<div class="roll-operation-card"> <div class="roll-operation-card">
<div class="card-title">
<div class="card-title" style="display: flex; justify-content: space-between; align-items: center;">
<div style="display: flex; align-items: center;">
<i class="el-icon-collection"></i> <i class="el-icon-collection"></i>
<span>卷操作</span>
<span style="margin-right: 20px;margin-top: -5px">卷操作</span>
<div class="current-roll-display" style="margin-top: -5px; display: flex; align-items: center; font-size: 14px; font-weight: normal; color: #606266;">
<!-- <label style="margin-right: 5px;">当前卷号：</label>-->
<span style="color: #667eea; font-weight: bold; font-size: 16px;">{{ this.currentRollOps.rollNo }}</span>
</div> </div>
<div class="roll-operation-content">
<div class="current-roll-display">
<label>当前卷号：</label>
<el-input v-model="this.currentRollOps.rollNo" :readonly="true" size="small" class="roll-no-input"></el-input>
</div> </div>
<div class="roll-buttons">
<el-button type="primary" size="small" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag" icon="el-icon-plus">
</div>
<div class="roll-operation-content">
<div class="roll-buttons" style="display: flex; justify-content: space-between; width: 100%;">
<el-button type="primary" size="small" @click="warnCreateNewRollConfirm" :disabled="buttonTags.createNewRollFlag" icon="el-icon-plus" style="flex: 1; margin: 0 5px;">
创建新卷 创建新卷
</el-button> </el-button>
<el-button type="primary" size="small" @click="switchRollModal" :disabled="buttonTags.switchRollFlag" icon="el-icon-sort">
<el-button type="primary" size="small" @click="switchRollModal" :disabled="buttonTags.switchRollFlag" icon="el-icon-sort" style="flex: 1; margin: 0 5px;">
切换卷 切换卷
</el-button> </el-button>
<el-button type="primary" size="small" @click="separateRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-tickets">
<el-button type="primary" size="small" @click="separateRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-tickets" style="flex: 1; margin: 0 5px;">
创建分卷 创建分卷
</el-button> </el-button>
<el-button type="warning" size="small" @click="abnormalContinueRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-refresh">
<el-button type="warning" size="small" @click="abnormalContinueRollModal" :disabled="buttonTags.separateRollFlag" icon="el-icon-refresh" style="flex: 1; margin: 0 5px;">
异常续卷 异常续卷
</el-button> </el-button>
<el-button type="success" size="small" :disabled="buttonTags.finishRollFlag" @click="finishRollModal" icon="el-icon-circle-check">
<el-button type="success" size="small" :disabled="buttonTags.finishRollFlag" @click="finishRollModal" icon="el-icon-circle-check" style="flex: 1; margin: 0 5px;">
结束卷 结束卷
</el-button> </el-button>
<el-button type="warning" size="small" :disabled="buttonTags.mergeRollFlag" @click="mergeRollModal" icon="el-icon-menu">
<el-button type="warning" size="small" :disabled="buttonTags.mergeRollFlag" @click="mergeRollModal" icon="el-icon-menu" style="flex: 1; margin: 0 5px;">
合并卷 合并卷
</el-button> </el-button>
<el-button type="danger" size="small" :disabled="buttonTags.finishScheduleFlag" @click="showFinishScheduleModal" icon="el-icon-error">
<el-button type="danger" size="small" :disabled="buttonTags.finishScheduleFlag" @click="showFinishScheduleModal" icon="el-icon-error" style="flex: 1; margin: 0 5px;">
结单 结单
</el-button> </el-button>
</div> </div>
@ -5678,7 +5680,7 @@ export default {
align-items: center; align-items: center;
gap: 6px; gap: 6px;
min-width: 120px; min-width: 120px;
max-width: 180px;
max-width: 300px;
} }
.current-roll-display label { .current-roll-display label {

39
src/views/modules/yieldReport/com_split_order_report.vue
View File

@ -54,47 +54,52 @@
</el-form> </el-form>
<!-- 第四行菜单 --> <!-- 第四行菜单 -->
<fieldset class="customer-fieldset" style="width: 660px;"> <fieldset class="customer-fieldset" style="width: 660px;">
<legend class="customer-legend">{{labels.rollButtons}}</legend>
<el-form>
<el-form-item class="customer-roll-css" style="width: 130px; font-size: 16px; color: #387877;">
<span>{{ this.currentRollOps.rollNo }}</span>
</el-form-item>
<el-form-item>
<legend class="customer-legend" style="display: flex; justify-content: space-between; align-items: center; width: calc(100% - 20px);">
<div style="display: flex; align-items: center;">
<span style="margin-right: 20px;">{{labels.rollButtons}}</span>
<div style="font-size: 14px; font-weight: normal; color: #606266; display: flex; align-items: center;">
<label style="margin-right: 5px;">当前卷号：</label>
<span style="color: #387877; font-weight: bold; font-size: 16px;">{{ this.currentRollOps.rollNo }}</span>
</div>
</div>
</legend>
<el-form style="display: flex; justify-content: space-between; width: 100%;">
<el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
<el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm" <el-button class="customer-bun-mid" type="primary" @click="warnCreateNewRollConfirm"
:disabled="buttonTags.createNewRollFlag" :disabled="buttonTags.createNewRollFlag"
style="margin-left: 5px; margin-bottom: 5px;">
style="width: 100%;">
{{ buttons.newRollButton }} {{ buttons.newRollButton }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
<el-button class="customer-bun-mid" type="primary" @click="switchRollModal" <el-button class="customer-bun-mid" type="primary" @click="switchRollModal"
:disabled="buttonTags.switchRollFlag" :disabled="buttonTags.switchRollFlag"
style="margin-left: 10px; margin-bottom: 5px;">
style="width: 100%;">
{{buttons.switchRoll}} {{buttons.switchRoll}}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
<el-button class="customer-bun-mid" type="primary" @click="separateRollModal" <el-button class="customer-bun-mid" type="primary" @click="separateRollModal"
:disabled="buttonTags.separateRollFlag" :disabled="buttonTags.separateRollFlag"
style="margin-left: 10px; margin-bottom: 5px;">
style="width: 100%;">
{{buttons.separateRoll}} {{buttons.separateRoll}}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
<el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishRollFlag" <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishRollFlag"
@click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
@click="finishRollModal" style="width: 100%;">
{{ buttons.finishRoll }} {{ buttons.finishRoll }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
<el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.mergeRollFlag" <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.mergeRollFlag"
@click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
@click="mergeRollModal" style="width: 100%;">
{{ buttons.mergeRoll }} {{ buttons.mergeRoll }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item>
<el-form-item style="flex: 1; margin: 0 5px; text-align: center;">
<el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishScheduleFlag" <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishScheduleFlag"
@click="showFinishScheduleModal" style="margin-left: 10px; margin-bottom: 5px;">
@click="showFinishScheduleModal" style="width: 100%;">
{{ buttons.finishSchedule }} {{ buttons.finishSchedule }}
</el-button> </el-button>
</el-form-item> </el-form-item>

Write Preview
Loading…
Cancel
Save