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

---
 src/components/view/record-content.vue |   42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
index e727526..111f284 100644
--- a/src/components/view/record-content.vue
+++ b/src/components/view/record-content.vue
@@ -144,7 +144,7 @@
 		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;">
@@ -155,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"
@@ -169,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
@@ -181,13 +181,13 @@
                         </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>
@@ -260,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
@@ -278,7 +285,7 @@
 					unit:'',
 				},
 				Rules:{
-					type:{required:true,message:'绫诲瀷涓嶈兘涓虹┖',trigger:'change'},
+					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'},
@@ -367,22 +374,19 @@
 					this.selectjilu()
 				})
 			},
-			add() {
-				this.$refs[formName].validate((valid) => {
-				if (valid) {
-					alert('submit!');
-				} else {
-					console.log('error submit!!');
-					return false;
-				}
-				});
+			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 = {};
 			},
-			resetForm(formName) {
-       		 this.$refs[formName].resetFields();
-		      },
 			query() {
 				this.selectAllleft()
 			},

--
Gitblit v1.9.3