Merge remote-tracking branch 'origin/featrue-lingshan' into featrue-lingshan

src/views/modules/communityParty/elegant/index.vue

@@ -421,6 +421,7 @@ export default {
     },
     //重置搜索条件
     resetSearch() {
+      this.value1 = []
       this.formData = {
         title: "",
         partyMemberName: '',

src/views/modules/hengAnShield/checkInReport/index.vue

@@ -5,13 +5,13 @@
       <el-form :inline="true" :model="queryParams" ref="ref_searchform" :label-width="'100px'">
         <div>
           <el-form-item label="所属组织" prop="agencyId">
-            <el-cascader style="width: 100%;" v-model="cascaderAgencyId" :options="organizeOptions"
+            <el-cascader style="width: 100%;" v-model="queryParams.cascaderAgencyId" :options="organizeOptions"
               :props="{ checkStrictly: true, multiple: false, value: 'value', label: 'label', children: 'children' }"
               :show-all-levels="false" @change="handleOrgChange" clearable></el-cascader>
           </el-form-item>
 
-          <el-form-item label="打卡上报类型" prop="status" :label-width="'140px'">
-            <el-select class="item_width_1" v-model.trim="queryParams.status" placeholder="全部" clearable>
+          <el-form-item label="打卡上报类型" prop="type" :label-width="'140px'">
+            <el-select class="item_width_1" v-model.trim="queryParams.type" placeholder="全部" clearable>
               <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" header-align="center" align="center" class="operate" width="120">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.status == 1" type="text" style="color:#1C6AFD;"
+            <el-button v-if="scope.row.type == 1" type="text" style="color:#1C6AFD;"
               size="small" @click="handleDetail(scope.row)">查看</el-button>
             <el-button v-else type="text" style="color:#FFA824;" size="small"
               @click="handleEdit(scope.row)">处理</el-button>
@@ -118,12 +118,12 @@ export default {
       tableLoading: false,
       timeRange: [],
       queryParams: {
+        cascaderAgencyId: [],
         title: "",
         agencyId: "",
         startTime: "",
         endTime: "",
       },
-      cascaderAgencyId: [],
       organizeOptions: [],
       tableData: [],
       typeList: [
@@ -287,8 +287,9 @@ export default {
     resetSearch() {
       this.timeRange = []
       this.queryParams = {
+        cascaderAgencyId: [],
         title: "",
-        status: "",
+        agencyId: "",
         startTime: "",
         endTime: "",
       }

src/views/modules/hengAnShield/inspectionRecord/index.vue

@@ -5,25 +5,25 @@
       <el-form :inline="true" :model="queryParams" ref="ref_searchform" :label-width="'100px'">
         <div>
           <el-form-item label="所属组织" prop="agencyId">
-            <el-cascader style="width: 100%;" v-model="cascaderAgencyId" :options="organizeOptions"
+            <el-cascader style="width: 100%;" v-model="queryParams.cascaderAgencyId" :options="organizeOptions"
               :props="{ checkStrictly: true, multiple: false, value: 'value', label: 'label', children: 'children' }"
               :show-all-levels="false" @change="handleOrgChange" clearable></el-cascader>
           </el-form-item>
 
-           <el-form-item label="巡检类型" prop="status">
-            <el-select class="item_width_1" v-model.trim="queryParams.status" placeholder="全部" clearable>
+           <el-form-item label="巡检类型" prop="patrolCategory">
+            <el-select class="item_width_1" v-model.trim="queryParams.patrolCategory" placeholder="全部" clearable>
               <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="巡检人" prop="title">
-            <el-input v-model.trim="queryParams.title" class="item_width_1" clearable placeholder="请输入">
+          <el-form-item label="巡检人" prop="patrolPeopleName">
+            <el-input v-model.trim="queryParams.patrolPeopleName" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
 
-          <el-form-item label="手机号" prop="title">
-            <el-input v-model.trim="queryParams.title" class="item_width_1" clearable placeholder="请输入">
+          <el-form-item label="手机号" prop="patrolPeoplePhone">
+            <el-input v-model.trim="queryParams.patrolPeoplePhone" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
 
@@ -117,12 +117,13 @@ export default {
       tableLoading: false,
       timeRange: [],
       queryParams: {
-        title: "",
+        patrolPeopleName: "",
         agencyId: "",
+        patrolPeoplePhone: '',
         startTime: "",
         endTime: "",
+        cascaderAgencyId: [],
       },
-      cascaderAgencyId: [],
       organizeOptions: [],
       tableData: [],
       typeList: [
@@ -271,8 +272,10 @@ export default {
     resetSearch() {
       this.timeRange = []
       this.queryParams = {
-        title: "",
-        status: "",
+        cascaderAgencyId: '',
+        patrolPeopleName: "",
+        patrolPeoplePhone: '',
+        patrolCategory: "",
         startTime: "",
         endTime: "",
       }

src/views/modules/hengAnXin/elderlyDatabase/index.vue

@@ -247,6 +247,10 @@ export default {
       this.$refs.queryForm.resetFields();
       this.queryParams.ageStart = '';
       this.queryParams.ageEnd = '';
+
+      this.pageSize = 10
+      this.pageNo = 1
+      this.handleSearchFrom()
     },
     handleSizeChange(val) {
       this.pageSize = val;

src/views/modules/hengAnXin/regularVisits/index.vue

@@ -321,6 +321,10 @@ export default {
       this.$refs.queryForm.resetFields();
       this.cascaderAgencyId = [];
       this.timeRange = [];
+
+      this.pageSize = 10
+      this.pageNo = 1
+      this.handleSearchFrom()
     },
     handleSizeChange(val) {
       this.pageSize = val;

src/views/modules/serviceManage/serviceRecord/index.vue

@@ -393,6 +393,7 @@ export default {
     },
     //重置搜索条件
     resetSearch() {
+      this.value1 = []
       this.formData = {
         partyOrgId: '',
         partyAttribute: '',