From dba0fdf9154af7d91de34aab02c7e70ba7d407eb Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 19 五月 2023 15:51:58 +0800
Subject: [PATCH] 1.工序检验记录提交
---
src/views/qualityManager/processCheck_back.vue | 885 +++++++++++++++++++++++
src/views/qualityManager/processCheck.vue | 1324 ++++++++++++++++-------------------
2 files changed, 1,503 insertions(+), 706 deletions(-)
diff --git a/src/views/qualityManager/processCheck.vue b/src/views/qualityManager/processCheck.vue
index 30b17ff..0a8ff5b 100644
--- a/src/views/qualityManager/processCheck.vue
+++ b/src/views/qualityManager/processCheck.vue
@@ -1,416 +1,336 @@
<template>
<div>
- <div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding-top: 10px;display: flex;flex-direction: column">
- <div style="margin-bottom: 15px;font-size: 14px">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />鎵爜淇℃伅
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px;display: flex">
- <div style="color: red;width:10px">*</div>
- 鎵弿鏉＄爜锛�
- </div>
- <el-input
- v-model="form.orderstepqrcode"
- name="GXproduceCode"
- style="width: 300px"
- @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
- />
- <!-- @keyup.native="e=>judgeIsScanning(e,'GXproduceCode')"-->
+ <div class="body" :style="{height:mainHeight+'px'}" style="background-color: #eaecef">
+ <div
+ style="background-color: #f8f8fa;margin: 10px 0;
+ overflow-y:auto;overflow-x: hidden;
+ display: flex;flex-direction: column"
+ :style="{height:mainHeight+'px'}"
+ >
+ <div class="content1">
+ <div>
+ <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+ </div>
+ <div class="title">
+ 鎵弿淇℃伅
+ </div>
</div>
- <!-- 鍏」淇℃伅 -->
- <div v-if="!isIpad" style="background:#f8f8fa ;display:flex;margin-top: 10px;align-items: center; line-height: 50px">
- <div style="display: flex; margin-left: 10px">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
- <div style="width: 150px">{{ form.wo_code }}</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧缂栫爜锛�</div>
- <div style="width: 150px">{{ form.partcode }}</div>
- </div>
+
+ <div class="content2">
+ <el-form :inline="true" label-width="80px">
+ <el-form-item label="妫�楠岀被鍨�">
+ <el-select
+ v-model="form.checktype"
+ style="width: 160px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checktypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎵爜鏉＄爜">
+ <el-input
+ v-model="form.orderstepqrcode"
+ name="GXproduceCode"
+ style="width: 250px"
+ placeholder="璇锋壂鐮佸伐鍗曞伐搴忕爜"
+ @keyup.enter.native="enterNative"
+ />
+ </el-form-item>
+ </el-form>
+ </div>
+
+ <div class="content1">
+ <div>
+ <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
</div>
- <div style="display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">浜у搧鍚嶇О锛�</div>
- <div style="width: 150px">{{ form.partname }}</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧瑙勬牸锛�</div>
- <div style="width: 150px">{{ form.partspec }}</div>
- </div>
+ <div class="title">
+ 宸ュ崟淇℃伅
</div>
- <div style=" display: flex;margin-left: 30px;">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div style="width: 150px">{{ form.stepcode }}</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div style="width: 150px">{{ form.stepname }}</div>
- </div>
+ </div>
+ <div class="content2" style="width: 60%;margin-left: 30px;">
+ <div class="orderMsg">鍗曟嵁缂栧彿锛歿{ form.wocode }}</div>
+ <div class="orderMsg">鐗╂枡缂栫爜锛歿{ form.partcode }}</div>
+ <div class="orderMsg">鐗╂枡鍚嶇О锛歿{ form.partname }}</div>
+ </div>
+ <div class="content2" style="width: 60%;margin-left: 30px;">
+ <div class="orderMsg">鐗╂枡瑙勬牸锛歿{ form.partspec }}</div>
+ <div class="orderMsg">宸ュ簭缂栫爜锛歿{ form.stepcode }}</div>
+ <div class="orderMsg">宸ュ簭鍚嶇О锛歿{ form.stepname }}</div>
+ </div>
+
+ <div class="content1">
+ <div>
+ <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+ </div>
+ <div class="title">
+ 璐ㄦ鏂规
+ </div>
+ </div>
+ <div class="content2" style="width: 60%;margin-left: 30px;">
+ <div class="orderMsg">鏂规鍚嶇О锛歿{ form.checkstandname }}</div>
+ <div class="orderMsg">鎶芥牱鏂瑰紡锛歿{
+ form.sampmethod === 'FIXED' ? '鍥烘椂鎶芥' : form.sampmethod === 'SCARE' ? '姣斾緥鎶芥' : ''
+ }}
+ </div>
+ </div>
+ <div class="content2" style="width: 60%;margin-left: 30px;">
+ <div class="orderMsg">鎶ュ伐鏁伴噺锛歿{ form.good_qty }}</div>
+ <div class="orderMsg">鏍锋湰鏁伴噺锛�
+ <el-input-number
+ v-if="form.good_qty"
+ v-model="form.sampscare"
+ :max="form.good_qty"
+ :min="1"
+ size="medium"
+ @change="numberChange"
+ />
+ </div>
+ </div>
+
+ <div
+ v-if="checkItemArr.length>0"
+ class="content1"
+ >
+ <div>
+ <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+ </div>
+ <div class="title">
+ 妫�楠岄」鐩�
</div>
</div>
<div
- v-if="isIpad"
- style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column"
+ v-if="form.sampscare!==1&&checkItemArr.length>0"
+ class="content2"
+ style="width: 60%;"
>
- <div style="display: flex; justify-content: flex-start;width: 100%">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
- <div style="width: 200px">{{ form.wo_code }}</div>
- </div>
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">浜у搧缂栫爜锛�</div>
- <div style="width: 200px">{{ form.partcode }}</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">浜у搧鍚嶇О锛�</div>
- <div style="width: 200px">{{ form.partname }}</div>
- </div>
- </div>
-
- <div style=" display: flex; justify-content: flex-start;margin-top: 10px;width: 100%">
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">浜у搧瑙勬牸锛�</div>
- <div style="width: 200px">{{ form.partspec }}</div>
- </div>
- <div style="display: flex;margin-right: 50px">
- <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
- <div style="width: 200px">{{ form.stepcode }}</div>
- </div>
- <div style="display: flex;">
- <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
- <div style="width: 200px">{{ form.stepname }}</div>
- </div>
- </div>
+ <el-link :underline="false" :disabled="!(stepActive>0)" style="width: 60px;margin-top: 5px" @click="pre">涓婁竴浠�
+ </el-link>
+ <el-steps :active="stepActive" style="width: 80%;margin:0 10px;" finish-status="success">
+ <el-step v-for="item in form.sampscare" :key="item" title="" />
+ </el-steps>
+ <el-link
+ :underline="false"
+ :disabled="!(stepActive < form.sampscare-1)"
+ style="width: 60px;margin-top: 5px"
+ @click="next"
+ >涓嬩竴浠�
+ </el-link>
</div>
- <div style="margin: 15px 0;font-size: 14px">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px;display: flex">
- <div style="color: red;width:10px">*</div>
- 妫�楠屾爣鍑嗭細
- </div>
- <el-select
- v-model="checkStandard"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- @change="changeCheckStandard"
+ <div
+ class="content2"
+ style="flex-direction: column;justify-content:flex-start;width: 480px;margin-top: 10px;"
+ >
+
+ <div
+ v-for="(item,index) in checkItemArr"
+ v-if="stepActive+1===item.checkNumber"
+ :key="item.code+(stepActive+1).toString()"
+ :style="{borderBottom:(index+1)%checkItemArr.map(i=>i.checkNumber===1).filter(i=>i).length!==0?`1px solid rgba(48,49,51,0.2)`:''}"
+ class="checkItem"
>
- <el-option
- v-for="item in checkStandardSelect"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- <div style="width: 90px;margin-left: 50px;display: flex">
- <div style="color: red;width:10px">*</div>
- 妫�楠屼汉鍛橈細
- </div>
- <el-select
- v-model="checkUser"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in checkUserSelect"
- :key="item.usercode"
- :label="item.username"
- :value="item.usercode"
- />
- </el-select>
- <div style="width: 90px;margin-left: 50px;display: flex">
- <div style="color: red;width:10px">*</div>
- 妫�楠屾暟閲忥細
- </div>
- <el-input v-model="checkqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
- </div>
- <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
- <div style="display: flex;margin-top: 20px;align-items: center">
+ <div style="display: flex;justify-content: space-between;align-items: center">
+ <div style="display: flex;width: 300px;">
+ <div class="serialNumber">{{ item.stepcheckitem_seq }}</div>
+ <div style="display: flex;align-items: center">{{ item.name }}</div>
+ </div>
- <div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px;display: flex">
- <div style="color: red;width:10px">*</div>
- 妫�楠岀粨鏋滐細
+ <div v-show="item.numberjudge==='N'" style="width: 150px;display: flex;padding-left: 20px">
+ <el-button
+ type="primary"
+ size="mini"
+ :plain="!item.check_result"
+ @click="checkResultClick('OK',item)"
+ >鍚堟牸
+ </el-button>
+ <el-button
+ type="warning"
+ size="mini"
+ :plain="item.check_result"
+ @click="checkResultClick('NG',item)"
+ >涓嶅悎鏍�
+ </el-button>
+ </div>
+ <div v-show="item.numberjudge!=='N'" style="width: 150px;" />
</div>
- <el-select
- v-model="checkResult"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- filterable
- >
- <el-option
- v-for="item in checkResultSelect"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
- <div style="display: flex;align-items: center">
- <div style="width: 90px">妫�楠屽娉細</div>
- <el-input v-model="checkdescr" style="width: 540px" placeholder="璇疯緭鍏�" />
- </div>
- </div>
-
- <div style="margin: 15px 0;font-size: 14px">
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠岄」淇℃伅
- </div>
- <div>
- <el-button v-waves type="primary" @click="add">鏂板</el-button>
- </div>
- <div style="margin-top: 10px">
- <el-table
- ref="multipleTable"
- :data="JYTableData"
- :height="tableHeight+'px'"
- border
- :row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @selection-change="handleSelectionChange"
- @cell-dblclick="cellDblclick"
- >
- <el-table-column
- type="index"
- label="搴忓彿"
- width="100"
- fixed
- />
-
- <!-- <el-table-column-->
- <!-- prop="code"-->
- <!-- label="妫�楠岄」鐩紪鐮�(鍚嶇О)"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.isVisible===0" style="display: flex;">-->
- <!-- <div>{{ row.code }}</div>-->
- <!-- <div style="margin-left: 10px">{{ row.name }}</div>-->
- <!-- </div>-->
-
- <!-- <el-select-->
- <!-- v-if="row.isVisible===1"-->
- <!-- v-model="row.code"-->
- <!-- filterable-->
- <!-- style="width: 400px;"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- @change="val=>changeCode(val,row)"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in JYSelectArr"-->
- <!-- :key="item.code"-->
- <!-- :label="item.code+''+item.name"-->
- <!-- :value="item.code"-->
- <!-- />-->
- <!-- </el-select>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
-
- <el-table-column
- prop="code"
- label="妫�楠屾爣鍑嗙紪鐮�"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.code }}</div>
- <el-select
- v-if="row.isVisible===1"
- v-model="row.code"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- @change="val=>changeName(val,row)"
- >
- <el-option
- v-for="item in JYSelectArr"
- :key="item.name"
- :label="item.code"
- :value="item.name"
+ <div style="display: flex;margin-bottom: 5px">
+ <div style="display: flex;flex-direction: column">
+ <div v-if="item.standvalue" class="itemTitle">鏍囧噯鍊�</div>
+ <div v-if="item.uppervalue" class="itemTitle">涓婇檺鍊�</div>
+ <div v-if="item.lowervalue" class="itemTitle">涓嬮檺鍊�</div>
+ <div v-if="item.stepcheckitem_desc" class="itemTitle">鎻忚堪</div>
+ <div v-if="item.numberjudge!=='N'" class="itemTitle">瀹炴祴鍊�
+ <el-input
+ v-model="item.real_value"
+ size="mini"
+ oninput="value=value.replace(/[^0-9]/g,'')"
+ style="width: 100px;margin-left: 5px"
+ @input="val=>inputChange(val,item)"
/>
- </el-select>
- </template>
- </el-table-column>
- <el-table-column
- prop="name"
- label="妫�楠屾爣鍑嗗悕绉�"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.isVisible===0">{{ row.name }}</div>
- <el-select
- v-if="row.isVisible===1"
- v-model="row.name"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- @change="val=>changeName(val,row)"
- >
- <el-option
- v-for="item in JYSelectArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </template>
- </el-table-column>
-
- <el-table-column
- prop="stepcheckitem_desc"
- label="妫�楠屾爣鍑嗘弿杩�"
- show-tooltip-when-overflow
- >
- <template slot-scope="scope">
- <el-input
- v-if="scope.row.isVisible===1||scope.row.index === tabClickIndex && tabClickLabel === '妫�楠屾爣鍑嗘弿杩�'"
- v-model="scope.row.stepcheckitem_desc"
- placeholder="璇疯緭鍏�"
- @keyup.enter.native="val=>keyUpEnterNative(val,scope.row)"
- />
- <div
- v-else
- > {{ scope.row.stepcheckitem_desc }}
</div>
+ </div>
+ <div style="display: flex;flex-direction: column">
+ <div v-if="item.standvalue" class="itemContent">{{ item.standvalue }}</div>
+ <div v-if="item.uppervalue" class="itemContent">{{ item.uppervalue }}</div>
+ <div v-if="item.lowervalue" class="itemContent">{{ item.lowervalue }}</div>
+ <div v-if="item.stepcheckitem_desc" class="itemContent">{{ item.stepcheckitem_desc }}</div>
- </template>
- </el-table-column>
-
- <el-table-column
- prop="result"
- label="妫�楠岀粨鏋�"
- width="100"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.result==='OK'">鍚堟牸</div>
- <div v-if="row.result==='NG'">涓嶈壇</div>
- </template>
-
- <!-- <template slot-scope="{row}">-->
- <!-- <el-radio-group-->
- <!-- v-model="row.result"-->
- <!-- size="small"-->
- <!-- @change="a=>changeRadioValue(a,row)"-->
- <!-- >-->
- <!-- <el-radio-->
- <!-- :label="0"-->
- <!-- @change="clickRadio(0,row)"-->
- <!-- >-->
- <!-- 鍚堟牸-->
- <!-- </el-radio>-->
- <!-- <el-radio-->
- <!-- :label="1"-->
- <!-- @change="clickRadio(1,row)"-->
- <!-- >-->
- <!-- 涓嶈壇-->
- <!-- </el-radio>-->
- <!-- </el-radio-group>-->
- <!-- </template>-->
-
- </el-table-column>
-
- <el-table-column
- type="selection"
- width="55"
- />
-
- <el-table-column
- label="鎿嶄綔"
- fixed="right"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button v-if="row.isVisible===0" v-waves type="text" @click="del(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" v-waves type="text" @click="confirm(row)">纭</el-button>
- <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancel(row)">鍙栨秷</el-button>
+ <div v-show="item.numberjudge!=='N'" class="itemContent" style="width: 150px;display: flex">
+ <el-button
+ type="primary"
+ size="mini"
+ :disabled="item.required==='Y'&&!item.real_value"
+ :plain="!item.check_result"
+ @click="checkResultClick('OK',item)"
+ >鍚堟牸
+ </el-button>
+ <el-button
+ type="warning"
+ size="mini"
+ :disabled="item.required==='Y'&&!item.real_value"
+ :plain="item.check_result"
+ @click="checkResultClick('NG',item)"
+ >
+ 涓嶅悎鏍�
+ </el-button>
</div>
- </template>
- </el-table-column>
- </el-table>
+ </div>
+ </div>
+
+ </div>
+
</div>
- <div style="display: flex;margin: 30px 0;align-items: center">
- <el-button v-waves type="primary" @click="submitButton('FirstCheck')">棣栨淇濆瓨</el-button>
- <el-button v-waves type="primary" style="margin-left: 50px" @click="submitButton('PatroCheck')">宸℃淇濆瓨</el-button>
- <el-button v-waves type="primary" style="margin-left: 50px" @click="submitButton('EndCheck')">瀹屽伐妫�淇濆瓨</el-button>
- <el-button v-waves type="info" style="margin-left: 50px" @click="submitButton('Cancel')">鍙栨秷</el-button>
+ <div
+ v-if="checkItemArr.filter(i=>i.check_result!=='').length===checkItemArr.length&&checkItemArr.length>0"
+ class="content1"
+ >
+ <div>
+ <i class="el-icon-s-operation" style="font-size: 14px" :style="{color:$store.state.settings.theme}" />
+ </div>
+ <div class="title">
+ 妫�楠岀粨鏋�
+ </div>
</div>
+
+ <div
+ v-if="checkItemArr.filter(i=>i.check_result!=='').length===checkItemArr.length&&checkItemArr.length>0"
+ class="content2"
+ style="width: 60%;margin-left: 30px;"
+ >
+ <div class="orderMsg2">鏍锋湰鏁伴噺锛歿{ form.sampscare }}</div>
+ <div class="orderMsg2">鍚堟牸鏁伴噺锛歿{ form.goodqty }}</div>
+ <div class="orderMsg2">涓嶅悎鏍兼暟閲忥細{{ form.ngqty }}</div>
+
+ <div style="width: 290px;display: flex;align-items: center" class="resultButton">
+ <div style="width: 70px;">鍒ゅ畾缁撴灉锛�</div>
+ <el-button type="primary" size="medium" :plain="!check_result" @click="check_result=true">鍚堟牸</el-button>
+ <el-button type="warning" size="medium" :plain="check_result" @click="check_result=false">涓嶅悎鏍�</el-button>
+ </div>
+ </div>
+
+ <div
+ v-if="checkItemArr.filter(i=>i.check_result!=='').length===checkItemArr.length&&checkItemArr.length>0"
+ class="content2 submitButton"
+ style="margin-top: 10px;margin-bottom: 10px;"
+ >
+ <el-button
+ v-waves
+ type="primary"
+ @click="submitButton"
+ >鎻愪氦
+ </el-button>
+ </div>
+
</div>
- </div>
+ </div>
</div>
</template>
<script>
-// import Pagination from '@/components/Pagination'
-
-// const SER_HZ = /^[\u4e00-\u9fa5]+$/
-import $ from 'jquery'
-import {
- MesOrderStepCheckItemList,
- MesOrderStepCheckSearch,
- MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
- StepCheckItemSelect
-} from '@/api/qualityManager'
-import { MesOrderSelectUser } from '@/api/produceManager'
-import { getCookie } from '@/utils/auth'
import waves from '@/directive/waves'
+import $ from 'jquery'
+import { MesOrderStepCheckItemList, MesOrderStepCheckSearch, SaveMesOrderStepCheckItem } from '@/api/qualityManager'
+import { getCookie } from '@/utils/auth'
export default {
- name: 'QXDY',
- // components: {
- // Pagination
- // },
+ name: 'Zzjg',
+
directives: { waves },
data() {
return {
- isIpad: false,
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
- form: { // 宸ュ簭
- // MO-2022-07-0001_1;001
- orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
- wo_code: '', // 宸ュ崟缂栫爜
- partcode: '', // 浜у搧缂栫爜
- partname: '', // 浜у搧鍚嶇О
- partspec: '', // 浜у搧瑙勬牸
- stepcode: '', // 宸ュ簭缂栫爜
- stepname: ''// 宸ュ簭鍚嶇О
- },
- checkStandard: '', // 妫�楠屾爣鍑�
- checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
- checkUser: getCookie('navTabId'), // 妫�楠屼汉鍛�
- checkqty: 0, // 妫�楠屾暟閲�
- checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
- checkResult: '', // 妫�楠岀粨鏋�
- checkResultSelect: [
- { code: 'OK', name: '鍚堟牸' },
- { code: 'NG', name: '涓嶈壇' }
- ], // 妫�楠岀粨鏋滀笅鎷夋暟缁�
- checkdescr: '', // 妫�楠屽娉紙鎻忚堪锛�
- JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
- JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
- // JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
- JYIsCancel: true,
- multipleSelection: [], // 琛ㄦ牸澶氶�夋
- tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
- tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
- isCancel: false, // 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
- judgeIsScanningArr: []// 鍒ゆ柇鏄惁鎵爜鏁扮粍
+ form: {
+ orderstepqrcode: '', // 鎵弿宸ュ簭浜岀淮鐮佷俊鎭�
+ checktype: 'FirstCheck',
+
+ wocode: '',
+ partcode: '',
+ partname: '',
+ partspec: '',
+ stepcode: '',
+ stepname: '',
+ checkstandcode: '',
+ checkstandname: '',
+ check_type: '',
+ sampmethod: '', // FIXED(鍥烘椂鎶芥) SCARE(姣斾緥鎶芥)
+ sampscare: '',
+ qualitystatus: '',
+ good_qty: '', // 鎸囩殑鎶ュ伐鏁伴噺
+ sampleqty: '',
+ goodqty: '', // 鍚堟牸鏁伴噺
+ ngqty: '', // 涓嶈壇鏁伴噺
+ // checkitemcont: [],
+
+ username: getCookie('admin')
+
+ },
+ checktypeArr: [
+ { code: 'FirstCheck', name: '棣栨' },
+ { code: 'PatroCheck', name: '宸℃' },
+ { code: 'EndCheck', name: '瀹屽伐妫�' }
+ ],
+ stepActive: 0, // 褰撳墠澶勪簬绗嚑浠�
+
+ checkItemArr: [],
+ check_result: ''
+
}
},
+
+ watch: {
+ 'checkItemArr': {
+ deep: true, // 娣卞害鐩戝惉鏃� 鐩戝惉鍒板睘鎬� 褰撲笉涓烘繁搴︾洃鍚椂锛屽彲鐩戝惉闀垮害
+ handler: function(val) {
+ // do something with the new and old value of myArray
+ this.form.goodqty = 0
+ for (var i = 0; i < this.form.sampscare; i++) {
+ const flag = this.checkItemArr.filter(j => j.checkNumber === i + 1).every(j => j.check_result)
+ if (flag) {
+ this.form.goodqty++
+ }
+ }
+ this.form.ngqty = this.form.sampscare - this.form.goodqty
+ }
+ }
+ },
+
created() {
- this.handleRequest()
+
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -419,371 +339,233 @@
this.getFocus()
},
methods: {
- handleRequest() {
- this.getMesOrderStepCheckSelect().then(res => {
- if (res.code === '200') {
- this.getMesOrderSelectUser()
- this.getJYSelectArr()
- }
- })
- },
-
// 鑾峰彇鑱氱劍
getFocus() {
this.$nextTick(() => {
- $("input[name='GXproduceCode']")[0].focus()
+ $('input[name=\'GXproduceCode\']')[0].focus()
})
},
- // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋暟缁�
- async getMesOrderStepCheckSelect() {
- const res = await MesOrderStepCheckSelect()
- this.checkStandardSelect = res.data
- return { code: res.code }
- },
- // 鑾峰彇妫�楠屼汉鍛樹笅鎷�
- async getMesOrderSelectUser() {
- const { data: res } = await MesOrderSelectUser()
- this.checkUserSelect = res
- },
- // 鑾峰彇妫�楠岄」涓嬫媺鏁扮粍
- async getJYSelectArr() {
- const { data: res } = await StepCheckItemSelect()
- this.JYSelectArr = res
- },
- // 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
- async changeCheckStandard(val) {
- await this.getJYSelectArr()
- this.isCancel = false
-
- const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
- this.JYTableData = res
-
- // let arr = [鈥].filter(x => [鈥].every(y => y.id !== x.id));
- this.JYSelectArr = [...this.JYSelectArr].filter(x => [...this.JYTableData].every(y => y.code !== x.code))
-
- this.JYTableData.forEach(item => {
- let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- number = number === 0 ? (10 + Math.random()) : number
-
- // item.result = 0 // 0鍚堟牸 1涓嶈壇
- item.result = 'OK'
-
- item.isVisible = 0
- item.number = number
- })
- this.$refs.multipleTable.toggleAllSelection()
- },
- // changeRadioValue(val, row) {
- // console.log(val, row.result, 20000)
- // },
- // clickRadio(e, row) {
- // console.log(e, row.result, 10000)
- // row.result = e
- // },
- handleSelectionChange(val) {
- this.multipleSelection = val
- const arr = this.multipleSelection.map(i => i.number)
- this.JYTableData.forEach(it => {
- if (arr.includes(it.number)) {
- it.result = 'OK'
- } else {
- it.result = 'NG'
- }
- })
-
- if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
- this.checkResult = 'OK'
- } else {
- this.checkResult = 'NG'
+ async enterNative() {
+ const data = {
+ orderstepqrcode: this.form.orderstepqrcode,
+ checktype: this.form.checktype
}
- if (this.isCancel) {
- this.checkResult = ''
- }
+ const { data: res } = await MesOrderStepCheckSearch(data)
+ this.form.wocode = res.labcont[0].wo_code
+ this.form.partcode = res.labcont[0].partcode
+ this.form.partname = res.labcont[0].partname
+ this.form.partspec = res.labcont[0].partspec ? res.labcont[0].partspec : '/'
+ this.form.stepcode = res.labcont[0].stepcode
+ this.form.stepname = res.labcont[0].stepname
+ this.form.good_qty = res.labcont[0].good_qty
+
+ this.form.checkstandcode = res.chekstand[0].checkstandcode
+ this.form.checkstandname = res.chekstand[0].checkstandname
+ this.form.sampmethod = res.chekstand[0].sampmethod
+ this.form.sampscare = res.chekstand[0].sampscare // 涓嬪崍鍐欒繖閲� *姣斾緥
+
+ await this.getMesOrderStepCheckItemList()
},
- // 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
- changeName(val, row) {
- const res = this.JYSelectArr.find(item => {
- return item.code === val || item.name === val
- })
- row.code = res.code
- row.name = res.name
- row.stepcheckitem_desc = res.descr
- },
- // 闃叉姈 //鎵爜鐢ㄧ殑鏄槻鎶�
- 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()
- that.enterNative(that.form.orderstepqrcode, belong)
- }, delay)
- }
- }
- },
- // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
- 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) {
- if (belong === 'GXproduceCode') {
- const res = await MesOrderStepCheckSearch({ orderstepqrcode: this.form.orderstepqrcode })
- this.form.wo_code = res.data[0].wo_code
- this.form.partcode = res.data[0].partcode
- this.form.partname = res.data[0].partname
- this.form.partspec = res.data[0].partspec
- this.form.stepcode = res.data[0].stepcode
- this.form.stepname = res.data[0].stepname
- }
- },
+ async getMesOrderStepCheckItemList() {
+ const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: this.form.checkstandcode })
+ // this.checkItemArr = res
+ this.checkItemArr = []
+ for (let i = 0; i < this.form.sampscare; i++) {
+ res.forEach(j => {
+ this.checkItemArr.push({
+ checkNumber: i + 1,
+ stepcheckitem_seq: j.stepcheckitem_seq,
+ name: j.name,
+ code: j.code,
+ standvalue: j.standvalue,
+ lowervalue: j.lowervalue,
+ uppervalue: j.uppervalue,
- // 鏂板
- add() {
- if (this.JYTableData.length === 0) {
- return this.$message.info('璇峰厛閫夋嫨妫�楠屾爣鍑嗭紒')
- }
- if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
- return this.$message.info('璇峰厛纭畾鎴栧彇娑堟湰鏉¤褰曪紒')
- }
-
- let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- number = number === 0 ? (10 + Math.random()) : number
- const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
- this.JYTableData.push(data)
- this.$refs.multipleTable.toggleRowSelection(data, true)
-
- this.JYIsCancel = false
- },
-
- // 纭
- confirm(row) {
- if (row.code === '') {
- return this.$message.info('妫�楠岄」鐩紪鐮佷笉鑳戒负绌猴紒')
- }
- if (row.name === '') {
- return this.$message.info('妫�楠岄」鐩悕绉颁笉鑳戒负绌猴紒')
- }
-
- this.JYSelectArr.forEach((item, index) => {
- if (item.code === row.code) {
- this.JYSelectArr.splice(index, 1)
- }
- })
-
- this.JYTableData.forEach((item, index) => {
- if (item.number === row.number) {
- item.isVisible = 0
- item.code = row.code
- item.name = row.name
- item.result = row.result
- item.stepcheckitem_desc = row.stepcheckitem_desc
- }
- })
-
- if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
- this.checkResult = 'OK'
- } else {
- this.checkResult = 'NG'
- }
- },
- // 鍙栨秷
- cancel(row) {
- this.JYTableData.forEach((item, index) => {
- if (item.number === row.number) {
- this.JYTableData.splice(index, 1)
- }
- })
-
- if (this.JYIsCancel && row.code.toString().length > 0) {
- this.JYSelectArr.splice(0, 0, {
- code: row.code,
- name: row.name,
- descr: row.stepcheckitem_desc
+ unit: j.unit,
+ stepcheckitem_desc: j.stepcheckitem_desc,
+ required: j.required, // 鏄惁蹇呭～
+ numberjudge: j.numberjudge, // 鏁板�煎垽鏂�
+ real_value: '',
+ check_result: j.numberjudge === 'Y' ? '' : true
+ })
})
}
- this.JYIsCancel = true
+
+ if (this.checkItemArr.every(i => i.check_result)) {
+ this.check_result = true
+ } else {
+ this.check_result = ''
+ }
},
- // 鍒犻櫎
- del(row) {
- this.JYSelectArr.splice(0, 0, {
- code: row.code,
- name: row.name,
- descr: row.stepcheckitem_desc
- })
+ numberChange(currentValue, oldValue) {
+ const t = this.checkItemArr.filter(i => i.checkNumber === 1)
- this.JYTableData.forEach((item, index) => {
- if (item.number === row.number) {
- this.JYTableData.splice(index, 1)
- }
- })
- },
- // 鎻愪氦
- submitButton(val) {
- if (val !== 'Cancel') {
- if (this.form.orderstepqrcode.length < 1) {
- return this.$message.info('鎵弿鏉＄爜涓嶈兘涓虹┖锛�')
- }
- if (this.form.wo_code.toString().length === 0) {
- return this.$message.info('鏈幏寰楀伐鍗曠紪鐮侊紒')
- }
- if (this.checkStandard.length < 1) {
- return this.$message.info('妫�楠屾爣鍑嗕笉鑳戒负绌猴紒')
- }
- if (this.checkUser.length < 1) {
- return this.$message.info('妫�楠屼汉鍛樹笉鑳戒负绌猴紒')
- }
- if (parseFloat(this.checkqty) <= 0) {
- return this.$message.info('妫�楠屾暟閲忓繀椤昏澶т簬闆讹紒')
- }
- if (this.JYTableData.length < 1) {
- return this.$message.info('妫�楠岄」淇℃伅涓嶈兘涓虹┖锛�')
- }
- if (this.checkResult.length < 1) {
- return this.$message.info('妫�楠岀粨鏋滀笉鑳戒负绌猴紒')
- }
+ // 浠舵暟鍙樺皯鏃舵墽琛�
+ if (currentValue < this.checkItemArr.length / t.length) {
+ this.checkItemArr.reverse()
+ this.checkItemArr.splice(0, t.length * (oldValue - currentValue))
+ this.checkItemArr.reverse()
- const text = val === 'FirstCheck' ? '棣栨淇濆瓨' : (val === 'PatroCheck' ? '宸℃淇濆瓨' : '瀹屽伐妫�淇濆瓨')
- this.$confirm('鏄惁纭' + text + '?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- const arr = []
- this.JYTableData = this.JYTableData.filter(item => item.code !== '')
- this.JYTableData.forEach((item, index) => {
- arr.push({
- code: item.code,
- name: item.name,
- seq: (index + 1),
- descr: item.stepcheckitem_desc,
- checkresult: item.result
+ this.stepActive = currentValue - 1
+ }
+ // 浠舵暟鍙樺鏃舵墽琛�
+ if (currentValue > this.checkItemArr.length / t.length) {
+ for (let i = currentValue; i > oldValue; i--) {
+ t.forEach(j => {
+ this.checkItemArr.push({
+ checkNumber: i,
+ name: j.name,
+ code: j.code,
+ standvalue: j.standvalue,
+ lowervalue: j.lowervalue,
+ uppervalue: j.uppervalue,
+
+ unit: j.unit,
+ stepcheckitem_desc: j.stepcheckitem_desc,
+ required: j.required, // 鏄惁蹇呭～
+ numberjudge: j.numberjudge, // 鏁板�煎垽鏂�
+ real_value: '',
+ check_result: j.numberjudge === 'Y' ? '' : true
})
})
- const data = {
- 'mesordercode': this.form.wo_code, // 宸ュ崟缂栧彿
- 'partcode': this.form.partcode, // 浜у搧缂栫爜
- 'stepcode': this.form.stepcode, // 宸ュ簭缂栫爜
- 'checkstanedcode': this.checkStandard, // 妫�楠屾爣鍑嗙紪鐮�
- 'checkusercode': this.checkUser, // 妫�楠屼汉鍛樼紪鐮�
- 'checkqty': this.checkqty, // 妫�楠屾暟閲�
- 'checktypecode': val, // 妫�楠岀被鍨嬬紪鐮�
- 'checkresult': this.checkResult, // 妫�楠岀粨鏋�(OK(鍚堟牸) NG(涓嶈壇))
- 'checkdescr': this.checkdescr, // 妫�楠屾弿杩�
- 'data': arr
+ }
+ this.checkItemArr.sort((a, b) => a.checkNumber - b.checkNumber)
+ }
+ },
+
+ pre() {
+ if (this.stepActive > 0) {
+ this.stepActive--
+ }
+ },
+ next() {
+ if (this.stepActive < this.form.sampscare) {
+ this.stepActive++
+ }
+ },
+
+ inputChange(val, item) {
+ if (val !== '') {
+ if (item.numberjudge === 'Y') { // 濡傛灉闇�瑕佽繘琛屾暟鍊煎垽鏂�
+ if (item.uppervalue === '' && item.lowervalue === '') { // 涓婇檺鍊间负绌猴紝涓嬮檺鍊间负绌�
+ item.check_result = parseFloat(val) === parseFloat(item.standvalue)
}
- SaveMesOrderStepCheckItem(data).then(res => {
- if (res.code === '200') {
- this.$message.success(text + '鎴愬姛锛�')
- this.clearContent()
- this.getFocus()
- this.getJYSelectArr()
- }
+
+ if (item.uppervalue !== '' && item.lowervalue !== '') { // 涓婇檺鍊间笉涓虹┖锛屼笅闄愬�间笉涓虹┖
+ item.check_result = parseFloat(val) >= parseFloat(item.lowervalue) && parseFloat(val) <=
+ parseFloat(item.uppervalue)
+ }
+
+ if (item.uppervalue !== '' && item.lowervalue === '') { // 涓婇檺鍊间笉涓虹┖锛屼笅闄愬�间负绌�
+ item.check_result = parseFloat(val) <= parseFloat(item.uppervalue)
+ }
+
+ if (item.uppervalue === '' && item.lowervalue !== '') { // 涓婇檺鍊间负绌猴紝涓嬮檺鍊间笉涓虹┖
+ item.check_result = parseFloat(val) >= parseFloat(item.lowervalue)
+ }
+ }
+ }
+
+ if (val === '') {
+ item.check_result = ''
+ }
+
+ this.check_result = !!this.checkItemArr.every(i => i.check_result)
+ },
+
+ checkResultClick(val, item) {
+ item.check_result = val === 'OK'
+
+ if (this.checkItemArr.filter(i => i.check_result !== '').length === this.checkItemArr.length) {
+ this.check_result = !!this.checkItemArr.every(i => i.check_result)
+ }
+ },
+
+ submitButton() {
+ this.$confirm('鏄惁纭鎻愪氦?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const checkitemcont = []
+ this.checkItemArr.forEach((i, index) => {
+ checkitemcont.push({
+ checknum: i.checkNumber + '/' + this.checkItemArr.length / this
+ .checkItemArr.filter(j => j.checkNumber === 1).length,
+ checkiem_seq: i.stepcheckitem_seq,
+ checkitem_code: i.code,
+ checkitem_name: i.name,
+ check_value: i.real_value ? i.real_value : '',
+ check_result: i.check_result ? 'OK' : 'NG',
+ checkitem_descr: ''
})
- }).catch(() => {
- this.$message.info('宸插彇娑堜繚瀛�')
})
- } else {
- this.clearContent()
- this.getFocus()
- this.getJYSelectArr()
- }
- },
- // 娓呯┖椤甸潰鍐呭
- clearContent() {
- this.JYTableData = []
- this.multipleSelection = []
- this.checkdescr = ''
- this.checkUser = getCookie('navTabId')
- this.checkqty = 0
- this.checkResult = ''
- this.checkStandard = ''
- this.form.orderstepqrcode = ''
- this.form.wo_code = ''
- this.form.partcode = ''
- this.form.partname = ''
- this.form.partspec = ''
- this.form.stepcode = ''
- this.form.stepname = ''
- this.judgeIsScanningArr = []
+ const data = {
+ wocode: this.form.wocode,
+ partcode: this.form.partcode,
+ stepcode: this.form.stepcode,
+ checkstandcode: this.form.checkstandcode,
+ check_type: this.form.checktype,
+ sampmethod: this.form.sampmethod,
+ qualitystatus: this.check_result ? 'OK' : 'NG',
+ good_qty: this.form.good_qty,
+ sampleqty: this.form.sampscare,
+ goodqty: this.form.goodqty,
+ ngqty: this.form.ngqty,
+ admin: this.form.username,
+ checkitemcont
+ }
- this.isCancel = true
+ SaveMesOrderStepCheckItem(data).then(res => {
+ if (res.code === '200') {
+ this.form.orderstepqrcode = ''
+
+ this.form.wocode = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.stepcode = ''
+ this.form.stepname = ''
+ this.form.checkstandcode = ''
+ this.form.checkstandname = ''
+ this.form.check_type = ''
+ this.form.sampmethod = ''// FIXED(鍥烘椂鎶芥) SCARE(姣斾緥鎶芥)
+ this.form.sampscare = ''
+ this.form.qualitystatus = ''
+ this.form.good_qty = '' // 鎸囩殑鎶ュ伐鏁伴噺
+ this.form.sampleqty = ''
+ this.form.goodqty = '' // 鍚堟牸鏁伴噺
+ this.form.ngqty = '' // 涓嶈壇鏁伴噺
+ this.stepActive = 0
+ this.checkItemArr = []
+ this.check_result = ''
+ this.$message.success('妫�楠屾垚鍔燂紒')
+ this.getFocus()
+ }
+ })
+ })
},
- // 鍗曞厓鏍艰鐐瑰嚮鏃�
- cellDblclick(row, column, cell, event) {
- console.log(row, column, cell, event)
- console.log(column.label)
- console.log(row.index)
- switch (column.label) {
- case '妫�楠屾爣鍑嗘弿杩�':
- this.tabClickIndex = row.index
- this.tabClickLabel = column.label
- break
- // case '鍒よ矗閲戦(鍏�)':
- // this.tabClickIndex = row.index
- // this.tabClickLabel = column.label
- // break
- default:
- return
- }
- },
- // 鍥炶溅浜嬩欢
- keyUpEnterNative(val, row) {
- this.tabClickLabel = ''
- },
-
- tableRowClassName({ row, rowIndex }) {
- // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
- row.index = rowIndex
- return 'custom-row'
- },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 450
-
- this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.tableHeight = this.mainHeight - 255
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
-<style lang="scss" scoped>
-::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
-}
-</style>
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-.el-button--text {
+::v-deep .el-button--text {
font-size: 14px;
cursor: pointer;
}
@@ -797,15 +579,41 @@
margin-right: 15px;
}
-::v-deep .el-button--primary, .el-button--default, .el-button--info {
- height: 34px;
+::v-deep .el-button--primary, .el-button--warning, .el-button--default, .el-button--info {
+ //height: 34px;
+ //display: flex;
+ //align-items: center;
+ //padding: 0 15px;
+ width: 58px;
display: flex;
align-items: center;
- padding: 0 15px;
+ justify-content: center;
}
-::v-deep .el-button--primary {
- //background-color: $main_color !important;
+.submitButton {
+ ::v-deep .el-button--primary {
+ width: 160px;
+ letter-spacing: 10px;
+ padding-left: 25px;
+ font-size: 18px;
+ //display: flex;
+ //justify-content: center;
+ //align-items: center;
+ }
+}
+
+.resultButton {
+ ::v-deep .el-button--primary {
+ width: 100px;
+ letter-spacing: 4px;
+ padding-left: 22px;
+ }
+
+ ::v-deep .el-button--warning {
+ width: 100px;
+ letter-spacing: 4px;
+ padding-left: 22px;
+ }
}
::v-deep .el-button--default {
@@ -859,7 +667,8 @@
}
::v-deep .el-form--inline .el-form-item__label {
- color: #a7a7a7;
+ //color: #a7a7a7;
+ //font-size: 16px;
}
.body ::v-deep .el-divider {
@@ -876,7 +685,110 @@
margin-bottom: 0;
}
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
</style>
+
+<style lang="scss" scoped>
+.content1 {
+ display: flex;
+ align-items: center;
+ margin: 10px 0 0 10px;
+
+ .title {
+ font-size: 14px;
+ font-weight: bold;
+ margin-left: 5px;
+ }
+}
+
+.content2 {
+ margin: 10px 0 0 20px;
+ display: flex;
+ font-size: 14px;
+ width: 100%;
+ align-items: center;
+}
+
+.orderMsg {
+ width: 33.33%;
+ display: flex;
+ align-items: center;
+}
+
+::v-deep .el-input-number--medium {
+ line-height: 32px;
+ width: 120px;
+}
+
+.checkItem {
+ display: flex;
+ justify-content: space-between;
+ min-height: 36px;
+
+ align-items: center;
+ flex-direction: column;
+ margin-top: 5px;
+}
+
+.serialNumber {
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ background-color: #42B983;
+ color: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 10px;
+}
+
+.itemTitle {
+ width: 300px;
+ padding-left: 40px;
+ height: 26px;
+ color: #909399;
+ display: flex;
+ align-items: center;
+
+ ::v-deep .el-input--mini {
+ line-height: 24px;
+ height: 24px;
+ }
+
+ ::v-deep .el-input__inner {
+ line-height: 24px;
+ height: 24px;
+ }
+}
+
+.itemContent {
+ width: 150px;
+ height: 26px;
+ padding-left: 20px;
+ display: flex;
+ align-items: center;
+
+}
+
+.orderMsg2 {
+ width: 200px;
+}
+</style>
+
<style>
.el-table .custom-row {
diff --git a/src/views/qualityManager/processCheck_back.vue b/src/views/qualityManager/processCheck_back.vue
new file mode 100644
index 0000000..30b17ff
--- /dev/null
+++ b/src/views/qualityManager/processCheck_back.vue
@@ -0,0 +1,885 @@
+<template>
+ <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding-top: 10px;display: flex;flex-direction: column">
+ <div style="margin-bottom: 15px;font-size: 14px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />鎵爜淇℃伅
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 鎵弿鏉＄爜锛�
+ </div>
+ <el-input
+ v-model="form.orderstepqrcode"
+ name="GXproduceCode"
+ style="width: 300px"
+ @keyup.enter.native="val=>enterNative(val,'GXproduceCode')"
+ />
+ <!-- @keyup.native="e=>judgeIsScanning(e,'GXproduceCode')"-->
+
+ </div>
+ <!-- 鍏」淇℃伅 -->
+ <div v-if="!isIpad" style="background:#f8f8fa ;display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div style="display: flex; margin-left: 10px">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div style="width: 150px">{{ form.wo_code }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div style="width: 150px">{{ form.partcode }}</div>
+ </div>
+ </div>
+ <div style="display: flex;margin-left: 30px;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 150px">{{ form.partname }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div style="width: 150px">{{ form.partspec }}</div>
+ </div>
+ </div>
+ <div style=" display: flex;margin-left: 30px;">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div style="width: 150px">{{ form.stepcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div style="width: 150px">{{ form.stepname }}</div>
+ </div>
+ </div>
+ </div>
+ <div
+ v-if="isIpad"
+ style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column"
+ >
+ <div style="display: flex; justify-content: flex-start;width: 100%">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ崟缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.wo_code }}</div>
+ </div>
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.partcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">浜у搧鍚嶇О锛�</div>
+ <div style="width: 200px">{{ form.partname }}</div>
+ </div>
+ </div>
+
+ <div style=" display: flex; justify-content: flex-start;margin-top: 10px;width: 100%">
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">浜у搧瑙勬牸锛�</div>
+ <div style="width: 200px">{{ form.partspec }}</div>
+ </div>
+ <div style="display: flex;margin-right: 50px">
+ <div style="width: 90px">宸ュ簭缂栫爜锛�</div>
+ <div style="width: 200px">{{ form.stepcode }}</div>
+ </div>
+ <div style="display: flex;">
+ <div style="width: 90px">宸ュ簭鍚嶇О锛�</div>
+ <div style="width: 200px">{{ form.stepname }}</div>
+ </div>
+ </div>
+ </div>
+
+ <div style="margin: 15px 0;font-size: 14px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屾爣鍑嗭細
+ </div>
+ <el-select
+ v-model="checkStandard"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ @change="changeCheckStandard"
+ >
+ <el-option
+ v-for="item in checkStandardSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ <div style="width: 90px;margin-left: 50px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屼汉鍛橈細
+ </div>
+ <el-select
+ v-model="checkUser"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkUserSelect"
+ :key="item.usercode"
+ :label="item.username"
+ :value="item.usercode"
+ />
+ </el-select>
+ <div style="width: 90px;margin-left: 50px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屾暟閲忥細
+ </div>
+ <el-input v-model="checkqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+ </div>
+
+ <!-- 妫�楠岀粨鏋� 鍜� 妫�楠屽娉� -->
+ <div style="display: flex;margin-top: 20px;align-items: center">
+
+ <div style="display: flex;margin-right: 50px;align-items: center">
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠岀粨鏋滐細
+ </div>
+ <el-select
+ v-model="checkResult"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ filterable
+ >
+ <el-option
+ v-for="item in checkResultSelect"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </div>
+ <div style="display: flex;align-items: center">
+ <div style="width: 90px">妫�楠屽娉細</div>
+ <el-input v-model="checkdescr" style="width: 540px" placeholder="璇疯緭鍏�" />
+ </div>
+
+ </div>
+
+ <div style="margin: 15px 0;font-size: 14px">
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" style="margin-right: 5px" />妫�楠岄」淇℃伅
+ </div>
+ <div>
+ <el-button v-waves type="primary" @click="add">鏂板</el-button>
+ </div>
+ <div style="margin-top: 10px">
+ <el-table
+ ref="multipleTable"
+ :data="JYTableData"
+ :height="tableHeight+'px'"
+ border
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:tableHeight+'px',}"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @selection-change="handleSelectionChange"
+ @cell-dblclick="cellDblclick"
+ >
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ width="100"
+ fixed
+ />
+
+ <!-- <el-table-column-->
+ <!-- prop="code"-->
+ <!-- label="妫�楠岄」鐩紪鐮�(鍚嶇О)"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.isVisible===0" style="display: flex;">-->
+ <!-- <div>{{ row.code }}</div>-->
+ <!-- <div style="margin-left: 10px">{{ row.name }}</div>-->
+ <!-- </div>-->
+
+ <!-- <el-select-->
+ <!-- v-if="row.isVisible===1"-->
+ <!-- v-model="row.code"-->
+ <!-- filterable-->
+ <!-- style="width: 400px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- @change="val=>changeCode(val,row)"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in JYSelectArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.code+''+item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+
+ <el-table-column
+ prop="code"
+ label="妫�楠屾爣鍑嗙紪鐮�"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.code"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.name"
+ :label="item.code"
+ :value="item.name"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="妫�楠屾爣鍑嗗悕绉�"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-select
+ v-if="row.isVisible===1"
+ v-model="row.name"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ @change="val=>changeName(val,row)"
+ >
+ <el-option
+ v-for="item in JYSelectArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="stepcheckitem_desc"
+ label="妫�楠屾爣鍑嗘弿杩�"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-if="scope.row.isVisible===1||scope.row.index === tabClickIndex && tabClickLabel === '妫�楠屾爣鍑嗘弿杩�'"
+ v-model="scope.row.stepcheckitem_desc"
+ placeholder="璇疯緭鍏�"
+ @keyup.enter.native="val=>keyUpEnterNative(val,scope.row)"
+ />
+ <div
+ v-else
+ > {{ scope.row.stepcheckitem_desc }}
+ </div>
+
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="result"
+ label="妫�楠岀粨鏋�"
+ width="100"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.result==='OK'">鍚堟牸</div>
+ <div v-if="row.result==='NG'">涓嶈壇</div>
+ </template>
+
+ <!-- <template slot-scope="{row}">-->
+ <!-- <el-radio-group-->
+ <!-- v-model="row.result"-->
+ <!-- size="small"-->
+ <!-- @change="a=>changeRadioValue(a,row)"-->
+ <!-- >-->
+ <!-- <el-radio-->
+ <!-- :label="0"-->
+ <!-- @change="clickRadio(0,row)"-->
+ <!-- >-->
+ <!-- 鍚堟牸-->
+ <!-- </el-radio>-->
+ <!-- <el-radio-->
+ <!-- :label="1"-->
+ <!-- @change="clickRadio(1,row)"-->
+ <!-- >-->
+ <!-- 涓嶈壇-->
+ <!-- </el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </template>-->
+
+ </el-table-column>
+
+ <el-table-column
+ type="selection"
+ width="55"
+ />
+
+ <el-table-column
+ label="鎿嶄綔"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="confirm(row)">纭</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancel(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <div style="display: flex;margin: 30px 0;align-items: center">
+ <el-button v-waves type="primary" @click="submitButton('FirstCheck')">棣栨淇濆瓨</el-button>
+ <el-button v-waves type="primary" style="margin-left: 50px" @click="submitButton('PatroCheck')">宸℃淇濆瓨</el-button>
+ <el-button v-waves type="primary" style="margin-left: 50px" @click="submitButton('EndCheck')">瀹屽伐妫�淇濆瓨</el-button>
+ <el-button v-waves type="info" style="margin-left: 50px" @click="submitButton('Cancel')">鍙栨秷</el-button>
+ </div>
+ </div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+// import Pagination from '@/components/Pagination'
+
+// const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import $ from 'jquery'
+import {
+ MesOrderStepCheckItemList,
+ MesOrderStepCheckSearch,
+ MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
+ StepCheckItemSelect
+} from '@/api/qualityManager'
+import { MesOrderSelectUser } from '@/api/produceManager'
+import { getCookie } from '@/utils/auth'
+import waves from '@/directive/waves'
+
+export default {
+ name: 'QXDY',
+ // components: {
+ // Pagination
+ // },
+ directives: { waves },
+ data() {
+ return {
+ isIpad: false,
+ mainHeight: 0,
+ tableHeight: 0,
+ form: { // 宸ュ簭
+ // MO-2022-07-0001_1;001
+ orderstepqrcode: '', // 鎵弿鐨勪簩缁寸爜淇℃伅
+ wo_code: '', // 宸ュ崟缂栫爜
+ partcode: '', // 浜у搧缂栫爜
+ partname: '', // 浜у搧鍚嶇О
+ partspec: '', // 浜у搧瑙勬牸
+ stepcode: '', // 宸ュ簭缂栫爜
+ stepname: ''// 宸ュ簭鍚嶇О
+ },
+ checkStandard: '', // 妫�楠屾爣鍑�
+ checkStandardSelect: [], // 妫�楠屾爣鍑嗕笅鎷夋暟缁�
+ checkUser: getCookie('navTabId'), // 妫�楠屼汉鍛�
+ checkqty: 0, // 妫�楠屾暟閲�
+ checkUserSelect: [], // 妫�楠屼汉鍛樹笅鎷夋暟缁�
+ checkResult: '', // 妫�楠岀粨鏋�
+ checkResultSelect: [
+ { code: 'OK', name: '鍚堟牸' },
+ { code: 'NG', name: '涓嶈壇' }
+ ], // 妫�楠岀粨鏋滀笅鎷夋暟缁�
+ checkdescr: '', // 妫�楠屽娉紙鎻忚堪锛�
+
+ JYTableData: [], // 妫�楠岄」淇℃伅琛ㄦ牸
+ JYSelectArr: [], // 妫�楠屼笅鎷夋暟缁�
+ // JYSelectedArr: [], // 宸查�夋楠岄」鐩暟缁�
+ JYIsCancel: true,
+ multipleSelection: [], // 琛ㄦ牸澶氶�夋
+ tabClickIndex: null, // 鐐瑰嚮鐨勫崟鍏冩牸
+ tabClickLabel: '', // 褰撳墠鐐瑰嚮鐨勫垪鍚�
+ isCancel: false, // 鏄惁鐐瑰嚮鍙栨秷鎸夐挳
+ judgeIsScanningArr: []// 鍒ゆ柇鏄惁鎵爜鏁扮粍
+ }
+ },
+ created() {
+ this.handleRequest()
+ },
+ mounted() {
+ window.addEventListener('resize', this.getHeight)
+ this.getHeight()
+
+ this.getFocus()
+ },
+ methods: {
+ handleRequest() {
+ this.getMesOrderStepCheckSelect().then(res => {
+ if (res.code === '200') {
+ this.getMesOrderSelectUser()
+ this.getJYSelectArr()
+ }
+ })
+ },
+
+ // 鑾峰彇鑱氱劍
+ getFocus() {
+ this.$nextTick(() => {
+ $("input[name='GXproduceCode']")[0].focus()
+ })
+ },
+ // 鑾峰彇妫�楠屾爣鍑嗕笅鎷夋暟缁�
+ async getMesOrderStepCheckSelect() {
+ const res = await MesOrderStepCheckSelect()
+ this.checkStandardSelect = res.data
+ return { code: res.code }
+ },
+ // 鑾峰彇妫�楠屼汉鍛樹笅鎷�
+ async getMesOrderSelectUser() {
+ const { data: res } = await MesOrderSelectUser()
+ this.checkUserSelect = res
+ },
+ // 鑾峰彇妫�楠岄」涓嬫媺鏁扮粍
+ async getJYSelectArr() {
+ const { data: res } = await StepCheckItemSelect()
+ this.JYSelectArr = res
+ },
+ // 妫�楠屾爣鍑嗕笅鎷夊�兼敼鍙�
+ async changeCheckStandard(val) {
+ await this.getJYSelectArr()
+ this.isCancel = false
+
+ const { data: res } = await MesOrderStepCheckItemList({ checkstandcode: val })
+ this.JYTableData = res
+
+ // let arr = [鈥].filter(x => [鈥].every(y => y.id !== x.id));
+ this.JYSelectArr = [...this.JYSelectArr].filter(x => [...this.JYTableData].every(y => y.code !== x.code))
+
+ this.JYTableData.forEach(item => {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+
+ // item.result = 0 // 0鍚堟牸 1涓嶈壇
+ item.result = 'OK'
+
+ item.isVisible = 0
+ item.number = number
+ })
+ this.$refs.multipleTable.toggleAllSelection()
+ },
+ // changeRadioValue(val, row) {
+ // console.log(val, row.result, 20000)
+ // },
+ // clickRadio(e, row) {
+ // console.log(e, row.result, 10000)
+ // row.result = e
+ // },
+ handleSelectionChange(val) {
+ this.multipleSelection = val
+ const arr = this.multipleSelection.map(i => i.number)
+ this.JYTableData.forEach(it => {
+ if (arr.includes(it.number)) {
+ it.result = 'OK'
+ } else {
+ it.result = 'NG'
+ }
+ })
+
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
+ } else {
+ this.checkResult = 'NG'
+ }
+ if (this.isCancel) {
+ this.checkResult = ''
+ }
+ },
+ // 妫�楠岄」鐩紪鐮侊紙鍚嶇О锛�
+ changeName(val, row) {
+ const res = this.JYSelectArr.find(item => {
+ return item.code === val || item.name === val
+ })
+ row.code = res.code
+ row.name = res.name
+ row.stepcheckitem_desc = res.descr
+ },
+ // 闃叉姈 //鎵爜鐢ㄧ殑鏄槻鎶�
+ 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()
+ that.enterNative(that.form.orderstepqrcode, belong)
+ }, delay)
+ }
+ }
+ },
+ // 鍒ゆ柇鏄惁鏄壂鐮佹灙鎵爜
+ 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) {
+ if (belong === 'GXproduceCode') {
+ const res = await MesOrderStepCheckSearch({ orderstepqrcode: this.form.orderstepqrcode })
+ this.form.wo_code = res.data[0].wo_code
+ this.form.partcode = res.data[0].partcode
+ this.form.partname = res.data[0].partname
+ this.form.partspec = res.data[0].partspec
+ this.form.stepcode = res.data[0].stepcode
+ this.form.stepname = res.data[0].stepname
+ }
+ },
+
+ // 鏂板
+ add() {
+ if (this.JYTableData.length === 0) {
+ return this.$message.info('璇峰厛閫夋嫨妫�楠屾爣鍑嗭紒')
+ }
+ if (this.JYTableData.length > 0 && this.JYTableData[this.JYTableData.length - 1].isVisible === 1) {
+ return this.$message.info('璇峰厛纭畾鎴栧彇娑堟湰鏉¤褰曪紒')
+ }
+
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
+ this.JYTableData.push(data)
+ this.$refs.multipleTable.toggleRowSelection(data, true)
+
+ this.JYIsCancel = false
+ },
+
+ // 纭
+ confirm(row) {
+ if (row.code === '') {
+ return this.$message.info('妫�楠岄」鐩紪鐮佷笉鑳戒负绌猴紒')
+ }
+ if (row.name === '') {
+ return this.$message.info('妫�楠岄」鐩悕绉颁笉鑳戒负绌猴紒')
+ }
+
+ this.JYSelectArr.forEach((item, index) => {
+ if (item.code === row.code) {
+ this.JYSelectArr.splice(index, 1)
+ }
+ })
+
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ item.isVisible = 0
+ item.code = row.code
+ item.name = row.name
+ item.result = row.result
+ item.stepcheckitem_desc = row.stepcheckitem_desc
+ }
+ })
+
+ if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
+ this.checkResult = 'OK'
+ } else {
+ this.checkResult = 'NG'
+ }
+ },
+ // 鍙栨秷
+ cancel(row) {
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.JYTableData.splice(index, 1)
+ }
+ })
+
+ if (this.JYIsCancel && row.code.toString().length > 0) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.stepcheckitem_desc
+ })
+ }
+ this.JYIsCancel = true
+ },
+
+ // 鍒犻櫎
+ del(row) {
+ this.JYSelectArr.splice(0, 0, {
+ code: row.code,
+ name: row.name,
+ descr: row.stepcheckitem_desc
+ })
+
+ this.JYTableData.forEach((item, index) => {
+ if (item.number === row.number) {
+ this.JYTableData.splice(index, 1)
+ }
+ })
+ },
+ // 鎻愪氦
+ submitButton(val) {
+ if (val !== 'Cancel') {
+ if (this.form.orderstepqrcode.length < 1) {
+ return this.$message.info('鎵弿鏉＄爜涓嶈兘涓虹┖锛�')
+ }
+ if (this.form.wo_code.toString().length === 0) {
+ return this.$message.info('鏈幏寰楀伐鍗曠紪鐮侊紒')
+ }
+ if (this.checkStandard.length < 1) {
+ return this.$message.info('妫�楠屾爣鍑嗕笉鑳戒负绌猴紒')
+ }
+ if (this.checkUser.length < 1) {
+ return this.$message.info('妫�楠屼汉鍛樹笉鑳戒负绌猴紒')
+ }
+ if (parseFloat(this.checkqty) <= 0) {
+ return this.$message.info('妫�楠屾暟閲忓繀椤昏澶т簬闆讹紒')
+ }
+ if (this.JYTableData.length < 1) {
+ return this.$message.info('妫�楠岄」淇℃伅涓嶈兘涓虹┖锛�')
+ }
+ if (this.checkResult.length < 1) {
+ return this.$message.info('妫�楠岀粨鏋滀笉鑳戒负绌猴紒')
+ }
+
+ const text = val === 'FirstCheck' ? '棣栨淇濆瓨' : (val === 'PatroCheck' ? '宸℃淇濆瓨' : '瀹屽伐妫�淇濆瓨')
+ this.$confirm('鏄惁纭' + text + '?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ const arr = []
+ this.JYTableData = this.JYTableData.filter(item => item.code !== '')
+ this.JYTableData.forEach((item, index) => {
+ arr.push({
+ code: item.code,
+ name: item.name,
+ seq: (index + 1),
+ descr: item.stepcheckitem_desc,
+ checkresult: item.result
+ })
+ })
+ const data = {
+ 'mesordercode': this.form.wo_code, // 宸ュ崟缂栧彿
+ 'partcode': this.form.partcode, // 浜у搧缂栫爜
+ 'stepcode': this.form.stepcode, // 宸ュ簭缂栫爜
+ 'checkstanedcode': this.checkStandard, // 妫�楠屾爣鍑嗙紪鐮�
+ 'checkusercode': this.checkUser, // 妫�楠屼汉鍛樼紪鐮�
+ 'checkqty': this.checkqty, // 妫�楠屾暟閲�
+ 'checktypecode': val, // 妫�楠岀被鍨嬬紪鐮�
+ 'checkresult': this.checkResult, // 妫�楠岀粨鏋�(OK(鍚堟牸) NG(涓嶈壇))
+ 'checkdescr': this.checkdescr, // 妫�楠屾弿杩�
+ 'data': arr
+ }
+ SaveMesOrderStepCheckItem(data).then(res => {
+ if (res.code === '200') {
+ this.$message.success(text + '鎴愬姛锛�')
+ this.clearContent()
+ this.getFocus()
+ this.getJYSelectArr()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堜繚瀛�')
+ })
+ } else {
+ this.clearContent()
+ this.getFocus()
+ this.getJYSelectArr()
+ }
+ },
+ // 娓呯┖椤甸潰鍐呭
+ clearContent() {
+ this.JYTableData = []
+ this.multipleSelection = []
+ this.checkdescr = ''
+ this.checkUser = getCookie('navTabId')
+ this.checkqty = 0
+ this.checkResult = ''
+ this.checkStandard = ''
+ this.form.orderstepqrcode = ''
+ this.form.wo_code = ''
+ this.form.partcode = ''
+ this.form.partname = ''
+ this.form.partspec = ''
+ this.form.stepcode = ''
+ this.form.stepname = ''
+
+ this.judgeIsScanningArr = []
+
+ this.isCancel = true
+ },
+
+ // 鍗曞厓鏍艰鐐瑰嚮鏃�
+ cellDblclick(row, column, cell, event) {
+ console.log(row, column, cell, event)
+ console.log(column.label)
+ console.log(row.index)
+ switch (column.label) {
+ case '妫�楠屾爣鍑嗘弿杩�':
+ this.tabClickIndex = row.index
+ this.tabClickLabel = column.label
+ break
+ // case '鍒よ矗閲戦(鍏�)':
+ // this.tabClickIndex = row.index
+ // this.tabClickLabel = column.label
+ // break
+ default:
+ return
+ }
+ },
+ // 鍥炶溅浜嬩欢
+ keyUpEnterNative(val, row) {
+ this.tabClickLabel = ''
+ },
+
+ tableRowClassName({ row, rowIndex }) {
+ // 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
+ row.index = rowIndex
+ return 'custom-row'
+ },
+ // 鑾峰彇椤甸潰楂樺害
+ getHeight() {
+ this.$nextTick(() => {
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 450
+
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.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 .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;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
--
Gitblit v1.9.3