mes-ocea-before.git

			@@ -8,12 +8,12 @@
			<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">
			<div class="finishedProduct-basic">
			<el-form :model="processInspectVo" ref="addInspectionform" class="l-mes"
			<el-form :model="processInspectVo" :rules="processInspectRules" ref="addInspectionform" class="l-mes"
			label-position="right" label-width="120px" style="width: 100%" size="small">
			<div class="formwrapper">
			<el-row>
			@@ -26,23 +26,26 @@
			<el-col :span="6">
			<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,29 +57,42 @@
			</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="请输入数量"
			autocomplete="off" :disabled="processInspectVo.id != null" />
			</el-form-item>
			</el-col>
			<el-col :span="6" v-if="processInspectVo.id != null">
			<el-form-item label="批次号：">
			<el-input v-model="processInspectVo.outBatchNo" autocomplete="off" disabled />
			</el-form-item>
			</el-col>
			<el-col :span="6" v-if="processInspectVo.id != null">
			<el-form-item label="产品合格库位：" prop="locationId">
			<el-select @change="changeLocation" clearable style="width:100%"
			v-model="processInspectVo.locationId" placeholder="请选择合格库位"
			:disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
			<el-option v-for="(item,i) in locationList" :key="i"
			:label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>
			@@ -104,21 +120,20 @@
			<el-table-column prop="required" label="标准值" width="240" ></el-table-column>
			<el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值"
			width="240" style="text-align: center;">

			<template slot-scope="scope">
			<el-col v-if="scope.row.itype === '1'">
			<el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null"
			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, index)" placeholder="请输入检测值"></el-input>
			@blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
			<span v-if="resultVal != null" v-text="scope.row.empiricalValueAddss[index]"></span>
			</el-tooltip>
			</el-col>
			<el-col v-else>
			<el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null"
			class="item" effect="dark" content="请先选择设备！" placement="top-start">
			<el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
			<el-select style="width: 100%;" @change="changeState(scope.row)" :disabled="scope.row.eId == null" v-model="scope.row.empiricalValueAddss[index]" placeholder="请选择">
			<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
			:value="item.value">
			</el-option>
			@@ -133,16 +148,21 @@
			<template slot-scope="scope">
			<span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
			<div v-else>
			<!-- <el-input v-model="scope.row.eId" v-if="scope.row.iname != null" placeholder="请输入设备号"></el-input> -->
			<el-select style="width:100%" v-model="scope.row.eId"
			v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
			<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.number +'-'+ item.name"></el-option>
			: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" :key="index"
			<el-table-column prop="inspectionValue"
			label="检验描述" width="240" style="text-align: center;">
			<template slot-scope="scope">
			<el-col v-if="scope.row.itype === '1'">
			@@ -151,7 +171,7 @@

			<el-input :disabled="scope.row.eId == null"
			v-model="scope.row.inote"
			@blur="changeState(scope.row, index)" placeholder="请输入检验描述"></el-input>
			@blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>

			<span v-if="resultVal != null && processInspectVo.id != null"
			v-text="scope.row.inote"></span>
			@@ -162,12 +182,7 @@
			class="item" effect="dark" content="请先选择设备！" placement="top-start">
			<el-input :disabled="scope.row.eId == null"
			v-model="scope.row.inote"
			@blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
			<!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="请选择">
			<el-option v-for="item in dataVal" :key="item.value" :label="item.label"
			:value="item.value">
			</el-option>
			</el-select> -->
			@blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
			<span v-if="resultVal != null && processInspectVo.id != null"
			v-text="scope.row.inote"></span>
			</el-tooltip>
			@@ -215,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>

			@@ -227,11 +254,21 @@
			updateFinishedInsProduct,
			updateFinishedInspectById,
			selectDeviceAPI,
			updateLocationIdById,
			} from '@/api/quality/finishedProduct'
			import { selectDevice } from '@/api/quality/rawMaterial'
			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: '是',
			value: '是'
			@@ -247,6 +284,9 @@
			empiricalValueAdd: 1,
			// 编辑时存储最长的列数字，做删除判断
			empiricalValueAddMaxNumber: 0,
			processInspectRules: {
			locationId: [{required: true,message:'请选择库位号',trigger:'blur'}]
			},
			processInspectVo: {
			id: null,
			finInsNo: null,
			@@ -260,7 +300,9 @@
			specificationsModel: null,
			unit: null,
			technologyId: null,
			documentId: null
			documentId: null,
			outBatchNo: null,
			locationId: null,
			},
			inspectionItems: [], // 新增检验项目表格
			inspectionResultForm: [],
			@@ -278,16 +320,70 @@
			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("finished-resultVal-"+this.processInspectVo.id);
			val == undefined ? this.resultVal=null : this.resultVal = val
			}
			this.getIfsLocation()
			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 = {
			id: this.processInspectVo.id,
			locationId: val
			}
			updateLocationIdById(obj).then(res=>{
			if(res.status===200){
			this.$message.success("更新合格库位成功")
			}
			})
			}
			},
			getIfsLocation(){
			getIfsLocationByGroupCopyAll({locationGroup: '1'}).then(res=>{
			if(res.status===200){
			this.locationList = res.data.data
			}
			}).catch(error=>{
			console.error(error);
			})
			},
			submitSave(){
			let locationId = this.processInspectVo.locationId
			if(locationId==null){
			this.$message.error("请选择产品合格库位")
			return
			}
			let pro = 0
			this.inspectionItems.forEach(item => {
			if(item.children){
			@@ -297,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: '确定',
			@@ -304,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()
			@@ -318,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()
			@@ -359,6 +457,8 @@
			this.processInspectVo.unit = result.punit
			this.processInspectVo.quantity = result.quantity
			this.processInspectVo.documentId = result.documentId
			this.processInspectVo.outBatchNo = result.outBatchNo
			this.processInspectVo.locationId = result.locationId
			let userList = []
			result.children.forEach(item=>{
			item.iid = Math.random()
			@@ -395,15 +495,11 @@
			},
			getDeviceList(){
			selectDeviceAPI(null).then(res=>{
			// this.deviceList = res.data.data
			console.log(res);
			this.deviceList = res.data.data

			})
			},
			updateDevice(row,index){
			updateDevice(row){
			let rowId=JSON.stringify(row.iid)
			console.log(row);
			updateDeviceById({deviceId:row.eId,fpid:row.iid}).then(res=>{
			this.inspectionItems.forEach(obj=>{
			obj.children.forEach(c=>{
			@@ -414,14 +510,6 @@
			c.inote=''
			}
			})

			// if(obj.children){
			// obj.children[index-1].inspectionValue = ''
			// obj.children[index-1].iresult = null
			// obj.children[index-1].empiricalValueAddss = []
			// obj.children[index-1].inote=''

			// }
			})
			}).catch(error=>{
			console.log(error)
			@@ -438,7 +526,7 @@
			this.processInspectVo.unit = sample.unit
			this.processInspectVo.documentId = sample.documentId
			},
			changeState(row, index) {
			changeState(row) {
			if (row.iid != null && row.iid != '') {
			let str = ""
			row.empiricalValueAddss.forEach(e => {
			@@ -482,7 +570,6 @@
			let id = res.data.data
			if(id != null){
			queryById(id).then(response=>{
			console.log(response.data.data.children)
			let proList = response.data.data.children
			proList.forEach(item=>{
			item.iid = Math.random();
			@@ -525,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);
			});