From a0eb3c8e9f2d145e94d8b6b8374d8233dcea86c2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 05 九月 2023 14:53:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.65.113:9001/r/lims-before
---
src/views/basicData/index.vue | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 3ce4b75..cb8c8f9 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -2,7 +2,7 @@
<div class="main_div">
<div class="top_div">
<span>鏍峰搧鍚嶇О锛�</span>
- <el-select v-model="params.material" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О">
+ <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>
<span class="top_div_span">椤圭洰鍒嗙粍锛�</span>
@@ -10,7 +10,7 @@
<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="params = {}">閲嶇疆</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>
@@ -19,21 +19,22 @@
<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="querySearch"
- placeholder="璇疯緭鍏ユ牱鍝佸悕绉�"></el-autocomplete>
+ <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-input v-model="form.father" style="width: 85%" placeholder="璇疯緭鍏ユ牱鍝佸垎缁�"></el-input>
+ <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: 70%" v-model="form.name"
+ <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: 70%" v-model="form.unit"
+ <el-input style="width: calc(100% - 70px);" v-model="form.unit"
placeholder="璇疯緭鍏ュ崟浣�"></el-input></el-form-item></el-col>
</el-row>
</el-form>
@@ -159,6 +160,7 @@
message: res.message,
type: "success",
});
+ this.selectProductMaster();
this.selectProductModelTable();
});
}
@@ -209,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;
@@ -216,8 +225,8 @@
this.form.father = result.father;
this.form.unit = result.unit;
this.form.id = scope.row.id;
+ this.centerDialogVisible = true;
});
- this.centerDialogVisible = true;
},
selectDataList() {
this.tableData.forEach((a) => {
@@ -305,18 +314,50 @@
this.selectProductModelTable();
});
},
- querySearch(queryString, cb) {
- var restaurants = this.restaurants;
+ querySearch1(queryString, cb) {
+ var restaurants = []
+ this.productModelSelectmater.forEach(a => {
+ restaurants.push({
+ value: a
+ })
+ })
var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
// 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
cb(results);
+ },
+ querySearch2(queryString, cb) {
+ var restaurants = []
+ this.projectGroupingOptions.forEach(a => {
+ restaurants.push({
+ value: a
+ })
+ })
+ var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+ // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
+ cb(results);
+ },
+ createFilter(queryString) {
+ return (restaurant) => {
+ return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+ };
+ },
+ clean() {
+ this.params = {
+ material: this.params.material,
+ father: null,
+ 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: {
--
Gitblit v1.9.3