From f5389299d31e2236d399e48cfc1b09e5dd16f4c1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 20 三月 2023 10:01:39 +0800
Subject: [PATCH] 1.看板样式优化
---
src/views/scgl/sckbg.vue | 1623 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 1,308 insertions(+), 315 deletions(-)
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index db79de5..55477ca 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,26 +1,28 @@
<template>
<div>
- <div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
+ <div class="body" style="padding-top: 10px;" :style="{height:mainHeight+'px'}">
<el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
<div style="display: flex;align-items: center">
<div style="width: 90px">鎵弿鏉＄爜锛�</div>
<!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
-
<el-input
+ id="keyWords"
v-model="form.orderstepqrcode"
name="produceCode"
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'produceCode')"
/>
+ <!-- @keyup.native="e=>judgeIsScanning(e,'produceCode')"-->
+
</div>
<div v-if="false" style="display: flex;padding-right: 10px">
- <el-button @click="ZZstart">
+ <el-button v-waves @click="ZZstart">
<svg-icon icon-class="start_time" style="margin-right: 2px" />
寮�濮�
</el-button>
- <el-button @click="ZZreport">
+ <el-button v-waves @click="ZZreport">
<svg-icon icon-class="report_work" style="margin-right: 2px" />
鎶ュ伐
</el-button>
@@ -29,29 +31,18 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
>
- <!-- <el-table-column-->
- <!-- width="50"-->
- <!-- fixed-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getCurrentRow(row.wo)"-->
- <!-- />-->
- <!-- </template>-->
- <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
@@ -60,21 +51,25 @@
/>
<el-table-column
prop="status"
+ show-tooltip-when-overflow
label="鐘舵��"
sortable="custom"
- width="110"
+ width="80"
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂拌鍗�</div>
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
+ <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
+ <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
</template>
</el-table-column>
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
- min-width="160"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -82,50 +77,96 @@
label="浜у搧缂栫爜"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="partname"
- min-width="110"
+ width="160"
+ show-tooltip-when-overflow
label="浜у搧鍚嶇О"
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭"
- min-width="80"
+ show-tooltip-when-overflow
+ width="120"
sortable="custom"
/>
- <el-table-column
- prop="descr"
- label="宸ュ簭鎻忚堪"
- min-width="150"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="descr"-->
+ <!-- label="宸ュ簭鎻忚堪"-->
+ <!-- min-width="150"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.descr">{{ row.descr }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
+ label="鏈姤宸ユ暟閲�"
+ width="120"
+ show-tooltip-when-overflow
+ >
+ <!-- sortable="custom"-->
+ <template slot-scope="{row}">
+ <div>{{ row.plan_qty - row.good_qty - row.ng_qty }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="good_qty"
- label="宸叉姤宸ユ暟閲�(鑹搧)"
+ show-tooltip-when-overflow
+ label="宸叉姤宸ユ暟閲�"
sortable="custom"
width="160"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ show-tooltip-when-overflow
width="150"
-
+ sortable="custom"
+ />
+ <el-table-column
+ prop="bad_qty"
+ label="宸叉姤搴熸暟閲�"
+ width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
- width="185"
+ show-tooltip-when-overflow
+ width="150"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="plan_enddate"
+ label="璁″垝瀹屽伐鏃ユ湡"
+ width="150"
+ sortable="custom"
+ show-tooltip-when-overflow
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<!-- <el-table-column-->
<!-- label="鎿嶄綔"-->
<!-- width="150"-->
@@ -133,8 +174,8 @@
<!-- >-->
<!-- <template slot-scope="{row}">-->
<!-- <div class="operationClass">-->
- <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
- <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- <el-button v-waves type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
@@ -142,12 +183,11 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -176,13 +216,15 @@
style="width: 300px"
@keyup.enter.native="val=>enterNative(val,'WXproduceCode')"
/>
+ <!-- @keyup.native="e=>judgeIsScanning(e,'WXproduceCode')"-->
+
</div>
<div v-if="false" style="display: flex;padding-right: 10px">
- <el-button @click="WXsend">
+ <el-button v-waves @click="WXsend">
<svg-icon icon-class="start_time" style="margin-right: 2px" />
鍙戞枡
</el-button>
- <el-button @click="WXback">
+ <el-button v-waves @click="WXback">
<svg-icon icon-class="report_work" style="margin-right: 2px" />
鏀舵枡
</el-button>
@@ -191,29 +233,18 @@
<el-divider />
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="WXtableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="WXsortChange"
>
- <!-- <el-table-column-->
- <!-- width="50"-->
- <!-- fixed-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <el-radio-->
- <!-- v-model="radioSelected"-->
- <!-- :label="row.wo_code"-->
- <!-- style="color: #fff;padding-left: 10px; margin-right: -25px;"-->
- <!-- @change.native="getWXCurrentRow(row.wo_code)"-->
- <!-- />-->
- <!-- </template>-->
- <!-- </el-table-column>-->
<el-table-column
prop="RowNum"
width="50"
@@ -223,8 +254,9 @@
<el-table-column
prop="status"
label="鐘舵��"
+ show-tooltip-when-overflow
sortable="custom"
- width="110"
+ width="80"
>
<template slot-scope="{row}">
<div v-if="row.status==='NEW'">鏂拌鍗�</div>
@@ -236,57 +268,105 @@
<el-table-column
prop="wo_code"
label="宸ュ崟鍙�"
- min-width="160"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
- min-width="110"
+ show-tooltip-when-overflow
+ width="110"
sortable="custom"
/>
<el-table-column
prop="partname"
label="浜у搧鍚嶇О"
- min-width="110"
+ width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="stepname"
label="宸ュ簭"
- min-width="80"
+ width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
- <el-table-column
- prop="descr"
- label="宸ュ簭鎻忚堪"
- min-width="150"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="descr"-->
+ <!-- label="宸ュ簭鎻忚堪"-->
+ <!-- min-width="150"-->
+ <!-- sortable="custom"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.descr">{{ row.descr }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="plan_qty"
label="浠诲姟鏁伴噺"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
<el-table-column
+ label="鏈敹鏂欐暟閲�"
+ width="120"
+ show-tooltip-when-overflow
+ >
+ <!-- sortable="custom"-->
+ <template slot-scope="{row}">
+ <div>{{ row.plan_qty - row.good_qty - row.ng_qty }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="good_qty"
- label="宸叉敹鏂欐暟閲�(鑹搧)"
+ label="宸叉敹鏂欐暟閲�"
+ show-tooltip-when-overflow
sortable="custom"
width="160"
/>
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ show-tooltip-when-overflow
width="150"
sortable="custom"
/>
<el-table-column
+ prop="bad_qty"
+ label="宸叉姤搴熸暟閲�"
+ min-width="120"
+ sortable="custom"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
prop="plan_startdate"
label="璁″垝寮�宸ユ棩鏈�"
- width="185"
+ show-tooltip-when-overflow
+ width="150"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="plan_enddate"
+ label="璁″垝瀹屽伐鏃ユ湡"
+ show-tooltip-when-overflow
+ width="150"
+ sortable="custom"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<!-- <el-table-column-->
<!-- label="鎿嶄綔"-->
<!-- width="150"-->
@@ -294,8 +374,8 @@
<!-- >-->
<!-- <template slot-scope="{row}">-->
<!-- <div class="operationClass">-->
- <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
- <!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
+ <!-- <el-button v-waves type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
+ <!-- <el-button v-waves type="text" @click="del(row)">鍒犻櫎</el-button>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-table-column>-->
@@ -303,14 +383,131 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="WXtotal>0"
:total="WXtotal"
:page.sync="WXform.page"
:limit.sync="WXform.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
+ />
+ </el-tab-pane>
+ <el-tab-pane label="涓嶈壇寰呭鐞嗗垪琛�">
+ <div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">鎵弿鏉＄爜锛�</div>
+ <!-- oninput="value=value.replace(/[^0-9a-zA-Z;_]/g,'')"-->
+
+ <el-input
+ v-model="badForm.orderstepqrcode"
+ name="badProduceCode"
+ style="width: 300px"
+ @keyup.enter.native="val=>enterNative(val,'badProduceCode')"
+ />
+ <!-- @keyup.native="e=>judgeIsScanning(e,'badProduceCode')"-->
+
+ </div>
+ </div>
+ <el-divider />
+ <div class="elTableDiv">
+ <el-table
+ ref="tableDataRef"
+ class="tableFixed"
+ :data="badTableData"
+ :height="isIpad? (tableHeight+50):tableHeight"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="badSortChange"
+ >
+ <el-table-column
+ prop="RowNum"
+ width="50"
+ label="搴忓彿"
+ fixed
+ />
+ <el-table-column
+ show-tooltip-when-overflow
+ prop="wo_code"
+ label="宸ュ崟鍙�"
+ min-width="160"
+ sortable="custom"
+ />
+ <el-table-column
+ show-tooltip-when-overflow
+ prop="partcode"
+ label="浜у搧缂栫爜"
+ min-width="110"
+ sortable="custom"
+ />
+ <el-table-column
+ show-tooltip-when-overflow
+ prop="partname"
+ min-width="160"
+ label="浜у搧鍚嶇О"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭"
+ show-tooltip-when-overflow
+ min-width="120"
+ sortable="custom"
+ />
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="good_qty"
+ label="宸叉姤宸ユ暟閲�"
+ sortable="custom"
+ min-width="160"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="bad_qty"
+ label="宸叉姤搴熸暟閲�"
+ width="120"
+ sortable="custom"
+ show-tooltip-when-overflow
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-waves type="text" @click="repairHandle(row)">缁翠慨澶勭悊</el-button>
+ </div>
+ </template>
+ </el-table-column>
+
+ </el-table>
+ </div>
+ <!--鍒嗛〉-->
+ <pagination
+ :total="badTotal"
+ :page.sync="badForm.page"
+ :limit.sync="badForm.rows"
+ align="right"
+ layout="total,prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getBadList"
/>
</el-tab-pane>
</el-tabs>
@@ -318,6 +515,7 @@
</div>
<el-dialog
+ v-el-drag-dialog
:title="dialogTitle"
:visible.sync="dialogVisible"
width="850px"
@@ -334,42 +532,42 @@
:model="dialogForm"
label-width="110px"
>
- <el-form-item label="宸ュ崟缂栧彿锛�">
+ <el-form-item label="宸ュ崟缂栧彿锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.wo_code }}</div>
</el-form-item>
- <el-form-item label="浜у搧缂栫爜锛�">
+ <el-form-item label="浜у搧缂栫爜锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partcode }}</div>
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О锛�">
+ <el-form-item label="浜у搧鍚嶇О锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
- <el-form-item label="浜у搧瑙勬牸锛�">
+ <el-form-item label="浜у搧瑙勬牸锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.partspec }}</div>
</el-form-item>
- <el-form-item label="褰撳墠宸ュ簭锛�">
+ <el-form-item label="褰撳墠宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.stepname }}</div>
</el-form-item>
- <el-form-item label="宸ュ簭鎻忚堪锛�">
+ <el-form-item v-if="false" label="宸ュ簭鎻忚堪锛�">
<!-- <el-tooltip class="item" effect="dark" content="鍘熸潗鏂欏垏鎸夋潗鏂欏垏鎸夋潗鏂欏垏鎸夋椂鎵撳崱鏁版嵁鐨勫崱" placement="top-start">-->
<div style="width: 200px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;">
{{ dialogForm.stepdesc }}
</div>
<!-- </el-tooltip>-->
</el-form-item>
- <el-form-item label="浠诲姟鏁伴噺锛�">
+ <el-form-item label="浠诲姟鏁伴噺锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.planqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗寮�濮�'" label="鏈紑/宸插紑锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鏈姤/宸叉姤锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�">
+ <el-form-item v-if="dialogTitle==='澶栧崗鍙戞枡'" label="鏈彂/宸插彂锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�">
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏈敹/宸叉敹锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.noreportqty }}/{{ dialogForm.reportqty }}</div>
</el-form-item>
<!--鑷埗寮�濮�-->
@@ -392,10 +590,19 @@
</el-select>
</el-form-item>
<!-- 鑷埗鎶ュ伐 -->
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�">
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="涓嬮亾宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="usergroupcode" label="鐢熶骇鐝粍锛�">
+
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="reckway" label="璁′欢鏂瑰紡锛�">
+
+ <el-radio-group v-model="dialogForm.reckway" style="width: 200px;" @change="reckwayChange">
+ <el-radio label="group">鐝粍</el-radio>
+ <el-radio label="person">涓汉</el-radio>
+ </el-radio-group>
+ </el-form-item>
+
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.reckway==='group'" prop="usergroupcode" label="鐢熶骇鐝粍锛�">
<el-select
v-model="dialogForm.usergroupcode"
style="width: 200px;"
@@ -410,6 +617,23 @@
/>
</el-select>
</el-form-item>
+
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.reckway==='person'" prop="operation" label="鎶ュ伐浜哄憳锛�">
+ <el-select
+ v-model="dialogForm.operation"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="usergroupChange"
+ >
+ <el-option
+ v-for="item in OperationArr"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ </el-form-item>
+
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">
<el-select
v-model="dialogForm.eqpcode"
@@ -438,6 +662,7 @@
placeholder="璇烽�夋嫨"
:disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
multiple
+ collapse-tags
>
<el-option
v-for="item in badArr"
@@ -447,16 +672,42 @@
/>
</el-select>
</el-form-item>
- <div v-if="dialogTitle==='鑷埗鎶ュ伐'">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 浜哄憳鍒楄〃
- <el-button type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜哄憳锛�">-->
+ <!-- <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />-->
+ <!-- </el-form-item>-->
+ <!-- 娉ㄩ噴-->
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鎶ュ伐浜猴細">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.operation"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in OperationArr"-->
+ <!-- :key="item.usercode"-->
+ <!-- :label="item.username"-->
+ <!-- :value="item.usercode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="澶囨敞锛�">
+ <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
+ </el-form-item>
+ <div v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.reckway==='group'">
+ <div style="display: flex;align-items:center;height: 40px;margin-bottom: 10px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" />
+ <div style="margin: 0 15px 0 5px;">浜哄憳鍒楄〃</div>
+ <el-button v-waves type="primary" style="margin: 10px 0" @click="userAdd">澧炶</el-button>
+ </div>
<el-table
+ ref="userTableDataRef"
:data="userTableData"
border
- stripe
+ class="tableFixed"
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- height="180"
+ height="188"
highlight-current-row
style="width: 100%"
>
@@ -464,13 +715,15 @@
width="100"
label="搴忓彿"
type="index"
+ fixed
/>
<el-table-column
prop="username"
label="浜哄憳鍚嶇О"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.username }}</div>
+
<el-select
v-if="row.isVisible===1"
v-model="row.username"
@@ -485,29 +738,53 @@
:value="item.usercode"
/>
</el-select>
+ <div v-else>{{ row.username }}</div>
</template>
</el-table-column>
<el-table-column
+ prop="ratio"
+ label="鍒嗛厤姣斾緥(%)"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <el-input
+ v-if="row.isVisible===1||row.isVisible===2"
+ v-model="row.ratio"
+ oninput="value=value.replace(/[^0-9.]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
+ <div v-else> {{ row.ratio }}</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
prop="RowNum"
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="userDel(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1&&!userIsSave" type="text" @click="userSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="userCancel(row)">鍙栨秷</el-button>
+ <el-button
+ v-if="(row.isVisible===1&&!userIsSave)||row.isVisible===2"
+ v-waves
+ type="text"
+ @click="userSave(row)"
+ >淇濆瓨
+ </el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="userCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="userDel(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRatio(row)">淇敼姣斾緥</el-button>
</div>
</template>
</el-table-column>
</el-table>
<!--鍒嗛〉-->
<pagination
- v-show="UserTotal>0"
:total="UserTotal"
:page.sync="Userform.page"
:limit.sync="Userform.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -626,12 +903,13 @@
<el-form-item
v-if="dialogTitle==='澶栧崗鏀舵枡'"
label="涓嶈壇鍘熷洜锛�"
- prop="badcode"
>
+ <!-- prop="badcode"-->
<el-select
v-model="dialogForm.badcode"
style="width: 200px;"
multiple
+ collapse-tags
:disabled="parseFloat(dialogForm.noputqty)===0||dialogForm.noputqty.trim()===''"
placeholder="璇烽�夋嫨"
>
@@ -643,67 +921,142 @@
/>
</el-select>
</el-form-item>
-
+ <!-- <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="鏀舵枡浜猴細">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.operation"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in OperationArr"-->
+ <!-- :key="item.usercode"-->
+ <!-- :label="item.username"-->
+ <!-- :value="item.usercode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <el-form-item v-if="dialogTitle==='澶栧崗鏀舵枡'" label="澶囨敞锛�">
+ <el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
+ </el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button v-if="dialogTitle==='鑷埗寮�濮�'" type="primary" @click="dialogVisibleConfirm">寮� 宸�</el-button>
- <el-button v-if="dialogTitle==='鑷埗鎶ュ伐'" type="primary" @click="dialogVisibleConfirm">鎻愪氦/鎵撳嵃</el-button>
- <el-button v-if="dialogTitle==='澶栧崗鍙戞枡'" type="primary" @click="dialogVisibleConfirm">鍙戞枡</el-button>
- <el-button v-if="dialogTitle==='澶栧崗鏀舵枡'" type="primary" @click="dialogVisibleConfirm">鏀舵枡/鎵撳嵃</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗寮�濮�'"
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >寮� 宸�</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname===''"
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鎻愪氦/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='鑷埗鎶ュ伐'&&dialogForm.nextstepname!==''"
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鎻愪氦</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鍙戞枡'"
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鍙戞枡</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname===''"
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鏀舵枡/鎵撳嵃</el-button>
+ <el-button
+ v-if="dialogTitle==='澶栧崗鏀舵枡'&&dialogForm.nextstepname!==''"
+ v-waves
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ type="primary"
+ @click="dialogVisibleConfirm"
+ >鏀舵枡</el-button>
</div>
</span>
</el-dialog>
- <!--鎵撳嵃棰勮椤甸潰-->
+ <!--鎵撳嵃棰勮椤甸潰 灏忔爣绛�-->
<el-dialog
+ v-el-drag-dialog
title="棰勮"
:visible.sync="dialogVisible2"
width="1140"
+ top="10vh"
:close-on-click-modal="false"
@close="dialogVisible2Close"
>
<!-- 瑕佹墦鍗扮殑鍖哄煙 -->
<div id="printMe2" style="padding: 30px;">
<div
- style="display: flex;width: 250px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+ style="display: flex;width: 280px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
>
- <div style="width: 60px;display: flex;flex-direction: column;border-right: 1px solid #000">
+ <div style="width: 90px;display: flex;flex-direction: column;border-right: 1px solid #000">
<div
- style="display: flex;height: 75%;border-bottom:1px solid #000;justify-content: center;align-items: center "
+ style="display: flex;height: 90px;border-bottom:1px solid #000;
+ justify-content: center;align-items: center;position: relative"
>
- <div id="qrCode2" ref="qrCodeDiv2" />
+ <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
</div>
- <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center">
- <div style="margin-left: 5px;width: 40px">鏁伴噺:</div>
+ <div
+ style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+ >
+ <div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
{{ qrForm.startqty }}
+ </div>
+ <div style="display: flex;height: 30px;justify-content: flex-start;align-items: center">
+ <div style="margin-left: 5px;width: 42px">澶勭悊浜�:</div>
+ {{ qrForm.operator }}
</div>
</div>
<div style="width:190px;display: flex;flex-direction: column">
<div
- style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
>
<div style="width: 60px;margin-left: 5px;">宸ュ崟缂栧彿:</div>
<div>{{ qrForm.wo_code }}</div>
</div>
<div
- style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+ style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
>
<div style="width: 60px;margin-left: 5px;">浜у搧缂栫爜:</div>
<div>{{ qrForm.partcode }}</div>
</div>
<div
- style="display: flex;height: 25%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
>
<div style="width:60px;margin-left: 5px;">浜у搧鍚嶇О:</div>
<div>{{ qrForm.partname }}</div>
</div>
- <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center;text-align: left">
- <div style="width: 60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
+ <div
+ style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+ >
+ <div style="width:60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
<div>{{ qrForm.nextstepname }}</div>
+ </div>
+ <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+ <div style="width: 60px;margin-left: 5px;">澶勭悊鏃堕棿:</div>
+ <div>{{ qrForm.operatorTime }}</div>
</div>
</div>
@@ -712,8 +1065,180 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisible2 = false">鍙� 娑�</el-button>
- <el-button v-print="printObj2" type="primary">纭� 瀹�</el-button>
+ <el-button v-waves @click="dialogVisible2 = false">鍙� 娑�</el-button>
+ <el-button v-waves v-print="printObj2" type="primary">纭� 瀹�</el-button>
+ </div>
+ </span>
+ </el-dialog>
+
+ <!-- 涓嶈壇澶勭悊鍒楄〃瀵硅瘽妗�-->
+ <el-dialog
+ v-el-drag-dialog
+ title="缁翠慨澶勭悊"
+ :visible.sync="badDialogVisible"
+ width="990px"
+ class="badDialogVisible"
+ top="10vh"
+ :close-on-click-modal="false"
+ @close="handleCloseBad"
+ @closed="handleCloseBad"
+ >
+ <el-form
+ inline
+ :model="badDialogForm"
+ label-width="110px"
+ >
+ <el-form-item label="宸ュ崟缂栧彿锛�">
+ <div style="width: 200px">{{ badDialogForm.wo_code }}</div>
+ </el-form-item>
+ <el-form-item label="浜у搧缂栫爜锛�">
+ <div style="width: 200px">{{ badDialogForm.partcode }}</div>
+ </el-form-item>
+ <el-form-item label="浜у搧鍚嶇О锛�">
+ <div style="width: 200px">{{ badDialogForm.partname }}</div>
+ </el-form-item>
+ <el-form-item label="浜у搧瑙勬牸锛�">
+ <div style="width: 200px">{{ badDialogForm.partspec }}</div>
+ </el-form-item>
+ <el-form-item label="褰撳墠宸ュ簭锛�">
+ <div style="width: 200px">{{ badDialogForm.stepname }}</div>
+ </el-form-item>
+ <el-form-item label="涓嬮亾宸ュ簭锛�">
+ <div style="width: 200px">{{ badDialogForm.nextstepname }}</div>
+ </el-form-item>
+ <el-form-item label="浠诲姟鏁伴噺锛�">
+ <div style="width: 200px">{{ badDialogForm.plan_qty }}</div>
+ </el-form-item>
+ <el-form-item label="鎶ュ伐鏁伴噺锛�">
+ <div style="width: 200px">{{ badDialogForm.good_qty }}</div>
+ </el-form-item>
+ <el-form-item label="涓嶈壇鏁伴噺锛�">
+ <div style="width: 200px">{{ badDialogForm.ng_qty }}</div>
+ </el-form-item>
+
+ <!-- 娉ㄩ噴-->
+ <!-- <el-form-item label="缁翠慨浜哄憳锛�">-->
+ <!-- <el-select-->
+ <!-- v-model="badDialogForm.operation"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in OperationArr"-->
+ <!-- :key="item.usercode"-->
+ <!-- :label="item.username"-->
+ <!-- :value="item.usercode"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+
+ </el-form>
+ <div style="margin-bottom:20px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 涓嶈壇淇℃伅鏄庣粏锛�
+ </div>
+ <div class="elTableDiv">
+ <el-table
+ :data="badTableDataDialog"
+ :height="isIpad? (tableHeight-350):(tableHeight-400)"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:(tableHeight-400)+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ type="index"
+ width="50"
+ label="搴忓彿"
+ fixed
+ />
+ <el-table-column
+ prop="step_code"
+ label="宸ュ簭缂栫爜"
+ min-width="80"
+ />
+ <el-table-column
+ prop="stepname"
+ label="宸ュ簭鍚嶇О"
+ min-width="80"
+ />
+
+ <el-table-column
+ prop="plan_qty"
+ label="浠诲姟鏁伴噺"
+ width="80"
+ />
+ <el-table-column
+ label="鎶ュ伐鏁伴噺"
+ width="80"
+ prop="report_qty"
+ />
+ <el-table-column
+ prop="ng_qty"
+ label="涓嶈壇鏁伴噺"
+ width="80"
+ />
+ <el-table-column
+ prop="badqty"
+ label="宸叉姤搴熸暟閲�"
+ width="100"
+ />
+ <el-table-column
+ prop="defect_name"
+ label="涓嶈壇鍘熷洜"
+ show-tooltip-when-overflow
+ width="80"
+ />
+ <el-table-column
+ prop="repair_qty"
+ label="缁翠慨鍚堟牸鏁伴噺"
+ width="110"
+ >
+ <template slot-scope="{row}">
+ <!-- {{ row.repair_qty }}-->
+ <div v-if="row.isVisible===0">{{ row.repair_qty }}</div>
+ <el-input v-if="row.isVisible===1" v-model="row.repair_qty" oninput="value=value.replace(/[^0-9]/g,'')" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="bad_qty"
+ label="鎶ュ簾鏁伴噺"
+ width="90"
+ >
+ <!-- oninput="value=value.replace(/[0-9]/g,'')"-->
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.bad_qty }}</div>
+ <el-input v-if="row.isVisible===1" v-model="row.bad_qty" oninput="value=value.replace(/[^0-9]/g,'')" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ width="100"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="badEdit(row)">缂栬緫</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="badDel(row)">鍒犻櫎</el-button>
+
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="badSave(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="badCancel(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+
+ </el-table>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button v-waves @click="badDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="badDialogVisibleConfirm "
+ >淇� 瀛�/鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
@@ -737,10 +1262,14 @@
MesOrderStepSelectCause,
SavaMesOrderStepIn,
SavaMesOrderStepStart,
- SavaMesOrderStepReport
+ SavaMesOrderStepReport, MesOrderNgStepSearch, MesOrderNgSubStepSearch, EditOrderNgStepSeave
} from '@/api/scgl'
import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
import QRCode from 'qrcodejs2'
+import { getCookie } from '@/utils/auth'
+import { handleDatetime2 } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -748,6 +1277,7 @@
components: {
Pagination
},
+ directives: { elDragDialog, waves },
data() {
const validateName = (rule, value, callback) => {
if (!value) {
@@ -821,7 +1351,7 @@
taskqty: '', // 浠诲姟鏁伴噺
fqty: '', // 鍙戞枡鏁伴噺
- inuser: '', // 鏀舵枡浜哄憳
+ inuser: getCookie('navTabId'), // 鏀舵枡浜哄憳
sqty: '', // 鏀舵枡鏁伴噺
ngqty: '', // 涓嶈壇鏁伴噺
badcode: '', // 涓嶈壇鍘熷洜缂栫爜
@@ -833,7 +1363,12 @@
usergroupcode: '', // 鐝粍缂栫爜
reportuser: '', // 鎶ュ伐浜哄憳
- startqtySum: '' // 涓嶈兘瓒呰繃鐨勬暟鍊�
+ startqtySum: '', // 涓嶈兘瓒呰繃鐨勬暟鍊�
+
+ reckway: 'group', // 璁′欢鏂瑰紡
+
+ operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
+ remarks: ''// 澶囨敞
},
ZZuserArr: [], // 鑷埗鐢ㄦ埛鎵�鏈�
@@ -876,6 +1411,9 @@
],
startqty: [
{ required: true, message: '璇疯緭鍏ユ姤宸ユ暟閲�', trigger: ['blur', 'change'] }
+ ],
+ operation: [
+ { required: true, message: '璇烽�夋嫨鎶ュ伐浜哄憳', trigger: ['blur', 'change'] }
]
},
activeName: '',
@@ -901,30 +1439,63 @@
console.log('鎵ц浜嗘墦鍗�')
}
},
- qrForm: {
+ qrForm: { // 鎵撳嵃鍐呭
qrvalue: '',
startqty: '',
wo_code: '',
partcode: '',
partname: '',
- nextstepname: ''
- }
+ nextstepname: '',
+ operator: '', // 鎿嶄綔浜�
+ operatorTime: ''// 鎿嶄綔鏃堕棿
+ },
+ badForm: {
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜
+ prop: 'wo_code',
+ order: 'asc',
+ page: 1,
+ rows: 20
+ },
+ badTableData: [], // 涓嶈壇澶勭悊鍒楄〃table鏁版嵁
+ badTotal: 0,
+ badDialogVisible: false,
+ badDialogForm: {
+ operation: getCookie('navTabId')
+ },
+ badTableDataDialog: [], // 涓嶈壇瀵硅瘽妗唗able琛ㄦ牸
+ OperationArr: [], // 浜哄憳鏁扮粍
+ sendButtonIsDisabled: false, // 涓嬭揪鎸夐挳鏄惁鍙偣鍑�
+ judgeIsScanningArr: [], // 鍒ゆ柇鏄惁鎵爜鏁扮粍
+ countJudgeIsScanningInput: 0 // 鍒ゆ柇鎵爜妗嗙殑涓暟
}
},
- // computed: {
- // qrLink: function() {
- // return this.$store.getters.getPreviewUrl
- // }
- // },
- // watch: {
- // qrLink: function(newVal, oldNew) {
- // if (newVal !== oldNew) {
- // this.$nextTick(() => {
- // this.bindQRCode(newVal)
- // })
- // }
- // }
- // },
+ watch: {
+ // 'form.orderstepqrcode': {
+ // handler(newValue) {
+ // this.form.orderstepqrcode = newValue
+ //
+ // // 鍦ㄨ繖閲岃皟鐢紝骞舵墽琛宼his.fnThrottle(this.search, 500, 2000)();
+ // this.fnThrottle(this.enterNative, 500, 2000, 'produceCode')()
+ // }
+ // },
+ // 'WXform.orderstepqrcode': {
+ // handler(newValue) {
+ // this.form.orderstepqrcode = newValue
+ //
+ // // 鍦ㄨ繖閲岃皟鐢紝骞舵墽琛宼his.fnThrottle(this.search, 500, 2000)();
+ // this.fnThrottle(this.enterNative, 500, 2000, 'WXproduceCode')()
+ // }
+ // },
+ // 'badForm.orderstepqrcode': {
+ // handler(newValue) {
+ // this.form.orderstepqrcode = newValue
+ //
+ // // 鍦ㄨ繖閲岃皟鐢紝骞舵墽琛宼his.fnThrottle(this.search, 500, 2000)();
+ // this.fnThrottle(this.enterNative, 500, 2000, 'badProduceCode')()
+ // }
+ // }
+ },
+
created() {
this.getMesOrderStepSearch()
this.tabClick()
@@ -934,13 +1505,28 @@
this.getHeight()
this.$nextTick(() => {
- $("input[name='produceCode']")[0].focus()
+ $('input[name=\'produceCode\']')[0].focus()
// this.bindQRCode('10001;001')
})
// webapp_urlprotocol_startup()
// webapp_ws_autoupdate(true)
+
+ this.getMesOrderSelectUserAll() // 鑾峰彇鎵�鏈変汉鍛�
},
methods: {
+ // 璁′欢鏂瑰紡鍊兼敼鍙樻椂
+ reckwayChange() {
+ this.dialogForm.usergroupcode = ''
+ this.dialogForm.operation = ''
+ this.userTableData = []
+ // console.log(this.$refs.dialogForm, 'log')
+ // this.$nextTick(() => {
+ // this.$refs.dialogForm.resetFields()
+ // })
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
async getMesOrderStepSearch() {
const res = await MesOrderStepSearch(this.form)
if (res.code === '200') {
@@ -980,6 +1566,18 @@
this.WXform.prop = prop
this.getMesOrderWxStepSearch()
},
+ badSortChange({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.badForm.order = order
+ this.badForm.prop = prop
+ this.getBadList()
+ },
// 鑷埗椤电鍘熺偣鐐瑰嚮
getCurrentRow(val) {
@@ -994,21 +1592,127 @@
if (this.$refs.elTabs.currentName === '0') {
this.$nextTick(() => {
this.getMesOrderStepSearch()
- $("input[name='produceCode']")[0].focus()
+ $('input[name=\'produceCode\']')[0].focus()
this.WXform.orderstepqrcode = ''
})
}
if (this.$refs.elTabs.currentName === '1') {
this.$nextTick(() => {
this.getMesOrderWxStepSearch()
- $("input[name='WXproduceCode']")[0].focus()
+ $('input[name=\'WXproduceCode\']')[0].focus()
this.form.orderstepqrcode = ''
})
+ }
+ if (this.$refs.elTabs.currentName === '2') {
+ this.$nextTick(() => {
+ this.getBadList()
+ $('input[name=\'badProduceCode\']')[0].focus()
+ this.badForm.orderstepqrcode = ''
+ })
+ }
+ },
+ // 闃叉姈 //鎵爜鐢ㄧ殑鏄槻鎶�
+ fnThrottle(method, delay, duration, belong) {
+ var that = this
+ var timer = this.timer
+ var begin = new Date().getTime()
+ return function() {
+ var current = new Date().getTime()
+ clearTimeout(timer)
+ if (current - begin >= duration) {
+ // method()
+ // that.VALUE()
+ begin = current
+ } else {
+ that.timer = setTimeout(function() {
+ // method()
+ if (belong === 'produceCode') {
+ that.enterNative(that.form.orderstepqrcode, belong)
+ }
+ if (belong === 'WXproduceCode') {
+ that.enterNative(that.WXform.orderstepqrcode, belong)
+ }
+ if (belong === 'badProduceCode') {
+ that.enterNative(that.badForm.orderstepqrcode, belong)
+ }
+ }, delay)
+ }
+ }
+ },
+ // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
+ judgeIsScanning2(e, belong) {
+ if (belong === 'produceCode' && this.form.orderstepqrcode.toString().length === 0) {
+ this.judgeIsScanningArr = []
+ this.countJudgeIsScanningInput = 0
+ }
+ if (belong === 'WXproduceCode' && this.WXform.orderstepqrcode.toString().length === 0) {
+ this.judgeIsScanningArr = []
+ this.countJudgeIsScanningInput = 0
+ }
+ const timenow = e.timeStamp
+ // console.log(timenow, 1)
+ // let flag = true
+ let flag = false
+ this.judgeIsScanningArr.push(timenow)
+ let i
+
+ for (i in this.judgeIsScanningArr) {
+ console.log(Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]))
+ // flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
+ if (Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1) {
+ this.countJudgeIsScanningInput++
+ }
+ if (this.countJudgeIsScanningInput >= 3) {
+ flag = true
+ }
+ if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
+ if (flag) {
+ console.log(flag, 1)
+ this.fnThrottle(this.enterNative, 500, 2000, belong)()
+ return
+ }
+ }
+ }
+
+ // // for (i in this.judgeIsScanningArr) {
+ // // console.log(i)
+ // // console.log( this.judgeIsScanningArr)
+ // console.log(Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]))
+ // if (Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 10) {
+ // this.countJudgeIsScanningInput++
+ // }
+ // if (this.countJudgeIsScanningInput > this.judgeIsScanningArr.length / 2) {
+ // flag = true
+ // }
+ // // flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
+ // // if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
+ // if (flag) {
+ // console.log(flag, 2)
+ // this.fnThrottle(this.enterNative, 500, 2000, belong)()
+ // return
+ // }
+ // // }
+ // // }
+ },
+ // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
+ judgeIsScanning(e, belong) {
+ const timenow = e.timeStamp
+ let flag = true
+ this.judgeIsScanningArr.push(timenow)
+ let i
+ for (i in this.judgeIsScanningArr) {
+ flag = Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 1]) - Math.ceil(this.judgeIsScanningArr[this.judgeIsScanningArr.length - 2]) < 0.1
+ if (i > 0 && this.judgeIsScanningArr.length === parseInt(i) + 1) {
+ if (flag) {
+ this.fnThrottle(this.enterNative, 500, 2000, belong)()
+ return
+ }
+ }
}
},
// 鎵爜閿洏鍥炶溅浜嬩欢
async enterNative(val, belong) {
- console.log(val, belong)
+ console.log(val, belong, 89898989)
// 寮�宸ワ細code="200" count=0
// 鎶ュ伐锛歝ode="200" count=1
// 鍙戞枡锛歝ode="200" count=2
@@ -1043,6 +1747,13 @@
if (res.code === '200' && res.count === 3) {
await this.WXback(res.data)
}
+ }
+
+ if (belong === 'badProduceCode') {
+ // this.badForm.orderstepqrcode=
+ await this.getBadList()
+ await this.repairHandle(this.badForm.orderstepqrcode)
+ this.badDialogVisible = true
}
},
// 鏌ヨ
@@ -1099,15 +1810,12 @@
// this.dialogForm.startqty = obj.startqty
this.dialogForm.startqty = obj.noreportqty
- if (obj.nextstepname === null || obj.nextstepcode === '') {
- this.dialogForm.nextstepname = obj.stepname
- this.dialogForm.nextstepcode = obj.stepcode
- } else {
- this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
- }
+ this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
this.dialogForm.startqtySum = obj.noreportqty
+
+ this.$refs.userTableDataRef.doLayout()
})
await this.getMesOrderStepStartSelectEqp()
@@ -1164,13 +1872,10 @@
this.dialogForm.reportqty = obj.reportqty
this.dialogForm.noreportqty = obj.noreportqty
this.dialogForm.stepcode = obj.stepcode
- if (obj.nextstepname === null || obj.nextstepcode === '') {
- this.dialogForm.nextstepname = obj.stepname
- this.dialogForm.nextstepcode = obj.stepcode
- } else {
- this.dialogForm.nextstepname = obj.nextstepname
- this.dialogForm.nextstepcode = obj.nextstepcode
- }
+
+ this.dialogForm.nextstepname = obj.nextstepname
+ this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
+
this.dialogForm.noputqty = obj.noputqty
this.dialogForm.stepseq = obj.seq
this.dialogForm.sqty = obj.startqty
@@ -1184,7 +1889,7 @@
// 鐢熶骇鐝粍涓嬫媺鏀瑰彉
usergroupChange(val) {
this.dialogForm.usergroupcode = val
- this.getUserTableData()
+ this.getMesOrderSelectUserZZ2()
},
// 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
async getMesOrderStepReportSelectUserGroup() {
@@ -1195,6 +1900,11 @@
async getMesOrderSelectUserZZ() {
const { data: res } = await MesOrderSelectUser({ usercode: this.dialogForm.usergroupcode })
this.ZZuserArr = res
+ },
+ async getMesOrderSelectUserZZ2() {
+ const { data: res } = await MesOrderSelectUser({ usercode: '' })
+ this.ZZuserArr = res
+ await this.getUserTableData()
},
// 鑾峰彇鑷埗鐢熶骇璁惧涓嬫媺
async getMesOrderStepStartSelectEqp() {
@@ -1232,25 +1942,92 @@
number = number === 0 ? (10 + Math.random()) : number
item.isVisible = 0
item.number = number
+ // item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
+ })
+
+ this.ZZuserArr = [...this.ZZuserArr].filter(x => [...this.userTableData].every(y => y.usercode !== x.usercode))
+
+ this.calculatedValue()
+ this.$nextTick(() => {
+ this.$refs.tableDataRef.doLayout()
+ this.$refs.userTableDataRef.doLayout()
})
},
+ calculatedValue() {
+ const total = 100
+ let value = 0
+ this.userTableData.forEach(item => {
+ item.ratio = parseFloat((100 / this.userTableData.length).toFixed(2))
+ value += item.ratio
+ })
+ console.log(value, 1)
+ if (value !== total) {
+ // let temp = this.userTableData
+ // temp[temp.length-1].ratio=temp[temp.length-1].ratio+(total-value)
+ this.userTableData[this.userTableData.length - 1].ratio = parseFloat((this.userTableData[this.userTableData.length - 1].ratio + (total - value)).toFixed(2))
+ }
+ },
+ // 淇敼鍒嗛厤姣斿垪
+ editRatio(row) {
+ // console.log(row, 'row')
+ this.userTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ const number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+
+ this.userTableData.splice(index, 1, {
+ usercode: row.usercode,
+ username: row.username,
+ ratio: row.ratio,
+ isVisible: 2,
+ number: number === 0 ? (10 + Math.random()) : number
+
+ })
+ }
+ })
+ },
+
// 鐢ㄦ埛娣诲姞
userAdd() {
+ if (this.userTableData.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨褰撳墠琛屼俊鎭紒')
+ }
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
console.log(this.userTableData, 6)
- this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number })
+ this.userTableData.unshift({ usercode: '', username: '', isVisible: 1, number: number, ratio: 0 })
+ this.calculatedValue()
},
// 鐢ㄦ埛鍒楄〃鍒犻櫎
userDel(row) {
+ this.ZZuserArr.splice(0, 0, {
+ usercode: row.usercode,
+ username: row.username
+ })
+
this.userTableData.forEach((item, index) => {
if (item.number === row.number) {
this.userTableData.splice(index, 1)
}
})
+
+ this.calculatedValue()
},
// 鐢ㄦ埛鍒楄〃淇濆瓨
userSave(row) {
+ console.log(row, 123)
+ if (row.usercode === '') {
+ return this.$message.info('浜哄憳鍚嶇О涓嶈兘涓虹┖锛�')
+ }
+ if (row.ratio === '') {
+ return this.$message.info('鍒嗛厤姣斿垪涓嶈兘涓虹┖锛�')
+ }
+
+ this.ZZuserArr.forEach((item, index) => {
+ if (item.usercode === row.usercode) {
+ this.ZZuserArr.splice(index, 1)
+ }
+ })
+
this.userTableData.forEach(item => {
if (item.number === row.number) {
item.isVisible = 0
@@ -1281,6 +2058,11 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
+ this.judgeIsScanningArr = []
+ this.form.orderstepqrcode = ''
+ this.WXform.orderstepqrcode = ''
+ this.badForm.orderstepqrcode = ''
+
this.dialogForm.wo_code = '', // 宸ュ崟缂栧彿
this.dialogForm.partcode = '', // 浜у搧缂栫爜
this.dialogForm.partname = '', // 浜у搧鍚嶇О
@@ -1300,7 +2082,7 @@
this.dialogForm.taskqty = '', // 浠诲姟鏁伴噺
this.dialogForm.fqty = '', // 鍙戞枡鏁伴噺
- this.dialogForm.inuser = '', // 鏀舵枡浜哄憳
+ this.dialogForm.inuser = getCookie('navTabId'), // 鏀舵枡浜哄憳 榛樿鐧诲綍浜哄憳
this.dialogForm.sqty = '', // 鏀舵枡鏁伴噺
this.dialogForm.ngqty = '', // 涓嶈壇鏁伴噺
this.dialogForm.badcode = '', // 涓嶈壇鍘熷洜缂栫爜
@@ -1313,6 +2095,16 @@
this.dialogForm.reportuser = '', // 鎶ュ伐浜哄憳
this.dialogForm.startqtySum = '' // 涓嶈兘瓒呰繃鐨勬暟鍊�
+
+ this.dialogForm.reckway = '' // 璁′欢鏂瑰紡
+
+ this.dialogForm.nextstepcode = '' // 涓嬮亾宸ュ簭缂栫爜
+
+ this.dialogForm.reckway = 'group'
+
+ this.dialogForm.remarks = '' // 澶囨敞
+ this.dialogForm.operation = getCookie('navTabId') // 鎶ュ伐浜猴紙鏀舵枡浜猴級
+ this.userTableData = [] // 浜哄憳鍒楄〃
this.$refs.dialogForm.clearValidate()
},
@@ -1339,11 +2131,13 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
fqty: this.dialogForm.fqty // 鍙戞枡鏁伴噺
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepOut(data).then(res => {
if (res.code === '200') {
- this.$message.success('鍙戞枡鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success('鍙戞枡鎴愬姛锛�')
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('鍙戞枡澶辫触!')
}
@@ -1370,16 +2164,22 @@
inuser: this.dialogForm.inuser, // 鍙戞枡浜哄憳
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
sqty: this.dialogForm.sqty, // 鏀舵枡鏁伴噺
+ remarks: this.dialogForm.remarks, // 澶囨敞
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepIn(data).then(res => {
if (res.code === '200') {
- this.WXprint2()
- this.$message.success('鏀舵枡鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success('鏀舵枡鎴愬姛锛�')
+ // if (this.dialogForm.nextstepcode === '') {
+ // this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
+ this.WXprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
this.dialogVisible2 = true
+ // }
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('鏀舵枡澶辫触!')
}
@@ -1396,11 +2196,13 @@
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
startqty: this.dialogForm.startqty// 寮�濮嬫暟閲�
}
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepStart(data).then(res => {
if (res.code === '200') {
- this.$message.success('寮�宸ユ垚鍔燂紒')
this.dialogVisible = false
+ this.$message.success('寮�宸ユ垚鍔燂紒')
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('寮�宸ュけ璐�!')
}
@@ -1411,8 +2213,24 @@
if (parseFloat(this.dialogForm.startqtySum) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鎶ュ伐鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
}
- if (this.userTableData.length < 1) {
+ if (this.userTableData.length < 1 && this.dialogForm.reckway === 'group') {
return this.$message.info('浜哄憳鍒楄〃涓嶈兘涓虹┖!')
+ }
+ // this.userTableData = [...new Set(this.userTableData)]// 鏁扮粍鍘婚噸
+ this.userTableData = this.userTableData.filter(item => item.usercode !== '')
+ // 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
+ this.userTableData = this.userTableData.filter((currentValue, currentIndex, selfArr) => {
+ return selfArr.findIndex(item => item.usercode === currentValue.usercode) === currentIndex
+ })
+
+ if (this.dialogForm.reckway === 'group') {
+ let sum = 0
+ this.userTableData.forEach(item => {
+ sum += parseFloat(item.ratio)
+ })
+ if (Math.round(sum * 100) / 100 !== 100) {
+ return this.$message.info('鍒嗛厤姣斾緥鎬诲拰蹇呴』涓�100锛�')
+ }
}
if (parseFloat(this.dialogForm.noputqty) > 0) {
@@ -1421,7 +2239,9 @@
}
}
- const reportuser = this.userTableData.map(item => item.usercode).join(';')
+ // console.log(this.userTableData, 1)
+ // const reportuser = this.userTableData.map(item => item.usercode).join(';')// 涓昏鏀圭殑鏄繖閲岀殑鏍煎紡
+ console.log(this.dialogForm.operation, 'dialogForm.operation')
const data = {
mesordercode: this.dialogForm.wo_code, // 宸ュ崟缂栧彿
partcode: this.dialogForm.partcode, // 浜у搧缂栫爜
@@ -1429,23 +2249,35 @@
stepcode: this.dialogForm.stepcode, // 宸ュ簭缂栫爜
eqpcode: this.dialogForm.eqpcode, // 璁惧缂栫爜
usergroupcode: this.dialogForm.usergroupcode, // 鐝粍缂栫爜
- reportuser: reportuser, // 鎶ュ伐浜哄憳
+ // reportuser: reportuser, // 鎶ュ伐浜哄憳
+ reportuser: this.dialogForm.reckway === 'group' ? this.userTableData : [{
+ usercode: this.dialogForm.operation,
+ ratio: 100
+ }],
taskqty: this.dialogForm.planqty, // 浠诲姟鏁伴噺
// startqty: this.dialogForm.startqty, // 寮�宸ユ暟閲�
startqty: this.dialogForm.reportqty, // 寮�宸ユ暟閲�
// reportqty: this.dialogForm.reportqty, // 鎶ュ伐鏁伴噺
reportqty: this.dialogForm.startqty, // 鎶ュ伐鏁伴噺
+ remarks: this.dialogForm.remarks, // 澶囨敞
+ reckway: this.dialogForm.reckway, // 璁′欢鏂瑰紡
ngqty: this.dialogForm.noputqty === '' ? 0 : this.dialogForm.noputqty, // 涓嶈壇鏁伴噺
badcode: this.dialogForm.badcode.length < 1 ? '' : this.dialogForm.badcode.join(';')// 涓嶈壇鍘熷洜
}
+ // console.log(JSON.stringify(data), 'data')
+ console.log(data, 'data')
+ this.$store.state.app.buttonIsDisabled = true
SavaMesOrderStepReport(data).then(res => {
if (res.code === '200') {
- this.ZZprint2()
- this.$message.success('鎶ュ伐鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success('鎶ュ伐鎴愬姛锛�')
+ // if (this.dialogForm.nextstepcode === '') {
+ this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
this.dialogVisible2 = true
+ // }
this.tabClick()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error('鎶ュ伐澶辫触!')
}
@@ -1458,35 +2290,37 @@
bindQRCode(text) {
new QRCode(this.$refs.qrCodeDiv2, {
text: text,
- width: 50,
- height: 50,
+ // width: 50,
+ width: 60,
+ // height: 50,
+ height: 60,
colorDark: '#000', // 浜岀淮鐮侀鑹�
colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
})
},
- ZZprint2() {
+ ZZprint2(username) {
this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
this.qrForm.startqty = this.dialogForm.startqty
this.qrForm.wo_code = this.dialogForm.wo_code
this.qrForm.partcode = this.dialogForm.partcode
this.qrForm.partname = this.dialogForm.partname
this.qrForm.nextstepname = this.dialogForm.nextstepname
-
+ this.qrForm.operator = username
+ this.qrForm.operatorTime = handleDatetime2(new Date())
this.$nextTick(() => {
this.bindQRCode(this.qrForm.qrvalue)
- console.log(this.$refs.qrCodeDiv2, 123)
- // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>img'), 1)
- // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>canvas'), 2)
})
},
- WXprint2() {
+ WXprint2(username) {
this.qrForm.qrvalue = this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode
this.qrForm.startqty = this.dialogForm.sqty
this.qrForm.wo_code = this.dialogForm.wo_code
this.qrForm.partcode = this.dialogForm.partcode
this.qrForm.partname = this.dialogForm.partname
this.qrForm.nextstepname = this.dialogForm.nextstepname
+ this.qrForm.operator = username
+ this.qrForm.operatorTime = handleDatetime2(new Date())
this.$nextTick(() => {
this.bindQRCode(this.qrForm.qrvalue)
})
@@ -1498,17 +2332,202 @@
this.qrForm.partcode = ''
this.qrForm.partname = ''
this.qrForm.nextstepname = ''
- this.$refs.qrCodeDiv2 = ''
+ this.qrForm.operator = ''
+ this.qrForm.operatorTime = ''
+ // this.$refs.qrCodeDiv2 = ''
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 50
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 220
this.isIpad = window.innerHeight < 769
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
+ }
+ this.$refs.tableDataRef.doLayout()
+ })
+ },
+
+ // 鑾峰彇涓嶈壇澶勭悊鍒楄〃
+ async getBadList() {
+ const res = await MesOrderNgStepSearch(this.badForm)
+ this.badTableData = res.data
+ this.badTotal = res.count
+ },
+ badDialogVisibleCancel() {
+ this.badDialogVisible = false
+ },
+ badDialogVisibleConfirm() {
+ const data = {
+ Data: this.badTableDataDialog
+ }
+ this.$store.state.app.buttonIsDisabled = true
+ EditOrderNgStepSeave(data, getCookie('navTabId')).then(res => {
+ if (res.code === '200' || res.code === '301') {
+ this.getBadList()
+ this.badDialogVisible = false
+ this.badPrint(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+ this.dialogVisible2 = true
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+
+ this.$store.state.app.buttonIsDisabled = false
+ }
+ })
+ },
+ badPrint(username) {
+ this.qrForm.qrvalue = this.badDialogForm.wo_code + ';' + this.badDialogForm.nextstepcode
+ this.qrForm.startqty = this.badDialogForm.plan_qty
+ this.qrForm.wo_code = this.badDialogForm.wo_code
+ this.qrForm.partcode = this.badDialogForm.partcode
+ this.qrForm.partname = this.badDialogForm.partname
+ this.qrForm.nextstepname = this.badDialogForm.nextstepname
+ this.qrForm.operator = username
+ this.qrForm.operatorTime = handleDatetime2(new Date())
+
+ this.$nextTick(() => {
+ this.bindQRCode(this.qrForm.qrvalue)
+ })
+ },
+
+ handleCloseBad() {
+ this.badDialogForm = {}
+ this.badDialogForm.operation = getCookie('navTabId')
+ this.badTableDataDialog = []
+ this.judgeIsScanningArr = []
+ },
+ async getMesOrderSelectUserAll() {
+ const { data: res } = await MesOrderSelectUser({ usercode: '' })
+ this.OperationArr = res
+ },
+ // 鐐瑰嚮缁翠慨澶勭悊鎸夐挳 鎴� 鎵弿鏉＄爜鐨勬壂鎻忓洖杞︿簨浠�
+ async repairHandle(row) {
+ let data
+ if (row.wo_code) {
+ data = {
+ orderstepqrcode: row.wo_code + ';' + row.stepcode
+ }
+ } else {
+ data = {
+ orderstepqrcode: row
+ }
+ }
+
+ const { data: res } = await MesOrderNgSubStepSearch(data)
+
+ this.$nextTick(() => {
+ this.badDialogForm.wo_code = res.data1.wo_code
+ this.badDialogForm.partcode = res.data1.partnumber
+ this.badDialogForm.partname = res.data1.partname
+ this.badDialogForm.partspec = res.data1.partspec
+ this.badDialogForm.stepname = res.data1.stepname
+ this.badDialogForm.nextstepcode = res.data1.nextstepcode
+ this.badDialogForm.nextstepname = res.data1.nextstepname
+ this.badDialogForm.plan_qty = res.data1.planqty
+ this.badDialogForm.good_qty = res.data1.noreportqty // 鎶ュ伐鏁伴噺
+ this.badDialogForm.ng_qty = res.data1.noputqty // 涓嶈壇鏁伴噺
+
+ this.badTableDataDialog = res.data2
+
+ this.badTableDataDialog.forEach(item => {
+ item.repair_qty = 0
+ item.bad_qty = 0
+ item.isVisible = 0
+ // item.defect_code = [...new Set(item.defect_code.split(','))].join(',')
+ // item.defect_name = [...new Set(item.defect_name.split(','))].join(',')
+ })
+ console.log(this.badTableDataDialog, 321)
+ this.badDialogVisible = true
+ })
+ },
+ badEdit(row) {
+ console.log(row)
+ this.badTableDataDialog.forEach((item, index) => {
+ if (item.id === row.id && item.m_id === row.m_id) {
+ this.badTableDataDialog.splice(index, 1, {
+ bad_qty: row.bad_qty,
+ repair_qty: row.repair_qty,
+ isVisible: 1,
+ defect_code: row.defect_code,
+ defect_name: row.defect_name,
+ badqty: row.badqty,
+ id: row.id,
+ m_id: row.m_id,
+ materiel_code: row.materiel_code,
+ ng_qty: row.ng_qty,
+ plan_qty: row.plan_qty,
+ report_qty: row.report_qty,
+ seq: row.seq,
+ step_code: row.step_code,
+ stepname: row.stepname,
+ style: row.style,
+ wo_code: row.wo_code
+ })
+ }
+ })
+ },
+ badSave(row) {
+ if (parseFloat(row.bad_qty) + parseFloat(row.repair_qty) > parseFloat(row.ng_qty)) {
+ this.badCancel(row)
+ return this.$message.info('缁翠慨鏁伴噺涓庢姤搴熸暟閲忎箣鍜屼笉鑳藉ぇ浜庝笉鑹暟閲忥紒')
+ }
+ this.badTableDataDialog.forEach((item, index) => {
+ if (item.id === row.id && item.m_id === row.m_id) {
+ this.badTableDataDialog.splice(index, 1, {
+ bad_qty: parseFloat(row.bad_qty),
+ repair_qty: parseFloat(row.repair_qty),
+ isVisible: 0,
+ defect_code: row.defect_code,
+ defect_name: row.defect_name,
+ id: row.id,
+ m_id: row.m_id,
+ badqty: row.badqty,
+ materiel_code: row.materiel_code,
+ ng_qty: row.ng_qty,
+ plan_qty: row.plan_qty,
+ report_qty: row.report_qty,
+ seq: row.seq,
+ step_code: row.step_code,
+ stepname: row.stepname,
+ style: row.style,
+ wo_code: row.wo_code
+ })
+ }
+ })
+ },
+ badCancel(row) {
+ this.badTableDataDialog.forEach((item, index) => {
+ if (item.id === row.id && item.m_id === row.m_id) {
+ this.badTableDataDialog.splice(index, 1, {
+ // bad_qty: row.bad_qty,
+ // repair_qty: row.repair_qty,
+ bad_qty: 0,
+ repair_qty: 0,
+ isVisible: 0,
+ defect_code: row.defect_code,
+ defect_name: row.defect_name,
+ id: row.id,
+ m_id: row.m_id,
+ badqty: row.badqty,
+ materiel_code: row.materiel_code,
+ ng_qty: row.ng_qty,
+ plan_qty: row.plan_qty,
+ report_qty: row.report_qty,
+ seq: row.seq,
+ step_code: row.step_code,
+ stepname: row.stepname,
+ style: row.style,
+ wo_code: row.wo_code
+ })
+ }
+ })
+ },
+
+ badDel(row) {
+ this.badTableDataDialog.forEach((item, index) => {
+ if (item.id === row.id && item.m_id === row.m_id) {
+ this.badTableDataDialog.splice(index, 1)
}
})
}
@@ -1518,92 +2537,7 @@
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
- border: none;
-}
-
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
+.el-button--text {
font-size: 14px;
cursor: pointer;
}
@@ -1613,29 +2547,6 @@
display: flex;
justify-content: space-between;
align-items: center;
-}
-
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
}
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
@@ -1648,36 +2559,6 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
}
//.dialogVisible{
@@ -1703,3 +2584,115 @@
}
</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .badDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
--
Gitblit v1.9.3