From 10903aca3b8fd5dd7cd8573fa5c99ccf19cb8f29 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 10 四月 2025 13:06:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio-frequency-cable' into radio-frequency-cable
---
src/views/standard/standardLibrary/index.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/standard/standardLibrary/index.vue b/src/views/standard/standardLibrary/index.vue
index dda6e28..d6ea973 100644
--- a/src/views/standard/standardLibrary/index.vue
+++ b/src/views/standard/standardLibrary/index.vue
@@ -34,8 +34,7 @@
</el-col>
<el-col v-if="
checkPermi(['standard:standardLibrary:delStandardTree']) &&
- (node.data.children === null ||
- node.data.children === undefined)
+ data.level == 7
" :span="2" style="text-align: right">
<el-button size="mini" type="text" @click.stop="editTreeName(node.data)" v-if="!auditId">
<i class="el-icon-edit"></i>
@@ -43,8 +42,7 @@
</el-col>
<el-col v-if="
checkPermi(['standard:standardLibrary:delStandardTree']) &&
- (node.data.children === null ||
- node.data.children === undefined)
+ data.level == 7
" :span="2" style="text-align: right">
<el-button size="mini" type="text" @click.stop="remove(node, data)" v-if="!auditId">
<i class="el-icon-delete"></i>
@@ -58,7 +56,7 @@
<el-row class="title" style="width: 100%">
<el-col :span="19" style="font-size: 14px; color: #999"><span>{{
selectTree
- }} </span></el-col>
+ }} </span></el-col>
<el-col :span="5" style="position: absolute;top: -3px;right: -25px;" v-if="!auditId && !standardCkeck">
<el-button size="small" type="primary" @click="submitReview" :loading="submitReviewLoad">鎻愪氦鍙樻洿</el-button>
<el-button v-if="isShowCopy" size="small" type="primary" @click="openCopyDia">鎵归噺澶嶅埗</el-button>
@@ -135,12 +133,12 @@
<span v-else>{{ scope.row.methodS }}</span>
</template>
</el-table-column> -->
- <el-table-column label="鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
+ <el-table-column label="璇曢獙鏉′欢" min-width="140" prop="radius" show-overflow-tooltip>
<template slot-scope="scope">
<el-select v-if="
checkPermi(['standard:standardLibrary:upStandardProduct'])
- " v-model="scope.row.radius" clearable placeholder="鏉′欢" size="small" @change="(value) => upStandardProductListOfRadius(value, scope.row.id)
- " :disabled="!!auditId || standardCkeck">
+ " v-model="scope.row.radius" clearable placeholder="璇曢獙鏉′欢" size="small" @change="(value) => upStandardProductListOfRadius(value, scope.row.id)
+ " :disabled="!!auditId || standardCkeck" allow-create filterable>
<el-option v-for="(a, i) in scope.row.radiusList &&
JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option>
</el-select>
@@ -313,7 +311,7 @@
import bindSupplierDensityDialogAsk from "./components/bindSupplierDensityDialogAsk.vue";
import BatchCopy from "./components/BatchCopy.vue";
export default {
- name: 'StandardLibrary',
+ // name: 'StandardLibrary',
components: {
BatchCopy,
bindSupplierDensityDialogAsk,
@@ -616,7 +614,11 @@
this.selectTree = "";
// 鎷兼帴鏍戣矾寰�
this.selectTree = this.getReversedTreePath(node);
- delStandardTree({ tree: this.selectTree }).then((res) => {
+ delStandardTree({
+ tree: this.selectTree,
+ level: data.level,
+ id: data.value
+ }).then((res) => {
this.$message.success("宸插垹闄�");
let arr = this.selectTree.split(" - ");
this.deleteStandard(this.list, arr[arr.length - 1]);
--
Gitblit v1.9.3