Merge branch 'dev' into preview

src/js/dai/request.js

@@ -64,7 +64,7 @@ const request = curry(
       };
       const failFn = (err) => {
         // console.log(`[request失败] ${url}`, data, err)
-        console.log(err);
+        // console.log(err);
         reslove(
           Object.assign({}, returnIniData, {
             httpCode: "9999", //访问出现意外

src/router/index.js

@@ -399,6 +399,8 @@ export function addDynamicRoute(routeParams, router) {
 			title: `${routeParams.title}`,
 		},
 	};
+	
+	router.matcher = new Router().matcher
 	router.addRoutes([{
 		...moduleRoutes,
 		name: `main-dynamic__${dynamicRoute.name}`,

src/views/modules/base/community/communityTable.vue

@@ -210,7 +210,7 @@
         formCode: 'community_info',
         pageNo: pageNo,
         pageSize: pageSize,
-
+        conditions:queryConditions
       }" @close="handleDiyClose"></community-export-info>
     </el-dialog>
 
@@ -315,7 +315,7 @@ export default {
       diyDialog: false,
 
 
-      // queryConditions: [],
+      queryConditions: [],
     };
   },
 
@@ -362,38 +362,38 @@ export default {
 
   async mounted() {
     this.customerId = localStorage.getItem("customerId");
-    // this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
-    //   elseParams: {
-    //     categoryKeys: ['house_info'], categoryKey: 'house_info',
-    //   }
-    // });
-    // this.getQueryConditions();
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ['house_info'], categoryKey: 'house_info',
+      }
+    });
+    this.getQueryConditions();
   },
 
   methods: {
-    // async getQueryConditions() {
-    // 	let params = {
-    // 		formCode: "community_info",
-    // 		customerId: this.$store.state.user.customerId,
-    // 	};
-    //
-    // 	const { data } = await this.$http.post(
-    // 		"/oper/customize/icform/queryItems",
-    // 		params
-    // 	);
-    //
-    // 	if (data.code === 0) {
-    // 		this.queryConditions = data.data.map((item) => {
-    // 			return {
-    // 				...item,
-    // 				humpName: util.capitalToHump(item.columnName),
-    // 			};
-    // 		});
-    // 		console.log(this.queryConditions);
-    // 	} else {
-    // 		this.$message.error(data.msg);
-    // 	}
-    // },
+    async getQueryConditions() {
+    	let params = {
+    		formCode: "community_info",
+    		customerId: this.$store.state.user.customerId,
+    	};
+    
+    	const { data } = await this.$http.post(
+    		"/oper/customize/icform/queryItems",
+    		params
+    	);
+    
+    	if (data.code === 0) {
+    		this.queryConditions = data.data.map((item) => {
+    			return {
+    				...item,
+    				humpName: util.capitalToHump(item.columnName),
+    			};
+    		});
+    		console.log(this.queryConditions);
+    	} else {
+    		this.$message.error(data.msg);
+    	}
+    },
 
     reportForm() {
       let paramMap = {

src/views/modules/base/resi.vue

@@ -51,27 +51,27 @@
                      class="diy-button--white"
                      @click="diyExport"
                      plain>导出</el-button>
-          <el-button v-if="btnAuths.ic_resi_export"
+          <!-- <el-button v-if="btnAuths.ic_resi_export"
                      style="margin-left: 10px"
                      size="small"
                      class="diy-button--add"
                      @click=""
                      type="parimary"
-                     plain>核对</el-button>
+                     plain>核对</el-button> -->
 
-          <el-button v-if="
+          <!-- <el-button v-if="
 							btnAuths.ic_resi_smart_import && displayedBaobiaoBtn
 						"
                      style="margin-left: 10px"
                      size="small"
                      @click="reportForm"
-                     class="diy-button--white">核对</el-button>
+                     class="diy-button--white">核对</el-button> -->
 
           <el-button style="margin-left: 10px"
                      v-if="btnAuths.ic_resi_batch_del"
                      size="small"
-                     class="diy-button--white"
-                     plain
+                     class="diy-button--add"
+                     type="parimary"
                      @click="deleteBatch">批量删除</el-button>
           <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
         </div>
@@ -582,8 +582,6 @@ export default {
         categoryKey: "resi_info",
       },
     });
-    this.getTableData()
-    // this.getQueryConditions();
   },
 
   methods: {
@@ -1362,20 +1360,22 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi" && oldVal.name == 'home') {
-          console.log(newVal);
-          if( newVal.query.category){
+        if (newVal.name == "base-resi") {
             this.$nextTick(()=>{
-            this.$refs.myResiSearch.form.categoryKey = []
-              this.$refs.myResiSearch.form.categoryKey.push(newVal.query.category)
-              this.handleSearchFrom()
+              if( newVal.params.category){
+                  this.$refs.myResiSearch.form.categoryKey = []
+                  this.$refs.myResiSearch.form.categoryKey.push(newVal.params.category)
+                  this.handleSearchFrom()
+              }else{
+                  this.$refs.myResiSearch.form.categoryKey = []
+                this.getTableData()
+              }
             })
-          }
         }
       },
       deep: true,
-      immediate: true,
-    },
+      immediate: true
+    }
   },
 };
 </script>

