From 5eb1499c02ac96f5d58fabfd17e36103d35a675c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 14:01:26 +0800
Subject: [PATCH] modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/login/index.vue modified: src/views/standardLibrary/index.vue
---
src/views/standardLibrary/index.vue | 21 +++++++++++++++++++--
src/views/login/index.vue | 4 ++--
src/views/experiment/planAssignments/plan.vue | 5 ++++-
src/views/experiment/nonConformingFeedback/index.vue | 2 +-
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/views/experiment/nonConformingFeedback/index.vue b/src/views/experiment/nonConformingFeedback/index.vue
index bccfa6a..e89b8a9 100644
--- a/src/views/experiment/nonConformingFeedback/index.vue
+++ b/src/views/experiment/nonConformingFeedback/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="content-main">
<div class="top-bar">
- <el-form ref="form" style="width: 1000px;margin-top: 10px;" :inline="true">
+ <el-form ref="form" style="width: 100%;margin-top: 10px;" :inline="true">
<el-form-item label="鏍峰紡缂栧彿锛�">
<el-input size="small" v-model="materialCode" placeholder="璇疯緭鍏ユ牱寮忕紪鍙�"></el-input>
</el-form-item>
diff --git a/src/views/experiment/planAssignments/plan.vue b/src/views/experiment/planAssignments/plan.vue
index 0b9cb4f..34a94cc 100644
--- a/src/views/experiment/planAssignments/plan.vue
+++ b/src/views/experiment/planAssignments/plan.vue
@@ -63,6 +63,7 @@
</el-form>
<el-button size="small" type="primary" @click="selectDataList">鏌ヨ</el-button>
<el-button size="small" @click="cleanBtn">閲嶇疆</el-button>
+ <el-checkbox style="margin-left: 10px;" @change="selectDataList" v-model="isLookMe">鍙湅鎴�</el-checkbox>
</div>
<div class="thing">
<el-table :data="tableData" style="width: 100%;" row-key="code" default-expand-all
@@ -229,7 +230,8 @@
upInsDia: false,
upIndex2: 0,
users: [],
- devices: []
+ devices: [],
+ isLookMe: false
}
},
mounted() {
@@ -241,6 +243,7 @@
selectDataList() {
var str = {}
str.code = this.search.code
+ str.isLookMe=this.isLookMe
str.status = this.search.testValue
try {
if (this.search.date.length != 0) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1d73885..04c5c38 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -118,7 +118,7 @@
<div class="title_big">娆㈣繋鎮ㄧ櫥褰曪紒</div>
<div class="title_small">瑁呭鐢电紗LIMS瀹為獙瀹ょ鐞嗙郴缁�</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="elform" :hide-required-asterisk="true">
- <el-form-item label="鐢ㄦ埛鍚�" prop="username">
+ <el-form-item label="璐﹀彿" prop="username">
<el-input v-model="ruleForm.username" placeholder="璇疯緭鍏ヨ处鍙�" clearable></el-input>
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
@@ -217,7 +217,7 @@
}
this.$message.success("鐧诲綍鎴愬姛")
this.btnload = false
- this.$router.push({ path: this.redirect || '/' })
+ this.$router.push({ path: '/' })
}).catch((error) => {
this.$message.error(error.message)
this.btnload = false
diff --git a/src/views/standardLibrary/index.vue b/src/views/standardLibrary/index.vue
index 5cbf919..2bfd5e1 100644
--- a/src/views/standardLibrary/index.vue
+++ b/src/views/standardLibrary/index.vue
@@ -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