Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/login/index.vue

@@ -159,7 +159,7 @@ defineOptions({
 const router = useRouter()
 // 验证函数
 const checkUsername = (rule, value, callback) => {
-  if (value.length < 5) {
+  if (value.length < 3) {
     return callback(new Error('请输入正确的用户名'))
   } else {
     callback()
@@ -201,7 +201,7 @@ const loginFormData = reactive({
 })
 const rules = reactive({
   username: [{ validator: checkUsername, trigger: 'blur' }],
-  password: [{ validator: checkPassword, trigger: 'blur' }],
+  // password: [{ validator: checkPassword, trigger: 'blur' }],
   captcha: [
     {
       message: '验证码格式不正确',

src/view/superAdmin/user/user.vue

@@ -413,11 +413,11 @@ const userInfo = ref({
 const rules = ref({
   userName: [
     { required: true, message: '请输入用户名', trigger: 'blur' },
-    { min: 5, message: '最低5位字符', trigger: 'blur' }
+    { min: 3, message: '最低3位字符', trigger: 'blur' }
   ],
   password: [
     { required: true, message: '请输入用户密码', trigger: 'blur' },
-    { min: 6, message: '最低6位字符', trigger: 'blur' }
+    { min: 0, message: '最低0位字符', trigger: 'blur' }
   ],
   nickName: [
     { required: true, message: '请输入用户昵称', trigger: 'blur' }

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -35,10 +35,10 @@
 				  <el-form-item label="工单编号" prop="name">
 					<el-row :gutter="20">
 					  <el-col :span="6">
-						<el-input v-model="formData.工单编号" :clearable="true"  />							
+						<el-input v-model="formData.工单编号" disabled :clearable="true"  />							
 					  </el-col>
 					  <el-col :span="18">
-						<el-input v-model="formData.产品名称" :clearable="true"  />
+						<el-input v-model="formData.产品名称" disabled :clearable="true"  />
 					  </el-col>
 					</el-row>
 					
@@ -49,12 +49,12 @@
 			  <el-row :gutter="20">
 				<el-col :span="6">
 				 <el-form-item label="印件编号" prop="id">
-				   <el-input v-model="formData.印件编号" :clearable="true"  />
+				   <el-input v-model="formData.印件编号" disabled :clearable="true"  />
 				 </el-form-item>
 				</el-col>
 			  <el-col :span="17">
 				 <el-form-item label="工序名称" prop="name">
-				   <el-input v-model="formData.工序名称" :clearable="true"  />
+				   <el-input v-model="formData.工序名称" disabled :clearable="true"  />
 				 </el-form-item>
 				</el-col>			    
 			  </el-row>
@@ -69,45 +69,45 @@
 <el-row :gutter="1">
 			 
 			 <el-col :span="4">
-			   <el-input v-model="formData.sczl_bh1" :clearable="true"  />
+			   <el-input v-model="formData.sczl_bh1" disabled :clearable="true"  />
 			 </el-col>
 			<el-col :span="4">
-			  <el-input v-model="formData.sczl_bh2" :clearable="true"  />
+			  <el-input v-model="formData.sczl_bh2" disabled :clearable="true"  />
 			</el-col>
 			  <el-col :span="4">			  			
-				<el-input v-model="formData.sczl_bh3" :clearable="true"  />
+				<el-input v-model="formData.sczl_bh3" disabled :clearable="true"  />
 			  </el-col>
 			  
 			 <el-col :span="4">
-				<el-input v-model="formData.sczl_bh4" :clearable="true"  />
+				<el-input v-model="formData.sczl_bh4" disabled :clearable="true"  />
 			  </el-col>
 			  <el-col :span="4">
-				<el-input v-model="formData.sczl_bh5" :clearable="true"  />
+				<el-input v-model="formData.sczl_bh5" disabled :clearable="true"  />
 			  </el-col>
 			  <el-col :span="4">
-				<el-input v-model="formData.sczl_bh6" :clearable="true"  />
+				<el-input v-model="formData.sczl_bh6" disabled :clearable="true"  />
 			  </el-col> 
 		   </el-row>
 		   
 		   <el-row :gutter="1">
 		 
 		 <el-col :span="4">
-		   <el-input v-model="formData.sczl_name1" :clearable="true"  />
+		   <el-input v-model="formData.sczl_name1" disabled :clearable="true"  />
 		 </el-col>
 		<el-col :span="4">
-		  <el-input v-model="formData.sczl_name2" :clearable="true"  />
+		  <el-input v-model="formData.sczl_name2" disabled :clearable="true"  />
 		</el-col>
 		  <el-col :span="4">			  			
-			<el-input v-model="formData.sczl_name3" :clearable="true"  />
+			<el-input v-model="formData.sczl_name3" disabled :clearable="true"  />
 		  </el-col>
 		  <el-col :span="4">
-		  			<el-input v-model="formData.sczl_name4" :clearable="true"  />
+		  			<el-input v-model="formData.sczl_name4" disabled :clearable="true"  />
 		  </el-col>
 		  <el-col :span="4">
-		  			<el-input v-model="formData.sczl_name5" :clearable="true"  />
+		  			<el-input v-model="formData.sczl_name5" disabled :clearable="true"  />
 		  </el-col>
 		  <el-col :span="4">
-		  			<el-input v-model="formData.sczl_name6" :clearable="true"  />
+		  			<el-input v-model="formData.sczl_name6" disabled :clearable="true"  />
 		  </el-col>
 	   </el-row>