From 3b6cea7dcb3f8bf5aa3142b8183adcf7116b1d54 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 17:09:47 +0800
Subject: [PATCH] modified: src/components/view/finishedProductInspectionAdd.vue modified: src/components/view/finishedProductInspectionUp.vue modified: src/components/view/rawInsDetail.vue
---
src/components/view/finishedProductInspectionUp.vue | 2 +-
src/components/view/finishedProductInspectionAdd.vue | 4 ++--
src/components/view/rawInsDetail.vue | 7 +++++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/view/finishedProductInspectionAdd.vue b/src/components/view/finishedProductInspectionAdd.vue
index 2f3df5c..b72612a 100644
--- a/src/components/view/finishedProductInspectionAdd.vue
+++ b/src/components/view/finishedProductInspectionAdd.vue
@@ -123,7 +123,7 @@
<el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
}}</el-button>
- <el-select style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="璇烽�夋嫨">
+ <el-select v-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="璇烽�夋嫨">
<el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
</el-option>
</el-select>
@@ -317,6 +317,7 @@
}
}).then(res => {
this.materialOptions = res.data;
+ this.filterText = row.did
if(this.materialOptions.length===1){
this.$message({
message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
@@ -325,7 +326,6 @@
return
}
row.isSelectDevice = true
- this.filterText = row.did
});
},
// 鐐瑰嚮琛ㄦ牸閫夋嫨瑙﹀彂
diff --git a/src/components/view/finishedProductInspectionUp.vue b/src/components/view/finishedProductInspectionUp.vue
index f944def..58acfa5 100644
--- a/src/components/view/finishedProductInspectionUp.vue
+++ b/src/components/view/finishedProductInspectionUp.vue
@@ -337,7 +337,7 @@
message: '涓婃姤鎴愬姛',
type: 'success'
});
- this.$refs.comBackMain(true)
+ this.$parent.comBackMain(true)
} else {
this.$message({
message: res.message,
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index a028670..4b41eba 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -365,7 +365,9 @@
}
this.getOptions();
},
- mounted() {},
+ mounted() {
+
+ },
computed: {
conclusionTable() {
const conclusion = {};
@@ -375,7 +377,7 @@
...new Set(this.projectTable.map(item => item.uName))
];
if (
- this.projectTable.filter(item => item.testState === null).length ===
+ this.projectTable.filter(item => item.testState === undefined).length ===
this.projectTable.length
) {
conclusion.testState = null;
@@ -456,6 +458,7 @@
params: { id: this.detailId }
})
.then(res => {
+ console.log(res);
this.detailInfo = res.data;
this.projectTable = res.data.children;
this.projectTable.forEach(i => {
--
Gitblit v1.9.3