From 9da0675fa67f1f03f48881b2664da4c01356d1b5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 23 七月 2025 15:01:08 +0800
Subject: [PATCH] 插回损--功能修改
---
src/views/quality/processInspect/processInspect-form.vue | 1028 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 808 insertions(+), 220 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 239b2bc..5ee1239 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -18,61 +18,85 @@
<div class="formwrapper">
<el-row>
<el-col :span="6">
- <el-form-item label="杩囩▼妫�楠岀紪鍙凤細">
- <el-input @blur="selectInfoByOrderId" disabled
- v-model="processInspectVo.proInsNo" autocomplete="off" />
+ <el-form-item label="杩囩▼妫�楠岀紪鍙�">
+ <el-input disabled
+ v-model="processInspectVo.proInsNo" placeholder="杩囩▼妫�楠岀紪鍙�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="璁㈠崟鍙凤細" prop="orderNumber">
+ <el-form-item label="杞﹂棿璁㈠崟鍙�" prop="moNo">
<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.orderNumber" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ v-model="processInspectVo.moNo" placeholder="璇疯緭鍏ヨ溅闂磋鍗曞彿" autocomplete="off" >
+ <!-- <el-button
+ slot="append"
+ icon="el-icon-search"
+ :disabled="resultVal!=null"
+ @click="queryCode"></el-button> -->
+ <el-button
+ slot="append"
+ icon="el-icon-full-screen"
+ :disabled="resultVal!=null"
+ @click="Turnonthecamera"></el-button>
+ </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧鍚嶇О锛�">
- <el-select style="width: 100%" @change="changeOptionsSamplename"
- :disabled="processInspectVo.id != null" v-model="processInspectVo.material"
- size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
- <el-option v-for="(item, index) in optionsSamplename" :key="index"
- :label="item.material" :value="item.materialCode">
- </el-option>
- </el-select>
+ <el-form-item label="閿�鍞鍗曞彿" prop="orderNumber">
+ <el-input disabled
+ v-model="processInspectVo.orderNumber" placeholder="閿�鍞鍗曞彿" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浜у搧缂栧彿锛�">
- <el-input disabled v-model="processInspectVo.materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�"
- autocomplete="off" />
+ <el-form-item label="浜у搧鍚嶇О">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
+ <el-input v-model="processInspectVo.material" disabled placeholder="浜у搧鍚嶇О"></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input disabled v-model="processInspectVo.specs"
- autocomplete="off" />
+ <el-form-item label="浜у搧缂栧彿">
+ <el-input disabled v-model="processInspectVo.materialCode" placeholder="浜у搧缂栧彿" autocomplete="off" />
</el-form-item>
</el-col>
-
<el-col :span="6">
- <el-form-item label="宸ュ簭鍚嶇О">
+ <el-form-item label="瑙勬牸鍨嬪彿">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
+ <el-input disabled v-model="processInspectVo.specs" placeholder="瑙勬牸鍨嬪彿" autocomplete="off" />
+ </el-tooltip>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+ <el-form-item label="宸ュ崟" prop="operationTaskId">
<el-select style="width: 100%" :disabled="processInspectVo.id != null"
- v-model="processInspectVo.technologyOperationId" size="small" placeholder="璇烽�夋嫨宸ュ簭">
- <el-option v-for="(item, index) in technologyList" :key="index" :label="item.name"
- :value="item.technologyOperationId">
+ v-model="processInspectVo.operationTaskId" size="small" placeholder="璇烽�夋嫨宸ュ崟">
+ <el-option v-for="(item, index) in technologyList" :key="index" :label="item.name+'-'+item.optaskNo"
+ :value="item.operationTaskId">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍗曚綅锛�">
- <el-input disabled v-model="processInspectVo.unit" placeholder="璇疯緭鍏ュ崟浣�"
- autocomplete="off" />
+ <el-form-item label="鍗曚綅">
+ <el-input disabled v-model="processInspectVo.unit" placeholder="鍗曚綅" autocomplete="off" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="瀹㈡埛鍚嶇О" prop="customerName">
+ <el-input v-model="processInspectVo.customerName" placeholder="瀹㈡埛鍚嶇О" autocomplete="off" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏁伴噺锛�">
+ <el-form-item label="宸ョ▼鍚嶇О" prop="projectName">
+ <el-input v-model="processInspectVo.projectName" placeholder="宸ョ▼鍚嶇О" autocomplete="off" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏁伴噺" prop="quantity">
<el-input v-model="processInspectVo.quantity" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off"
:disabled="processInspectVo.id != null" />
</el-form-item>
@@ -81,97 +105,242 @@
</div>
</el-form>
</div>
- <div class="finishedProduct-detail">
- <el-row style="width:100%;z-index: 10;height:30px;">
- <el-col :span="12" class="inspectionProject_span">妫�楠岄」鐩�</el-col>
- <el-col v-if="resultVal == null" :span="12" class="inspectionProject_span" style="text-align: right;">
- <el-button size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
- <el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
- </el-col>
- </el-row>
- <el-row style="width:100%;">
- <el-col :span="24">
- <el-table border
- :data="inspectionItems"
- height="400"
- :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
- :cell-style="{ textAlign: 'center' }"
- row-key="iid"
- default-expand-all style="width: 100%"
- ref="table"
- :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
- <el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
- <el-table-column label="椤圭洰" prop="father" width="240"></el-table-column>
- <el-table-column prop="iname" label="鎸囨爣" width="240"></el-table-column>
- <el-table-column prop="iunit" label="鍗曚綅" width="240"></el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="240"></el-table-column>
- <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
- label="妫�娴嬪��" width="240" style="text-align: center;">
- <template slot-scope="scope">
- <el-col v-if="scope.row.itype === '1'">
- <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.empiricalValueAddss[index]"
- @blur="changeState(scope.row,true)" placeholder="璇疯緭鍏ユ娴嬪��"></el-input>
- <span v-if="resultVal != null && processInspectVo.id != null"
- v-text="scope.row.empiricalValueAddss[index]"></span>
- </el-tooltip>
- </el-col>
- <el-col v-else>
- <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
- <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <span v-if="resultVal != null && processInspectVo.id != null"
- v-text="scope.row.empiricalValueAddss[index]"></span>
- </el-tooltip>
- </el-col>
- </template>
+ <div>
+ <el-tabs class="finishedProduct-detail" @tab-click="tabsClick">
+ <el-tab-pane label="妫�楠岄」鐩�">
+ <el-row>
+ <el-col v-if="resultVal == null" :span="24" class="inspectionProject_span" style="text-align: right;">
+ <el-button size="small"
+ type="primary"
+ v-if="inspectionItems&&inspectionItems.length>0"
+ @click="saveTable()">淇濆瓨</el-button>
+ <el-button size="mini" @click="clickAddInspectionColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
+ <el-button size="mini" @click="clickDeleteInspectionColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-table border
+ :data="inspectionItems"
+ height="400"
+ :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
+ :cell-style="{ textAlign: 'center' }"
+ row-key="iid"
+ default-expand-all style="width: 100%"
+ ref="table"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+ <el-table-column type="index" prop="parentIndex" label="搴忓彿" width="60">
+ <template scope="scope">
+ <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="椤圭洰" prop="father" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="iname" label="鎸囨爣" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="iunit" label="鍗曚綅" show-overflow-tooltip width="140"></el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="140"></el-table-column>
+ <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index"
+ label="妫�娴嬪��" width="140" style="text-align: center;">
+ <template slot-scope="scope">
+ <el-col v-if="scope.row.itype === '1'">
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.empiricalValueAddss[index]"
+ @blur="changeState(scope.row,true)" placeholder="璇疯緭鍏ユ娴嬪��"
+ :id="`detectionValue${index}`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `detectionValue${index}`)"></el-input>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.empiricalValueAddss[index]"></span>
+ </el-tooltip>
+ </el-col>
+ <el-col v-else>
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.empiricalValueAddss[index]"></span>
+ </el-tooltip>
+ </el-col>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
+ <template slot-scope="scope">
+ <span v-if="resultVal != null && scope.row.iname != null"
+ v-text="scope.row.ename"></span>
+ <div v-else>
+ <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null"
+ filterable @change="updateDevice(scope.row, scope.$index)">
+ <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
+ :label="item.code + '-' + item.name"></el-option>
+ </el-select>
+ <el-button
+ size="small"
+ slot="append"
+ icon="el-icon-full-screen"
+ v-if="scope.row.iname != null"
+ @click="codeDevice(scope.row,scope.$index)"></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column show-overflow-tooltip
+ label="妫�楠屾弿杩�" width="140" style="text-align: center;">
+ <template slot-scope="scope">
+ <el-col>
+ <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
+ class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-input :disabled="scope.row.eId == null"
+ v-model="scope.row.inote"
+ @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"
+ :id="`remark`+scope.$index"
+ @keyup.native="moveFocus($event, scope.$index, `remark`)"></el-input>
+ <span v-if="resultVal != null && processInspectVo.id != null"
+ v-text="scope.row.inote"></span>
+ </el-tooltip>
+ </el-col>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁撹" fixed="right" min-width="100">
+ <template slot-scope="scope">
+ <div v-if="scope.row.iname != null">
+ <span style="color: #34BD66;" v-if="scope.row.iresult == 1">鍚堟牸</span>
+ <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">涓嶅悎鏍�</span>
+ <span v-else>鏆傛棤缁撹</span>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="闄勪欢涓婁紶" type="card">
+ <div style="display: flex;justify-content:flex-end;">
+ <div></div>
+ </div>
+ <div
+ v-loading="progrecessFileLoading"
+ element-loading-text="璇风◢绛夛紝鏂囦欢涓婁紶涓�"
+ >
+ <el-upload
+ :disabled="processInspectVo.proInsNo==null || (resultVal!=null && resultVal!='')"
+ drag
+ ref="upload"
+ action="/mes/rawInsProduct/upload"
+ :auto-upload="true"
+ :headers="headers"
+ :before-upload="submitUpload"
+ :on-success="uploadSuccess"
+ :data="paramData"
+ :with-credentials="true"
+ :show-file-list="false"
+ >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em>
+ </div>
+ </el-upload>
+ </div>
+ <el-table :data="processConfigFileTableData" height="260px">
+ <el-table-column
+ prop="rawInsNo"
+ align="center"
+ width="120"
+ label="鍘熸潗鏂欐楠岀紪鍙�"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ ></el-table-column>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑"></el-table-column>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�"></el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button
+ @click="delProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ :disabled="(resultVal!=null && resultVal!='')"
+ >鍒犻櫎</el-button
+ >
+ <el-button
+ @click="downloadProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ <el-tab-pane label="闄勪欢">
+ <el-table :data="configFileTableData" height="400px">
+ <el-table-column
+ prop="orderNumber"
+ align="center"
+ label="璁㈠崟鍙�"
+ show-overflow-tooltip
+ >
</el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="250">
- <template slot-scope="scope">
- <span v-if="resultVal != null && scope.row.iname != null"
- v-text="scope.row.ename"></span>
- <div v-else>
- <el-select style="width:100%" v-model="scope.row.eId" v-if="scope.row.iname != null"
- filterable @change="updateDevice(scope.row, scope.$index)">
- <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id"
- :label="item.code + '-' + item.name"></el-option>
- </el-select>
- </div>
- </template>
+ <el-table-column
+ prop="originalFileName"
+ align="center"
+ label="鍘熸枃浠跺悕"
+ width="200"
+ >
</el-table-column>
- <el-table-column
- label="妫�楠屾弿杩�" width="240" style="text-align: center;">
- <template slot-scope="scope">
- <el-col>
- <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
- class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-input :disabled="scope.row.eId == null"
- v-model="scope.row.inote"
- @blur="changeState(scope.row)" placeholder="璇疯緭鍏ユ楠屾弿杩�"></el-input>
- <span v-if="resultVal != null && processInspectVo.id != null"
- v-text="scope.row.inote"></span>
- </el-tooltip>
- </el-col>
- </template>
+ <el-table-column prop="fileName" align="center" label="鏂囦欢鍚庣紑">
</el-table-column>
- <el-table-column label="缁撹" fixed="right" min-width="100">
- <template slot-scope="scope">
- <div v-if="scope.row.iname != null">
- <span style="color: #34BD66;" v-if="scope.row.iresult == 1">鍚堟牸</span>
- <span style="color: #E84738;" v-else-if="scope.row.iresult == 0">涓嶅悎鏍�</span>
- <span v-else>鏆傛棤缁撹</span>
- </div>
- </template>
+ <el-table-column prop="createUser" align="center" label="涓婁紶浜�">
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ align="center"
+ label="涓婁紶鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column prop="updateUser" align="center" label="鏇存柊浜�">
+ </el-table-column>
+ <el-table-column
+ prop="updateTime"
+ align="center"
+ label="鏇存柊鏃堕棿"
+ show-overflow-tooltip
+ >
+ </el-table-column>
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button
+ @click="downloadProcessConfigFiles(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
</el-table-column>
</el-table>
- </el-col>
- </el-row>
+ </el-tab-pane>
+ </el-tabs>
</div>
<div class="finishedProduct-result">
<el-row style="width:100%">
@@ -182,8 +351,8 @@
<el-table border height="90" :data="inspectionResultForm"
:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
:cell-style="{ textAlign: 'center' }">
- <el-table-column prop="materialCode" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="material" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="materialCode" width="200" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="material" width="200" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="result" label="妫�楠岀粨璁�">
<template slot-scope="scope">
@@ -202,9 +371,55 @@
</el-row>
</div>
</div>
+ <el-dialog
+ title="鎵弿"
+ :visible.sync="qrcode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeCompont" @ok="getResultInfo" @cancelCodeDialog="cancelCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="qrcode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="qrcode = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="璁惧鎵弿"
+ :visible.sync="deviceCode"
+ width="60%">
+ <div style="height: 100vh;width: 100%;">
+ <qr-code-app ref="codeDeviceCompont" @ok="getDeviceResultInfo" @cancelCodeDialog="cancelDeviceCodeDialog"></qr-code-app>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="deviceCode = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="deviceCode = false">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog
+ title="涓嶅悎鏍间俊鎭�"
+ :visible.sync="unqualified"
+ width="30%">
+ <div style="height: 30vh;width: 100%;">
+ <el-form :model="ruleForm" :rules="unqualifiedRules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+ <el-form-item label="涓嶅悎鏍兼暟閲�" prop="number">
+ <el-input v-model="ruleForm.number"></el-input>
+ </el-form-item>
+ <el-form-item label="鎵规鍙�" prop="outBatchNo">
+ <el-select v-model="ruleForm.outBatchNo" multiple placeholder="璇烽�夋嫨鎵规鍙�" style="width: 100%;" :multiple-limit="Number(ruleForm.number)">
+ <el-option :label="m" :value="m" v-for="(m,i) in outBatchNoList" :key="i"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="unqualified = false">鍙� 娑�</el-button>
+ <el-button type="primary" :loading="loading" @click="handleSubmit">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ <processPart :paramObj="paramObj" :currshowlist.sync="workshop" />
</div>
</template>
-
+
<script>
import {
chooseMater,
@@ -212,14 +427,64 @@
queryById,
updateDeviceBypppId,
updateProcessInsProduct,
+ updateProcessInsProduct2,
updateProcessInspectsById,
+ selOutBatchNo,
} from '@/api/quality/processInspect'
+import {
+ getProcessConfigFiles,
+ deleteProcessConfigFile,
+ downloadProcessConfigFile
+ } from '@/api/quality/attachment'
+import { getProcessConfigFile } from '@/api/plan/manufacturingorder'
+import processPart from '@/views/common/processinspect-part'
import { selectDevice } from '@/api/quality/processInspect'
+import qrCodeApp from '@/views/common/qrCodeApp'
+import { validatePositiveInteger } from '@/util/validate'
+import { getStore } from '@/util/store'
+import * as customerorder from '@/api/plan/customerorder'
export default {
+ components:{
+ qrCodeApp,processPart
+ },
data() {
return {
+ outBatchNoList:[],
+ unqualifiedInfo:null,
+ loading:false,
+ ruleForm:{
+ number:'',
+ outBatchNo:[]
+ },
+ unqualifiedRules:{
+ number: [
+ { required: true, message: '璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', trigger: 'blur' },
+ { pattern: /^\d+$/, message: '璇疯緭鍏ユ暟瀛�', trigger: 'blur' }
+ ],
+ outBatchNo: [
+ { required: true, message: '璇烽�夋嫨鎵规鍙�', trigger: 'change' },
+ ],
+ },
+ unqualified:false,
+ progrecessFileLoading: false,
+ processConfigFileTableData: [],
+ headers: {
+ Authorization: 'Bearer ' + getStore({ name: 'access_token' })
+ },
+ paramData: {
+ rawInsNo: '',
+ lineNumber: '',
+ type: 2
+ },
+ paramObj:{},
+ qrcode: false,
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
rules: {
- orderNumber: [{required:true,message:'璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}]
+ moNo: [{required:true,message:'杞﹂棿璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}],
+ quantity: [{required:true,validator: validatePositiveInteger,trigger:'blur'}],
+ operationTaskId: [{required:true,message: '璇烽�夋嫨宸ュ崟',trigger:'change'}],
},
dataVal: [{
label: '鏄�',
@@ -231,6 +496,7 @@
resultVal: null,
technologyList: [],
deviceList: [],
+ workshop:false,//杞﹂棿寮圭獥
hasChildren: true,
optionsSamplename: [],
// 娣诲姞鍒�
@@ -239,6 +505,7 @@
empiricalValueAddMaxNumber: 0,
processInspectVo: {
id: null,
+ moNo: null,
proInsNo: null,
material: null,
materialCode: null,
@@ -246,13 +513,31 @@
quantity: null,
specs: null,
unit: null,
- technologyOperationId: null
+ operationTaskId: null,
+ customerName: null,
+ projectName: null
},
inspectionItems: [], // 鏂板妫�楠岄」鐩〃鏍�
inspectionResultForm: [],
+ configFileTableData:[],
+ dataForm:null,
+ keyfield:['remark'],
+ keyfield0:['detectionValue0']
}
},
watch: {
+ empiricalValueAdd(newVal){
+ if(newVal!=this.keyfield0.length){
+ if(newVal>this.keyfield0.length){
+ this.keyfield0 = []
+ for(let i=0;i<newVal;i++){
+ this.keyfield0.push('detectionValue'+i)
+ }
+ }else{
+ this.keyfield0.splice(this.keyfield0.length-1,1);
+ }
+ }
+ }
},
beforeUpdate() {
this.$nextTick(() => {
@@ -269,10 +554,154 @@
let val = sessionStorage.getItem("process-resultVal-" + this.processInspectVo.id);
val == undefined ? this.resultVal = null : this.resultVal = val
}
- console.log(this.resultVal);
+ const isAdd = this.$route.query.isAdd
this.init()
+ if(isAdd) {
+ this.selOutBatchNo()
+ }
},
methods: {
+ selOutBatchNo(){
+ selOutBatchNo({id:this.$route.query.id}).then((res)=>{
+ this.outBatchNoList = res.data.data
+ })
+ },
+ getProcessConfigFile(){
+ getProcessConfigFile({
+ orderNumber: this.dataForm.orderNumber,
+ lineNumber: this.dataForm.customerNo
+ }).then((res)=>{
+ this.configFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFiles(row){
+ customerorder.downloadProcessConfigFile(
+ row.fileName,
+ row.bucketName,
+ row.originalFileName
+ )
+ },
+ saveTable(){
+ let processInsProduct = [];
+ this.inspectionItems.forEach((item) => {
+ if(item.children&&item.children.length>0){
+ item.children.forEach((child)=>{
+ let obj = {}
+ obj.id = child.iid;
+ obj.eId = child.eId;
+ obj.note = child.inote;
+ obj.inspectionValue = child.empiricalValueAddss.join(',');
+ obj.required = child.required;
+ processInsProduct.push(obj)
+ })
+ }
+ })
+ if(processInsProduct.length>0){
+ updateProcessInsProduct2(processInsProduct).then(res => {
+ if (res.data.code == 0) {
+ this.$message.success("鏇存柊鎴愬姛")
+ } else {
+ this.$message.error("鏇存柊澶辫触")
+ }
+ this.init()
+ })
+ }
+ },
+ delProcessConfigFile(row) {
+ this.$confirm('鏄惁鍒犻櫎璇ラ檮浠�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ closeOnClickModal: false
+ }).then(function() {
+ return deleteProcessConfigFile(row.id)
+ }).then((data) => {
+ this.getConfigFiles()
+ })
+ },
+ getConfigFiles() {
+ const param = {
+ no: this.processInspectVo.rawInsNo,
+ lineNumber: this.processInspectVo.id,
+ type: 2
+ }
+ getProcessConfigFiles(param).then((res) => {
+ this.processConfigFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFile(row) {
+ downloadProcessConfigFile({
+ bucket: row.bucketName,
+ fileName: row.fileName,
+ originalFileName: row.originalFileName
+ })
+ },
+ submitUpload() {
+ this.paramData.no = this.processInspectVo.proInsNo
+ this.paramData.lineNumber = this.processInspectVo.id
+ this.progrecessFileLoading = true
+ },
+ uploadSuccess() {
+ this.progrecessFileLoading = false
+ this.getConfigFiles()
+ },
+ tabsClick(tab,even){
+ if(tab.index == 1){
+ if(this.processInspectVo.proInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨杩囩▼妫�楠屼俊鎭�")
+ return
+ }
+ this.getConfigFiles();
+ }
+ },
+ queryCode(){
+ this.workshop = true
+ },
+ cancelCodeDialog(){
+ this.qrcode = false
+ },
+ getResultInfo(data){
+ if(!data.includes("moNo")){
+ this.$message.warning('鏈瘑鍒嚭杞﹂棿璁㈠崟鍙蜂俊鎭紒');
+ }
+ let obj=JSON.parse(data)
+ let info={"code":obj["moNo"]}
+ if(info.code){
+ this.processInspectVo.moNo = obj["moNo"]
+ this.selectInfoByOrderId()
+ }else{
+ this.$message.warning('鏈瘑鍒嚭杞﹂棿璁㈠崟鍙蜂俊鎭紒');
+ }
+ },
+ // 鎵撳紑鐩告満
+ Turnonthecamera() {
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ },
+ cancelDeviceCodeDialog(){
+ this.deviceCode = false
+ },
+ getDeviceResultInfo(val){
+ let id=val.split("id@")[1]
+ if(id!=undefined&&id!=''&&id!=null){
+ let filterData=this.deviceList.filter(item=>{
+ return item.id==id
+ })[0]
+ this.row.eId=Number(id)
+ this.updateDevice(this.row)
+ }else{
+ this.$message({
+ message: '鏈瘑鍒嚭璁￠噺鍣ㄥ叿淇℃伅锛�',
+ type: 'warning'
+ });
+ }
+ },
+ codeDevice(row,index){
+ this.row=row
+ this.deviceCode =true
+ this.$refs.codeDeviceCompont.openCamera()
+ this.proIndex=index
+ },
submitSave() {
let pro = 0
this.inspectionItems.forEach(item => {
@@ -288,27 +717,30 @@
number: 0,
result: this.inspectionResultForm[0].result
}
+ this.unqualifiedInfo = obj;
if (pro > 0) {
- this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- inputPattern: /^\d+$/,
- inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
- }).then(({ value }) => {
- obj.number = value
- updateProcessInspectsById(obj).then(res => {
- let data = res.data.data
- if (data) {
- if (data.indexOf("鎴愬姛") > 0) {
- this.$message.success(data);
- this.checkTestState()
- } else {
- this.$message.warning(data);
- }
- return
- }
- });
- }).catch(() => { });
+ this.unqualified = true;
+ this.$refs.ruleForm.resetFields();
+ // this.$prompt('璇疯緭鍏ヤ笉鍚堟牸鏁伴噺', '涓嶅悎鏍兼暟閲�', {
+ // confirmButtonText: '纭畾',
+ // cancelButtonText: '鍙栨秷',
+ // inputPattern: /^\d+$/,
+ // inputErrorMessage: '璇疯緭鍏ユ纭暟瀛楁牸寮�'
+ // }).then(({ value }) => {
+ // obj.number = value
+ // updateProcessInspectsById(obj).then(res => {
+ // let data = res.data.data
+ // if (data) {
+ // if (data.indexOf("鎴愬姛") > 0) {
+ // this.$message.success(data);
+ // this.checkTestState()
+ // } else {
+ // this.$message.warning(data);
+ // }
+ // return
+ // }
+ // });
+ // }).catch(() => { });
} else {
updateProcessInspectsById(obj).then(res => {
let data = res.data.data
@@ -324,6 +756,36 @@
});
}
this.init()
+ },
+ handleSubmit(){
+ this.$refs.ruleForm.validate((valid) => {
+ if (valid) {
+ if(this.ruleForm.outBatchNo.length!=this.ruleForm.number){
+ this.$message.error(`璇烽�夋嫨${this.ruleForm.number}涓壒娆″彿`)
+ return
+ }
+ this.loading = true;
+ let obj = {number:this.ruleForm.number,outBatchNo:this.ruleForm.outBatchNo.join(','),...this.unqualifiedInfo};
+ updateProcessInspectsById(obj).then(res => {
+ let data = res.data.data
+ if (data) {
+ if (data.indexOf("鎴愬姛") > 0) {
+ this.$message.success(data);
+ this.$refs.ruleForm.resetFields();
+ this.unqualified = false;
+ this.checkTestState()
+ this.init()
+ } else {
+ this.$message.warning(data);
+ }
+ return
+ }
+ this.loading = false;
+ });
+ } else {
+ return false;
+ }
+ });
},
checkTestState() {
let resultVal = '1'
@@ -345,16 +807,22 @@
if (id != null) {
queryById(id).then(res => {
let result = res.data.data
+ this.processInspectVo.moNo = result.moNo
+ this.dataForm = result;
+ this.processInspectVo.operationTaskId = result.technologyOperationName
this.processInspectVo.proInsNo = result.proInsNo
+ this.processInspectVo.projectName = result.projectName
+ this.processInspectVo.customerName = result.customerName
this.processInspectVo.orderNumber = result.orderNumber
this.processInspectVo.materialCode = result.materialCode
this.processInspectVo.material = result.material
- this.processInspectVo.technologyOperationId = result.technologyOperationName
this.processInspectVo.specs = result.specs
this.processInspectVo.unit = result.punit
this.processInspectVo.quantity = result.quantity
let userList = []
- result.children.forEach(item => {
+ result.children.forEach((item,index) => {
+ item.isIndex = true;
+ item.parentIndex = index + 1;
item.iid = Math.random()
if (item.children != undefined) {
item.children.forEach(obj => {
@@ -365,9 +833,11 @@
if (obj.inspectionValue) {
arr = obj.inspectionValue.split(",")
}
- obj.empiricalValueAddss = arr
+ this.$set(obj, "empiricalValueAddss", arr)
+ this.$set(obj, "inote", obj.inote)
if(!obj.inote){
- obj.inote = null
+ // obj.inote = null
+ this.$set(obj, "inote", null)
}
if (arr.length > this.empiricalValueAdd) {
this.empiricalValueAdd = arr.length
@@ -376,22 +846,29 @@
}
})
this.inspectionItems = result.children
- let rVal = '1'
+ let rVal = ''
+ let passNum = 0
+ let unPassNum = 0
this.inspectionItems.forEach(item => {
if (item.children) {
item.children.forEach(obj => {
- if (obj.iresult == 0) {
- rVal = '0'
+ if(obj.iresult == 0){
+ unPassNum += 1
+ }
+ if(obj.iresult == 1){
+ passNum+=1
}
})
}
})
+ rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
this.inspectionResultForm = [{
materialCode: result.materialCode,
material: result.material,
userName: Array.from(new Set(userList)).join(","),
result: this.resultVal == null ? rVal : this.resultVal,
}]
+ this.getProcessConfigFile()
}).catch(error => {
console.log(error)
})
@@ -419,24 +896,13 @@
console.log(error)
})
},
- //浜у搧鍚嶇О锛岄�夋嫨
- changeOptionsSamplename(val) {
- let sample = this.optionsSamplename.filter(o => {
- return o.materialCode == val
- })[0]
- this.processInspectVo.materialCode = sample.materialCode
- this.processInspectVo.specs = sample.specs
- this.processInspectVo.unit = sample.unit
- this.processInspectVo.material = sample.material
- this.technologyList = sample.children
- },
changeState(row,isChecked) {
const _than = this
if(isChecked){
let isNumber = true
for(var i=0;i<row.empiricalValueAddss.length;i++){
let val = row.empiricalValueAddss[i]
- if(!/^[0-9]*[1-9][0-9]*$/.test(val)){
+ if(!/(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/.test(val)){
row.empiricalValueAddss[i] = null
_than.$message.error("璇疯緭鍏ユ暟瀛�")
isNumber = false
@@ -446,80 +912,89 @@
return
}
}
- if (row.iid != null && row.iid != '') {
- let str = ""
- row.empiricalValueAddss.forEach(e => {
- str += e + ","
- })
- str = str.slice(0, -1);
- if (str === undefined || str === '' || str === null) {
- return
- }
- let obj = {
- devideId: row.eId,
- ppid: row.iid,
- inspectionValue: str,
- note : row.inote
- }
- updateProcessInsProduct(obj).then(res => {
- if (res.data.code == 0) {
- this.$message.success("鏇存柊鎴愬姛")
- } else {
- this.$message.error("鏇存柊澶辫触")
- }
- this.init()
- })
- }
+ // if (row.iid != null && row.iid != '') {
+ // let str = ""
+ // row.empiricalValueAddss.forEach(e => {
+ // str += e + ","
+ // })
+ // str = str.slice(0, -1);
+ // if (str === undefined || str === '' || str === null) {
+ // return
+ // }
+ // let obj = {
+ // devideId: row.eId,
+ // ppid: row.iid,
+ // inspectionValue: str,
+ // note : row.inote
+ // }
+ // updateProcessInsProduct(obj).then(res => {
+ // if (res.data.code == 0) {
+ // this.$message.success("鏇存柊鎴愬姛")
+ // } else {
+ // this.$message.error("鏇存柊澶辫触")
+ // }
+ // this.init()
+ // })
+ // }
},
addTestProject() {
let val = this.processInspectVo
const _than = this
- addProcess(val).then(res => {
- let id = res.data.data
- if (id != null) {
- _than.processInspectVo.id = id
- queryById(id).then(response => {
- let proList = response.data.data.children
- proList.forEach(item => {
- item.iid = Math.random();
- if (item.children != undefined) {
- item.children.forEach(obj => {
- obj.inote = null
- obj.empiricalValueAddss = []
+ this.$refs.addInspectionform.validate(valid=>{
+ if(valid){
+ addProcess(val).then(res => {
+ let id = res.data.data
+ if (id != null) {
+ _than.processInspectVo.id = id
+ queryById(id).then(response => {
+ let proList = response.data.data.children
+ proList.forEach(item => {
+ item.iid = Math.random();
+ if (item.children != undefined) {
+ item.children.forEach(obj => {
+ obj.inote = null
+ obj.empiricalValueAddss = []
+ })
+ }
})
- }
- })
- _than.inspectionItems = proList
+ _than.inspectionItems = proList
+ }).catch(error => {
+ console.log(error);
+ })
+ }
}).catch(error => {
- console.log(error);
+ console.log(error)
})
}
- }).catch(error => {
- console.log(error)
})
},
selectInfoByOrderId() {
- this.$refs.addInspectionform.validate(valid=>{
- if(valid){
- chooseMater({
- orderNumber: this.processInspectVo.orderNumber
+ if(this.processInspectVo.moNo){
+ chooseMater({
+ moNo: this.processInspectVo.moNo
}).then(res => {
- if (res.data.data != null) {
- this.optionsSamplename = res.data.data.children
+ let data = res.data.data
+ if (data) {
+ this.technologyList = data.children
+ this.processInspectVo.materialCode = data.materialCode
+ this.processInspectVo.orderNumber = data.orderNumber
+ this.processInspectVo.projectName = data.projectName
+ this.processInspectVo.customerName = data.customerName
+ this.processInspectVo.customerNo = data.customerNo
+ this.processInspectVo.material = data.material
+ this.processInspectVo.specs = data.specs
+ this.processInspectVo.unit = data.unit
} else {
- this.$message({
- message: '娌℃湁璇ヨ鍗曞彿锛�',
- type: 'warning'
- });
- this.optionsSamplename = []
+ this.$message.warning('娌℃湁璇ヨ溅闂磋鍗曞彿锛�');
+ this.technologyList = []
this.processInspectVo.materialCode = null
+ this.processInspectVo.orderNumber = null
this.processInspectVo.material = null
this.processInspectVo.specs = null
this.processInspectVo.unit = null
}
})
- }
- })
+ }
},
changeRowResult(){
if(this.inspectionItems){
@@ -538,7 +1013,7 @@
updateProcessInsProduct(obj).then(res => {
if (res.data.code == 0) {
this.init()
- }
+ }
})
}
})
@@ -561,28 +1036,141 @@
})
}
});
+ _than.saveTable();
}
}
},
// 娣诲姞妫�楠屽�煎垪
clickAddInspectionColumn() {
this.empiricalValueAdd = this.empiricalValueAdd + 1;
+ },
+ moveFocus(event, index, key) {
+ console.log(key, index,key)
+ let keyfield = this.insertArrayAt(this.keyfield,0,this.keyfield0);
+ // enter閿�
+ // if (event.keyCode === 13) { // 鍥炶溅
+ // if (index === this.getLen() - 1 && key === keyfield[keyfield.length - 1]) { // 鏈�鍚庝竴琛屾渶鍚庝竴涓�
+ // console.log('鏈�鍚庝竴琛屾渶鍚庝竴涓棤娉曞洖杞�')
+ // return
+ // }
+ // this.$nextTick(() => {
+ // event.target.blur()
+ // })
+ // if (key === keyfield[keyfield.length - 1]) { // 褰撳墠琛屾渶鍚庝竴涓�,璺宠浆涓嬩竴琛岀涓�涓�
+
+ // } else { // 璺宠浆涓嬩竴涓�
+ // const nextkeyindex = keyfield.findIndex(k => k === key) + 1
+ // this.$nextTick(() => {
+ // document.getElementById(keyfield[nextkeyindex] + index).focus()
+ // })
+ // }
+ // }
+
+ // 鍚戜笂 =38
+ if (event.keyCode === 38) {
+ console.log('鍚戜笂')
+ if (index === 0) { // 绗竴琛�
+ console.log('绗竴琛屾棤娉曞悜涓�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ let i = 0;
+ while (true){
+ let dom = document.getElementById(key + (index - 1-i))
+ if(dom){
+ dom.focus()
+ return
+ }else if((index-1-i)==0){
+ return
+ }
+ i++
+ }
}
+
+ // 涓� = 40
+ if (event.keyCode === 40) {
+ console.log('鍚戜笅')
+ if (index === this.getLen() - 1) { // 鏈�鍚庝竴琛�
+ console.log('鏈�鍚庝竴琛屾棤娉曞悜涓�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ this.$nextTick(() => {
+ let i = 0;
+ while (true){
+ let dom = document.getElementById(key + (index + 1+i))
+ console.log(dom,key + (index + 1+i))
+ if(dom){
+ dom.focus()
+ return
+ }else if((index+1+i)==this.getLen() - 1){
+ return
+ }
+ i++
+ }
+ })
+ }
+
+ // 宸� = 37
+ if (event.keyCode === 37) {
+ console.log('鍚戝乏')
+ if (index === 0 && key === keyfield[0]) { // 绗竴琛岀涓�涓�
+ console.log('绗竴琛岀涓�涓棤娉曞悜宸�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ const prevkeyindex = keyfield.findIndex(k => k === key) - 1
+ this.$nextTick(() => {
+ let dom = document.getElementById(keyfield[prevkeyindex] + index)
+ if(dom){
+ dom.focus()
+ }
+ })
+ }
+
+ // 鍙� = 39
+ if (event.keyCode === 39) {
+ console.log('鍚戝彸')
+ if (index === this.getLen() - 1 && key === keyfield[keyfield.length - 1]) { // 鏈�鍚庝竴琛屾渶鍚庝竴涓�
+ console.log('鏈�鍚庝竴琛屾渶鍚庝竴涓棤娉曞悜鍙�')
+ return
+ }
+ document.getElementById(key + index).blur()
+ const nextkeyindex = keyfield.findIndex(k => k === key) + 1
+ this.$nextTick(() => {
+ let dom = document.getElementById(keyfield[nextkeyindex] + index)
+ if(dom){
+ dom.focus()
+ }
+ })
+ }
+ },
+ insertArrayAt(arr1, index, arr2) {
+ return arr1.slice(0, index).concat(arr2, arr1.slice(index));
+ },
+ getLen(){
+ let arr = []
+ this.inspectionItems.forEach(item => {
+ arr.push(item)
+ item.children.forEach(child => {
+ arr.push(child)
+ })
+ })
+ return arr.length
+ }
},
}
</script>
-
+
<style scoped>
.finishedProduct-detail {
width: 100%;
- height: 470px;
+ height: 520px;
padding: 10px 20px;
- display: flex;
border: 1px solid #ddd;
background-color: #fff;
margin-top: 10px;
box-sizing: border-box;
- flex-wrap: wrap;
}
.finishedProduct-result {
@@ -635,4 +1223,4 @@
border-top: 0 !important;
cursor: pointer !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3