From 94e0abbf193f9e1fc953716ca7868d74cd14a2cd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 21 九月 2026 11:06:25 +0800
Subject: [PATCH] fix(inspectionTask): 修复连接实验室功能并更新字段标签
---
src/views/standard/model/index.vue | 12 ++++++------
src/views/business/inspectionTask/index.vue | 32 +++++++++++++++++++++-----------
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 37b7124..5c66bd9 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -234,7 +234,6 @@
import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue"
import {
claimInsOrderPlan,
- upPlanUser2,
upPlanUser,
selectUserCondition,
getBindingProductByProductId,
@@ -244,6 +243,7 @@
selectInsOrderPlanList,
selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
+import { treeDevice } from "@/api/cnas/resourceDemand/device.js";
import { mapGetters } from "vuex";
import {getRetestResult} from "@/api/business/rawMaterialOrder";
import {upReportUrl} from "@/api/business/insReport";
@@ -839,19 +839,29 @@
},
handleConnect(row) {
this.orderId = row.id;
- this.connect = {};
+ this.connect = {
+ connectPerson: "",
+ sonLaboratory: "",
+ };
+ this.sonLaboratoryList = [];
this.connectVisible = true;
- upPlanUser2({ orderId: this.orderId }).then((res) => {
- if (res.code === 200 && res.data.length > 0) {
- this.sonLaboratoryList = [];
- res.data.forEach((m) => {
- this.sonLaboratoryList.push({
- value: m,
- label: m,
- });
- });
+ treeDevice().then((res) => {
+ if (res.code === 200) {
+ const laboratoryNames = [
+ ...new Set((res.data || []).map((item) => item && item.label).filter(Boolean)),
+ ];
+ this.sonLaboratoryList = laboratoryNames.map((laboratoryName) => ({
+ value: laboratoryName,
+ label: laboratoryName,
+ }));
+ if (this.sonLaboratoryList.length === 0) {
+ this.$message.warning("鏆傛棤鍦烘墍鏁版嵁");
+ return;
+ }
this.connect.sonLaboratory = this.sonLaboratoryList[0].value;
}
+ }).catch(() => {
+ this.$message.error("鍦烘墍鏁版嵁鍔犺浇澶辫触");
});
},
confirmConnect() {
diff --git a/src/views/standard/model/index.vue b/src/views/standard/model/index.vue
index e179b7a..5fa3ec2 100644
--- a/src/views/standard/model/index.vue
+++ b/src/views/standard/model/index.vue
@@ -3,7 +3,7 @@
<div class="search">
<div class="search_box">
<div class="search_item">
- <span class="search_label">妯℃澘鍚嶇О</span>
+ <span class="search_label">妫�楠岄」鐩�</span>
<el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable()"></el-input>
</div>
@@ -27,10 +27,10 @@
<el-dialog :before-close="closeCopyTem" :close-on-click-modal="false" :close-on-press-escape="false"
:visible.sync="isShowCopyTem" :title="title" width="35%" :modal-append-to-body="false">
<el-form ref="copyForm" :model="copyForm" :rules="copyFormRules" label-position="right" label-width="80px">
- <el-form-item label="妫�楠岄」鐩�" prop="number">
+ <el-form-item label="妫�楠屼緷鎹�" prop="number">
<el-input v-model="copyForm.number" clearable size="small"></el-input>
</el-form-item>
- <el-form-item label="妯＄増鍚嶇О" prop="name">
+ <el-form-item label="妫�楠岄」鐩�" prop="name">
<el-input v-model="copyForm.name" clearable size="small"></el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -86,15 +86,15 @@
id: "",
},
copyFormRules: {
- name: [{ required: true, message: "璇疯緭鍏ユā鐗堝悕绉�", trigger: "blur" }],
+ name: [{ required: true, message: "璇疯緭鍏ユ楠岄」鐩�", trigger: "blur" }],
},
queryParams: {
name: null,
},
tableData: [],
column: [
- { label: "妫�楠岄」鐩�", prop: "number" },
- { label: "妯℃澘鍚嶇О", prop: "name" },
+ { label: "妫�楠屼緷鎹�", prop: "number" },
+ { label: "妫�楠岄」鐩�", prop: "name" },
{ label: "澶囨敞", prop: "remark" },
{ label: "浠锋牸(鍏�)", prop: "price" },
{ label: "鍒涘缓鐢ㄦ埛", prop: "createUserName" },
--
Gitblit v1.9.3