Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表优化

Browse Source
master
wws 1 year ago
parent 993fdee52c
commit 780b648027
5 changed files with 856 additions and 727 deletions
Show Stats Download Patch File Download Diff File

1206
src/views/device/inspectionWork/index.vue
View File

File diff suppressed because it is too large Load Diff

163
src/views/device/maintenanceWork/index.vue
Unescape Escape View File

@ -330,71 +330,107 @@
@pagination="getList"
/>
<el-drawer
<el-dialog
title="保养详情"
:visible.sync="workDetail"
size="700px">
<div class="my-margin-lr">
<el-descriptions title="保养信息">
<el-descriptions-item label="计划编码">{{workVO.order.planCode}}</el-descriptions-item>
<el-descriptions-item label="计划名称">{{workVO.order.planName}}</el-descriptions-item>
<el-descriptions-item label="循环周期">{{workVO.order.planLoop}}{{workVO.order.planLoopType}}</el-descriptions-item>
<el-descriptions-item label="工单编码">{{workVO.order.orderCode}}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{workVO.order.planWorkshop}}</el-descriptions-item>
<el-descriptions-item label="保养执行开始时间">{{workVO.order.planLoopStart}}</el-descriptions-item>
<el-descriptions-item label="保养执行结束时间">{{workVO.order.planLoopEnd}}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{workVO.order.orderStart}}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{workVO.order.orderEnd}}</el-descriptions-item>
<el-descriptions-item label="保养人">{{workVO.order.planPerson}}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
<el-descriptions title="设备信息">
<el-descriptions-item label="设备编码">{{workVO.equ.equipmentCode}}</el-descriptions-item>
<el-descriptions-item label="设备名称">{{workVO.equ.equipmentName}}</el-descriptions-item>
<el-descriptions-item label="设备位置">{{workVO.equ.equipmentLocation}}</el-descriptions-item>
<el-descriptions-item label="设备类型编码">{{workVO.equ.equipmentTypeCode}}</el-descriptions-item>
<el-descriptions-item label="设备类型名称">{{workVO.equ.equipmentTypeName}}</el-descriptions-item>
<el-descriptions-item label="所属工作中心编码">{{workVO.equ.workshopCode}}</el-descriptions-item>
<el-descriptions-item label="所属工作中心名称">{{workVO.equ.workshopName}}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
<el-descriptions v-if="workVO.spareList.length > 0" title="备件信息"/>
<div v-for="(spare,index) in workVO.spareList" :key="index">
<el-descriptions title="">
<el-descriptions-item label="备件编码">{{spare.materialCode}}</el-descriptions-item>
<el-descriptions-item label="备件名称">{{spare.materialDesc}}</el-descriptions-item>
<el-descriptions-item label="申领数量">{{spare.applyNum}}</el-descriptions-item>
width="900px"
>
<el-tabs type="border-card">
<el-tab-pane label="保养信息">
<el-descriptions title="" border :column="2">
<el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
<el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
<el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
</el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="保养执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="保养执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="保养人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
</div>
<el-descriptions v-if="workVO.detailList.length > 0" title="检查项信息"/>
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="right">{{detail.itemName}}</el-divider>
<div v-for="(standard,index) in detail.standardList" :key="index">
<el-descriptions title="">
<el-descriptions-item label="标准名称">{{standard.standardName}}</el-descriptions-item>
<el-descriptions-item label="标准类型">{{standard.standardTypeName}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="上限">{{standard.detailUpLimit}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="下限">{{standard.detailDownLimit}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="单位">{{standard.detailUnit}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="实际值">{{standard.actualValue}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'qualitative' " label="是否达标">{{standard.detailReach}}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
</el-tab-pane>
<el-tab-pane label="设备信息">
<el-descriptions class="my-margin-top" title="" :column="2" border>
<el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
<el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
<el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
<el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
<el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
<el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
<el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="备件信息">
<el-table
:data="workVO.spareList"
border
style="width: 100%">
<el-table-column
prop="materialCode"
label="备件编码"
width="180">
</el-table-column>
<el-table-column
prop="materialDesc"
label="备件名称"
width="180">
</el-table-column>
<el-table-column
prop="applyNum"
label="申领数量">
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table
:data="detail.standardList"
border
style="width: 100%">
<el-table-column
prop="standardName"
label="标准名称"
width="180">
</el-table-column>
<el-table-column
prop="standardType"
label="标准类型"
width="180">
</el-table-column>
<el-table-column
prop="detailReach"
label="是否达标">
</el-table-column>
<el-table-column
prop="actualValue"
label="实际值">
</el-table-column>
<el-table-column
prop="detailUpLimit"
label="上限">
</el-table-column>
<el-table-column
prop="detailDownLimit"
label="下限">
</el-table-column>
<el-table-column
prop="detailUnit"
label="单位">
</el-table-column>
</el-table>
</div>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="workDetail = false">取 消</el-button>
<el-button type="primary" @click="workDetail = false">确 定</el-button>
</span>
</el-dialog>
</div>
</div>
</el-drawer>
<!-- 添加或修改保养记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -637,7 +673,10 @@ export default {
</script>
<style>
.my-margin-lr{
margin-right: 10px;
margin-left: 10px;
margin-right: 20px;
margin-left: 20px;
}
.my-margin-top{
margin-top: 10px;
}
</style>

36
src/views/device/spotCheckPlan/index.vue
Unescape Escape View File

@ -18,12 +18,14 @@
/>
</el-form-item>
<el-form-item label="车间" prop="planWorkshop">
<el-input
v-model="queryParams.planWorkshop"
placeholder="请输入车间"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
<el-option
v-for="work in workCenterList"
:key="work.factoryCode"
:label="work.factoryName"
:value="work.factoryCode"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="产线" prop="planProdLine">
<el-input
@ -101,10 +103,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否可生产-限制" prop="planRestrict">
<el-form-item label-width="90px" label="是否可生产" prop="planRestrict">
<el-input
v-model="queryParams.planRestrict"
placeholder="请输入是否可生产-限制"
placeholder="请输入是否可生产"
clearable
@keyup.enter.native="handleQuery"
/>
@ -277,14 +279,14 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="主键" align="center" prop="planId" />
<el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
<el-table-column label="计划编码" align="center" prop="planCode" />
<el-table-column label="计划名称" align="center" prop="planName" />
<el-table-column width="120" label="计划编码" align="center" prop="planCode" />
<el-table-column width="120" label="计划名称" align="center" prop="planName" />
<el-table-column label="车间编码" align="center" prop="planWorkshop" />
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
<el-table-column v-if="false" label="设备名称" align="center" prop="equipmentName" />
<el-table-column v-if="false" label="设备编码" align="center" prop="equipmentCode" />
<el-table-column label="循环周期" align="center" prop="planLoop" />
<el-table-column label="循环周期类型" align="center" prop="planLoopType">
<el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType">
<template slot-scope="scope">
<dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
</template>
@ -305,7 +307,11 @@
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus"/>
</template>
</el-table-column>
<el-table-column label="是否可生产-限制" align="center" prop="planRestrict" />
<el-table-column width="120" label="是否可生产" align="center" prop="planRestrict" >
<template slot-scope="scope">
<dict-tag :options="dict.type.device_yes_no" :value="scope.row.planRestrict"/>
</template>
</el-table-column>
<el-table-column v-if="false" label="维护类型" align="center" prop="planType" />
<el-table-column v-if="false" label="是否委外" align="center" prop="planOutsource" />
<el-table-column v-if="false" label="委外工单编码" align="center" prop="workCode" />
@ -329,7 +335,7 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<el-table-column width="180" label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
@ -637,7 +643,7 @@ import {addPlan, getEquList, getPersonList, getWorkCenter, initUpdatePlanInfo, u
export default {
name: "SpotCheckPlan",
dicts: ['device_loop_type', 'sys_normal_disable'],
dicts: ['device_loop_type', 'sys_normal_disable','device_yes_no'],
data() {
return {
// 工作中心list
@ -743,12 +749,14 @@ export default {
},
created() {
this.getList();
this.setWorkCenter();
},
methods: {
// 获取工作中心
setWorkCenter() {
getWorkCenter().then(response => {
this.workCenterList = response.data;
console.log(this.workCenterList)
})
},
// 选择工作中心

43
src/views/device/spotInspectionOrder/index.vue
Unescape Escape View File

@ -26,12 +26,14 @@
/>
</el-form-item>
<el-form-item label="车间编码" prop="planWorkshop">
<el-input
v-model="queryParams.planWorkshop"
placeholder="请输入车间编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.planWorkshop" placeholder="请选择车间" clearable>
<el-option
v-for="work in workCenterList"
:key="work.factoryCode"
:label="work.factoryName"
:value="work.factoryCode"
/>
</el-select>
</el-form-item>
<el-form-item v-if="false" label="产线" prop="planProdLine">
<el-input
@ -41,7 +43,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="循环周期" prop="planLoop">
<el-form-item v-if="false" label="循环周期" prop="planLoop">
<el-input
v-model="queryParams.planLoop"
placeholder="请输入循环周期"
@ -249,13 +251,17 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="主键" align="center" prop="orderId" />
<el-table-column v-if="false" label="计划id" align="center" prop="planId" />
<el-table-column label="计划编码" align="center" prop="planCode" />
<el-table-column width="120" label="计划编码" align="center" prop="planCode" />
<el-table-column v-if="false" label="计划类型" align="center" prop="planType" />
<el-table-column label="工单号" align="center" prop="orderCode" />
<el-table-column width="120" label="工单号" align="center" prop="orderCode" />
<el-table-column label="车间编码" align="center" prop="planWorkshop" />
<el-table-column v-if="false" label="产线" align="center" prop="planProdLine" />
<el-table-column label="循环周期" align="center" prop="planLoop" />
<el-table-column label="循环周期类型" align="center" prop="planLoopType" />
<el-table-column width="120" label="循环周期类型" align="center" prop="planLoopType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.device_loop_type" :value="scope.row.planLoopType"/>
</template>
</el-table-column>
<el-table-column label="循环执行时间开始" align="center" prop="planLoopStart" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.planLoopStart, '{y}-{m}-{d}') }}</span>
@ -277,7 +283,11 @@
</template>
</el-table-column>
<el-table-column label="设备编码" align="center" prop="equipmentCode" />
<el-table-column label="工单状态" align="center" prop="orderStatus" />
<el-table-column label="工单状态" align="center" prop="orderStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.device_order_status" :value="scope.row.orderStatus"/>
</template>
</el-table-column>
<el-table-column v-if="false" label="工单费用" align="center" prop="orderCost" />
<el-table-column label="点检人" align="center" prop="planPerson" />
<el-table-column v-if="false" label="工单用时" align="center" prop="orderCostTime" />
@ -451,12 +461,15 @@
<script>
import { listSpotInspectionOrder, getSpotInspectionOrder, delSpotInspectionOrder, addSpotInspectionOrder, updateSpotInspectionOrder } from "@/api/device/spotInspectionOrder";
import {getDeviceOrder, updateDeviceOrder} from "@/api/device/deviceOrder";
import {getWorkCenter} from "@/api/device/plan";
export default {
name: "SpotInspectionOrder",
dicts: ['device_order_status', 'device_loop_type'],
data() {
return {
// 工作中心
workCenterList:[],
// 遮罩层
loading: true,
// 选中数组
@ -519,8 +532,16 @@ export default {
},
created() {
this.getList();
this.setWorkCenter();
},
methods: {
// 获取工作中心
setWorkCenter() {
getWorkCenter().then(response => {
this.workCenterList = response.data;
console.log(this.workCenterList)
})
},
/** 查询点检工单列表 */
getList() {
this.loading = true;

135
src/views/device/spotInspectionWork/index.vue
Unescape Escape View File

@ -330,61 +330,85 @@
@pagination="getList"
/>
<el-drawer
<el-dialog
title="点检详情"
:visible.sync="workDetail"
size="700px">
<div class="my-margin-lr">
<el-descriptions title="点检信息">
<el-descriptions-item label="计划编码">{{workVO.order.planCode}}</el-descriptions-item>
<el-descriptions-item label="计划名称">{{workVO.order.planName}}</el-descriptions-item>
<el-descriptions-item label="循环周期">{{workVO.order.planLoop}}{{workVO.order.planLoopType}}</el-descriptions-item>
<el-descriptions-item label="工单编码">{{workVO.order.orderCode}}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{workVO.order.planWorkshop}}</el-descriptions-item>
<el-descriptions-item label="点检执行开始时间">{{workVO.order.planLoopStart}}</el-descriptions-item>
<el-descriptions-item label="点检执行结束时间">{{workVO.order.planLoopEnd}}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{workVO.order.orderStart}}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{workVO.order.orderEnd}}</el-descriptions-item>
<el-descriptions-item label="点检人">{{workVO.order.planPerson}}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{workVO.order.repairCode}}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
<el-descriptions title="设备信息">
<el-descriptions-item label="设备编码">{{workVO.equ.equipmentCode}}</el-descriptions-item>
<el-descriptions-item label="设备名称">{{workVO.equ.equipmentName}}</el-descriptions-item>
<el-descriptions-item label="设备位置">{{workVO.equ.equipmentLocation}}</el-descriptions-item>
<el-descriptions-item label="设备类型编码">{{workVO.equ.equipmentTypeCode}}</el-descriptions-item>
<el-descriptions-item label="设备类型名称">{{workVO.equ.equipmentTypeName}}</el-descriptions-item>
<el-descriptions-item label="所属工作中心编码">{{workVO.equ.workshopCode}}</el-descriptions-item>
<el-descriptions-item label="所属工作中心名称">{{workVO.equ.workshopName}}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
<el-descriptions v-if="workVO.detailList.length > 0" title="检查项信息"/>
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="right">{{detail.itemName}}</el-divider>
<div v-for="(standard,index) in detail.standardList" :key="index">
<el-descriptions title="">
<el-descriptions-item label="标准名称">{{standard.standardName}}</el-descriptions-item>
<el-descriptions-item label="标准类型">{{standard.standardTypeName}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="上限">{{standard.detailUpLimit}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="下限">{{standard.detailDownLimit}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="单位">{{standard.detailUnit}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'quantify' " label="实际值">{{standard.actualValue}}</el-descriptions-item>
<el-descriptions-item v-if="standard.standardType == 'qualitative' " label="是否达标">{{standard.detailReach}}</el-descriptions-item>
</el-descriptions>
<el-divider></el-divider>
width="900px"
>
<el-tabs type="border-card">
<el-tab-pane label="点检信息">
<el-descriptions title="" border :column="2">
<el-descriptions-item label="计划编码">{{ workVO.order.planCode }}</el-descriptions-item>
<el-descriptions-item label="计划名称">{{ workVO.order.planName }}</el-descriptions-item>
<el-descriptions-item label="循环周期">{{ workVO.order.planLoop }}{{ workVO.order.planLoopType }}
</el-descriptions-item>
<el-descriptions-item label="工单编码">{{ workVO.order.orderCode }}</el-descriptions-item>
<el-descriptions-item label="车间编码">{{ workVO.order.planWorkshop }}</el-descriptions-item>
<el-descriptions-item label="点检执行开始时间">{{ workVO.order.planLoopStart }}</el-descriptions-item>
<el-descriptions-item label="点检执行结束时间">{{ workVO.order.planLoopEnd }}</el-descriptions-item>
<el-descriptions-item label="实际开始时间">{{ workVO.order.orderStart }}</el-descriptions-item>
<el-descriptions-item label="实际结束时间">{{ workVO.order.orderEnd }}</el-descriptions-item>
<el-descriptions-item label="点检人">{{ workVO.order.planPerson }}</el-descriptions-item>
<el-descriptions-item label="报修单号">{{ workVO.order.repairCode }}</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="设备信息">
<el-descriptions class="my-margin-top" title="" :column="2" border>
<el-descriptions-item label="设备编码">{{ workVO.equ.equipmentCode }}</el-descriptions-item>
<el-descriptions-item label="设备名称">{{ workVO.equ.equipmentName }}</el-descriptions-item>
<el-descriptions-item label="设备位置">{{ workVO.equ.equipmentLocation }}</el-descriptions-item>
<el-descriptions-item label="设备类型编码">{{ workVO.equ.equipmentTypeCode }}</el-descriptions-item>
<el-descriptions-item label="设备类型名称">{{ workVO.equ.equipmentTypeName }}</el-descriptions-item>
<el-descriptions-item label="所属工作中心编码">{{ workVO.equ.workshopCode }}</el-descriptions-item>
<el-descriptions-item label="所属工作中心名称">{{ workVO.equ.workshopName }}</el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息">
<div v-for="(detail,index) in workVO.detailList" :key="index">
<el-divider content-position="left">{{ detail.itemName }}</el-divider>
<el-table
:data="detail.standardList"
border
style="width: 100%">
<el-table-column
prop="standardName"
label="标准名称"
width="180">
</el-table-column>
<el-table-column
prop="standardType"
label="标准类型"
width="180">
</el-table-column>
<el-table-column
prop="detailReach"
label="是否达标">
</el-table-column>
<el-table-column
prop="actualValue"
label="实际值">
</el-table-column>
<el-table-column
prop="detailUpLimit"
label="上限">
</el-table-column>
<el-table-column
prop="detailDownLimit"
label="下限">
</el-table-column>
<el-table-column
prop="detailUnit"
label="单位">
</el-table-column>
</el-table>
</div>
</div>
</div>
</el-drawer>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="workDetail = false">取 消</el-button>
<el-button type="primary" @click="workDetail = false">确 定</el-button>
</span>
</el-dialog>
<!-- 添加或修改点检记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -625,7 +649,10 @@ export default {
</script>
<style>
.my-margin-lr{
margin-right: 10px;
margin-left: 10px;
margin-right: 20px;
margin-left: 20px;
}
.my-margin-top{
margin-top: 10px;
}
</style>

Write Preview
Loading…
Cancel
Save