From 3268451493960900a913befafe760729061f38e8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 14:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/inspectionTask/index.vue | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index d3505bf..515c16e 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -246,6 +246,8 @@
<edit-inspection-item ref="editInspectionItem"></edit-inspection-item>
<!--鏌ョ湅宸ユ椂寮规-->
<viewManHourDia ref="viewManHourDia"></viewManHourDia>
+ <!--涓嶅悎鏍煎娴嬫煡鐪嬪脊妗�-->
+ <un-pass-retest-result v-if="retestVisible" :retestInfo="retestInfo" :retestVisible="retestVisible" @closeRetestLook="closeRetestLook"></un-pass-retest-result>
</div>
</template>
@@ -254,6 +256,7 @@
import EditInspectionItem from "./components/EditInspectionItem.vue";
import limsTable from "@/components/Table/lims-table.vue";
import viewManHourDia from "./components/viewManHourDia.vue"
+import UnPassRetestResult from "@/components/rawMaterialInspection/unPassRetestResult.vue"
import {
claimInsOrderPlan,
upPlanUser2,
@@ -267,12 +270,14 @@
selectSampleAndProductByOrderId,
} from "@/api/business/inspectionTask.js";
import { mapGetters } from "vuex";
+import {getRetestResult} from "@/api/business/rawMaterialOrder";
export default {
name: 'InspectionTask',
components: {
EditInspectionItem,
limsTable,
- viewManHourDia
+ viewManHourDia,
+ UnPassRetestResult
},
dicts: ["urgency_level", "inspection_task_state"],
computed: {
@@ -569,6 +574,16 @@
label: "鎿嶄綔",
operation: [
{
+ name: "涓嶅悎鏍煎娴嬫煡鐪�",
+ type: "text",
+ clickFun: (row) => {
+ this.getRetestResultInfo(row);
+ },
+ disabled: (row) => {
+ return row.insResult!=0
+ },
+ },
+ {
name: "妫�楠岄」缁戝畾",
type: "text",
clickFun: (row) => {
@@ -592,6 +607,7 @@
},
lookTableLoading: false,
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
+ retestVisible: false,
};
},
mounted() {
@@ -928,6 +944,16 @@
this.personList = data;
});
},
+ // 鏌ョ湅涓嶅悎鏍煎娴嬬粨鏋�
+ getRetestResultInfo (row) {
+ getRetestResult({insProductId: row.insProductId}).then(res => {
+ this.retestVisible = true
+ this.retestInfo = res.data
+ })
+ },
+ closeRetestLook () {
+ this.retestVisible = false
+ },
// 缁戝畾妫�楠岄」缁戝畾
getBinding(row) {
this.bindCurrentInfo = row;
--
Gitblit v1.9.3