From efcf450e8e7e375ef4ffe9f421ec0d34c5378180 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 14:02:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/views/standardLibrary/index.vue | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index e52478e..2bfd5e1 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -4,13 +4,13 @@
<div class="library-bom" style="width: 300px">
<el-row :gutter="10">
<el-col :span="19">
- <el-input clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
+ <el-input size="small" clearable v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"></el-input>
</el-col>
<el-col :span="5">
- <el-button type="primary" icon="el-icon-plus" @click="addTreeFormVisible = true"></el-button>
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="addTreeFormVisible = true"></el-button>
</el-col>
</el-row>
- <el-button type="text">鍏ㄩ儴</el-button>
+ <el-button size="small" type="text">鍏ㄩ儴</el-button>
<el-tree ref="tree" style="width: 100%" class="filter-tree" :data="standardTree" :props="defaultProps"
node-key="id" :highlight-current="true" :default-expand-all="true" :filter-node-method="filterNode"
:render-content="renderContent" @node-click="nodeClick" />
@@ -19,13 +19,13 @@
<div class="table-header">
<div class="serve-btn">
<span class="tipMsg">{{ msg !== "" ? msg : "" }}</span>
- <el-select v-model="versionValue" @change="changeSelect" placeholder="璇烽�夋嫨鐗堟湰鍙�">
+ <el-select size="small" v-model="versionValue" @change="changeSelect" placeholder="璇烽�夋嫨鐗堟湰鍙�">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <el-button type="primary" @click="addVersionFun">鏂板鐗堟湰鍙�</el-button>
- <el-button type="primary" @click="centerDialogVisible = true">鏂板椤圭洰</el-button>
- <el-button class="top_div_button" icon="el-icon-delete-solid" style="color: #00a5ff"
+ <el-button size="small" type="primary" @click="addVersionFun">鏂板鐗堟湰鍙�</el-button>
+ <el-button size="small" type="primary" @click="centerDialogVisible = true">鏂板椤圭洰</el-button>
+ <el-button size="small" class="top_div_button" icon="el-icon-delete-solid" style="color: #00a5ff"
@click="deleteListClick">鍒犻櫎</el-button>
</div>
</div>
@@ -586,12 +586,29 @@
});
},
async requiredOnfocus(scope) {
+ console.log(scope);
let obj = {
id: scope.row.id,
required: scope.row.required,
internal: scope.row.internal,
- };
-
+ };
+ let internal=obj.internal.charAt(0)
+ let required=obj.required.charAt(0)
+ let arr=['>','<','='];
+ if(!arr.includes(required)){
+ this.$message({
+ message: '鏍囧噯鍊煎弬鏁颁笉绗﹀悎锛�',
+ type: 'warning'
+ });
+ return
+ }
+ if(!arr.includes(internal)){
+ this.$message({
+ message: '鍐呮帶鍊煎弬鏁颁笉绗﹀悎锛�',
+ type: 'warning'
+ });
+ return
+ }
await blurUpdateApi(obj).then((res) => {
this.$message({
message: res.message,
--
Gitblit v1.9.3