Merge branch 'test' into shibei_master

src/main.js

@@ -35,6 +35,7 @@ if (getQueryPara("token")) {
   Cookies.set("token", getQueryPara("token"));
 }
 
+
 window.app = Object.assign(
   {},
   {

src/views/components/editResi.vue

@@ -1,6 +1,6 @@
 <template>
   <div :id="formId" class="resi-container">
-    <el-form :ref="formId" class="resi-form" :model="form" :rules="rules" :label-width="labelWidth">
+    <el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth">
       <template v-if="supportAdd">
         <el-row style="margin-bottom: 10px;">
           <el-col :span="24">
@@ -33,48 +33,70 @@
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item prop="VILLAGE_ID" label="所属小区" required>
+              <el-form-item label="所属家庭" required>
                 <div class="resi-cell-value">
-                  <el-select v-model.trim="form.VILLAGE_ID" :disabled="disabled" placeholder="请选择小区" size="small"
+                  <div class="resi-cell-col">
-                  clearable class="resi-cell-select" @change="handleChangeV"
+                    <el-form-item prop="VILLAGE_ID">
-                  >
+                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
-                    <el-option
+                      clearable class="resi-cell-select" @change="handleChangeV"
-                      v-for="item in optionsV"
+                      >
-                      :key="item.value"
+                        <el-option
-                      :label="item.label"
+                          v-for="item in optionsV"
-                      :value="item.value">
+                          :key="item.value"
-                    </el-option>
+                          :label="item.label"
-                  </el-select>
+                          :value="item.value">
-                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
+                        </el-option>
-                  clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
+                      </el-select>
-                  >
+                    </el-form-item>
-                    <el-option
+                    <el-form-item prop="BUILD_ID">
-                      v-for="item in optionsB"
+                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                      :key="item.value"
+                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
-                      :label="item.label"
+                      >
-                      :value="item.value">
+                        <el-option
-                    </el-option>
+                          v-for="item in optionsB"
-                  </el-select>
+                          :key="item.value"
-                  <el-select v-model.trim="form.UNIT_ID" :disabled="disabled" placeholder="请选择单元" size="small"
+                          :label="item.label"
-                  clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
+                          :value="item.value">
-                  >
+                        </el-option>
-                    <el-option
+                      </el-select>
-                      v-for="item in optionsD"
+                    </el-form-item>
-                      :key="item.value"
+                    <el-form-item prop="UNIT_ID">
-                      :label="item.label"
+                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
-                      :value="item.value">
+                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
-                    </el-option>
+                      >
-                  </el-select>
+                        <el-option
-                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择房号" size="small"
+                          v-for="item in optionsD"
-                  clearable class="resi-cell-select resi-cell-select-middle"
+                          :key="item.value"
-                  >
+                          :label="item.label"
-                    <el-option
+                          :value="item.value">
-                      v-for="item in optionsH"
+                        </el-option>
-                      :key="item.value"
+                      </el-select>
-                      :label="item.label"
+                    </el-form-item>
-                      :value="item.value">
+                    <el-form-item prop="HOME_ID">
-                    </el-option>
+                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
-                  </el-select>
+                      clearable class="resi-cell-select resi-cell-select-middle"
+                      >
+                        <el-option
+                          v-for="item in optionsH"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </div>
+                  <!-- <el-col :span="6">
+                    
+                  </el-col>
+                  <el-col :span="6">
+                    
+                  </el-col>
+                  <el-col :span="6">
+                    
+                  </el-col>
+                  <el-col :span="6">
+                    
+                  </el-col> -->
                 </div>
             </el-form-item>
           </el-col>
@@ -379,7 +401,15 @@ export default {
       tempFormList,
       addCount: 0,
       addList: [],
-      rules,
+      rulesForm: {
+        ...rules,
+        VILLAGE_ID: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
+        GRID_ID: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
+        BUILD_ID: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
+        UNIT_ID: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
+        HOME_ID: [{ required: true, message: `请选择房号`, trigger: 'blur' }]
+      },
+      // rules,
       value: '',
       optionsV: [],
       optionsB: [],
@@ -804,7 +834,12 @@ export default {
   .resi-cell-value .resi-cell-textarea {
     width: 300px;
   }
-
+  .resi-cell-col {
+    display: flex;
+    .el-form-item {
+      margin-right: 10px;
+    }
+  }
   .resi-cell-select {
     width: 180px;
     box-sizing: border-box;