src/views/modules/base/smartImport.vue

@@ -296,11 +296,9 @@ export default {
     async getResident() {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
-          dictType: "resident_category",
+          dictType: "resident_category_import",
         });
-        let myObject = { label: "基础信息", value: "BASEINFO" };
         this.resiClass = data.data;
-        this.resiClass.unshift(myObject);
       } catch (error) {
         console.log(error, "获取居民类别字典");
       }

src/views/modules/home/index.vue

@@ -50,10 +50,10 @@
 									查一下
 								</div>
 							</div>
-							<div class="btn2" @click="handleClickSearchBtn('smart')">
+							<!-- <div class="btn2" @click="handleClickSearchBtn('smart')">
 								<img src="@/assets/images/index/i-search.png" />
 								智能查询
-							</div>
+							</div> -->
 						</div>
 					</div>
 				</div>
@@ -363,11 +363,12 @@ export default {
 		},
 		handleClickCategory(item) {
 			this.$router.push({
-				path: "/main/base-resi",
-				query: {
-					category: item.code,
-				},
+				name: "base-resi",
+				params: {
+					category: item.code
+				}
 			});
+
 		},
 
 		handleClickNotice(item) {

src/views/modules/shequ/chaxun.vue

@@ -39,10 +39,10 @@
             </div>
             <div class="btn" @click="handleClickSearchBtn">查一下</div>
           </div>
-          <div class="btn2" @click="handleClickSmartSearchBtn">
+          <!-- <div class="btn2" @click="handleClickSmartSearchBtn">
             <img src="@/assets/images/index/i-search.png" />
             {{ smatrFlag ? "关闭智能查询" : "智能查询" }}
-          </div>
+          </div> -->
         </div>
         <p v-show="smatrFlag && searchStatus == 'ing'" class="rules_box">
           已显示‘{{ searchData.type == "fangwu" ? "房屋" : "居民" }}’状态为{{
@@ -461,7 +461,7 @@ export default {
 
       currentPage: "chaxun", //查询 预警,
 
-      smatrFlag: false,
+      smatrFlag: true,
       showSmatrForm: false,
       rulesData: [],
 
@@ -561,18 +561,7 @@ export default {
         console.log(msg);
       }
     },
-    handleClickSmartSearchBtn() {
-      this.smatrFlag = !this.smatrFlag;
-      if (!this.searchData.searchKey) return;
-      if (this.searchData.type == "jumin") {
-        this.getSearchJumin();
-      } else {
-        this.getSearchFangwu();
-      }
-      if (this.smatrFlag) {
-        this.getRulesList();
-      }
-    },
+   
     handleSizeChangeSearchJumin(val) {
       console.log(`每页 ${val} 条`);
       this.searchJumin.pageSize = val;
@@ -613,6 +602,8 @@ export default {
     getApiData() {},
 
     async getSearchJumin() {
+      // "/actual/base/residentBaseInfo/communitySearch" 普通查询
+      // "/actual/base/residentBaseInfo/residentSearch" 智能查询
       let url = this.smatrFlag
         ? "/actual/base/residentBaseInfo/residentSearch"
         : "/actual/base/residentBaseInfo/communitySearch";