From 61282c106068d9a792e1b084746e2d6b9a997b99 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 15 九月 2026 15:29:52 +0800
Subject: [PATCH] 新疆——新聚lims 1.不需要判定要求、检测方法、检验结果、结论 2.设备不需要绑定每个检验子项，只需要绑定当前的的检验委托单 3.判定结果检测的时候不要出现，复核的时候才判断选择最终结果是否合格
---
src/views/business/inspectionView/index.vue | 30 +++++-------------------------
1 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/src/views/business/inspectionView/index.vue b/src/views/business/inspectionView/index.vue
index 0d4eefa..697e2c0 100644
--- a/src/views/business/inspectionView/index.vue
+++ b/src/views/business/inspectionView/index.vue
@@ -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("鎿嶄綔鎴愬姛");
--
Gitblit v1.9.3