From 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 18 十二月 2023 16:02:12 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 154 +++++++++++++++++++++++++--------------------------
1 files changed, 76 insertions(+), 78 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 170a926..7a663b7 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -28,12 +28,7 @@
</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-button
- slot="append"
- icon="el-icon-search"
- :disabled="resultVal!=null && dataForm.id!=null"
- @click="queryCode()"></el-button> -->
+ <el-input v-model="dataForm.code" disabled>
<el-button
slot="append"
icon="el-icon-full-screen"
@@ -44,8 +39,9 @@
</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">
@@ -63,7 +59,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">
@@ -76,7 +74,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">
@@ -185,11 +185,17 @@
<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%"
+ <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:80%"
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>
@@ -278,6 +284,18 @@
<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>
@@ -299,6 +317,9 @@
computed:{},
data(){
return{
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
qrcode: false,
userdata:[],
currentRow:[],
@@ -321,7 +342,7 @@
formTime: '',
message: '',
name: '',
- code: '88.118.1/A0498220',
+ code: '',
specs: '',
unit: '',
number: '',
@@ -374,84 +395,62 @@
},
},
methods:{
+ cancelDeviceCodeDialog(){
+ this.deviceCode = false
+ },
+ getDeviceResultInfo(val){
+ console.log("鎵弿鍚庢暟鎹�",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){
- console.log("鎵弿鍚庢墽琛�");
+ console.log("鎵弿鍚庢墽琛�",data);
+ if(!data.includes("part_no")){
+ this.$message({
+ message: '鏈瘑鍒嚭浜屼綅鐮侀浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
let obj=JSON.parse(data)
let info={"code":obj["part_no"]}
- this.paramObj = info
- this.showPart = true
+ console.log("鍊�",info);
+ if(info.code!=undefined&&info.code!=''){
+ this.paramObj = info
+ this.showPart = true
+ }else{
+ this.$message({
+ message: '鏈瘑鍒嚭浜屼綅鐮侀浂浠朵俊鎭紒',
+ type: 'warning'
+ });
+ }
},
cancelCodeDialog(){
this.qrcode = false
},
// 鎵撳紑鐩告満
Turnonthecamera() {
- console.log("鎵ц");
this.qrcode = true
this.$refs.codeCompont.openCamera()
- // this.camera = 'rear'
},
- // 鎵爜缁撴灉鍥炶皟
- // onDecode(result) {
- // console.log(result)
- // this.turnCameraOff()
- // },
- // 鐩告満鍙嶈浆
- // switchCamera() {
- // switch (this.camera) {
- // case 'front':
- // this.camera = 'rear'
- // break
- // case 'rear':
- // this.camera = 'front'
- // break
- // default:
- // this.$toast('閿欒')
- // }
- // },
- // 鍏抽棴鐩告満
- // turnCameraOff() {
- // this.camera = 'off'
- // this.qrcode = false
- // },
- // 鎵撳紑鎵嬬數绛�
- // ClickFlash() {
- // switch (this.torchActive) {
- // case true:
- // this.torchActive = false
- // break
- // case false:
- // this.torchActive = true
- // break
- // default:
- // this.$toast('閿欒')
- // }
- // },
-
- // 妫�鏌ユ槸鍚﹁皟鐢ㄦ憚鍍忓ご
- // async onInit(promise) {
- // try {
- // await promise
- // } catch (error) {
- // if (error.name === 'StreamApiNotSupportedError') {
- // } else if (error.name === 'NotAllowedError') {
- // this.errorMessage = 'Hey! I need access to your camera'
- // } else if (error.name === 'NotFoundError') {
- // this.errorMessage = 'Do you even have a camera on your device?'
- // } else if (error.name === 'NotSupportedError') {
- // this.errorMessage =
- // 'Seems like this page is served in non-secure context (HTTPS, localhost or file://)'
- // } else if (error.name === 'NotReadableError') {
- // this.errorMessage =
- // "Couldn't access your camera. Is it already in use?"
- // } else if (error.name === 'OverconstrainedError') {
- // this.errorMessage =
- // "Constraints don't match any installed camera. Did you asked for the front camera although there is none?"
- // } else {
- // this.errorMessage = 'UNKNOWN ERROR: ' + error.message
- // }
- // }
- // },
// 纭鍥炶皟
selectPart(param, nodePart, index) {
if (typeof param !== 'undefined') {
@@ -717,7 +716,6 @@
for(var i=0;i<row.testValueList.length;i++){
let val = row.testValueList[i]
let reg = /^[0-9]*[1-9][0-9]*$/
- console.log(['鏄�','鍚�'].includes(val));
if(!reg.test(val) && !['鏄�','鍚�'].includes(val)){
this.$message.error("璇疯緭鍏ユ暟瀛楁垨閫夋嫨鏄惁")
row.testValueList[i] = null
--
Gitblit v1.9.3