From cf76f6292034875727546747a68230bf0befa83d Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 15:46:56 +0800
Subject: [PATCH] modified: src/components/view/standard-table/material.vue modified: src/components/view/standard-table/product.vue modified: src/components/view/standard-table/target.vue modified: src/components/view/standard-table/technology.vue
---
src/components/view/processInspectionUpdate.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/components/view/processInspectionUpdate.vue b/src/components/view/processInspectionUpdate.vue
index 1e40e84..2a422a8 100644
--- a/src/components/view/processInspectionUpdate.vue
+++ b/src/components/view/processInspectionUpdate.vue
@@ -103,7 +103,7 @@
> -->
</el-col>
</el-row>
- <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
+ <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
height="calc(100vh - 550px)" style="width: 100%">
<el-table-column type="index" label="搴忓彿" width="60"></el-table-column>
<el-table-column label="椤圭洰" prop="father"></el-table-column>
@@ -125,13 +125,14 @@
<template slot-scope="scope">
<el-col>
<el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
- scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
- }}</el-button>
- <el-select @blur="blurNode(scope)" v-else-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>
+ scope.row.dname == null ? "璇烽�夋嫨" : scope.row.dname
+ }}</el-button>
+ <el-select @blur="blurNode(scope)" v-else-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>
</el-col>
</template>
</el-table-column>
@@ -304,7 +305,7 @@
this.getTableData()
},
methods: {
- blurNode(scope){
+ blurNode(scope) {
// console.log(11);
// this.$set(this.inspectionItems[scope.$index],'isSelectDevice',false)
},
@@ -378,11 +379,11 @@
}
}).then(res => {
this.materialOptions = res.data;
- if(this.materialOptions.length===1){
+ if (this.materialOptions.length === 1&&row.did!=null) {
this.$message({
- message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
- type: 'warning'
- });
+ message: '璇ラ」鐩笅鍙湁涓�涓瘯楠岃澶囷紝鏃犻渶閫夋嫨锛�',
+ type: 'warning'
+ });
return
}
row.isSelectDevice = true
@@ -397,8 +398,8 @@
clickTableSelect(scope) {
// return scope;
// this.centerDialogVisible = true;
- if(this.clickSelectDevice.index!=null){
- this.$set(this.inspectionItems[this.clickSelectDevice.index],'isSelectDevice',false)
+ if (this.clickSelectDevice.index != null) {
+ this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
}
this.clickSelectDevice.index = scope.$index;
this.clickSelectDevice.rpId = scope.row.id;
--
Gitblit v1.9.3