Merge remote-tracking branch 'origin/dev' into dev

project/sass/apps/AppConference/addMeeting.vue

@@ -19,7 +19,7 @@
                     :picker-options="pickerOptions"
                     type="datetime"
                     size="small"
-                    placeholder="选择日期">
+                    placeholder="选择开始时间">
                 </el-date-picker>
               </el-form-item>
               <el-form-item label="结束时间：" prop="endTime">
@@ -31,7 +31,7 @@
                     type="datetime"
                     :disabled="!Boolean(saveData.startTime)"
                     size="small"
-                    placeholder="选择日期">
+                    placeholder="选择结束时间">
                 </el-date-picker>
               </el-form-item>
             </el-row>

project/sass/apps/AppGridMember/components/Family.vue

@@ -194,7 +194,7 @@
           params: {
             ...this.search,
             girdMemberId: this.params.id,
-            areaId: this.areaId
+            searchAreaId: this.areaId
           }
         }).then(res => {
           if (res.code == 0) {

project/sass/apps/AppResident/mobileResident.vue

@@ -716,16 +716,6 @@ export default {
             }, trigger: "blur"
           }],
         currentAddress: [{message: "请选择现住址详细地址", required: true}],
-        householdAreaId: [
-          {message: "户籍地必须选到村级", required: true, trigger: "blur"},
-          {
-            validator: (r, v, cb) => {
-              if (/.+0{3}$/.test(v)) {
-                cb("户籍地必须选到村级")
-              } else cb()
-            }, trigger: "blur"
-          }
-        ],
         householdName: [
           {required: true, message: "请选择是否户主", trigger: "change"}
         ],
@@ -939,14 +929,11 @@ export default {
     }
   },
   created() {
-    this.disabledLevel = this.user.info.areaMap[this.user.info.areaId].length;
     if (!this.showDetail) {
       this.showEdit1 = true;
       this.showEdit2 = true;
       this.showEdit3 = true;
       this.showEdit4 = true;
-      this.baseInfo.householdAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
-      this.baseInfo.currentAreaId = JSON.parse(JSON.stringify(this.user.info.areaId))
       this.$nextTick(() => this.$refs.ruleForm?.resetFields())
     } else {
       this.searchDetail(this.$route.query.id);

project/sass/apps/AppReturnHomeRegister/components/List.vue

@@ -41,7 +41,7 @@
             </ai-select>
             <ai-area-get
               style="width: 215px;"
-              placeholder="请选择出发地区"
+              placeholder="请选择到达地区"
               :instance="instance"
               v-model="search.arriveAreaId"
               @select="changeArea" />