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
fd2fdf8e2a
commit
ed6e3a490b
2 changed files with 152 additions and 20 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. 89
      src/views/modules/yieldReport/com_produce_report_normal.vue
  2. 83
      src/views/modules/yieldReport/com_split_order_report.vue

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

@ -271,9 +271,23 @@
<!-- 列表信息区域 --> <!-- 列表信息区域 -->
<div class="list-panel-full"> <div class="list-panel-full">
<div class="card-title">
<i class="el-icon-tickets"></i>
<span>过程记录</span>
<div class="card-title" style="display: flex; justify-content: space-between; align-items: center;">
<div>
<i class="el-icon-tickets"></i>
<span>过程记录</span>
</div>
<div v-if="activeTable === 'sfdc_tool'">
<el-button type="text" size="mini" style="padding: 0;" @click="toggleOrderToolTable">
<!-- {{ showOrderToolTable ? '收起上表' : '展开上表' }}-->
<i :class="showOrderToolTable ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
</el-button>
</div>
<div v-if="activeTable === 'sfdc_material'">
<el-button type="text" size="mini" style="padding: 0;" @click="toggleOrderBomTable">
<!-- {{ showOrderBomTable ? '收起上表' : '展开上表' }}-->
<i :class="showOrderBomTable ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
</el-button>
</div>
</div> </div>
<el-tabs v-model="activeTable" class="modern-tabs" type="border-card" @tab-click="tabClick"> <el-tabs v-model="activeTable" class="modern-tabs" type="border-card" @tab-click="tabClick">
<el-tab-pane label="订单信息" name="order_info"> <el-tab-pane label="订单信息" name="order_info">
@ -356,7 +370,7 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="工装模具" name="sfdc_tool"> <el-tab-pane label="工装模具" name="sfdc_tool">
<el-table
<el-table v-show="showOrderToolTable"
height="182" height="182"
:data="orderToolList" :data="orderToolList"
border border
@ -379,7 +393,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
height="193"
:height="showOrderToolTable ? '193' : '375'"
:data="sfdcToolList" :data="sfdcToolList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -419,7 +433,7 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="材料清单" name="sfdc_material"> <el-tab-pane label="材料清单" name="sfdc_material">
<el-table
<el-table v-show="showOrderBomTable"
height="189" height="189"
:data="orderBomList" :data="orderBomList"
border border
@ -442,8 +456,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
height="186"
:data="sfdcMaterialList"
:height="showOrderBomTable ? '153' : '342'"
:data="sfdcMaterialList.slice((sfdcMaterialPage - 1) * sfdcMaterialLimit, sfdcMaterialPage * sfdcMaterialLimit)"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
@ -503,6 +517,16 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
style="margin-top: 0px"
@size-change="sizeChangeHandleMaterial"
@current-change="currentChangeHandleMaterial"
:current-page="sfdcMaterialPage"
:page-sizes="[20, 50, 100]"
:page-size="sfdcMaterialLimit"
:total="sfdcMaterialList.length"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="生产卷操作信息" name="sfdc_rollOps"> <el-tab-pane label="生产卷操作信息" name="sfdc_rollOps">
<el-table <el-table
@ -568,8 +592,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="机器下机卷" name="sfdc_roll"> <el-tab-pane label="机器下机卷" name="sfdc_roll">
<el-table <el-table
height="375"
:data="sfdcRollList"
height="342"
:data="sfdcRollList.slice((sfdcRollPage - 1) * sfdcRollLimit, sfdcRollPage * sfdcRollLimit)"
border border
show-summary show-summary
v-loading="dataListLoading" v-loading="dataListLoading"
@ -612,6 +636,16 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
style="margin-top: 0px"
@size-change="sizeChangeHandleRoll"
@current-change="currentChangeHandleRoll"
:current-page="sfdcRollPage"
:page-sizes="[20, 50, 100]"
:page-size="sfdcRollLimit"
:total="sfdcRollList.length"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@ -988,6 +1022,15 @@ export default {
sfdcMaterialList: [], sfdcMaterialList: [],
sfdcRollOpsList: [], sfdcRollOpsList: [],
sfdcDefectList: [], sfdcDefectList: [],
// 机器下机卷分页
sfdcRollPage: 1,
sfdcRollLimit: 20,
// 材料清单下表分页
sfdcMaterialPage: 1,
sfdcMaterialLimit: 20,
// 上表展开/收起状态
showOrderToolTable: true,
showOrderBomTable: true,
sfdcRollList: [], sfdcRollList: [],
columnTimeArray: [ columnTimeArray: [
{ {
@ -4036,9 +4079,33 @@ export default {
}); });
return sums; return sums;
}, },
// 机器下机卷分页
sizeChangeHandleRoll(val) {
this.sfdcRollLimit = val;
this.sfdcRollPage = 1;
},
currentChangeHandleRoll(val) {
this.sfdcRollPage = val;
},
// 材料清单分页
sizeChangeHandleMaterial(val) {
this.sfdcMaterialLimit = val;
this.sfdcMaterialPage = 1;
},
currentChangeHandleMaterial(val) {
this.sfdcMaterialPage = val;
},
// 展开/收起上表
toggleOrderToolTable() {
this.showOrderToolTable = !this.showOrderToolTable;
},
toggleOrderBomTable() {
this.showOrderBomTable = !this.showOrderBomTable;
},
// 机器下机卷 // 机器下机卷
sfdcRollListSummaries(param) { sfdcRollListSummaries(param) {
const {columns, data} = param;
const {columns} = param;
const data = this.sfdcRollList;
const sums = []; const sums = [];
columns.forEach((column, index) => { columns.forEach((column, index) => {
if (index === 0) { if (index === 0) {

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

@ -103,7 +103,21 @@
<!-- 列表展示区域 --> <!-- 列表展示区域 -->
<fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 310px;"> <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 310px;">
<legend class="customer-legend">{{labels.listDesc}}</legend>
<legend class="customer-legend" style="display: flex; justify-content: space-between; align-items: center; width: calc(100% - 20px);">
<span>{{labels.listDesc}}</span>
<div v-if="activeTable === 'sfdc_tool'">
<el-button type="text" size="mini" style="padding: 0;" @click="toggleOrderToolTable">
{{ showOrderToolTable ? '收起上表' : '展开上表' }}
<i :class="showOrderToolTable ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
</el-button>
</div>
<div v-if="activeTable === 'sfdc_material'">
<el-button type="text" size="mini" style="padding: 0;" @click="toggleOrderBomTable">
{{ showOrderBomTable ? '收起上表' : '展开上表' }}
<i :class="showOrderBomTable ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
</el-button>
</div>
</legend>
<el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 285px;" <el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 285px;"
type="border-card" @tab-click="tabClick" class="customer-tab"> type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tab-pane :label=labels.timeList name="sfdc_time"> <el-tab-pane :label=labels.timeList name="sfdc_time">
@ -132,7 +146,7 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.toolList name="sfdc_tool"> <el-tab-pane :label=labels.toolList name="sfdc_tool">
<el-table
<el-table v-show="showOrderToolTable"
height="120" height="120"
:data="orderToolList" :data="orderToolList"
border border
@ -156,7 +170,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
height="140"
:height="showOrderToolTable ? '140' : '260'"
:data="sfdcToolList" :data="sfdcToolList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -197,7 +211,7 @@
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.materialList name="sfdc_material"> <el-tab-pane :label=labels.materialList name="sfdc_material">
<el-table
<el-table v-show="showOrderBomTable"
height="120" height="120"
:data="orderBomList" :data="orderBomList"
border border
@ -221,8 +235,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
height="140"
:data="sfdcMaterialList"
:height="showOrderBomTable ? '104' : '224'"
:data="sfdcMaterialList.slice((sfdcMaterialPage - 1) * sfdcMaterialLimit, sfdcMaterialPage * sfdcMaterialLimit)"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
@ -263,6 +277,15 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
@size-change="sizeChangeHandleMaterial"
@current-change="currentChangeHandleMaterial"
:current-page="sfdcMaterialPage"
:page-sizes="[20, 50, 100]"
:page-size="sfdcMaterialLimit"
:total="sfdcMaterialList.length"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.rollopsList name="sfdc_rollOps"> <el-tab-pane :label=labels.rollopsList name="sfdc_rollOps">
<el-table <el-table
@ -319,8 +342,8 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.rollList name="sfdc_roll"> <el-tab-pane :label=labels.rollList name="sfdc_roll">
<el-table <el-table
height="260"
:data="materialRollList"
height="224"
:data="materialRollList.slice((sfdcRollPage - 1) * sfdcRollLimit, sfdcRollPage * sfdcRollLimit)"
border border
show-summary show-summary
v-loading="dataListLoading" v-loading="dataListLoading"
@ -355,6 +378,15 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
@size-change="sizeChangeHandleRoll"
@current-change="currentChangeHandleRoll"
:current-page="sfdcRollPage"
:page-sizes="[20, 50, 100]"
:page-size="sfdcRollLimit"
:total="materialRollList.length"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</fieldset> </fieldset>
@ -673,6 +705,15 @@ export default {
sfdcMaterialList: [], sfdcMaterialList: [],
sfdcRollOpsList: [], sfdcRollOpsList: [],
sfdcDefectList: [], sfdcDefectList: [],
// 机器下机卷分页
sfdcRollPage: 1,
sfdcRollLimit: 20,
// 材料清单下表分页
sfdcMaterialPage: 1,
sfdcMaterialLimit: 20,
// 上表展开/收起状态
showOrderToolTable: true,
showOrderBomTable: true,
materialRollList: [], materialRollList: [],
columnTimeArray: [ columnTimeArray: [
{ {
@ -3366,9 +3407,33 @@ export default {
}); });
return sums; return sums;
}, },
// 机器下机卷分页
sizeChangeHandleRoll(val) {
this.sfdcRollLimit = val;
this.sfdcRollPage = 1;
},
currentChangeHandleRoll(val) {
this.sfdcRollPage = val;
},
// 材料清单分页
sizeChangeHandleMaterial(val) {
this.sfdcMaterialLimit = val;
this.sfdcMaterialPage = 1;
},
currentChangeHandleMaterial(val) {
this.sfdcMaterialPage = val;
},
// 展开/收起上表
toggleOrderToolTable() {
this.showOrderToolTable = !this.showOrderToolTable;
},
toggleOrderBomTable() {
this.showOrderBomTable = !this.showOrderBomTable;
},
// 机器下机卷 // 机器下机卷
sfdcRollListSummaries(param) { sfdcRollListSummaries(param) {
const {columns, data} = param;
const {columns} = param;
const data = this.materialRollList;
const sums = []; const sums = [];
columns.forEach((column, index) => { columns.forEach((column, index) => {
if (index === 0) { if (index === 0) {

Write Preview
Loading…
Cancel
Save