haojianlong %!s(int64=5) %!d(string=hai) anos
pai
achega
332dadb6ac

+ 20 - 3
src/components/ready/buildfloor/formItems.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="inforsPoint">
-    <el-form ref="ruleForm" :model="form" label-width="150px" :inline="true" :label-position="'left'">
-      <el-form-item :label="item.InfoPointName" v-for="item in InforsList" :key="item.InfoPointCode"
+    <el-form ref="ruleForm" :model="form" label-width="150px" :rules="rules" :inline="true" :label-position="'left'">
+      <el-form-item :label="item.InfoPointName" :prop="item.InfoPointCode" v-for="item in InforsList" :key="item.InfoPointCode"
         :class="{FloorTypeSelect:item.InputMode == 'D1'||item.Unit}">
         <el-input v-model="form[item.Path]" v-if="item.Visible && (item.InputMode == 'B1')"></el-input>
         <el-input v-model="form[item.Path]" v-else-if="item.Visible && (item.InputMode == 'A1'||item.InputMode == 'A2')" type="number">
@@ -30,7 +30,15 @@ export default {
   data() {
     return {
       form: {},
-      InforsList: []
+      InforsList: [],
+      rules: {
+        "FloorLocalName": [
+          { "required": true, "message": "请输入楼层本地名称", "trigger": "blur" }
+        ],
+        "FloorSequenceID": [
+          { "required": true, "message": "请输入楼层顺序号", "trigger": "blur" }
+        ]
+      }
     };
   },
   created() {
@@ -55,6 +63,15 @@ export default {
         })
       })
     },
+    submitForm(call) {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          call()
+        } else {
+          return false;
+        }
+      });
+    },
   }
 };
 </script>

+ 3 - 8
src/views/ready/buildfloor/addFloor/index.vue

@@ -59,20 +59,15 @@ export default {
     handleClose() { },
     //创建
     confirm() {
+      this.$refs.formItems.submitForm(this.save)
+    },
+    save() {
       let form = this.$refs.formItems.form
       let newform = tools.formatData(form)
       newform.BuildID = this.curBuildId
       let Param = {
         Content: [newform]
       }
-      if(!newform.FloorLocalName){
-        this.$message.warning('请填写楼层本地名')
-        return
-      }
-      if(!newform.FloorSequenceID){
-        this.$message.warning('请填写楼层顺序号')
-        return
-      }
       if (newform.FloorID) {
         manageUpdateFloor(Param, res => {
           this.$message.success('更新成功')

+ 1 - 0
src/views/ready/buildfloor/index.vue

@@ -221,6 +221,7 @@ export default {
     },
     // 修改楼层信息
     editFloorData(floor) {
+      this.floorTitle = '编辑楼层信息'
       this.curFloorId = floor.FloorID;
       this.$refs.addFloorDialog.showDialog(floor)
     },