diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index dc88257c3..455a6fae4 100644
--- a/src/js/dai/request.js
+++ b/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", //访问出现意外
diff --git a/src/router/index.js b/src/router/index.js
index f1dcdf5e2..4afe3bf5b 100644
--- a/src/router/index.js
+++ b/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}`,
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index b0e61b62d..e1b39544e 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -210,7 +210,7 @@
formCode: 'community_info',
pageNo: pageNo,
pageSize: pageSize,
-
+ conditions:queryConditions
}" @close="handleDiyClose">
@@ -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 = {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index c6190af1b..bc3751b34 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -51,27 +51,27 @@
class="diy-button--white"
@click="diyExport"
plain>导出
- 核对
+ plain>核对 -->
- 核对
+ class="diy-button--white">核对 -->
批量删除
diff --git a/src/views/modules/base/smartImport.vue b/src/views/modules/base/smartImport.vue
index a941a3185..ac1f399d0 100644
--- a/src/views/modules/base/smartImport.vue
+++ b/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, "获取居民类别字典");
}