Merge branch 'dev-huji' into test

src/views/modules/base/huji/chusheng/cpts/edit.vue

@@ -706,7 +706,7 @@ export default {
       console.log(row);
       if (row) {
         // this.fmData = { ...this.fmData, ...row };
-        this.getInfo(row.id);
+        await this.getInfo(row.id);
         this.getValiheList();
         this.getBuildList();
         this.getUniList();

src/views/modules/base/huji/immigration/edit.vue

@@ -468,8 +468,9 @@ export default {
   watch: {},
 
   async mounted() {
-    this.getGridList()
+    console.log('mounted-----我执行了')
-    this.getValiheList()
+    await this.getGridList()
+    
     this.getRelationList()
   },
 
@@ -750,6 +751,7 @@ export default {
         await this.getDatail(id)
       }
       if (this.formType != 'add') {
+        this.getValiheList()
         this.getBuildList()
         this.getUniList()
         this.getHouseList()

src/views/modules/base/huji/immigration/index.vue

@@ -143,9 +143,9 @@
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="迁入时间" prop="rangeTime">
+          <el-form-item label="迁入时间" prop="startTime">
             <el-date-picker
-              v-model="fmData.rangeTime"
+              v-model="rangeTime"
               type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
@@ -409,6 +409,7 @@
       @closed="handleClose"
     >
       <edit-form
+        v-if="formShow"
         ref="eleEditForm"
         @dialogCancle="handleClose"
         @dialogOk="handleEditSuccess"
@@ -501,6 +502,7 @@ export default {
   },
   watch: {
     rangeTime: function (val) {
+      console.log('val----', val)
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.startTime = val[0]
         this.fmData.endTime = val[1]