mes-ocea-before.git

			@@ -8,7 +8,7 @@
			<h2 v-else>编辑-产品检验单</h2>
			</div>
			<div class="btn-group header-right">
			<el-button @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button>
			<el-button type="primary" @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button>
			</div>
			</div>
			<div class="page-main">
			@@ -24,25 +24,28 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="报工单号：">
			<el-form-item label="订单号：">
			<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
			v-model="processInspectVo.orderNumber" placeholder="请输入订单号" autocomplete="off" />
			v-model="processInspectVo.orderNumber" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="报工单号：">
			<el-input disabled v-model="processInspectVo.productNo" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="客户名称：">
			<el-input disabled v-model="processInspectVo.prname"
			placeholder="请输入客户名称" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="工程名称：">
			<el-input disabled v-model="processInspectVo.sname"
			placeholder="请输入工程名称" autocomplete="off" />
			<el-input disabled v-model="processInspectVo.prname" autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="工程名称：">
			<el-input disabled v-model="processInspectVo.sname" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="产品名称：">
			<el-select style="width: 100%" @change="changeOptionsSamplename" :disabled="processInspectVo.id != null"
			@@ -54,25 +57,23 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="产品编码：">
			<el-input disabled v-model="processInspectVo.mcode"
			placeholder="请输入产品编码" autocomplete="off" />
			<el-form-item label="产品编号：">
			<el-input disabled v-model="processInspectVo.mcode" autocomplete="off" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="规格型号：">
			<el-input disabled v-model="processInspectVo.specificationsModel"
			placeholder="请输入规格型号" autocomplete="off" />
			<el-input disabled v-model="processInspectVo.specificationsModel" autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="单位：">
			<el-input disabled v-model="processInspectVo.unit"
			placeholder="请输入单位" autocomplete="off" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="数量：">
			<el-input v-model="processInspectVo.quantity" placeholder="请输入数量"
			@@ -147,15 +148,21 @@
			<template slot-scope="scope">
			<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
			<div v-else>
			<el-select style="width:100%" v-model="scope.row.eId"
			<el-select style="width:80%" v-model="scope.row.eId"
			v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)">
			<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>
			<el-table-column prop="inspectionValue">
			<el-table-column prop="inspectionValue"
			label="检验描述" width="240" style="text-align: center;">
			<template slot-scope="scope">
			<el-col v-if="scope.row.itype === '1'">
			@@ -223,6 +230,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>

			@@ -239,9 +258,16 @@
			} from '@/api/quality/finishedProduct'
			import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
			import { remote } from '@/api/admin/dict'
			import qrCodeApp from '@/views/common/qrCodeApp'
			export default {
			components:{
			qrCodeApp
			},
			data() {
			return {
			row: null,
			proIndex: 0,
			deviceCode: false,
			locationList: [],
			dataVal: [{
			label: '是',
			@@ -303,6 +329,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
			},
			changeLocation(val){
			if(val){
			let obj = {
			@@ -340,6 +393,11 @@
			pro+=arr.length
			}
			})
			let obj = {
			id: this.processInspectVo.id,
			number: 0,
			result: this.inspectionResultForm[0].result
			}
			if (pro > 0) {
			this.$prompt('请输入不合格数量', '不合格数量', {
			confirmButtonText: '确定',
			@@ -347,11 +405,8 @@
			inputPattern: /^\d+$/,
			inputErrorMessage: '请输入正确数字格式'
			}).then(({ value }) => {
			let data = {
			id: this.processInspectVo.id,
			number: value
			}
			updateFinishedInspectById(data).then(res => {
			obj.number = value
			updateFinishedInspectById(obj).then(res => {
			if(res.data.data.indexOf("成功") > 0){
			this.$message.success("上报成功");
			this.checkTestState()
			@@ -361,7 +416,7 @@
			});
			}).catch(() => {});
			}else{
			updateFinishedInspectById({id:this.processInspectVo.id,number:0}).then(res => {
			updateFinishedInspectById(obj).then(res => {
			if(res.data.data.indexOf("成功") > 0){
			this.$message.success("上报成功");
			this.checkTestState()
			@@ -557,12 +612,38 @@
			}
			})
			},
			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,
			fpid: row.iid,
			inspectionValue: arr.join(","),
			note : i.inote
			}
			updateFinishedInsProduct(obj).then(res => {
			if (res.data.code == 0) {
			this.init()
			}
			})
			}
			})
			}
			})
			}
			},
			// 删除检验值列
			clickDeleteInspectionColumn() {
			if (this.empiricalValueAdd - 1 === 0) {
			} else {
			if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
			this.empiricalValueAdd = this.empiricalValueAdd - 1;
			this.changeRowResult()
			this.inspectionItems.forEach(i => {
			i.empiricalValueAddss.splice(this.empiricalValueAdd, 1);
			});