From 34a7e21b3508ac0f5f011d958210fdb7176d726b Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:54:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/lims-before

---
 src/views/basicData/index.vue |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/views/basicData/index.vue b/src/views/basicData/index.vue
index 1b1c086..3b5b8ac 100644
--- a/src/views/basicData/index.vue
+++ b/src/views/basicData/index.vue
@@ -17,33 +17,30 @@
 					<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>
-					<el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
+				<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="30%" right :before-close="handleClose"
+			<el-dialog :visible.sync="centerDialogVisible" width="45%" 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-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>
-						<span>椤圭洰鍒嗙粍锛�</span>
+					<el-form-item label="椤圭洰鍒嗙粍锛�">
 						<el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
-							placeholder="璇疯緭鍏ユ牱鍝佸垎缁�" style="width: calc(100% - 70px);"></el-autocomplete>
+							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-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 prop="unit">
-								<span v-html="'鍗�&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;浣嶏細'"></span>
+							<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>
@@ -193,12 +190,8 @@
 				});
 			},
 			handleClose(done) {
-				this.$confirm("纭鍏抽棴锛�")
-					.then((_) => {
-						this.centerDialogVisible = false;
-						done();
-					})
-					.catch((_) => {});
+				this.centerDialogVisible = false;
+				done();
 			},
 			selectProductModelTable() {
 				selectproductModelApi(this.params).then((res) => {

--
Gitblit v1.9.3