lims-ruoyi-before.git

			@@ -45,7 +45,7 @@
			<el-input v-model="currentSample.sample" clearable disabled placeholder="请输入" size="small"></el-input>
			</el-form-item>
			<el-form-item label="样品数量:">
			<el-input v-model="sampleProduct.length" clearable disabled placeholder="请输入" size="small"></el-input>
			<el-input v-model="insOrder.testQuantity" clearable disabled placeholder="请输入" size="small"></el-input>
			</el-form-item>
			<el-form-item label="样品型号:">
			<el-input v-model="currentSample.model" clearable disabled placeholder="请输入" size="small"></el-input>
			@@ -74,7 +74,7 @@
			@blur="subOtherForm(insOrder.remark, 'remark')"></el-input>
			<!-- <el-tag v-if="currentKey">{{ insOrder.remark }}</el-tag> -->
			</el-form-item>
			<el-form-item v-if="isDirectTemplateOrder()" label="检验结论:">
			<el-form-item label="检验结论:">
			<el-radio-group v-model="reviewInsResult" :disabled="state != 2">
			<el-radio :label="1">合格</el-radio>
			<el-radio :label="0">不合格</el-radio>
			@@ -343,17 +343,6 @@
			</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>
			<span slot="footer" class="dialog-footer">
			<el-button @click="addVerifyDia = false">取消</el-button>
			<el-button :loading="submitLoading" type="primary" @click="submit()">确定</el-button>
			@@ -572,7 +561,6 @@
			widthList: [],
			addVerifyDia: false,
			verifyUser: null,
			reportType: null,
			personList: [],
			enumList: [],
			tableLoading: false,
			@@ -1982,7 +1970,7 @@
			upInsReview(e) {
			if (e == 1) {
			// 通过
			if (this.isDirectTemplateOrder() && this.reviewInsResult !== 0 && this.reviewInsResult !== 1) {
			if (this.reviewInsResult !== 0 && this.reviewInsResult !== 1) {
			this.$message.error("请选择检验结论");
			return;
			}
			@@ -1993,7 +1981,7 @@
			laboratory: this.sonLaboratory,
			tell: null,
			userId: this.checkUser,
			insResult: this.isDirectTemplateOrder() ? this.reviewInsResult : null,
			insResult: this.reviewInsResult,
			}).then((res) => {
			if (res.code === 200) {
			this.$message.success("操作成功");
			@@ -2039,16 +2027,11 @@
			this.$refs.viewManHourDia.showDialog(this.id, 99);
			},
			openAddVerifyDia() {
			this.reportType = null;
			this.addVerifyDia = true;
			},
			submit() {
			if (this.verifyUser === null \|\| this.verifyUser === "") {
			this.$message.error("请指定复核人员");
			return;
			}
			if (this.reportType === null \|\| this.reportType === "") {
			this.$message.error("请选择报告类型");
			return;
			}
			if (!this.otherForm.humidity) {
			@@ -2063,7 +2046,6 @@
			checkSubmitPlan({
			orderId: this.orderId,
			laboratory: this.sonLaboratory,
			reportType: this.reportType,
			}).then((res) => {
			if (res.code === 200) {
			if (!res.data \|\| res.data.errorMsg.length == 0) {
			@@ -2073,8 +2055,7 @@
			laboratory: this.sonLaboratory,
			verifyUser: this.verifyUser,
			entrustCode: this.insOrder.entrustCode,
			registerInsResults: this.reportType === 1,
			reportType: this.reportType,
			registerInsResults: false,
			}).then((res) => {
			if (res.code === 200) {
			this.$message.success("操作成功");
			@@ -2127,7 +2108,6 @@
			laboratory: this.sonLaboratory,
			verifyUser: this.verifyUser,
			registerInsResults: false,
			reportType: this.reportType,
			}).then((res) => {
			if (res.code === 200) {
			this.$message.success("操作成功");