root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:晶棒库报表和回温库报表查询逻辑优化、页面优化

Browse Source
This commit is contained in:
DESKTOP-5DIJMF9\admin
2024-09-09 11:03:37 +08:00
parent 8c96550696
commit 23f96ca8f6
13 changed files with 148 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-ui/src/views/wms/hw/detail/index.vue
View File

@@ -196,7 +196,7 @@ export default {
title: '回温间库存明细',
url: 'api/report/hw/detail',
idField: 'group_id',
sort: 'pointCode,desc',
sort: '',
optShow: {
add: false,
edit: false,

4
lms/nladmin-ui/src/views/wms/hw/in/index.vue
View File

@@ -141,10 +141,10 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '回温间库存明细',
title: '回温间入库明细',
url: 'api/report/hw/in',
idField: 'group_id',
sort: 'pointCode,desc',
sort: '',
optShow: {
add: false,
edit: false,

2
lms/nladmin-ui/src/views/wms/hw/inpending/index.vue
View File

@@ -117,7 +117,7 @@
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
<el-table-column prop="updateTime" label="更新时间" :min-width="150" />
<el-table-column prop="updateTime" label="更新时间" :min-width="flexWidth('updateTime',crud.data,'更新时间')" />
</el-table>
<!--分页组件-->
<pagination />

12
lms/nladmin-ui/src/views/wms/hw/out/index.vue
View File

@@ -118,10 +118,10 @@
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
<el-table-column prop="updateTime" label="入库时间" :min-width="170" />
<el-table-column prop="standingTime" label="回温时间H" :min-width="70" />
<el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
<el-table-column label="是否完成" :min-width="70">
<el-table-column prop="updateTime" label="出库时间" :min-width="flexWidth('updateTime',crud.data,'出库时间')" />
<el-table-column prop="standingTime" label="回温时间H" :min-width="flexWidth('standingTime',crud.data,'回温时间H')" />
<el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
<el-table-column label="是否完成" :min-width="80">
<template slot-scope="scope">
<span>{{ scope.row.standingTime > scope.row.usedTime ? '未完成' : '已完成' }}</span>
</template>
@@ -149,10 +149,10 @@ export default {
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '回温间库存明细',
title: '回温间出库明细',
url: 'api/report/hw/out',
idField: 'group_id',
sort: 'pointCode,desc',
sort: '',
optShow: {
add: false,
edit: false,

4
lms/nladmin-ui/src/views/wms/hw/outpending/index.vue
View File

@@ -119,8 +119,8 @@
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="number" label="每托数量(根)" :min-width="flexWidth('number',crud.data,'每托数量(根)')" />
<el-table-column prop="updateTime" label="入库时间" :min-width="170" />
<el-table-column prop="usedTime" label="已回温时间H" :min-width="70" />
<el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
<el-table-column prop="usedTime" label="已回温时间H" :min-width="flexWidth('usedTime',crud.data,'已回温时间H')" />
</el-table>
<!--分页组件-->
<pagination />

4
lms/nladmin-ui/src/views/wms/ycl/detail/index.vue
View File

@@ -106,8 +106,8 @@
<el-table-column prop="lotSN" label="晶体编号" :min-width="flexWidth('lotSN',crud.data,'晶体编号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'批次')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="updateTime" label="入库时间" :min-width="140" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
<el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="flexWidth('incomingWeight',crud.data,'重量KG')" />
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />

4
lms/nladmin-ui/src/views/wms/ycl/in/index.vue
View File

@@ -106,8 +106,8 @@
<el-table-column prop="lotSN" label="晶体编号" :min-width="flexWidth('lotSN',crud.data,'晶体编号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'客户来料批次号')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="updateTime" label="入库时间" :min-width="140" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
<el-table-column prop="updateTime" label="入库时间" :min-width="flexWidth('updateTime',crud.data,'入库时间')" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="flexWidth('incomingWeight',crud.data,'重量KG')" />
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />

10
lms/nladmin-ui/src/views/wms/ycl/out/index.vue
View File

@@ -95,9 +95,9 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" height="550" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="pointCode" label="点位编码" :min-width="flexWidth('pointCode',crud.data,'点位编码')" />
<el-table-column prop="pointName" label="点位名称" :min-width="flexWidth('pointName',crud.data,'点位名称')" />
<el-table-column prop="regionCode" label="区域编码" :min-width="flexWidth('regionCode',crud.data,'区域编码')" />
<el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
<el-table-column prop="pointCode2" label="目的点位编码" :min-width="flexWidth('pointCode2',crud.data,'目的点位编码')" />
<el-table-column prop="regionName2" label="目的区域名称" :min-width="flexWidth('regionName2',crud.data,'目的区域名称')" />
<el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />
@@ -106,8 +106,8 @@
<el-table-column prop="lotSN" label="晶体编号" :min-width="flexWidth('lotSN',crud.data,'晶体编号')" />
<el-table-column prop="ingotBatch" label="批次" :min-width="flexWidth('ingotBatch',crud.data,'客户来料批次号')" />
<el-table-column prop="siliconGrade" label="棒源等级" :min-width="flexWidth('siliconGrade',crud.data,'棒源等级')" />
<el-table-column prop="updateTime" label="入库时间" :min-width="140" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="70" />
<el-table-column prop="updateTime" label="出库时间" :min-width="flexWidth('updateTime',crud.data,'出库时间')" />
<el-table-column prop="incomingWeight" label="重量KG" :min-width="flexWidth('incomingWeight',crud.data,'重量KG')" />
<el-table-column prop="weightCoefficientValue" label="折算系数" :min-width="flexWidth('weightCoefficientValue',crud.data,'折算系数')" />
<el-table-column prop="incomingLength" label="来料长度mm" :min-width="flexWidth('incomingLength',crud.data,'来料长度mm')" />
<el-table-column prop="incomingchipping" label="来料缺陷长度mm" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度mm')" />
@@ -141,7 +141,7 @@ export default {
title: '晶棒库库存明细',
url: 'api/report/yl/out',
idField: 'group_id',
sort: 'pointCode,desc',
sort: '',
optShow: {
add: false,
edit: false,

1
lms/nladmin-ui/src/views/wms/ycl/outdetail/index.vue
View File

@@ -151,7 +151,6 @@
<el-table-column prop="regionName" label="区域名称" :min-width="flexWidth('regionName',crud.data,'区域名称')" />
<el-table-column prop="subTray" label="子托编码" :min-width="flexWidth('subTray',crud.data,'子托编码')" />
<el-table-column prop="motherTray" label="母托编码" :min-width="flexWidth('motherTray',crud.data,'母托编码')" />
<!-- <el-table-column prop="somtOrderNo" label="出库单号" :min-width="flexWidth('somtOrderNo',crud.data,'出库单号')" />-->
<el-table-column prop="moname" label="生产工单" :min-width="flexWidth('moname',crud.data,'生产工单')" />
<el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
<el-table-column prop="supplierName" label="供应商名称" :min-width="flexWidth('supplierName',crud.data,'供应商名称')" />