From 03be129c50068164b8cc4186d4d4e5b860503476 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 03 一月 2024 14:35:58 +0800
Subject: [PATCH] 包装检验-默认检验项目
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 599 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 440 insertions(+), 159 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 62a368f..b4d8e55 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -7,7 +7,7 @@
<h2 v-else>缂栬緫-鍘熸潗鏂欐楠�</h2>
</div>
<div class="btn-group header-right">
- <el-button @click="save()" v-if="this.dataForm.id==null">淇濆瓨</el-button>
+ <el-button @click="save()" type="primary" v-if="dataForm.id==null">淇濆瓨</el-button>
</div>
</div>
<div class="page-main">
@@ -28,19 +28,25 @@
</el-col>
<el-col :span="6">
<el-form-item label="闆朵欢鍙�" prop="code">
- <el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
+ <el-input v-model="dataForm.code">
<el-button
slot="append"
icon="el-icon-search"
- :disabled="resultVal!=null && dataForm.id!=null"
- @click="queryCode()"></el-button>
+ :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 prop="name" label="鍘熸潗鏂欏悕绉�">
- <el-input v-model="dataForm.name" disabled >
- </el-input>
+ <el-tooltip class="item" effect="dark" :content="dataForm.name">
+ <el-input v-model="dataForm.name" disabled ></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -51,7 +57,6 @@
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
disabled>
-
</el-date-picker>
</el-form-item>
</el-col>
@@ -59,7 +64,9 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿" prop="specs">
- <el-input v-model="dataForm.specs" disabled></el-input>
+ <el-tooltip class="item" effect="dark" :content="dataForm.specs">
+ <el-input v-model="dataForm.specs" disabled></el-input>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -72,7 +79,9 @@
</el-col>
<el-col :span="6">
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplier">
+ <el-tooltip class="item" effect="dark" :content="dataForm.supplier" >
<el-input v-model="dataForm.supplier" disabled />
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -102,120 +111,201 @@
</el-row>
</el-form>
</div>
+ <div>
+ <el-tabs class="rawMaterial-detail" @tab-click="tabsClick">
+ <el-tab-pane label="妫�楠岄」鐩�">
+ <el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
+ <el-col :span="12"></el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
+ <el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
+ <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
+ </el-col>
+ </el-row>
+ <el-row style="width:100%;">
+ <el-col :span="24">
+ <el-table
+ :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
+ :cell-style="{textAlign:'center'}"
+ ref="table"
+ :data="list"
+ border
+ style="width: 100%;"
+ height="400"
+ row-key="iid"
+ default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+ <el-table-column type="index" label="搴忓彿" width="60">
+ </el-table-column>
+ <el-table-column prop="father" label="妫�楠岄」鐩�" width="160">
+ <template slot-scope="scope">
+ <el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="椤圭洰" width="160">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
+ placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="unit" label="鍗曚綅" width="160">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="required" label="鏍囧噯鍊�" width="160">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input :disabled="dataForm.id != null" v-model="scope.row.required"
+ placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="testValue" label="妫�娴嬪��" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
+ <el-select style="width:100%" allow-create filterable default-first-option
+ :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
+ v-model="scope.row.testValueList[index]"
+ placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��"
+ @change="changeState(scope.row,scope.$index)">
+ <el-option label="鏄�" value="鏄�"/>
+ <el-option label="鍚�" value="鍚�"/>
+ </el-select>
+ </el-tooltip>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="200">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%"
+ v-model="scope.row.deviceId" 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"
+ :disabled="dataForm!=null && resultVal!=null"
+ @click="codeDevice(scope.row,scope.$index)"></el-button>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="note" label="妫�楠屾弿杩�" width="160" >
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
+ <template slot-scope="scope">
+ <div v-if="!scope.row.children">
+ <span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
+ <span v-else-if="scope.row.testState == 1" style="color:#67C23A">鍚堟牸</span>
+ <span v-else>鏆傛棤缁撹</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
+ <template slot-scope="scope">
+ <div v-if="scope.row.fId!=null">
+ <el-button type="text" @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
+ <el-button type="text" @click="delChildren(scope.row,scope.$index,true)">鍒犻櫎琛�</el-button>
+ </div>
+ <el-button v-else type="text" @click="delChildren(scope.row,scope.$index,false)">鍙栨秷</el-button>
+ </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="dataForm.rawInsNo==null || resultVal!=null"
+ 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>
-
- <div class="rawMaterial-detail">
- <el-row style="width:100%;z-index: 10;height:50px;">
- <el-col :span="18">妫�楠岄」鐩�</el-col>
- <el-col :span="2">
- <el-button style="width:90%" v-if="dataForm.id==null" size="small" @click="clickAddLine()">娣诲姞妫�楠岄」鐩�</el-button>
- </el-col>
- <el-col :span="2">
- <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">娣诲姞妫�娴嬪�煎垪</el-button>
- </el-col>
- <el-col :span="2">
- <el-button style="width:90%" v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">鍒犻櫎妫�娴嬪�煎垪</el-button>
- </el-col>
- </el-row>
- <el-row style="width:100%;">
- <el-col :span="24">
- <el-table
- :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
- :cell-style="{textAlign:'center'}"
- ref="table"
- :data="list"
- border
- style="width: 100%;"
- height="400"
- row-key="iid"
- default-expand-all
- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
- <el-table-column type="index" label="搴忓彿" width="60">
- </el-table-column>
- <el-table-column prop="father" label="妫�楠岄」鐩�" width="260">
- <template slot-scope="scope">
- <el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="璇疯緭鍏ユ楠岄」鐩�"></el-input>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="椤圭洰" width="260">
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
- placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="260">
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�"></el-input>
- </div>
- </template>
-
- </el-table-column>
- <el-table-column prop="required" label="鏍囧噯鍊�" width="260">
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <el-input :disabled="dataForm.id != null" v-model="scope.row.required"
- placeholder="璇疯緭鍏ユ爣鍑嗗��"></el-input>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="testValue" label="妫�娴嬪��" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="璇峰厛閫夋嫨璁惧锛�" placement="top-start">
- <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
- :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)"
- v-model="scope.row.testValueList[index]"
- placeholder="璇疯緭鍏ユ垨閫夋嫨妫�娴嬪��" @change="updateTestValue(scope.row,scope.$index)">
- <el-option label="鏄�" value="鏄�"/>
- <el-option label="鍚�" value="鍚�"/>
- </el-select>
- </el-tooltip>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="deviceName" label="璇曢獙璁惧" min-width="260">
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%"
- v-model="scope.row.deviceId" 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>
- <el-table-column prop="note" label="妫�楠屾弿杩�" width="260" >
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="妫�楠屾弿杩�"></el-input>
- </div>
- </template>
- </el-table-column>
- <el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="缁撹" min-width="150">
- <template slot-scope="scope">
- <div v-if="!scope.row.children">
- <span v-if="scope.row.testState == 0" style="color:#F56C6C">涓嶅悎鏍�</span>
- <span v-else-if="scope.row.testState == 1" style="color:#67C23A">鍚堟牸</span>
- <span v-else>鏆傛棤缁撹</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
- <template slot-scope="scope">
- <div v-if="scope.row.fId!=null">
- <el-button type="text" @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
- <el-button type="text" @click="delChildren(scope.row,scope.$index,true)">鍒犻櫎琛�</el-button>
- </div>
- <el-button v-else type="text" @click="delChildren(scope.row,scope.$index,false)">鍙栨秷</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-col>
- </el-row>
+ <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"
+ >鍒犻櫎</el-button
+ >
+ <el-button
+ @click="downloadProcessConfigFile(scope.row)"
+ type="text"
+ size="small"
+ >涓嬭浇</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-tab-pane>
+ </el-tabs>
</div>
<div class="rawMaterial-result">
<el-row>
@@ -226,8 +316,8 @@
<el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
:header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
:cell-style="{textAlign:'center'}">
- <el-table-column prop="code" label="鐗╂枡缂栧彿"></el-table-column>
- <el-table-column prop="name" label="鐗╂枡鍚嶇О"></el-table-column>
+ <el-table-column prop="code" width="150" show-overflow-tooltip label="鐗╂枡缂栧彿"></el-table-column>
+ <el-table-column prop="name" width="150" show-overflow-tooltip label="鐗╂枡鍚嶇О"></el-table-column>
<el-table-column prop="userName" label="妫�楠屽憳"></el-table-column>
<el-table-column prop="judgeState" label="妫�楠岀粨璁�">
<template slot-scope="scope">
@@ -261,6 +351,30 @@
<el-button type="primary" @click="submitSave()">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <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>
</div>
</template>
@@ -271,15 +385,36 @@
getObj,
updateRawInsProduct,
updateRawInspectsById,
- updateDeviceById, } from '@/api/quality/rawMaterial'
+ getProcessConfigFiles,
+ downloadProcessConfigFile,
+ deleteProcessConfigFile,
+ updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
-export default {
+ import { getStore } from '@/util/store'
+ import qrCodeApp from '@/views/common/qrCodeApp'
+ import transformImage from '@/util/fileTransform'
+ export default {
+ components:{
+ rawMaterialPartDialog,
+ qrCodeApp
+ },
computed:{},
- components:{
- rawMaterialPartDialog
- },
data(){
return{
+ progrecessFileLoading: false,
+ processConfigFileTableData: [],
+ fileList: [],
+ headers: {
+ Authorization: 'Bearer ' + getStore({ name: 'access_token' })
+ },
+ paramData: {
+ rawInsNo: '',
+ lineNumber: ''
+ },
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
+ qrcode: false,
userdata:[],
currentRow:[],
userlist:[],
@@ -301,7 +436,7 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0498220',
+ code: '',
specs: '',
unit: '',
number: '',
@@ -325,7 +460,9 @@
userName: '',
testState: ''
}],
- dataRule: {},
+ dataRule: {
+ code:[{ required: true, message: '璇锋壂鎻忛�夋嫨闆朵欢', trigger: 'blur' }]
+ },
deviceList: [],
}
},
@@ -352,6 +489,105 @@
},
},
methods:{
+ tabsClick(tab,even){
+ if(tab.index == 1){
+ if(this.dataForm.rawInsNo==null){
+ this.$message.error("璇峰厛淇濆瓨鍘熸潗鏂欐楠屼俊鎭�")
+ return
+ }
+ this.getConfigFiles();
+ }
+ },
+ getConfigFiles() {
+ const param = {
+ rawInsNo: this.dataForm.rawInsNo,
+ lineNumber: this.dataForm.id
+ }
+ getProcessConfigFiles(param).then((res) => {
+ this.processConfigFileTableData = res.data.data
+ })
+ },
+ downloadProcessConfigFile(row) {
+ downloadProcessConfigFile({
+ bucket: row.bucketName,
+ fileName: row.fileName,
+ originalFileName: row.originalFileName
+ })
+ },
+ delProcessConfigFile(row) {
+ this.$confirm('鏄惁鍒犻櫎璇ラ檮浠�', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ closeOnClickModal: false
+ }).then(function() {
+ return deleteProcessConfigFile(row.id)
+ }).then((data) => {
+ this.getConfigFiles()
+ })
+ },
+ submitUpload() {
+ this.paramData.rawInsNo = this.dataForm.rawInsNo
+ this.paramData.lineNumber = this.dataForm.id
+ this.progrecessFileLoading = true
+ },
+ uploadSuccess() {
+ this.progrecessFileLoading = false
+ this.getConfigFiles()
+ },
+ 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]
+ console.log(filterData);
+ this.row.deviceId=Number(id)
+ this.updateDevice(this.row,this.proIndex)
+ }else{
+ this.$message({
+ message: '鏈瘑鍒嚭浜屼綅鐮佽閲忓櫒鍏蜂俊鎭紒',
+ type: 'warning'
+ });
+ }
+ },
+ codeDevice(row,index){
+ this.row=row
+ console.log("row",row);
+ this.deviceCode =true
+ this.$refs.codeDeviceCompont.openCamera()
+ this.proIndex=index
+ },
+ getResultInfo(data){
+ if(!data.includes("part_no")){
+ this.$message({
+ message: '鏈瘑鍒嚭浜岀淮鐮侀浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
+ let obj=JSON.parse(data)
+ let info={"code":obj["part_no"]}
+ if(info.code!=undefined&&info.code!=''){
+ this.paramObj = info
+ this.showPart = true
+ }else{
+ this.$message({
+ message: '鏈瘑鍒嚭浜岀淮鐮侀浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
+ },
+ cancelCodeDialog(){
+ this.qrcode = false
+ },
+ // 鎵撳紑鐩告満
+ Turnonthecamera() {
+ this.qrcode = true
+ this.$refs.codeCompont.openCamera()
+ },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
@@ -424,6 +660,7 @@
let data = {
id: this.dataForm.id,
number: this.unqualifiedNum,
+ result: this.conclusionTable[0].testState
}
updateRawInspectsById(data).then(res => {
if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
@@ -479,7 +716,7 @@
required: null,
rpId: null,
name: null,
- unit: null,
+ unit: 'mm',
userName: null,
testValue: '',
testValueList: [],
@@ -490,37 +727,45 @@
}
},
+ changeRowResult(){
+ if(this.list){
+ this.list.forEach(e=>{
+ if(e.children){
+ e.children.forEach(i=>{
+ if(i.testValueList.length>1){
+ let arr = i.testValue.split(",")
+ arr.splice((arr.length-1),1)
+ let obj = {
+ deviceId: i.deviceId,
+ rpId: i.rpId,
+ testValue: arr.join(","),
+ note: i.note
+ }
+ updateRawInsProduct(obj).then(res=>{
+ if(res.data.code === 0){
+ this.init()
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ },
delTeatValueColumn(){
if (this.empiricalValueAdd - 1 > 0) {
if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
this.empiricalValueAdd = this.empiricalValueAdd - 1;
+ this.changeRowResult()
this.list.forEach(i => {
- i.testValueList.splice(this.empiricalValueAdd, 1);
+ if(i.children){
+ i.children.forEach(ele=>{
+ ele.testValueList.splice(this.empiricalValueAdd, 1);
+ })
+ }
});
}
}
- },
- updateTestValue(row,index){
- if(row.rpId == null){
- return
- }
- let val = row.testValueList.join(",");
- let obj = {
- deviceId: row.deviceId,
- rpId: row.rpId,
- testValue: val,
- note: row.note
- }
- updateRawInsProduct(obj).then(res=>{
- if(res.data.code === 0){
- this.$message.success("鏇存柊鎴愬姛")
- this.init()
- }else{
- this.$message.success("鏇存柊澶辫触")
- }
- }).catch(error=>{
- this.$message.error(error)
- })
},
init(){
if(this.dataForm.id){
@@ -579,11 +824,27 @@
this.list.push(ele)
}}
})
+ let rVal = ''
+ let passNum = 0
+ let unPassNum = 0
+ this.list.forEach(item=>{
+ if(item.children){
+ item.children.forEach(ele=>{
+ if(ele.testState == 0){
+ unPassNum += 1
+ }
+ if(ele.testState == 1){
+ passNum+=1
+ }
+ })
+ }
+ })
+ rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
this.conclusionTable = [{
code: data.code,
name: data.name,
userName: Array.from(new Set(userNameList)).join(','),
- testState: this.resultVal==null?null:this.resultVal
+ testState: this.resultVal==null?rVal:this.resultVal
}]
}).catch(error=>{
this.$message.error("鑾峰彇澶辫触",error)
@@ -593,6 +854,21 @@
}
},
changeState(row, index) {
+ if(row){
+ let isTrue = true
+ for(var i=0;i<row.testValueList.length;i++){
+ let val = row.testValueList[i]
+ let reg = /(^-?[0-9]{1,6}$)|(^-?[0-9]{1,6}[\.]{1}[0-9]{1,3}$)/
+ if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
+ this.$message.error("璇疯緭鍏ユ暟瀛楁垨閫夋嫨鏄惁")
+ row.testValueList[i] = null
+ isTrue = false
+ }
+ }
+ if(!isTrue){
+ return
+ }
+ }
if (row.rpId != null && row.rpId != '') {
let val = row.testValueList.join(",")
if (val === undefined || val === '' || val === null) {
@@ -640,7 +916,7 @@
required: null,
rpId: null,
name: null,
- unit: null,
+ unit: 'mm',
userName: null,
testValue: null,
testValueList: [],
@@ -676,14 +952,14 @@
<style>
.rawMaterial-detail {
width: 100%;
- height: 470px;
+ height: 530px;
padding: 10px 20px;
- display: flex;
border: 1px solid #ddd;
background-color: #fff;
margin-top: 10px;
box-sizing: border-box;
- flex-wrap: wrap;
+ /* display: flex;
+ flex-wrap: wrap; */
}
.rawMaterial-result {
@@ -700,7 +976,7 @@
.rawMaterial-basic {
background-color: #fff;
- height: 155px;
+ height: 170px;
display: flex;
flex-wrap: wrap;
padding: 10px 20px;
@@ -873,4 +1149,9 @@
border: 1px solid #e4e7ed;
border-bottom: none;
}
+@media (max-width: 767px) {
+ .pad-addcol-btn{
+ font-size:12px;
+ }
+}
</style>
--
Gitblit v1.9.3