|
|
@@ -2,14 +2,17 @@
|
|
|
<div>
|
|
|
|
|
|
<header>
|
|
|
- <div style="height: 90px;">
|
|
|
- <el-button type="primary" @click="onBZ" style="height: 70px;width: 75px;">班组维护</el-button>
|
|
|
- <el-button type="primary" @click="onDel" style="height: 70px;width: 75px;">删除</el-button>
|
|
|
- <el-button type="primary" @click="onOver" style="height: 70px;width: 75px;">完工</el-button>
|
|
|
- <el-button type="primary" @click="ondianjian" style="height: 70px;width: 75px;" >设备点检</el-button>
|
|
|
- <el-button type="primary" @click="onchanliang" v-if="zdtreeType === true" style="height: 70px;width: 75px;">日产量上报</el-button>
|
|
|
- <el-button type="primary" @click="onxuncha" style="height: 70px;width: 75px;">管理巡查</el-button>
|
|
|
- <el-button type="primary" @click="onstatus" style="height: 70px;width: 75px;">设置机台状态</el-button>
|
|
|
+ <div style="height: 50px;">
|
|
|
+ <el-button type="primary" @click="onBZ" >班组维护</el-button>
|
|
|
+ <el-button type="primary" @click="onchanliang" v-if="zdtreeType === true" >日产量上报</el-button>
|
|
|
+ <el-button type="primary" @click="onDel" >删除</el-button>
|
|
|
+ <el-button type="primary" @click="onOver" >完工</el-button>
|
|
|
+ <el-button type="primary" @click="ondianjian" >设备点检</el-button>
|
|
|
+ <el-button type="primary" @click="onxuncha" >管理巡查</el-button>
|
|
|
+ <el-button type="primary" @click="onstatus" >设置机台状态</el-button>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
</div>
|
|
|
|
|
|
</header>
|
|
|
@@ -20,7 +23,7 @@
|
|
|
<div class="JKWTree-tree">
|
|
|
|
|
|
<h3 > 车间报工</h3>
|
|
|
- <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
|
|
|
+ <el-tree :data="treeData" :props="defaultProps" :default-expand-all="true" @node-click="handleNodeClick"></el-tree>
|
|
|
</div>
|
|
|
|
|
|
</el-aside>
|
|
|
@@ -34,7 +37,7 @@
|
|
|
<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px;">
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="20">
|
|
|
<el-form-item label="工单编号" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
@@ -50,12 +53,12 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :span="5">
|
|
|
<el-form-item label="印件编号" prop="id">
|
|
|
<el-input v-model="formData.印件号" :clearable="true" placeholder="2023.12.14" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="15">
|
|
|
<el-form-item label="工序名称" prop="name">
|
|
|
<el-input v-model="formData.工序名称" :clearable="true" placeholder="A班" />
|
|
|
</el-form-item>
|
|
|
@@ -168,19 +171,7 @@
|
|
|
|
|
|
</div>
|
|
|
<div class="gva-table-box">
|
|
|
- <div class="gva-btn-list">
|
|
|
- <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
|
|
|
- <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
|
|
|
- <p>确定要删除吗？</p>
|
|
|
- <div style="text-align: right; margin-top: 8px;">
|
|
|
- <el-button type="primary" link @click="deleteVisible = false">取消</el-button>
|
|
|
- <el-button type="primary" @click="onDelete">确定</el-button>
|
|
|
- </div>
|
|
|
- <template #reference>
|
|
|
- <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
|
|
|
- </template>
|
|
|
- </el-popover>
|
|
|
- </div>
|
|
|
+
|
|
|
<el-tabs v-model="activeName" type="card" @tab-click="duohandleClick" >
|
|
|
|
|
|
<el-tab-pane label="设备作业清单" @click="showTable('印件资料')" name="first">
|
|
|
@@ -600,7 +591,7 @@
|
|
|
v-model="dianjianVisible"
|
|
|
title="选择"
|
|
|
destroy-on-close
|
|
|
- width="1300px"
|
|
|
+ width="100px"
|
|
|
style="height: 110%;"
|
|
|
>
|
|
|
<el-row :gutter="0">
|
|
|
@@ -688,7 +679,7 @@
|
|
|
title="选择"
|
|
|
destroy-on-close
|
|
|
width="1400px"
|
|
|
- style="height: 170%;"
|
|
|
+ style="height: 110%;"
|
|
|
>
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="4">
|
|
|
@@ -699,16 +690,16 @@
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="产品名称" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="40">
|
|
|
+ <el-col :span="30">
|
|
|
<el-input v-model="formData3.product_name" :clearable="true" placeholder="ZT01733" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item label="工序名称" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="12">
|
|
|
+ <el-col :span="30">
|
|
|
<el-input v-model="formData3.gxmc" :clearable="true" placeholder="ZT01733" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -784,66 +775,69 @@
|
|
|
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="3">
|
|
|
+ <el-col :span="4">
|
|
|
<el-form-item label="产量" prop="id">
|
|
|
<el-input v-model="formData3.产量" :clearable="true" placeholder="2023.12.14" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="3">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="制程废品" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="40">
|
|
|
<el-input v-model="formData3.制程废品" :clearable="true" placeholder="ZT01733" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="3">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="制程次品" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="12">
|
|
|
<el-input v-model="formData3.制程次品" :clearable="true" placeholder="ZT01733" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="3">
|
|
|
+ <el-col :span="6">
|
|
|
<el-form-item label="前工序废" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="12">
|
|
|
<el-input v-model="formData3.前工序废" :clearable="true" placeholder="ZT01733" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="3">
|
|
|
- <el-form-item label="来料异常" prop="name">
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :span="6">
|
|
|
- <el-input v-model="formData3.来料异常" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="3">
|
|
|
- <el-form-item label="联数" prop="name">
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formData3.联数" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-form-item label="墨色" prop="name">
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formData3.墨色" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
</el-row>
|
|
|
+
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-form-item label="来料异常" prop="id">
|
|
|
+ <el-input v-model="formData3.来料异常" :clearable="true" placeholder="2023.12.14" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="联数" prop="name">
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="40">
|
|
|
+ <el-input v-model="formData3.联数" :clearable="true" placeholder="ZT01733" />
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="前工序废" prop="name">
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-input v-model="formData3.前工序废" :clearable="true" placeholder="ZT01733" />
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
@@ -1128,7 +1122,7 @@
|
|
|
title="选择"
|
|
|
destroy-on-close
|
|
|
width="1300px"
|
|
|
- style="height: 110%;"
|
|
|
+ style="height: 80%;"
|
|
|
>
|
|
|
<el-row :gutter="0">
|
|
|
<el-col :span="4">
|
|
|
@@ -1139,7 +1133,7 @@
|
|
|
|
|
|
<el-col :span="10">
|
|
|
<el-row :gutter="20">
|
|
|
- <el-col :span="5">
|
|
|
+ <el-col :span="10">
|
|
|
<el-input v-model="formData.product_name" :clearable="true" placeholder="ZT01733" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -1204,67 +1198,67 @@
|
|
|
row-key="ID"
|
|
|
highlight-current-row="true"
|
|
|
border @row-click="dianjianhandle"
|
|
|
- style="width:40%; height:100px;"
|
|
|
+ style="width:40%; height:400px;"
|
|
|
@row-dblclick="handleSelectClick"
|
|
|
:row-class-name="rowClassName"
|
|
|
>
|
|
|
<el-table-column
|
|
|
- prop="检验项目"
|
|
|
+ prop="工单编号"
|
|
|
label="工单编号"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="点检方法"
|
|
|
+ prop="印件号"
|
|
|
label="印件号"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="检验项目"
|
|
|
+ prop="工序名称"
|
|
|
label="工序名称"
|
|
|
- width="180"
|
|
|
+ width="240"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="点检方法"
|
|
|
+ prop="流程单号"
|
|
|
label="流程单号"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="检验项目"
|
|
|
+ prop="设备编号"
|
|
|
label="设备编号"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="点检方法"
|
|
|
+ prop="班组编号"
|
|
|
label="班组编号"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="检验项目"
|
|
|
+ prop="检验备注"
|
|
|
label="检验备注"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="点检方法"
|
|
|
+ prop="现场管理人员"
|
|
|
label="现场管理人员"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="检验项目"
|
|
|
+ prop="提交时间"
|
|
|
label="提交时间"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="点检方法"
|
|
|
+ prop="开工时间"
|
|
|
label="开工时间"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="检验项目"
|
|
|
+ prop="分钟差数"
|
|
|
label="分钟差数"
|
|
|
width="180"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- prop="点检方法"
|
|
|
+ prop="归属时段"
|
|
|
label="归属时段"
|
|
|
width="180"
|
|
|
/>
|
|
|
@@ -1272,6 +1266,8 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
+
|
|
|
+
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
|
<el-button @click="closeDialog">关 闭</el-button>
|
|
|
@@ -1323,7 +1319,8 @@ import {
|
|
|
getYg,
|
|
|
submitPatrolRecord,
|
|
|
getMachineMac,
|
|
|
- setMachineStatus
|
|
|
+ setMachineStatus,
|
|
|
+ fieldInspectionRecord
|
|
|
} from '@/api/jixiaoguanli/jitairibaobiao'
|
|
|
|
|
|
import {
|
|
|
@@ -1343,8 +1340,7 @@ let checked1=ref(false)
|
|
|
let checked2=ref(false)
|
|
|
let checked3=ref(false)
|
|
|
const detailData = reactive([])
|
|
|
-const treeData=ref([
|
|
|
-])
|
|
|
+const treeData=ref([])
|
|
|
let dianjiantreeData;
|
|
|
let JTMC=ref()
|
|
|
const sbzyData = reactive([])
|
|
|
@@ -1354,6 +1350,11 @@ let JYData = reactive([])
|
|
|
|
|
|
const handleNodeClick = (nodeData,node) => {
|
|
|
//存放当前节点的nodeId
|
|
|
+ if(nodeData.level === 1){
|
|
|
+ console.log('1')
|
|
|
+ }else{
|
|
|
+ console.log('2')
|
|
|
+ }
|
|
|
// if (nodeData.level === 1) {
|
|
|
// console.log(node.label); // 第一级节点
|
|
|
// } else if (nodeData.level === 2) {
|
|
|
@@ -1369,10 +1370,8 @@ const handleNodeClick = (nodeData,node) => {
|
|
|
// } else if (nodeData.level === 3) {
|
|
|
// console.log(node.label); // 第三级节点
|
|
|
// }
|
|
|
- JTMC=node.label.split("【")[0]
|
|
|
- FacilityProduction()
|
|
|
- FacilityWorklist()
|
|
|
- FacilityTeam(JTMC)
|
|
|
+ // JTMC=node.label.split("【")[0]
|
|
|
+ // FacilityProduction()
|
|
|
// console.log(node.label)
|
|
|
}
|
|
|
//当前生产订单
|
|
|
@@ -1408,6 +1407,8 @@ const FacilityProduction = async () => {
|
|
|
}
|
|
|
}
|
|
|
console.log(formData.value)
|
|
|
+ FacilityWorklist()
|
|
|
+ FacilityTeam(JTMC)
|
|
|
InspectionRecord()
|
|
|
FacilityDetail()
|
|
|
// 输出填充后的formData对象
|
|
|
@@ -1426,7 +1427,7 @@ const FacilityWorklist = async () => {
|
|
|
//检验记录
|
|
|
const InspectionRecord = async () => {
|
|
|
console.log(formData.value.班组)
|
|
|
- const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2312191',team:formData.value.班组});
|
|
|
+ const response = await inspectionRecord({machine:'JY01#',Gd_gdbh:'2312191',team:'A班'});
|
|
|
console.log(response)
|
|
|
if(response.code==0){
|
|
|
// 提取 inspectiontime 作为列名
|
|
|
@@ -1466,7 +1467,7 @@ const InspectionRecord = async () => {
|
|
|
}
|
|
|
//当班产量明细
|
|
|
const FacilityDetail = async () => {
|
|
|
- const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2312191', team: formData.value.班组 });
|
|
|
+ const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2312191', team:'A班' });
|
|
|
if (response.code === 0) {
|
|
|
console.log(response);
|
|
|
CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
|
|
|
@@ -1681,7 +1682,7 @@ const SetMachineStatus = async () => {
|
|
|
});
|
|
|
console.log(response)
|
|
|
if (response.code === 0) {
|
|
|
- console.log(response)
|
|
|
+ // console.log(response)
|
|
|
}
|
|
|
}
|
|
|
//提交巡查记录
|
|
|
@@ -1702,22 +1703,40 @@ const ReportProduceInfo = async (value,inputName) => {
|
|
|
formData.value.yjno=response.data.yjno
|
|
|
formData.value.product_name=response.data.product_name
|
|
|
formData.value.gxmc=response.data.gxmc
|
|
|
+ FieldInspectionRecord()
|
|
|
xunchaVisible.value=true
|
|
|
}
|
|
|
}
|
|
|
+// 假设 xunchaselectData 是一个 ref 对象
|
|
|
+const xunchaselectData = ref([]);
|
|
|
+
|
|
|
+// 在 FieldInspectionRecord 方法中填充数据
|
|
|
+const FieldInspectionRecord = async () => {
|
|
|
+ const response = await fieldInspectionRecord({ workOrder: '2311114', team: 'A班', start: '2024-01-19 08:30:00' });
|
|
|
+ console.log(response);
|
|
|
+ if (response.code === 0) {
|
|
|
+ xunchaselectData.value = response.data;
|
|
|
+ }
|
|
|
+}
|
|
|
//获取机台编号
|
|
|
const GetMachineMac = async () => {
|
|
|
- const response = await getMachineMac({addr:'68-ED-A4-26-5F-37'});
|
|
|
- console.log(response)
|
|
|
+ const response = await getMachineMac({ addr: '68-ED-A4-26-5F-37' });
|
|
|
+ console.log(response);
|
|
|
if (response.code === 0) {
|
|
|
- // 将接口返回的数据添加到树型结构中
|
|
|
- // 将接口返回的数据添加到树型结构中
|
|
|
- let newNode = {
|
|
|
- label: response.data["设备编号"],
|
|
|
- children: []
|
|
|
- };
|
|
|
-
|
|
|
- treeData.value.push(newNode);
|
|
|
+ // 将接口返回的数据添加到树型结构中
|
|
|
+ let newNode = {
|
|
|
+ label: response.data["使用部门"],
|
|
|
+ level: 1,
|
|
|
+ children: [
|
|
|
+ {
|
|
|
+ label: response.data["设备编号"],
|
|
|
+ level: 2,
|
|
|
+ }
|
|
|
+ ]
|
|
|
+ };
|
|
|
+ treeData.value.push(newNode);
|
|
|
+ JTMC = newNode.children[0].label;
|
|
|
+ FacilityProduction();
|
|
|
}
|
|
|
}
|
|
|
GetMachineMac()
|
|
|
@@ -1743,7 +1762,6 @@ const SubmitPatrolRecord = async () => {
|
|
|
//日产量上报
|
|
|
function onchanliang() {
|
|
|
console.log(JTMC.split("#")[0]); // 通过value属性获取ref对象的值，然后再调用split方法
|
|
|
- chanliangVisible.value=true
|
|
|
ReportInfo()
|
|
|
}
|
|
|
//日产量详情获取
|
|
|
@@ -1798,6 +1816,7 @@ const ReportInfo = async () => {
|
|
|
};
|
|
|
formData3.value = { ...formData3.value, ...newData };
|
|
|
chanliangselectData.splice(0, chanliangselectData.length, ...response.data.bom)
|
|
|
+ chanliangVisible.value=true
|
|
|
}
|
|
|
// getTableData()
|
|
|
}
|
|
|
@@ -1916,6 +1935,7 @@ const dianjianNodeClick = (node, check, nodeData) => {
|
|
|
FacilityInspectionItem(node.label)
|
|
|
}
|
|
|
};
|
|
|
+
|
|
|
let pandingfangfa=ref()
|
|
|
//检验项目单击
|
|
|
const dianjianhandle = async (val, row) => {
|
|
|
@@ -1938,7 +1958,14 @@ const rowClassName = (row, column) => {
|
|
|
return '';
|
|
|
}
|
|
|
};
|
|
|
-
|
|
|
+function duohandleClick(table) {
|
|
|
+ console.log(table.props.label)
|
|
|
+ if(table.props.label=='当班产量明细'){
|
|
|
+ zdtreeType.value=true
|
|
|
+ }else{
|
|
|
+ zdtreeType.value=false
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
// 异步函数，用于获取指定设备的巡检项目，并且将结果格式化为树形结构数据
|
|
|
const getSpotCheckItem = async (machineName) => {
|
|
|
@@ -2213,9 +2240,11 @@ const handleSelectionChange = (val) => {
|
|
|
}
|
|
|
const zdtreeType = ref(false)
|
|
|
const showsTable = (val,tab) => {
|
|
|
- zdtreeType.value=true
|
|
|
+
|
|
|
+}
|
|
|
+const showTable = (val,tab) => {
|
|
|
+ // zdtreeType.value=false
|
|
|
}
|
|
|
-
|
|
|
// 删除行
|
|
|
const deleteRow = (row) => {
|
|
|
ElMessageBox.confirm('确定要删除吗?', '提示', {
|
|
|
@@ -2380,6 +2409,10 @@ const closeDialog = () => {
|
|
|
name: '',
|
|
|
}
|
|
|
}
|
|
|
+const equipmentCode=ref('JY01')
|
|
|
+const equipmentName=ref('海德堡对开')
|
|
|
+const workOrder=ref('2312117')
|
|
|
+const number=ref('1907')
|
|
|
// 弹窗确定
|
|
|
const enterDialog = async () => {
|
|
|
elFormRef.value?.validate( async (valid) => {
|
|
|
@@ -2443,4 +2476,6 @@ const enterDialog = async () => {
|
|
|
width:150px;
|
|
|
text-align:center;
|
|
|
background-color:white}
|
|
|
+
|
|
|
+
|
|
|
</style>
|
