|
|
@@ -1,15 +1,13 @@
|
|
|
<template>
|
|
|
<div>
|
|
|
|
|
|
- <header>
|
|
|
+ <header>
|
|
|
<el-button type="primary" @click="onBZ">班组维护</el-button>
|
|
|
<el-button type="primary" @click="onDel">删除</el-button>
|
|
|
<el-button type="primary" @click="onxuncha">管理巡查</el-button>
|
|
|
<el-button type="primary" @click="ondianjian">设备点检</el-button>
|
|
|
<el-button type="primary" @click="onyinban">印版领退</el-button>
|
|
|
</header>
|
|
|
-
|
|
|
-
|
|
|
<el-container>
|
|
|
<el-aside width="200px">
|
|
|
<div class="JKWTree-tree">
|
|
|
@@ -20,23 +18,22 @@
|
|
|
|
|
|
</el-aside>
|
|
|
<el-container>
|
|
|
-<!-- <el-header>dd</el-header>-->
|
|
|
<el-main>
|
|
|
|
|
|
|
|
|
-<div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;">
|
|
|
+<div class="gva-search-box" v-if="JTMCOn" style="overflow: hidden; padding: 0; display: flex;">
|
|
|
|
|
|
- <div style="flex: 1; border: 1px magenta solid; margin: 0; padding: 0;">
|
|
|
+ <div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0;">
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="工单编号" prop="name">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
|
- <el-input v-model="formData.工单编号" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.工单编号" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="18">
|
|
|
- <el-input v-model="formData.产品名称" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.产品名称" :clearable="true" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -47,12 +44,12 @@
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="印件编号" prop="id">
|
|
|
- <el-input v-model="formData.印件编号" :clearable="true" placeholder="2023.12.14" />
|
|
|
+ <el-input v-model="formData.印件编号" :clearable="true" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="17">
|
|
|
<el-form-item label="工序名称" prop="name">
|
|
|
- <el-input v-model="formData.工序名称" :clearable="true" placeholder="A班" />
|
|
|
+ <el-input v-model="formData.工序名称" :clearable="true" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -67,63 +64,51 @@
|
|
|
<el-row :gutter="1">
|
|
|
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_bh1" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_bh2" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_bh2" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_bh3" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_bh3" :clearable="true" />
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_bh4" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_bh4" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_bh5" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_bh5" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_bh6" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_bh6" :clearable="true" />
|
|
|
</el-col>
|
|
|
- <!-- <el-col :span="1">
|
|
|
- <el-input v-model="formData.sczl_bh7" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="1">
|
|
|
- <el-input v-model="formData.sczl_bh8" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="1">
|
|
|
- <el-input v-model="formData.sczl_bh9" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="1">
|
|
|
- <el-input v-model="formData.sczl_bh10" :clearable="true" placeholder="2023.12.14" />
|
|
|
- </el-col> -->
|
|
|
</el-row>
|
|
|
|
|
|
<el-row :gutter="1">
|
|
|
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_name1" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_name1" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_name2" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_name2" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_name3" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_name3" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_name4" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_name4" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_name5" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_name5" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formData.sczl_name6" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.sczl_name6" :clearable="true" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
- <div style="flex: 1; border: 1px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
|
|
|
+ <div style="flex: 1; border: 0px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
|
|
|
|
|
|
<el-table
|
|
|
tooltip-effect="dark"
|
|
|
@@ -149,10 +134,10 @@
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
- <div class="gva-table-box">
|
|
|
+ <div v-if="JTMCOn" 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">
|
|
|
+ <!-- <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>
|
|
|
@@ -161,9 +146,9 @@
|
|
|
<template #reference>
|
|
|
<el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
|
|
|
</template>
|
|
|
- </el-popover>
|
|
|
+ </el-popover> -->
|
|
|
</div>
|
|
|
- <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
|
|
|
+ <el-tabs v-model="activName" type="card" @tab-click="handleClick">
|
|
|
|
|
|
<el-tab-pane label="设备作业清单" @click="showTable('印件资料')" name="first">
|
|
|
<el-table ref="multipleTable"
|
|
|
@@ -276,19 +261,84 @@
|
|
|
</el-tab-pane>
|
|
|
|
|
|
</el-tabs>
|
|
|
- <!-- <div class="gva-pagination">
|
|
|
- <el-pagination
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :current-page="page"
|
|
|
- :page-size="pageSize"
|
|
|
- :page-sizes="[10, 30, 50, 100]"
|
|
|
- :total="total"
|
|
|
- @current-change="handleCurrentChange"
|
|
|
- @size-change="handleSizeChange"
|
|
|
- />
|
|
|
- </div> -->
|
|
|
</div>
|
|
|
- <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
|
|
|
+ <div v-if="dateOn" >
|
|
|
+ <el-tabs v-model="activName" type="card" @tab-click="handleClick">
|
|
|
+ <el-tab-pane label="当日上报产量" @click="showTable('工艺资料')" name="first">
|
|
|
+ <el-table ref="multipleTable"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ :row-style="{ height: '20px' }"
|
|
|
+ :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
+ :header-cell-style="{ padding: '0px' }"
|
|
|
+ highlight-current-row="true"
|
|
|
+ style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+ <el-table-column type="selection" width="55" />
|
|
|
+ <el-table-column align="left" label="选择" prop="工单编号" width="100"/>
|
|
|
+ <el-table-column align="left" label="产品名称" prop="产品名称" width="100"/>
|
|
|
+ <el-table-column align="left" label="工序" prop="工序" width="240"/>
|
|
|
+ <el-table-column align="left" label="备注" prop="备注" width="100"/>
|
|
|
+ <el-table-column align="left" label="产量" prop="产量" width="100"/>
|
|
|
+ <el-table-column align="left" label="千件工价" prop="千件工价" width="100"/>
|
|
|
+ <el-table-column align="left" label="日定额" prop="日定额" width="100"/>
|
|
|
+ <el-table-column align="left" label="补产标准" prop="补产标准" width="100"/>
|
|
|
+ <el-table-column align="left" label="难度系数" prop="难度系数" width="100"/>
|
|
|
+ <el-table-column align="left" label="印刷方式" prop="印刷方式" width="120"/>
|
|
|
+ <el-table-column align="left" label="组员1" prop="组员1" width="240" />
|
|
|
+ <el-table-column align="left" label="组员2" prop="组员2" width="240" />
|
|
|
+ <el-table-column align="left" label="组员3" prop="组员3" width="240" />
|
|
|
+ <el-table-column align="left" label="组员4" prop="组员4" width="240" />
|
|
|
+ <el-table-column align="left" label="组员5" prop="组员5" width="100" />
|
|
|
+ <el-table-column align="left" label="组员6" prop="组员6" width="100" />
|
|
|
+ <el-table-column align="left" label="组员7" prop="组员7" width="100" />
|
|
|
+ <el-table-column align="left" label="组员8" prop="组员8" width="100" />
|
|
|
+ <el-table-column align="left" label="组员9" prop="组员9" width="100" />
|
|
|
+ <el-table-column align="left" label="组员10" prop="组员10" width="120" />
|
|
|
+ <el-table-column align="left" label="制程废品" prop="制程废品" width="100" />
|
|
|
+ <el-table-column align="left" label="制程次品" prop="制程次品" width="100" />
|
|
|
+ <el-table-column align="left" label="前工序废" prop="前工序废" width="100" />
|
|
|
+ <el-table-column align="left" label="来料异常" prop="来料异常" width="100"/>
|
|
|
+ <el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
|
|
|
+ <el-table-column align="left" label="保养工时" prop="保养工时" width="100" />
|
|
|
+ <el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
|
|
|
+ <el-table-column align="left" label="异常停机工时" prop="异常总工时" width="120"/>
|
|
|
+ <el-table-column align="left" label="通电工时" prop="通电工时" width="100"/>
|
|
|
+ <el-table-column align="left" label="码开始行" prop="码开始行" width="100" />
|
|
|
+ <el-table-column align="left" label="码结束行" prop="码结束行" width="100" />
|
|
|
+ <el-table-column align="left" label="码包" prop="码包" width="100" />
|
|
|
+ <el-table-column align="left" label="主电表" prop="主电表" width="100"/>
|
|
|
+ <el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
|
|
|
+ <el-table-column align="left" label="色度数" prop="色度数" width="100" />
|
|
|
+ <el-table-column align="left" label="用户" prop="用户" width="100" />
|
|
|
+ <el-table-column align="left" label="更新时间" prop="更新时间" width="100" />
|
|
|
+ </el-table>
|
|
|
+ </el-tab-pane>
|
|
|
+
|
|
|
+ <el-tab-pane label="当日制程检验记录" @click="showTable('印件资料')" name="second">
|
|
|
+ <el-table ref="multipleTable"
|
|
|
+ :row-style="{ height: '20px' }"
|
|
|
+ :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
+ :header-cell-style="{ padding: '0px' }"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ highlight-current-row="true"
|
|
|
+ style="width: 100%;height: 400px" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
+ <el-table-column type="selection" width="55" />
|
|
|
+ <el-table-column align="left" label="工单编号" prop="工单编号" width="120"/>
|
|
|
+ <el-table-column align="left" label="印件号" prop="印件号" width="120" />
|
|
|
+ <el-table-column align="left" label="工序名称" prop="工序名称" width="330" />
|
|
|
+ <el-table-column align="left" label="检验项目" prop="检验项目" width="120"/>
|
|
|
+ <el-table-column
|
|
|
+ v-for="time in columnNames"
|
|
|
+ :key="time"
|
|
|
+ :label="time"
|
|
|
+ :prop="time"
|
|
|
+ align="center"
|
|
|
+ width="120"
|
|
|
+ ></el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-tab-pane>
|
|
|
+ </el-tabs>
|
|
|
+ </div>
|
|
|
+ <!-- <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
|
|
|
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
|
|
|
<el-tab-pane label="当日上报产量" @click="showTable('工艺资料')" name="first">
|
|
|
<el-table ref="multipleTable"
|
|
|
@@ -363,7 +413,7 @@
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
- </el-dialog>
|
|
|
+ </el-dialog> -->
|
|
|
|
|
|
<el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
|
|
|
<el-table ref="multipleTable"
|
|
|
@@ -408,7 +458,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="班组编号" prop="id">
|
|
|
- <el-input v-model="BZMC" :clearable="true" placeholder="2023.12.14" />
|
|
|
+ <el-input v-model="BZMC" :clearable="true" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -464,115 +514,51 @@
|
|
|
|
|
|
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code1" :clearable="true" placeholder="11.0" />
|
|
|
+ <el-input v-model="formDatas.code1" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code2" :clearable="true" placeholder="打包废纸" />
|
|
|
+ <el-input v-model="formDatas.code2" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code3" :clearable="true" placeholder="是" />
|
|
|
+ <el-input v-model="formDatas.code3" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code4" :clearable="true" placeholder="是" />
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <!-- <el-col :span="2">
|
|
|
- <el-input v-model="formData.name" :clearable="true" placeholder="瞿春生" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="percentage" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="打包废纸" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
|
|
|
+ <el-input v-model="formDatas.code4" :clearable="true" />
|
|
|
</el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col> -->
|
|
|
</el-row>
|
|
|
<el-row :gutter="10" style="margin-top: 10px;">
|
|
|
<el-col :span="2">
|
|
|
<span></span>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name1" :clearable="true" placeholder="ZI00401" />
|
|
|
+ <el-input v-model="formDatas.name1" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name2" :clearable="true" placeholder="瞿春生" />
|
|
|
+ <el-input v-model="formDatas.name2" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name3" :clearable="true" placeholder="11.0" />
|
|
|
+ <el-input v-model="formDatas.name3" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name4" :clearable="true" placeholder="打包废纸" />
|
|
|
- </el-col>
|
|
|
- <!-- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
+ <el-input v-model="formDatas.name4" :clearable="true" />
|
|
|
</el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col> -->
|
|
|
</el-row>
|
|
|
<el-row :gutter="10" style="margin-top: 10px;">
|
|
|
<el-col :span="2">
|
|
|
<span></span>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="ZI00401" />
|
|
|
+ <el-input v-model="formDatas.percentage1" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="瞿春生" />
|
|
|
+ <el-input v-model="formDatas.percentage2" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage3" :clearable="true" placeholder="11.0" />
|
|
|
+ <el-input v-model="formDatas.percentage3" :clearable="true" />
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage4" :clearable="true" placeholder="打包废纸" />
|
|
|
+ <el-input v-model="formDatas.percentage4" :clearable="true" />
|
|
|
</el-col>
|
|
|
- <!-- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col>
|
|
|
- <el-col :span="2">
|
|
|
- <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
|
|
|
- </el-col> -->
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -588,13 +574,13 @@
|
|
|
<el-row :gutter="0">
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="设备编号" prop="id">
|
|
|
- <el-input v-model="formData.JTMC" :clearable="true" placeholder="2023.12.14" />
|
|
|
+ <el-input v-model="formData.JTMC" :clearable="true" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="20">
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="5">
|
|
|
- <el-input v-model="formData.产品名称" :clearable="true" placeholder="ZT01733" />
|
|
|
+ <el-input v-model="formData.产品名称" :clearable="true" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
@@ -784,11 +770,6 @@
|
|
|
/>
|
|
|
|
|
|
</el-table>
|
|
|
- <!-- <el-row :gutter="20">
|
|
|
- <el-col :span="20">
|
|
|
- <el-input v-model="pandingfangfa" style="height: 50px;" :clearable="true" />
|
|
|
- </el-col>
|
|
|
- </el-row> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -801,21 +782,6 @@
|
|
|
style="height: 80%;"
|
|
|
>
|
|
|
|
|
|
- <!-- <el-row :gutter="24">
|
|
|
- <el-col :span="4">
|
|
|
- <el-form-item label="工单编号" prop="id">
|
|
|
- <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="20">
|
|
|
- <el-row :gutter="20">
|
|
|
- <el-col :span="5">
|
|
|
- <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-col>
|
|
|
- </el-row> -->
|
|
|
-
|
|
|
|
|
|
<div style="display: flex;">
|
|
|
<div style="flex: 1;">
|
|
|
@@ -899,22 +865,9 @@
|
|
|
label="归属时段"
|
|
|
width="180"
|
|
|
/>
|
|
|
-
|
|
|
-
|
|
|
</el-table>
|
|
|
- <!-- <el-row :gutter="20">
|
|
|
- <el-col :span="20">
|
|
|
- <el-input v-model="pandingfangfa" style="height: 50px;" :clearable="true" />
|
|
|
- </el-col>
|
|
|
- </el-row> -->
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
|
<!-- <el-button @click="closeDialog">关 闭</el-button> -->
|
|
|
@@ -987,6 +940,10 @@ const treeData=ref([])
|
|
|
const yinbantreeData=ref([])
|
|
|
let dianjiantreeData;
|
|
|
let JTMC=ref()
|
|
|
+let date=ref()
|
|
|
+let JTMCOn=ref()
|
|
|
+let dateOn=ref()
|
|
|
+const activName = ref('first')
|
|
|
let productCode=ref()
|
|
|
const sbzyData = reactive([])
|
|
|
const FPData = reactive([])
|
|
|
@@ -1000,11 +957,18 @@ const handleNodeClick = (nodeData,node) => {
|
|
|
} else if (nodeData.level === 2) {
|
|
|
console.log(node.label); // 第二级节点
|
|
|
JTMC=node.label.split("【")[0]
|
|
|
+ JTMCOn.value=true
|
|
|
+ dateOn.value=false
|
|
|
FacilityProduction()
|
|
|
FacilityWorklist()
|
|
|
- console.log(JTMC)
|
|
|
} else if (nodeData.level === 3) {
|
|
|
- console.log(node.label); // 第三级节点
|
|
|
+ JTMC=nodeData.machineName.split("【")[0]
|
|
|
+ JTMCOn.value=false
|
|
|
+ dateOn.value=true
|
|
|
+ date=node.label
|
|
|
+ FacilityInspect()
|
|
|
+ FacilitychanLiang()
|
|
|
+ console.log(node.label); // 第三级节点
|
|
|
}
|
|
|
}
|
|
|
//当前生产订单
|
|
|
@@ -1019,28 +983,6 @@ const FacilityProduction = async () => {
|
|
|
formData.value.产品名称 = response.data[0].产品名称;
|
|
|
formData.value.JTMC=JTMC
|
|
|
FacilityTeam(JTMC)
|
|
|
-
|
|
|
- // 填充sczl_bh和sczl_name字段
|
|
|
- for (let i = 1; i <= 10; i++) {
|
|
|
- const sczl_bh = `sczl_bh${i}`;
|
|
|
- const sczl_name = `sczl_name${i}`;
|
|
|
- if (response.data[sczl_bh] ) {
|
|
|
- formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
|
|
|
- formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
|
|
|
- console.log(response.data[sczl_bh]['员工姓名'])
|
|
|
- console.log(formData.value.sczl_bh)
|
|
|
- // console.log(sczl_name)
|
|
|
- } else {
|
|
|
- // 如果字段不存在，可以在这里进行处理
|
|
|
- // console.log('2');
|
|
|
- // formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
|
|
|
- // formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
|
|
|
- // console.log(formData.value.sczl_bh)
|
|
|
- // console.log(sczl_name)
|
|
|
- }
|
|
|
- }
|
|
|
- // 输出填充后的formData对象
|
|
|
- // console.log(formData.value);
|
|
|
}
|
|
|
// getTableData()
|
|
|
}
|
|
|
@@ -1222,6 +1164,7 @@ const getTableData = async () => {
|
|
|
const dateOnly = dateTime.split(' ')[0];
|
|
|
return {
|
|
|
label: dateOnly,
|
|
|
+ machineName:machineName,
|
|
|
level: 3, // 添加层级属性
|
|
|
parentNode: machineNode
|
|
|
};
|
|
|
@@ -1295,43 +1238,9 @@ const onyinban = async() => {
|
|
|
}
|
|
|
}
|
|
|
const onxuncha = async() => {
|
|
|
- // const res = await facilityPrintGetTab({productCode:productCode.value})
|
|
|
- // if(res.code===0){
|
|
|
- // yinbantreeData.value=[{
|
|
|
- // label:'产品印版库',
|
|
|
- // children:res.data.map(item=>({
|
|
|
- // label:item.印版分类,
|
|
|
- // code:item.编号
|
|
|
- // }))
|
|
|
- // }]
|
|
|
- // console.log(res.data.map(item=>({
|
|
|
- // label:item.印版分类,
|
|
|
- // code:item.编号
|
|
|
- // })))
|
|
|
- xunchaVisible.value=true
|
|
|
- // }
|
|
|
-
|
|
|
+ xunchaVisible.value=true
|
|
|
}
|
|
|
-// function onyinban() {
|
|
|
-
|
|
|
-// getSpotCheckItem(productCode).then(treeData => {
|
|
|
-// if (treeData) {
|
|
|
-// // 如果获取成功，treeData 就是我们需要的树形结构数据
|
|
|
-// dianjiantreeData = treeData;
|
|
|
-// console.log('222');
|
|
|
-// console.log(dianjiantreeData);
|
|
|
-// // 使用 nextTick 来确保在更新 dianjianVisible 后立即刷新视图
|
|
|
-// nextTick(() => {
|
|
|
-// dianjianVisible.value = true;
|
|
|
-// });
|
|
|
-// // 这里可以处理treeData，例如将其赋值给某个状态管理变量或者用于渲染界面
|
|
|
-// } else {
|
|
|
-// // 如果获取失败，则treeData为null
|
|
|
-// console.log('获取巡检项目树形结构数据失败');
|
|
|
-// }
|
|
|
-// });
|
|
|
-
|
|
|
-// }
|
|
|
+
|
|
|
//获取设备点检->检验项目
|
|
|
const FacilityInspectionItem = async (value) => {
|
|
|
try {
|
|
|
@@ -1415,19 +1324,6 @@ let pandingfangfa=ref()
|
|
|
//检验项目单击
|
|
|
const dianjianhandle = (val, row) => {
|
|
|
try {
|
|
|
- console.log(row);
|
|
|
- // if(val.notjc==true){
|
|
|
- // if(val.zc==false&&val.yc==false){
|
|
|
- // val.zc=true
|
|
|
- // }
|
|
|
- // }else{
|
|
|
- // if(val.zc==true||val.yc==true){
|
|
|
- // val.notjc==true
|
|
|
- // val.zc=false
|
|
|
- // val.yc==false
|
|
|
- // }
|
|
|
- // }
|
|
|
- // val.notjc=false
|
|
|
pandingfangfa.value = val.判定标准;
|
|
|
} catch (error) {
|
|
|
console.error('An error occurred:', error);
|
|
|
@@ -1481,18 +1377,6 @@ const rowClassName = (row, column) => {
|
|
|
return '';
|
|
|
}
|
|
|
};
|
|
|
-// const isIndeterminate = () => {
|
|
|
-// return (checked1 && !checked2 && checked3) ||
|
|
|
-// (!checked1 && checked2 && !checked3) ||
|
|
|
-// (!checked1 && !checked2 && checked3);
|
|
|
-// };
|
|
|
-// const handleCheckAllChange = () => {
|
|
|
-// if (checked1 && checked2 && checked3) {
|
|
|
-// checked1 = false;
|
|
|
-// checked2 = false;
|
|
|
-// checked3 = false;
|
|
|
-// }
|
|
|
-// };
|
|
|
|
|
|
// 异步函数，用于获取指定设备的巡检项目，并且将结果格式化为树形结构数据
|
|
|
const getSpotCheckItem = async (machineName) => {
|
|
|
@@ -1845,11 +1729,6 @@ const getDetails = async (row) => {
|
|
|
// 关闭详情弹窗
|
|
|
const closeDetailShow = () => {
|
|
|
detailShow.value = false
|
|
|
- // formData.value = {
|
|
|
- // address: '',
|
|
|
- // image: '',
|
|
|
- // name: '',
|
|
|
- // }
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1862,34 +1741,33 @@ const openDialog = () => {
|
|
|
dialogFormVisible.value = true
|
|
|
}
|
|
|
let drzcData=[]
|
|
|
+const drzcDatas =ref([])
|
|
|
let columnNames=[]
|
|
|
//当日制程检验记录
|
|
|
const FacilityInspect = async () => {
|
|
|
- const response = await facilityInspect({machine:'JY01#',date:'2024-01-04'});
|
|
|
+ const response = await facilityInspect({machine:JTMC,date:date});
|
|
|
console.log(response)
|
|
|
if(response.code==0){
|
|
|
// 提取 inspectiontime 作为列名
|
|
|
// Extract inspectiontime as columnNames
|
|
|
- columnNames = response.data.inspectiontime;
|
|
|
-
|
|
|
+ columnNames = response.data.InspectionTime;
|
|
|
// Populate drzcData with row data
|
|
|
- for (const key in response.data) {
|
|
|
- if (key !== 'inspectiontime') {
|
|
|
- const item = response.data[key];
|
|
|
+ for (const key in response.data.row[0]) {
|
|
|
+ if (key !== 'InspectionTime') {
|
|
|
+ const item = response.data.row[0][key];
|
|
|
const rowData = {
|
|
|
'工单编号': item['工单编号'],
|
|
|
'印件号': item['印件号'],
|
|
|
'工序名称': item['工序名称'],
|
|
|
'检验项目': item['检验项目']
|
|
|
};
|
|
|
-
|
|
|
// Initialize time columns with '—'
|
|
|
columnNames.forEach(time => {
|
|
|
rowData[time] = '';
|
|
|
});
|
|
|
|
|
|
// Split inspectresult and fill the corresponding time columns
|
|
|
- const results = item['inspectresult'].split(',');
|
|
|
+ const results = item['time'].split(',');
|
|
|
results.forEach(result => {
|
|
|
if (columnNames.includes(result)) {
|
|
|
rowData[result] = '√';
|
|
|
@@ -1900,29 +1778,16 @@ const FacilityInspect = async () => {
|
|
|
drzcData.push(rowData);
|
|
|
}
|
|
|
}
|
|
|
+ drzcDatas.value=drzcData
|
|
|
console.log(drzcData);
|
|
|
}
|
|
|
}
|
|
|
const FacilitychanLiang = async () => {
|
|
|
- const response = await facilitychanLiang({machine:'JY01#',date:'2024-01-04'});
|
|
|
- // console.log( response.data)
|
|
|
+ const response = await facilitychanLiang({machine:JTMC,date:date});
|
|
|
if(response.code==0){
|
|
|
delete response.data['totalA']
|
|
|
delete response.data['totalB']
|
|
|
gytableData.value=Object.values(response.data)
|
|
|
- console.log( response.data)
|
|
|
- // for (let key in response.data) {
|
|
|
- // // 忽略 "productingAll" 和 "progressAll"
|
|
|
- // if (key !== "productingAll" && key !== "progressAll") {
|
|
|
- // let temp = data.data[key];
|
|
|
- // let object = {};
|
|
|
- // object.id = temp[0];
|
|
|
- // object.label = data.data[key];
|
|
|
- // object.children = [];
|
|
|
- // treeData.data.push(object);
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
