|
|
@@ -12,7 +12,7 @@
|
|
|
<el-aside width="200px">
|
|
|
<div class="JKWTree-tree">
|
|
|
|
|
|
- <h3 > 组织列表</h3>
|
|
|
+ <h3 >设备运行跟踪</h3>
|
|
|
<el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
|
|
|
</div>
|
|
|
|
|
|
@@ -136,17 +136,6 @@
|
|
|
</div>
|
|
|
<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">
|
|
|
- <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="activName" type="card" @tab-click="handleClick">
|
|
|
|
|
|
@@ -160,15 +149,15 @@
|
|
|
@row-click="yjupdateCompanyFunc"
|
|
|
style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
|
|
|
<!-- <el-table-column type="selection" width="55" />-->
|
|
|
- <el-table-column align="left" label="选择" prop="bh" width="80"/>
|
|
|
- <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
|
|
|
+ <!-- <el-table-column align="left" label="选择" prop="bh" width="80"/> -->
|
|
|
+ <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
|
|
|
<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="180"/>
|
|
|
- <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="240" />
|
|
|
+ <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
|
|
|
+ <el-table-column align="left" label="装版时数" prop="装版时数" width="85"/>
|
|
|
+ <el-table-column align="left" label="工序产能" prop="工序产能" width="85"/>
|
|
|
+ <el-table-column align="left" label="计划工时" prop="计划工时" width="85"/>
|
|
|
+ <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="210" />
|
|
|
<el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
|
|
|
<el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
|
|
|
</el-table>
|
|
|
@@ -186,18 +175,18 @@
|
|
|
style="width: 100%;height: 400px" border tooltip-effect="dark" :data="FPData" row-key="ID" @selection-change="handleSelectionChange"
|
|
|
@row-click="clickybupdate">
|
|
|
<!-- <el-table-column type="selection" width="55" />-->
|
|
|
- <el-table-column align="left" label="选择" prop="方案" width="70"/>
|
|
|
- <el-table-column align="left" label="班组号" prop="班组号" width="80" />
|
|
|
- <el-table-column align="left" label="组员1" prop="0" width="240" />
|
|
|
- <el-table-column align="left" label="组员2" prop="1" width="240" />
|
|
|
- <el-table-column align="left" label="组员3" prop="2" width="240" />
|
|
|
- <el-table-column align="left" label="组员4" prop="3" width="240" />
|
|
|
- <el-table-column align="left" label="组员5" prop="4" width="100" />
|
|
|
- <el-table-column align="left" label="组员6" prop="5" width="100" />
|
|
|
- <el-table-column align="left" label="组员7" prop="6" width="100" />
|
|
|
- <el-table-column align="left" label="组员8" prop="7" width="100" />
|
|
|
- <el-table-column align="left" label="组员9" prop="8" width="100" />
|
|
|
- <el-table-column align="left" label="组员10" prop="9_正品版" width="120" />
|
|
|
+ <!-- <el-table-column align="left" label="选择" prop="方案" width="70"/> -->
|
|
|
+ <el-table-column align="left" label="班组号" prop="班组号" width="70" />
|
|
|
+ <el-table-column align="left" label="组员1" prop="0" width="200" />
|
|
|
+ <el-table-column align="left" label="组员2" prop="1" width="200" />
|
|
|
+ <el-table-column align="left" label="组员3" prop="2" width="200" />
|
|
|
+ <el-table-column align="left" label="组员4" prop="3" width="200" />
|
|
|
+ <el-table-column align="left" label="组员5" prop="4" width="200" />
|
|
|
+ <el-table-column align="left" label="组员6" prop="5" width="70" />
|
|
|
+ <el-table-column align="left" label="组员7" prop="6" width="70" />
|
|
|
+ <el-table-column align="left" label="组员8" prop="7" width="70" />
|
|
|
+ <el-table-column align="left" label="组员9" prop="8" width="70" />
|
|
|
+ <el-table-column align="left" label="组员10" prop="9_正品版" width="70" />
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
@@ -213,8 +202,8 @@
|
|
|
>
|
|
|
<!-- <el-table-column type="selection" width="55" />-->
|
|
|
<el-table-column align="left" label="生产时段" prop="生产时间段" width="180"/>
|
|
|
- <el-table-column align="left" label="工单编号" prop="工单编号" width="120" />
|
|
|
- <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
|
|
|
+ <el-table-column align="left" label="工单编号" prop="工单编号" width="85" />
|
|
|
+ <el-table-column align="left" label="产品名称" prop="产品名称" width="150" />
|
|
|
<el-table-column align="left" label="印件及工序" prop="印件及工序" width="320"/>
|
|
|
<el-table-column align="left" label="标牌号" prop="标牌号" width="80"/>
|
|
|
<el-table-column align="left" label="产量" prop="产量" width="100"/>
|
|
|
@@ -245,17 +234,17 @@
|
|
|
highlight-current-row="true"
|
|
|
style="width: 100%;height: 400px" border tooltip-effect="dark" :data="JYData" 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 align="left" label="工单编号" prop="工单编号" width="85"/>
|
|
|
+ <el-table-column align="left" label="印件号" prop="印件号" width="70" />
|
|
|
+ <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
|
|
|
+ <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
|
|
|
<el-table-column
|
|
|
v-for="time in columnNames"
|
|
|
:key="time"
|
|
|
:label="time"
|
|
|
:prop="time"
|
|
|
align="center"
|
|
|
- width="120"
|
|
|
+ width="80"
|
|
|
></el-table-column>
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
@@ -273,43 +262,43 @@
|
|
|
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="200"/>
|
|
|
+ <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="组员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-column align="left" label="产量" prop="产量" width="70"/>
|
|
|
+ <el-table-column align="left" label="千件工价" prop="千件工价" width="85"/>
|
|
|
+ <el-table-column align="left" label="日定额" prop="日定额" width="85"/>
|
|
|
+ <el-table-column align="left" label="补产标准" prop="补产标准" width="85"/>
|
|
|
+ <el-table-column align="left" label="难度系数" prop="难度系数" width="85"/>
|
|
|
+ <el-table-column align="left" label="印刷方式" prop="印刷方式" width="85"/>
|
|
|
+ <el-table-column align="left" label="组员1" prop="组员1" width="170" />
|
|
|
+ <el-table-column align="left" label="组员2" prop="组员2" width="170" />
|
|
|
+ <el-table-column align="left" label="组员3" prop="组员3" width="170" />
|
|
|
+ <el-table-column align="left" label="组员4" prop="组员4" width="170" />
|
|
|
+ <el-table-column align="left" label="组员5" prop="组员5" width="70" />
|
|
|
+ <el-table-column align="left" label="组员6" prop="组员6" width="70" />
|
|
|
+ <el-table-column align="left" label="组员7" prop="组员7" width="70" />
|
|
|
+ <el-table-column align="left" label="组员8" prop="组员8" width="70" />
|
|
|
+ <el-table-column align="left" label="组员9" prop="组员9" width="70" />
|
|
|
+ <el-table-column align="left" label="组员10" prop="组员10" width="70" />
|
|
|
+ <el-table-column align="left" label="制程废品" prop="制程废品" width="85" />
|
|
|
+ <el-table-column align="left" label="制程次品" prop="制程次品" width="85" />
|
|
|
+ <el-table-column align="left" label="前工序废" prop="前工序废" width="85" />
|
|
|
+ <el-table-column align="left" label="来料异常" prop="来料异常" width="85"/>
|
|
|
+ <el-table-column align="left" label="装版工时" prop="装版工时" width="85" />
|
|
|
+ <el-table-column align="left" label="保养工时" prop="保养工时" width="85" />
|
|
|
+ <el-table-column align="left" label="打样工时" prop="打样工时" width="85"/>
|
|
|
+ <el-table-column align="left" label="异常停机工时" prop="异常总工时" width="110"/>
|
|
|
+ <el-table-column align="left" label="通电工时" prop="通电工时" width="85"/>
|
|
|
+ <el-table-column align="left" label="码开始行" prop="码开始行" width="85" />
|
|
|
+ <el-table-column align="left" label="码结束行" prop="码结束行" width="85" />
|
|
|
+ <el-table-column align="left" label="码包" prop="码包" width="70" />
|
|
|
+ <el-table-column align="left" label="主电表" prop="主电表" width="70"/>
|
|
|
+ <el-table-column align="left" label="辅电表" prop="辅电表" width="70" />
|
|
|
+ <el-table-column align="left" label="色度数" prop="色度数" width="70" />
|
|
|
+ <el-table-column align="left" label="用户" prop="用户" width="210" />
|
|
|
+ <el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
|
|
|
@@ -322,100 +311,23 @@
|
|
|
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 align="left" label="工单编号" prop="工单编号" width="85"/>
|
|
|
+ <el-table-column align="left" label="印件号" prop="印件号" width="70" />
|
|
|
+ <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
|
|
|
+ <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
|
|
|
<el-table-column
|
|
|
v-for="time in columnNames"
|
|
|
:key="time"
|
|
|
:label="time"
|
|
|
:prop="time"
|
|
|
align="center"
|
|
|
- width="120"
|
|
|
+ width="80"
|
|
|
></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"
|
|
|
- :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="drzcData" 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>
|
|
|
- </el-dialog> -->
|
|
|
-
|
|
|
- <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
|
|
|
+ <el-dialog v-model="detailShow" style="width: 1000px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
|
|
|
<el-table ref="multipleTable"
|
|
|
:row-style="{ height: '20px' }"
|
|
|
:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
|
|
|
@@ -463,9 +375,9 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
- <div class="groupbox">
|
|
|
+ <div class="groupbox" style="height: 18vh; width: 920px;">
|
|
|
<span class="grouptitle">组员及分配比例</span>
|
|
|
- <el-row :gutter="10" style="margin-top: 10px;">
|
|
|
+ <el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
|
|
|
<el-col :span="2">
|
|
|
<span></span>
|
|
|
</el-col>
|
|
|
@@ -493,72 +405,92 @@
|
|
|
<el-col :span="2">
|
|
|
|
|
|
</el-col>
|
|
|
- <el-col :span="2">
|
|
|
+ <el-col :span="3">
|
|
|
|
|
|
</el-col>
|
|
|
- <el-col :span="2">
|
|
|
+ <el-col :span="3">
|
|
|
<el-form-item label="特殊组员" prop="id">
|
|
|
|
|
|
</el-form-item>
|
|
|
</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.code1" :clearable="true" />
|
|
|
+ <el-row :gutter="10" style="margin-top: 0px;">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code1" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code2" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code2" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code3" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code3" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.code4" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code4" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code5" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code6" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code7" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.code8" :clearable="true" placeholder="" />
|
|
|
</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" />
|
|
|
+ <el-row :gutter="10" style="margin-top: 1px;">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name1" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name2" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name2" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name3" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name3" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.name4" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name4" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name5" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name6" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name7" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.name8" :clearable="true" placeholder="" />
|
|
|
+ </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" />
|
|
|
+ <el-row :gutter="10" style="margin-top: 1px;">
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage2" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage3" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage3" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <el-input v-model="formDatas.percentage4" :clearable="true" />
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage4" :clearable="true" placeholder="" />
|
|
|
</el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage5" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage6" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage5" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-input v-model="formDatas.percentage6" :clearable="true" placeholder="" />
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
@@ -566,20 +498,20 @@
|
|
|
|
|
|
<el-dialog
|
|
|
v-model="dianjianVisible"
|
|
|
- title="选择"
|
|
|
+ title="设备点检记录"
|
|
|
destroy-on-close
|
|
|
width="1300px"
|
|
|
- style="height: 110%;"
|
|
|
+ style="height: 80%;"
|
|
|
>
|
|
|
- <el-row :gutter="0">
|
|
|
- <el-col :span="4">
|
|
|
+ <el-row :gutter="24">
|
|
|
+ <el-col :span="3">
|
|
|
<el-form-item label="设备编号" prop="id">
|
|
|
<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-col :span="10">
|
|
|
+ <el-row>
|
|
|
+ <el-col>
|
|
|
<el-input v-model="formData.产品名称" :clearable="true" />
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -587,8 +519,8 @@
|
|
|
</el-row>
|
|
|
|
|
|
<div style="display: flex;">
|
|
|
- <div style="flex: 1;">
|
|
|
- <el-aside width="250px" style="margin: 0;">
|
|
|
+ <div style="flex: 0.1;">
|
|
|
+ <el-aside width="200px" style="margin: 0;">
|
|
|
<div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">
|
|
|
<el-tree :data="dianjiantreeData" :props="defaultProps" highlight-current="true"
|
|
|
@node-click="dianjianNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
|
|
|
@@ -601,6 +533,7 @@
|
|
|
:data="dianjianselectData"
|
|
|
row-key="ID"
|
|
|
highlight-current-row="true"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
border @row-click="dianjianhandle"
|
|
|
style="width:100%; height:400px;"
|
|
|
@row-dblclick="handleSelectClick"
|
|
|
@@ -609,7 +542,7 @@
|
|
|
<el-table-column
|
|
|
prop="检验项目"
|
|
|
label="检验项目"
|
|
|
- width="180"
|
|
|
+ width="300"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="点检方法"
|
|
|
@@ -776,10 +709,10 @@
|
|
|
|
|
|
<el-dialog
|
|
|
v-model="xunchaVisible"
|
|
|
- title="选择"
|
|
|
+ title="管理人员现场巡查记录"
|
|
|
destroy-on-close
|
|
|
width="1300px"
|
|
|
- style="height: 80%;"
|
|
|
+ style="height: 65%;"
|
|
|
>
|
|
|
|
|
|
|
|
|
@@ -802,16 +735,17 @@
|
|
|
style="width:1000px; height:400px;"
|
|
|
@row-dblclick="handleSelectClick"
|
|
|
:row-class-name="rowClassName"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
>
|
|
|
<el-table-column
|
|
|
prop="工单编号"
|
|
|
label="工序编号"
|
|
|
- width="180"
|
|
|
+ width="85"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="印件号"
|
|
|
label="印件号"
|
|
|
- width="180"
|
|
|
+ width="70"
|
|
|
/>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -822,48 +756,48 @@
|
|
|
<el-table-column
|
|
|
prop="流程单号"
|
|
|
label="流程单号"
|
|
|
- width="180"
|
|
|
+ width="85"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="设备编号"
|
|
|
label="设备编号"
|
|
|
- width="180"
|
|
|
+ width="85"
|
|
|
/>
|
|
|
|
|
|
<el-table-column
|
|
|
prop="班组编号"
|
|
|
label="班组编号"
|
|
|
- width="180"
|
|
|
+ width="85"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="检验备注"
|
|
|
label="检验备注"
|
|
|
- width="180"
|
|
|
+ width="85"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="现场管理人员"
|
|
|
label="现场管理人员"
|
|
|
- width="180"
|
|
|
+ width="145"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="提交时间"
|
|
|
label="提交时间"
|
|
|
- width="180"
|
|
|
+ width="160"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="开工时间"
|
|
|
label="开工时间"
|
|
|
- width="180"
|
|
|
+ width="160"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="分钟差数"
|
|
|
label="分钟差数"
|
|
|
- width="180"
|
|
|
+ width="85"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
prop="归属时段"
|
|
|
label="归属时段"
|
|
|
- width="180"
|
|
|
+ width="160"
|
|
|
/>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
@@ -935,6 +869,7 @@ defineOptions({
|
|
|
name: 'Company'
|
|
|
})
|
|
|
const gytableData = ref([])
|
|
|
+const drzcDatas =ref([])
|
|
|
const detailData = reactive([])
|
|
|
const treeData=ref([])
|
|
|
const yinbantreeData=ref([])
|
|
|
@@ -956,16 +891,20 @@ const handleNodeClick = (nodeData,node) => {
|
|
|
console.log(node.label); // 第一级节点
|
|
|
} else if (nodeData.level === 2) {
|
|
|
console.log(node.label); // 第二级节点
|
|
|
- JTMC=node.label.split("【")[0]
|
|
|
+ JTMC=node.label.split("-")[0]
|
|
|
JTMCOn.value=true
|
|
|
dateOn.value=false
|
|
|
FacilityProduction()
|
|
|
FacilityWorklist()
|
|
|
} else if (nodeData.level === 3) {
|
|
|
- JTMC=nodeData.machineName.split("【")[0]
|
|
|
+ JTMC=nodeData.machineName.split("-")[0]
|
|
|
JTMCOn.value=false
|
|
|
dateOn.value=true
|
|
|
date=node.label
|
|
|
+ gytableData.value=[]
|
|
|
+ drzcDatas.value=[]
|
|
|
+ columnNames=[]
|
|
|
+ drzcData=[]
|
|
|
FacilityInspect()
|
|
|
FacilitychanLiang()
|
|
|
console.log(node.label); // 第三级节点
|
|
|
@@ -977,10 +916,21 @@ const FacilityProduction = async () => {
|
|
|
if (response.code === 0) {
|
|
|
console.log(response)
|
|
|
// 填充formData对象的基本字段
|
|
|
- formData.value.工单编号 = response.data[0].工单编号;
|
|
|
- formData.value.印件编号 = response.data[0].印件号;
|
|
|
- formData.value.工序名称 = response.data[0].工序名称;
|
|
|
- formData.value.产品名称 = response.data[0].产品名称;
|
|
|
+ formData.value.工单编号 = response.data.工单编号;
|
|
|
+ formData.value.印件编号 = response.data.印件号;
|
|
|
+ formData.value.工序名称 = response.data.工序名称;
|
|
|
+ formData.value.产品名称 = response.data.产品名称;
|
|
|
+ formData.value.班组 = response.data.班组编号;
|
|
|
+ let sczl_bhkey=''
|
|
|
+ let sczl_namekey=''
|
|
|
+ if (response.data.班组成员) {
|
|
|
+ for (let i = 1; i <= Math.min(Object.keys(response.data.班组成员).length, 6); i++) {
|
|
|
+ sczl_bhkey=`sczl_bh${i}`
|
|
|
+ sczl_namekey=`sczl_name${i}`
|
|
|
+ formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
|
|
|
+ formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
|
|
|
+ }
|
|
|
+ }
|
|
|
formData.value.JTMC=JTMC
|
|
|
FacilityTeam(JTMC)
|
|
|
}
|
|
|
@@ -1419,47 +1369,48 @@ const getSpotCheckItem = async (machineName) => {
|
|
|
const FacilityTeam = async (value) => {
|
|
|
const response = await facilityTeam({ machine: value });
|
|
|
if (response.code === 0) {
|
|
|
- formData.value.班组 = response.data[0]['班组号'];
|
|
|
- if(response.data[0][2]){
|
|
|
- // console.log(response.data[0][2].split(' '));
|
|
|
- for (let i = 1; i <= 3; i++) {
|
|
|
- const sczl_bh = `sczl_bh${i}`;
|
|
|
- const sczl_name = `sczl_name${i}`;
|
|
|
- formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
- formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
+ // formData.value.班组 = response.data[0]['班组号'];
|
|
|
+ BZMC.value=response.data[0]['班组号']
|
|
|
+ // if(response.data[0][2]){
|
|
|
+ // // console.log(response.data[0][2].split(' '));
|
|
|
+ // for (let i = 1; i <= 3; i++) {
|
|
|
+ // const sczl_bh = `sczl_bh${i}`;
|
|
|
+ // const sczl_name = `sczl_name${i}`;
|
|
|
+ // formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
+ // formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
- if(response.data[0][0]){
|
|
|
- // console.log(response.data[0][2].split(' '));
|
|
|
- for (let i = 1; i <= 1; i++) {
|
|
|
- const sczl_bh = `sczl_bh${i}`;
|
|
|
- const sczl_name = `sczl_name${i}`;
|
|
|
- formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
- formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if(response.data[0][0]){
|
|
|
+ // // console.log(response.data[0][2].split(' '));
|
|
|
+ // for (let i = 1; i <= 1; i++) {
|
|
|
+ // const sczl_bh = `sczl_bh${i}`;
|
|
|
+ // const sczl_name = `sczl_name${i}`;
|
|
|
+ // formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
+ // formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
- if(response.data[0][1]){
|
|
|
- // console.log(response.data[0][2].split(' '));
|
|
|
- for (let i = 1; i <= 2; i++) {
|
|
|
- const sczl_bh = `sczl_bh${i}`;
|
|
|
- const sczl_name = `sczl_name${i}`;
|
|
|
- formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
- formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if(response.data[0][1]){
|
|
|
+ // // console.log(response.data[0][2].split(' '));
|
|
|
+ // for (let i = 1; i <= 2; i++) {
|
|
|
+ // const sczl_bh = `sczl_bh${i}`;
|
|
|
+ // const sczl_name = `sczl_name${i}`;
|
|
|
+ // formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
+ // formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
- if(response.data[0][3]){
|
|
|
- // console.log(response.data[0][2].split(' '));
|
|
|
- for (let i = 1; i <= 4; i++) {
|
|
|
- const sczl_bh = `sczl_bh${i}`;
|
|
|
- const sczl_name = `sczl_name${i}`;
|
|
|
- formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
- formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // if(response.data[0][3]){
|
|
|
+ // // console.log(response.data[0][2].split(' '));
|
|
|
+ // for (let i = 1; i <= 4; i++) {
|
|
|
+ // const sczl_bh = `sczl_bh${i}`;
|
|
|
+ // const sczl_name = `sczl_name${i}`;
|
|
|
+ // formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
|
|
|
+ // formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
InspectionRecord()
|
|
|
FacilityDetail()
|
|
|
@@ -1741,7 +1692,6 @@ const openDialog = () => {
|
|
|
dialogFormVisible.value = true
|
|
|
}
|
|
|
let drzcData=[]
|
|
|
-const drzcDatas =ref([])
|
|
|
let columnNames=[]
|
|
|
//当日制程检验记录
|
|
|
const FacilityInspect = async () => {
|
|
|
@@ -1850,6 +1800,10 @@ const enterDialog = async () => {
|
|
|
.JKWTree-content {
|
|
|
flex: 1;
|
|
|
}
|
|
|
+/* 选中某行时的背景色*/
|
|
|
+.el-table__body tr.current-row>td {
|
|
|
+ background: #ff80ff !important;
|
|
|
+}
|
|
|
.groupbox
|
|
|
{margin:10px;
|
|
|
width:500px;
|
