lims-ruoyi-before.git

			@@ -63,7 +63,7 @@
			</template>
			<template v-else-if="n.v.ps != undefined && n.v.ps.value === '结论'">
			<el-select
			v-if="(getInspectionValueType(n.i) == 2 \|\| getInspectionValueType(n.i) == 5) && state == 1 && PROJECT == '装备电缆'"
			v-if="(getInspectionValueType(n.i) == 2 \|\| getInspectionValueType(n.i) == 5) && state == 1"
			v-model="n.v.v" class="table_input"
			@change="m => changeInput(m, `${item.templateId}-${n.r}-${n.c}-${n.i}`, n, 'getDataType')">
			<el-option :value="1" label="合格"></el-option>
			@@ -176,6 +176,15 @@
			<el-select v-model="verifyUser" clearable filterable placeholder="请选择" size="small" style="width: 100%;">
			<el-option v-for="(item, i) in personList" :key="i" :label="item.label" :value="item.value">
			</el-option>
			</el-select>
			</div>
			</div>
			<div class="body" style="display: flex;padding: 10px;align-items: center;">
			<div class="search_label" style="width: 150px;"><span class="required-span">*</span>报告类型</div>
			<div class="search_input" style="width: 100%;">
			<el-select v-model="reportType" clearable placeholder="请选择" size="small" style="width: 100%;">
			<el-option label="检测报告" :value="0"></el-option>
			<el-option label="检验报告" :value="1"></el-option>
			</el-select>
			</div>
			</div>
			@@ -356,6 +365,7 @@
			widthList: [],
			addVerifyDia: false,
			verifyUser: null,
			reportType: null,
			personList: [],
			enumList: [],
			tableLoading: false,
			@@ -1763,6 +1773,10 @@
			this.$message.error("请指定复核人员")
			return
			}
			if (this.reportType === null \|\| this.reportType === '') {
			this.$message.error("请选择报告类型")
			return
			}
			if (!this.otherForm.humidity) {
			this.$message.error("请输入湿度")
			return
			@@ -1783,7 +1797,8 @@
			orderId: this.orderId,
			laboratory: this.sonLaboratory,
			verifyUser: this.verifyUser,
			entrustCode: this.insOrder.entrustCode
			entrustCode: this.insOrder.entrustCode,
			reportType: this.reportType
			}).then(res => {
			if (res.code === 200) {
			this.$message.success("操作成功")
			@@ -1817,7 +1832,8 @@
			submitPlan({
			orderId: this.orderId,
			laboratory: this.sonLaboratory,
			verifyUser: this.verifyUser
			verifyUser: this.verifyUser,
			reportType: this.reportType
			}).then(res => {
			if (res.code === 200) {
			this.$message.success("操作成功")