From e564beb607ed42a01513ff8482cce3b4b04378db Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 17:54:38 +0800
Subject: [PATCH] modified: src/views/basicData/index.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/laboratory/role/index.vue
---
src/views/basicData/index.vue | 129 +++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 60 deletions(-)
diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index efdd624..3b5b8ac 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -1,53 +1,57 @@
<template>
<div class="main_div">
<div class="top_div">
- <span>鏍峰搧鍚嶇О锛�</span>
- <el-select v-model="params.material" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О">
- <el-option v-for="item in productModelSelectmater" :value="item" :key="item.index" :label="item"></el-option>
- </el-select>
- <span class="top_div_span">椤圭洰鍒嗙粍锛�</span>
- <el-input v-model="params.father" placeholder="璇疯緭鍏ラ」鐩垎缁�" style="width: 10%" size="small "></el-input>
- <span class="top_div_span">椤圭洰鍚嶇О锛�</span>
- <el-input v-model="params.name" placeholder="璇疯緭鍏ラ」鐩悕绉�" style="width: 10%" size="small "></el-input>
- <el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">鏌ヨ</el-button>
- <el-button class="top_div_button" size="small" @click="clean">閲嶇疆</el-button>
- <div style="float: right">
- <el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
- @click="centerDialogVisible = true">鏂板</el-button>
- <el-dialog :visible.sync="centerDialogVisible" width="30%" right :before-close="handleClose"
- :title="isUpdate ? '鏇存柊' : '鏂板'" :hide-required-asterisk="false">
- <el-form :model="form" :rules="rules" ref="ruleForm" class="addForm">
- <el-form-item prop="material" required>
- <span>鏍峰搧鍚嶇О锛�</span>
- <el-autocomplete class="inline-input" v-model="form.material" :fetch-suggestions="querySearch1"
- placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" style="width: calc(100% - 70px);"></el-autocomplete>
- </el-form-item>
- <el-form-item>
- <span>椤圭洰鍒嗙粍锛�</span>
- <el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
- placeholder="璇疯緭鍏ユ牱鍝佸垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
- </el-form-item>
- <el-row :gutter="24">
- <el-col :span="12"><el-form-item prop="name" required><span>椤圭洰鍚嶇О锛�</span>
- <el-input style="width: calc(100% - 70px);" v-model="form.name"
- placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input></el-form-item></el-col>
- <el-col :span="12">
- <el-form-item prop="unit">
- <span v-html="'鍗� 浣嶏細'"></span>
- <el-input style="width: calc(100% - 70px);" v-model="form.unit"
- placeholder="璇疯緭鍏ュ崟浣�"></el-input></el-form-item></el-col>
- </el-row>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="centerDialogVisible = false" size="small ">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitAdd" size="small ">{{
- isUpdate ? "鏇� 鏂�" : "淇� 瀛�"
- }}</el-button>
- </span>
- </el-dialog>
- <el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
- @click="deleteListClick">鍒犻櫎</el-button>
- </div>
+ <el-form :inline="true" :model="params" label-position="left">
+ <el-form-item prop="material" label="鏍峰搧鍚嶇О锛�">
+ <el-select v-model="params.material" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О" @change="selectProductModelTable()">
+ <el-option v-for="item in productModelSelectmater" :value="item" :key="item.index" :label="item"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item prop="father" label="椤圭洰鍒嗙粍锛�" width="200">
+ <el-input size="small" v-model="params.father" placeholder="璇疯緭鍏ラ」鐩垎缁�"></el-input>
+ </el-form-item>
+ <el-form-item prop="name" label="椤圭洰鍚嶇О锛�" width="200" >
+ <el-input size="small" v-model="params.name" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">鏌ヨ</el-button>
+ <el-button class="top_div_button" size="small" @click="clean">閲嶇疆</el-button>
+ </el-form-item>
+ <el-form-item style="margin-left: 25%;">
+ <el-button class="top_div_button" type="primary" size="small" icon="el-icon-plus"
+ @click="centerDialogVisible = true">鏂板</el-button>
+ <el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
+ @click="deleteListClick">鍒犻櫎</el-button>
+ </el-form-item>
+ </el-form>
+ <el-dialog :visible.sync="centerDialogVisible" width="45%" right :before-close="handleClose"
+ :title="isUpdate ? '鏇存柊' : '鏂板'" :hide-required-asterisk="false">
+ <el-form style="width: 100%;" label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="addForm" label-position="left">
+ <el-form-item label="鏍峰搧鍚嶇О锛�" prop="material" required>
+ <el-autocomplete class="inline-input" v-model="form.material" :fetch-suggestions="querySearch1"
+ placeholder="璇疯緭鍏ユ牱鍝佸悕绉�" style="width: calc(100% - 70px);"></el-autocomplete>
+ </el-form-item>
+ <el-form-item label="椤圭洰鍒嗙粍锛�">
+ <el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
+ placeholder="璇疯緭鍏ラ」鐩垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
+ </el-form-item>
+ <el-row :gutter="24">
+ <el-col :span="12"><el-form-item label="椤圭洰鍚嶇О锛�" prop="name" required>
+ <el-input style="width: calc(100% - 70px);" v-model="form.name"
+ placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input></el-form-item></el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input style="width: calc(100% - 70px);" v-model="form.unit"
+ placeholder="璇疯緭鍏ュ崟浣�"></el-input></el-form-item></el-col>
+ </el-row>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="centerDialogVisible = false" size="small ">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitAdd" size="small ">{{
+ isUpdate ? "鏇� 鏂�" : "淇� 瀛�"
+ }}</el-button>
+ </span>
+ </el-dialog>
</div>
<div class="table_div">
<el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="id" border
@@ -160,6 +164,7 @@
message: res.message,
type: "success",
});
+ this.selectProductMaster();
this.selectProductModelTable();
});
}
@@ -185,12 +190,8 @@
});
},
handleClose(done) {
- this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.centerDialogVisible = false;
- done();
- })
- .catch((_) => {});
+ this.centerDialogVisible = false;
+ done();
},
selectProductModelTable() {
selectproductModelApi(this.params).then((res) => {
@@ -210,6 +211,13 @@
childrenClick(scope) {
this.isUpdate = true;
let father = "";
+ this.form = {
+ material: "", // 鏍峰搧鍚嶇О
+ father: "", // 椤圭洰鍒嗙粍
+ name: "", // 椤圭洰鍚嶇О
+ unit: "", // 鍗曚綅
+ id: ""
+ }
selectproductModelByIdApi(scope.row.id).then((res) => {
let result = res.data;
this.form.name = result.name;
@@ -239,7 +247,6 @@
this.selectProductModelTable();
});
},
-
// 琛ㄦ牸鏍戝叏閮ㄩ�変腑閰嶇疆
// 鍏ㄩ��/鍙栨秷閫夋搷浣�
selectAll(val) {
@@ -330,7 +337,6 @@
},
createFilter(queryString) {
return (restaurant) => {
- console.log(restaurant);
return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
};
},
@@ -341,13 +347,16 @@
name: null
}
this.selectProductModelTable()
+ },
+ selectList(){
+ this.selectProductMaster().then((res) => {
+ this.params.material = this.productModelSelectmater[0];
+ this.selectProductModelTable();
+ })
}
},
mounted() {
- this.selectProductMaster().then((res) => {
- this.params.material = this.productModelSelectmater[0];
- this.selectProductModelTable();
- });
+ this.selectList()
},
watch: {
centerDialogVisible: {
@@ -429,7 +438,7 @@
}
.top_div {
- height: 120px;
+ height: 90px;
width: 100%;
padding: 30px 40px;
background-color: #ffffff;
--
Gitblit v1.9.3