From c7ccbc6510a9350e0a0a5a39a84f46c382d080b3 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 九月 2023 15:00:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/record-content.vue |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index 84d06bb..111f284 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -140,12 +140,14 @@
 			</span>
 		</el-dialog>
 		<!-- 鏂板寮圭獥 -->
-		<el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" width="35%">
+		<el-dialog title="鐢熶骇璁板綍鏂板" :visible.sync="dialogVisible" :rules="Rules"
+		ref="ruleForm" width="35%">
 			<div>
 				<el-form ref="form" :model="form" label-width="80px">
-				<el-form-item label="绫诲瀷">
+				<el-form-item label="绫诲瀷" prop="type">
 					<template>
-                        <el-select v-model="form.type"  @change="edittype" placeholder="璇烽�夋嫨" style="width: 480px;">
+                        <el-select v-model="form.type"  
+						@change="edittype" placeholder="璇烽�夋嫨" style="width: 480px;">
                             <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
 							<el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
 							<el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
@@ -153,7 +155,7 @@
                         </el-select>
                         </template>
 				</el-form-item>
-				<el-form-item label="宸ュ簭">
+				<el-form-item label="宸ュ簭" prop="work">
 					<template>
                         <el-select v-model="form.work"
 						@change="workevent"
@@ -167,7 +169,7 @@
                         </el-select>
                         </template>
 				</el-form-item>
-				<el-form-item label="宸ヨ壓鍚嶇О">
+				<el-form-item label="宸ヨ壓鍚嶇О" prop="name">
 					<template>
                         <el-select v-model="form.craft" placeholder="璇烽�夋嫨" style="width: 480px;">
                             <el-option
@@ -179,19 +181,19 @@
                         </el-select>
                         </template>
 				</el-form-item>
-				<el-form-item label="璁板綍">
+				<el-form-item label="璁板綍" prop="record">
 					<el-input v-model="form.record"></el-input>
 				</el-form-item>
 				<el-form-item label="澶囨敞">
 					<el-input v-model="form.remarks"></el-input>
 				</el-form-item>
-				<el-form-item label="鍗曚綅">
+				<el-form-item label="鍗曚綅" prop="unit">
 					<el-input v-model="form.unit"></el-input>
 				</el-form-item>
 				</el-form>
 			</div>
 			<span slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="add">纭� 瀹�</el-button>
+				<el-button type="primary" @click="add(form)">纭� 瀹�</el-button>
 				<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
 			</span>
 		</el-dialog>
@@ -258,7 +260,14 @@
 <script>
 	export default {
 		data() {
-			return {
+			var checktype = (rule, value, callback) => {
+       			 if (!value) {
+          		return callback(new Error('绫诲瀷涓嶈兘涓虹┖'));
+        		}else{
+					return callback
+				}
+			};
+			return {	
 				search: {
 					type: 0,
 					technology: null
@@ -274,6 +283,13 @@
 					record:'',
 					remarks:'',
 					unit:'',
+				},
+				Rules:{
+					type:{validator:checktype,required:true,message:'绫诲瀷涓嶈兘涓虹┖',trigger:'change'},
+					work:{required:true,message:'宸ュ簭涓嶈兘涓虹┖',trigger:'change'},
+					name:{required:true,message:'宸ヨ壓涓嶈兘涓虹┖',trigger:'change'},
+					record:{required:true,message:'璁板綍涓嶈兘涓虹┖',trigger:'blur'},
+					unit:{required:true,message:'鍗曚綅涓嶈兘涓虹┖',trigger:'blur'},
 				},
 				modifyVisible:false,
 				dialogVisible:false,
@@ -358,9 +374,17 @@
 					this.selectjilu()
 				})
 			},
-			add() {
+			add(formName) {
 				this.dialogVisible = false
 				this.addRecord()
+				// this.$refs[formName].validate((valid) => {
+				// if (valid) {
+				// 	alert('submit!');
+				// } else {
+				// 	console.log('error submit!!');
+				// 	return false;
+				// }
+				// });
 				this.form = {};
 			},
 			query() {

--
Gitblit v1.9.3