From 154ef0e4c3dbb483d55e9b2b242021f627bee451 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 26 十二月 2023 09:45:16 +0800
Subject: [PATCH] modified: src/views/technology/document/index.vue modified: src/views/technology/routing/index.vue
---
src/views/quality/processInspect/processInspect-form.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/processInspect/processInspect-form.vue b/src/views/quality/processInspect/processInspect-form.vue
index 239b2bc..42cef67 100644
--- a/src/views/quality/processInspect/processInspect-form.vue
+++ b/src/views/quality/processInspect/processInspect-form.vue
@@ -31,6 +31,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜у搧鍚嶇О锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.material">
<el-select style="width: 100%" @change="changeOptionsSamplename"
:disabled="processInspectVo.id != null" v-model="processInspectVo.material"
size="small" placeholder="璇烽�夋嫨浜у搧鍚嶇О">
@@ -38,6 +39,7 @@
:label="item.material" :value="item.materialCode">
</el-option>
</el-select>
+ </el-tooltip>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -50,8 +52,10 @@
<el-row>
<el-col :span="6">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-tooltip class="item" effect="dark" :content="processInspectVo.specs">
<el-input disabled v-model="processInspectVo.specs"
autocomplete="off" />
+ </el-tooltip>
</el-form-item>
</el-col>
@@ -137,11 +141,17 @@
<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"
+ <el-select style="width:80%" 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>
@@ -202,6 +212,18 @@
</el-row>
</div>
</div>
+ <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>
@@ -215,9 +237,16 @@
updateProcessInspectsById,
} from '@/api/quality/processInspect'
import { selectDevice } from '@/api/quality/processInspect'
+import qrCodeApp from '@/views/common/qrCodeApp'
export default {
+ components:{
+ qrCodeApp
+ },
data() {
return {
+ row: null,
+ proIndex: 0,
+ deviceCode: false,
rules: {
orderNumber: [{required:true,message:'璁㈠崟鍙蜂笉鑳戒负绌�',trigger:'blur'}]
},
@@ -273,6 +302,33 @@
this.init()
},
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.eId=Number(id)
+ this.updateDevice(this.row)
+ }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
+ },
submitSave() {
let pro = 0
this.inspectionItems.forEach(item => {
@@ -436,7 +492,7 @@
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
--
Gitblit v1.9.3