Merge branch 'dev'

 <!--
 <!--
  * @Description: 
  * @Description: 
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-05-09 09:20:10
+ * @LastEditTime: 2023-07-18 08:55:31
 -->
 -->
 <template>
 <template>
   <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
   <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
     :isFullscreen="false">
     :isFullscreen="false">
-    <el-form :model="ruleForm" ref="ruleForm" label-width="70px">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px">
       <el-row>
       <el-row>
         <el-col :span="24">
         <el-col :span="24">
-          <el-form-item label="材料类型">
+          <el-form-item label="材料类型" prop="cllx">
             <el-select v-model="ruleForm.cllx" class="width100" placeholder="请选择">
             <el-select v-model="ruleForm.cllx" class="width100" placeholder="请选择">
               <el-option v-for="item in dictData['A40']" :key="item.dcode" :label="item.dname" :value="item.dcode">
               <el-option v-for="item in dictData['A40']" :key="item.dcode" :label="item.dname" :value="item.dcode">
               </el-option>
               </el-option>
@@ -19,7 +19,7 @@
       </el-row>
       </el-row>
       <el-row :gutter="20">
       <el-row :gutter="20">
         <el-col :span="24">
         <el-col :span="24">
-          <el-form-item label="材料名称">
+          <el-form-item label="材料名称" prop="clmc">
             <el-input v-model="ruleForm.clmc"></el-input>
             <el-input v-model="ruleForm.clmc"></el-input>
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -41,7 +41,15 @@
           cllx: "",
           cllx: "",
           clmc: "",
           clmc: "",
         },
         },
-      };
+        rules: {
+          cllx: [
+            { required: true, message: '请选择材料类型', trigger: 'change' }
+          ],
+          clmc: [
+            { required: true, message: '请输入材料名称', trigger: 'blur' }
+          ]
+        }
+      }
     },
     },
     computed: {
     computed: {
       ...mapGetters(["dictData"]),
       ...mapGetters(["dictData"]),
@@ -60,14 +68,21 @@
         }
         }
       },
       },
       handleSubmit () {
       handleSubmit () {
+        debugger
+        this.$refs['ruleForm'].validate((valid) => {
+          if (valid) {
             this.$parent.addSave(this.ruleForm);
             this.$parent.addSave(this.ruleForm);
             this.ruleForm = {
             this.ruleForm = {
               cllx: "",
               cllx: "",
               clmc: "",
               clmc: "",
             }
             }
             this.$emit("input", false);
             this.$emit("input", false);
-      },
-    },
+          } else {
+            return false;
+          }
+        })
+      }
+    }
   };
   };
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">