mes-ocea-before.git

			@@ -24,9 +24,14 @@
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="车间订单号" prop="moNumber">
			<el-form-item label="车间订单号" prop="moNo">
			<el-input @blur="selectInfoByOrderId" :disabled="processInspectVo.id != null"
			v-model="processInspectVo.moNumber" placeholder="请输入车间订单号" autocomplete="off" >
			v-model="processInspectVo.moNo" placeholder="请输入车间订单号" autocomplete="off" >
			<!-- <el-button
			slot="append"
			icon="el-icon-search"
			:disabled="resultVal!=null"
			@click="queryCode"></el-button> -->
			<el-button
			slot="append"
			icon="el-icon-full-screen"
			@@ -62,7 +67,7 @@
			</el-tooltip>
			</el-form-item>
			</el-col>


			<el-col :span="6">
			<el-form-item label="工单" prop="operationTaskId">
			<el-select style="width: 100%" :disabled="processInspectVo.id != null"
			@@ -110,14 +115,14 @@
			</el-row>
			<el-row style="width:100%;">
			<el-col :span="24">
			<el-table border
			:data="inspectionItems"
			<el-table border
			:data="inspectionItems"
			height="400"
			:header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }"
			:cell-style="{ textAlign: 'center' }"
			row-key="iid"
			:cell-style="{ textAlign: 'center' }"
			row-key="iid"
			default-expand-all style="width: 100%"
			ref="table"
			ref="table"
			:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
			<el-table-column type="index" label="序号" show-overflow-tooltip width="60"></el-table-column>
			<el-table-column label="项目" prop="father" show-overflow-tooltip width="140"></el-table-column>
			@@ -251,9 +256,10 @@
			<el-button type="primary" @click="deviceCode = false">确定</el-button>
			</span>
			</el-dialog>
			<processPart :paramObj="paramObj" :currshowlist.sync="workshop" />
			</div>
			</template>


			<script>
			import {
			chooseMater,
			@@ -263,21 +269,23 @@
			updateProcessInsProduct,
			updateProcessInspectsById,
			} from '@/api/quality/processInspect'
			import processPart from '@/views/common/processinspect-part'
			import { selectDevice } from '@/api/quality/processInspect'
			import qrCodeApp from '@/views/common/qrCodeApp'
			import { validatePositiveInteger } from '@/util/validate'
			export default {
			components:{
			qrCodeApp
			qrCodeApp,processPart
			},
			data() {
			return {
			paramObj:{},
			qrcode: false,
			row: null,
			proIndex: 0,
			deviceCode: false,
			rules: {
			moNumber: [{required:true,message:'车间订单号不能为空',trigger:'blur'}],
			moNo: [{required:true,message:'车间订单号不能为空',trigger:'blur'}],
			quantity: [{required:true,validator: validatePositiveInteger,trigger:'blur'}],
			operationTaskId: [{required:true,message: '请选择工单',trigger:'change'}],
			},
			@@ -291,6 +299,7 @@
			resultVal: null,
			technologyList: [],
			deviceList: [],
			workshop:false,//车间弹窗
			hasChildren: true,
			optionsSamplename: [],
			// 添加列
			@@ -299,7 +308,7 @@
			empiricalValueAddMaxNumber: 0,
			processInspectVo: {
			id: null,
			moNumber: null,
			moNo: null,
			proInsNo: null,
			material: null,
			materialCode: null,
			@@ -335,6 +344,14 @@
			this.init()
			},
			methods: {
			queryCode(){
			console.log("llll");
			this.workshop = true
			console.log(this.workshop);
			// this.paramObj = {
			// code: this.dataForm.code
			// }
			},
			cancelCodeDialog(){
			this.qrcode = false
			},
			@@ -345,7 +362,7 @@
			let obj=JSON.parse(data)
			let info={"code":obj["moNo"]}
			if(info.code){
			this.processInspectVo.moNumber = obj["moNo"]
			this.processInspectVo.moNo = obj["moNo"]
			this.selectInfoByOrderId()
			}else{
			this.$message.warning('未识别出车间订单号信息！');
			@@ -375,7 +392,7 @@
			}
			},
			codeDevice(row,index){
			this.row=row
			this.row=row
			this.deviceCode =true
			this.$refs.codeDeviceCompont.openCamera()
			this.proIndex=index
			@@ -452,7 +469,7 @@
			if (id != null) {
			queryById(id).then(res => {
			let result = res.data.data
			this.processInspectVo.moNumber = result.moNumber
			this.processInspectVo.moNo = result.moNo
			this.processInspectVo.operationTaskId = result.technologyOperationName
			this.processInspectVo.proInsNo = result.proInsNo
			this.processInspectVo.projectName = result.projectName
			@@ -486,16 +503,22 @@
			}
			})
			this.inspectionItems = result.children
			let rVal = '1'
			let rVal = ''
			let passNum = 0
			let unPassNum = 0
			this.inspectionItems.forEach(item => {
			if (item.children) {
			item.children.forEach(obj => {
			if (obj.iresult == 0) {
			rVal = '0'
			if(obj.iresult == 0){
			unPassNum += 1
			}
			if(obj.iresult == 1){
			passNum+=1
			}
			})
			}
			})
			rVal = (passNum+unPassNum)>0 ? unPassNum>0 ? '0' :'1' : ''
			this.inspectionResultForm = [{
			materialCode: result.materialCode,
			material: result.material,
			@@ -602,9 +625,9 @@
			})
			},
			selectInfoByOrderId() {
			if(this.processInspectVo.moNumber){
			if(this.processInspectVo.moNo){
			chooseMater({
			moNo: this.processInspectVo.moNumber
			moNo: this.processInspectVo.moNo
			}).then(res => {
			let data = res.data.data
			if (data) {
			@@ -645,7 +668,7 @@
			updateProcessInsProduct(obj).then(res => {
			if (res.data.code == 0) {
			this.init()
			}
			}
			})
			}
			})
			@@ -678,7 +701,7 @@
			},
			}
			</script>


			<style scoped>
			.finishedProduct-detail {
			width: 100%;
			@@ -742,4 +765,4 @@
			border-top: 0 !important;
			cursor: pointer !important;
			}
			</style>
			</style>