mes-ocea-before.git

			@@ -113,7 +113,7 @@
			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)" placeholder="请输入检测值"></el-input>
			@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>
			@@ -137,11 +137,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 +208,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 +233,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'}]
			},
			@@ -264,14 +289,35 @@
			mounted() {
			this.getDeviceList()
			this.processInspectVo.id = this.$route.query.id
			this.resultVal = this.$route.query.resultVal
			this.resultVal = this.$route.params.resultVal
			if (this.resultVal == null) {
			let val = sessionStorage.getItem("process-resultVal-" + this.processInspectVo.id);
			val == undefined ? this.resultVal = null : this.resultVal = val
			}
			console.log(this.resultVal);
			this.init()
			},
			methods: {
			cancelDeviceCodeDialog(){
			this.deviceCode = false
			},
			getDeviceResultInfo(val){
			console.log("扫描后数据",val);
			let id=val.split("id@")[1]
			let filterData=this.deviceList.filter(item=>{
			return item.id==id
			})[0]
			console.log(filterData);
			this.row.eId=Number(id)
			this.updateDevice(this.row)
			},
			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 => {
			@@ -282,6 +328,11 @@
			pro += arr.length
			}
			})
			let obj = {
			id: this.processInspectVo.id,
			number: 0,
			result: this.inspectionResultForm[0].result
			}
			if (pro > 0) {
			this.$prompt('请输入不合格数量', '不合格数量', {
			confirmButtonText: '确定',
			@@ -289,11 +340,8 @@
			inputPattern: /^\d+$/,
			inputErrorMessage: '请输入正确数字格式'
			}).then(({ value }) => {
			let data = {
			id: this.processInspectVo.id,
			number: value
			}
			updateProcessInspectsById(data).then(res => {
			obj.number = value
			updateProcessInspectsById(obj).then(res => {
			let data = res.data.data
			if (data) {
			if (data.indexOf("成功") > 0) {
			@@ -307,7 +355,7 @@
			});
			}).catch(() => { });
			} else {
			updateProcessInspectsById({ id: this.processInspectVo.id, number: 0 }).then(res => {
			updateProcessInspectsById(obj).then(res => {
			let data = res.data.data
			if (data) {
			if (data.indexOf("成功") > 0) {
			@@ -373,11 +421,21 @@
			}
			})
			this.inspectionItems = result.children
			let rVal = '1'
			this.inspectionItems.forEach(item => {
			if (item.children) {
			item.children.forEach(obj => {
			if (obj.iresult == 0) {
			rVal = '0'
			}
			})
			}
			})
			this.inspectionResultForm = [{
			materialCode: result.materialCode,
			material: result.material,
			userName: Array.from(new Set(userList)).join(","),
			result: this.resultVal == null ? '' : this.resultVal,
			result: this.resultVal == null ? rVal : this.resultVal,
			}]
			}).catch(error => {
			console.log(error)
			@@ -417,7 +475,22 @@
			this.processInspectVo.material = sample.material
			this.technologyList = sample.children
			},
			changeState(row) {
			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)){
			row.empiricalValueAddss[i] = null
			_than.$message.error("请输入数字")
			isNumber = false
			}
			}
			if(!isNumber){
			return
			}
			}
			if (row.iid != null && row.iid != '') {
			let str = ""
			row.empiricalValueAddss.forEach(e => {
			@@ -427,13 +500,11 @@
			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) {
			@@ -495,14 +566,45 @@
			}
			})
			},
			changeRowResult(){
			if(this.inspectionItems){
			this.inspectionItems.forEach(e=>{
			if(e.children){
			e.children.forEach(i=>{
			if(i.empiricalValueAddss.length>1){
			let arr = i.inspectionValue.split(",")
			arr.splice((arr.length-1),1)
			let obj = {
			devideId: i.eId,
			ppid: i.iid,
			inspectionValue: arr.join(","),
			note : i.inote
			}
			updateProcessInsProduct(obj).then(res => {
			if (res.data.code == 0) {
			this.init()
			}
			})
			}
			})
			}
			})
			}
			},
			// 删除检验值列
			clickDeleteInspectionColumn() {
			if (this.empiricalValueAdd - 1 === 0) {
			const _than = this
			if (_than.empiricalValueAdd - 1 === 0) {
			} else {
			if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
			this.empiricalValueAdd = this.empiricalValueAdd - 1;
			this.inspectionItems.forEach(i => {
			i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
			if (_than.empiricalValueAddMaxNumber != _than.empiricalValueAdd - 1) {
			_than.empiricalValueAdd = _than.empiricalValueAdd - 1;
			_than.changeRowResult()
			_than.inspectionItems.forEach(i => {
			if(i.children){
			i.children.forEach(ele=>{
			ele.empiricalValueAddss.splice(_than.empiricalValueAdd, 1);
			})
			}
			});
			}
			}