mes-ocea-before.git

			@@ -28,16 +28,16 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="零件号" prop="code">
			<el-input v-model="dataForm.code">
			<el-input v-model="dataForm.code" :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''">
			<el-button
			slot="append"
			icon="el-icon-search"
			:disabled="(resultVal!=null && resultVal!='')"
			:disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''"
			@click="queryCode"></el-button>
			<el-button
			slot="append"
			icon="el-icon-full-screen"
			:disabled="(resultVal!=null && resultVal!='')"
			:disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''"
			@click="Turnonthecamera"></el-button>
			</el-input>
			</el-form-item>
			@@ -86,7 +86,7 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="数量" prop="number">
			<el-input v-model="dataForm.number" :disabled="(resultVal!=null && resultVal!='')" />
			<el-input v-model="dataForm.number" :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -117,7 +117,7 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="备注" prop="remark">
			<el-input v-model="dataForm.remark" />
			<el-input :disabled="dataForm&&dataForm.id!==null&&dataForm.id!==''" v-model="dataForm.remark" />
			</el-form-item>
			</el-col>
			</el-row>
			@@ -129,7 +129,7 @@
			<el-row style="width:100%;z-index: 10;height:50px;" v-if="resultVal==null">
			<el-col :span="12"></el-col>
			<el-col :span="12" style="text-align: right;">
			<el-button v-if="resultVal==null \|\| dataForm.id==null" size="small"
			<el-button v-if="dataForm.id&&resultVal==null" size="small"
			type="primary"
			@click="saveTable()">保存</el-button>
			<el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
			@@ -149,8 +149,6 @@
			height="400"
			row-key="iid"
			default-expand-all
			highlight-current-row
			@row-click="handleTable"
			:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
			<el-table-column type="index" prop="parentIndex" label="序号" width="60">
			<template scope="scope">
			@@ -159,13 +157,13 @@
			</el-table-column>
			<el-table-column prop="father" label="检验项目" width="160">
			<template slot-scope="scope">
			<el-input v-if="scope.row.children" style="width:80%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
			<el-input v-if="scope.row.children" style="width:80%" :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
			</template>
			</el-table-column>
			<el-table-column prop="name" label="项目" width="160">
			<template slot-scope="scope">
			<div v-if="!scope.row.children">
			<el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
			<el-input class="inline-input" :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.name"
			placeholder="请输入项目名称"></el-input>
			</div>
			</template>
			@@ -173,7 +171,7 @@
			<el-table-column prop="unit" label="单位" width="160">
			<template slot-scope="scope">
			<div v-if="!scope.row.children">
			<el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="请输入单位"></el-input>
			<el-input :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.unit" placeholder="请输入单位"></el-input>
			</div>
			</template>

			@@ -181,7 +179,7 @@
			<el-table-column prop="required" label="标准值" width="160">
			<template slot-scope="scope">
			<div v-if="!scope.row.children">
			<el-input :disabled="dataForm.id != null" v-model="scope.row.required"
			<el-input :disabled="dataForm.id!=null&&(resultVal!=null && resultVal!='')" v-model="scope.row.required"
			placeholder="请输入标准值"></el-input>
			</div>
			</template>
			@@ -412,6 +410,7 @@
			getObj,
			updateRawInsProduct,
			updateRawInspectsById,
			updateRawInsProduct2,
			updateDeviceById, chooseIFS} from '@/api/quality/rawMaterial'
			import {
			getProcessConfigFiles,
			@@ -495,7 +494,6 @@
			// startTime: [{ required: true, message: '请选择报检日期', trigger: 'blur' }]
			},
			deviceList: [],
			currentTable:null
			}
			},
			beforeUpdate(){
			@@ -704,7 +702,6 @@
			if(res.data.code == 0 && (res.data.data=='1'\|\| res.data.data=='0')){
			sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
			this.$message.success("上报成功");
			this.$router.go(-1)
			}else{
			this.$message.error("上报失败，",res.data.data);
			}
			@@ -776,32 +773,35 @@
			if(this.list){
			this.list.forEach(e=>{
			if(e.children){
			e.children.forEach(i=>{
			e.children.map(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(this.dataForm.id)
			}
			})
			i.testValueList = i.testValueList.splice(i.testValueList.length-1,1)
			return i
			// 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(this.dataForm.id)
			// }
			// })
			}
			})
			}
			})
			this.saveTable()
			}
			},
			delTeatValueColumn(){
			if (this.empiricalValueAdd - 1 > 0) {
			if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
			this.empiricalValueAdd = this.empiricalValueAdd - 1;
			this.changeRowResult()
			// this.changeRowResult()
			this.list.forEach(i => {
			if(i.children){
			i.children.forEach(ele=>{
			@@ -809,6 +809,7 @@
			})
			}
			});
			this.saveTable()
			}
			}
			},
			@@ -936,27 +937,32 @@
			// this.changeState(row)
			}
			},
			changeState(row) {
			saveTable() {
			let rawInsProducts = [];
			this.$nextTick(()=>{
			if (row.rpId != null && row.rpId != '') {
			let val = row.testValueList.join(",")
			if (val === undefined \|\| val === '' \|\| val === null) {
			return
			this.list.forEach(item=>{
			if(item.children){
			item.children.forEach(ele=>{
			let obj = JSON.parse(JSON.stringify(ele))
			obj.testValue = obj.testValueList.join(",")
			obj.id = obj.rpId
			delete obj.testValueList;
			obj.name = ele.name;
			obj.father = item.father;
			obj.unit = ele.unit;
			rawInsProducts.push(obj)
			})
			}
			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("更新成功")
			} else {
			this.$message.error("更新失败")
			}
			this.init(this.dataForm.id)
			})
			})
			if(rawInsProducts.length>0){
			updateRawInsProduct2(rawInsProducts).then(res => {
			if (res.data.code == 0) {
			this.$message.success("更新成功")
			} else {
			this.$message.error("更新失败")
			}
			this.init(this.dataForm.id)
			})
			}
			})
			},
			@@ -1028,14 +1034,6 @@
			this.deviceList = res.data.data
			})
			},
			handleTable(row){
			this.currentTable = row
			},
			saveTable(){
			if(this.currentTable){}else{
			this.$message.error("请选择一个项目")
			}
			}
			},
			}
			</script>