mes-ocea-before.git

			@@ -29,16 +29,16 @@
			<el-col :span="6">
			<el-form-item label="零件号" prop="code">
			<el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
			<el-button
			<!-- <el-button
			slot="append"
			icon="el-icon-search"
			:disabled="resultVal!=null && dataForm.id!=null"
			@click="queryCode()"></el-button>
			<!-- <el-button
			@click="queryCode()"></el-button> -->
			<el-button
			slot="append"
			icon="el-icon-full-screen"
			:disabled="resultVal!=null && dataForm.id!=null"
			@click="Turnonthecamera"></el-button> -->
			@click="Turnonthecamera"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			@@ -170,10 +170,11 @@
			<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
			<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="updateTestValue(scope.row,scope.$index)">
			placeholder="请输入或选择检测值"
			@change="changeState(scope.row,scope.$index)">
			<el-option label="是" value="是"/>
			<el-option label="否" value="否"/>
			</el-select>
			@@ -265,7 +266,18 @@
			<el-button type="primary" @click="submitSave()">确定</el-button>
			</span>
			</el-dialog>
			<!-- <qrcode :qrcode="qrcode" v-show="qrcode" :camera="camera" /> -->
			<el-dialog
			title="扫描"
			:visible.sync="qrcode"
			width="60%">
			<div style="height: 100vh;width: 100%;">
			<qr-code-app ref="codeCompont" @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>
			</div>
			</template>

			@@ -278,19 +290,16 @@
			updateRawInspectsById,
			updateDeviceById, } from '@/api/quality/rawMaterial'
			import rawMaterialPartDialog from '@/views/common/rawMaterial-part'
			// import qrcode from './QrcodeReader.vue'
			export default {
			import qrCodeApp from '@/views/common/qrCodeApp'
			export default {
			components:{
			rawMaterialPartDialog,
			qrCodeApp
			},
			computed:{},
			components:{
			rawMaterialPartDialog,
			// qrcode
			// qrcode: () => import('./QrcodeReader.vue'),
			},
			data(){
			return{
			qrcode: false,
			torchActive: false,
			camera: 'off',
			userdata:[],
			currentRow:[],
			userlist:[],
			@@ -363,10 +372,15 @@
			},
			},
			methods:{
			cancelCodeDialog(){
			this.qrcode = false
			},
			// 打开相机
			Turnonthecamera() {
			this.qrcode = true
			this.camera = 'rear'
			console.log("执行");
			this.qrcode = true
			this.$refs.codeCompont.openCamera()
			// this.camera = 'rear'
			},
			// 扫码结果回调
			// onDecode(result) {
			@@ -501,6 +515,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')){
			@@ -567,37 +582,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){
			@@ -656,11 +679,21 @@
			this.list.push(ele)
			}}
			})
			let rVal = '1'
			this.list.forEach(item=>{
			if(item.children){
			item.children.forEach(ele=>{
			if(ele.testState == 0){
			rVal = '0'
			}
			})
			}
			})
			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)
			@@ -670,6 +703,22 @@
			}
			},
			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-9][0-9]$/
			console.log(['是','否'].includes(val));
			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) {