From 8e092d27909dcc96ce8ac4d618b4f9a8ca7ee12e Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 18 Jan 2022 15:09:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 123 +++++++++++++++++++-----------
 1 file changed, 79 insertions(+), 44 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 07d1a731..8d431863 100644
--- a/src/views/components/editResi.vue
+++ b/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"
-                  clearable class="resi-cell-select" @change="handleChangeV"
-                  >
-                    <el-option
-                      v-for="item in optionsV"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                  <el-select v-model.trim="form.BUILD_ID" :disabled="disabled" placeholder="请选择楼号" size="small"
-                  clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                  <el-select v-model.trim="form.UNIT_ID" :disabled="disabled" placeholder="请选择单元" size="small"
-                  clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
-                  >
-                    <el-option
-                      v-for="item in optionsD"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                  <el-select v-model.trim="form.HOME_ID" :disabled="disabled" placeholder="请选择房号" size="small"
-                  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>
+                  <div class="resi-cell-col">
+                    <el-form-item prop="VILLAGE_ID">
+                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
+                      clearable class="resi-cell-select" @change="handleChangeV"
+                      >
+                        <el-option
+                          v-for="item in optionsV"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item prop="BUILD_ID">
+                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
+                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
+                      >
+                        <el-option
+                          v-for="item in optionsB"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item prop="UNIT_ID">
+                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
+                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
+                      >
+                        <el-option
+                          v-for="item in optionsD"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item prop="HOME_ID">
+                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
+                      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;

From 8279d1dacc15ac691f95a89d5d530a2a68d0513e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 18 Jan 2022 15:27:01 +0800
Subject: [PATCH 2/2] ss

---
 src/main.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main.js b/src/main.js
index 4da8f1c8..72159ce2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,6 +35,7 @@ if (getQueryPara("token")) {
   Cookies.set("token", getQueryPara("token"));
 }
 
+
 window.app = Object.assign(
   {},
   {