diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue index 2c6b0077f..ce87e7ab4 100644 --- a/src/views/modules/communityService/labelConfig/addForm.vue +++ b/src/views/modules/communityService/labelConfig/addForm.vue @@ -7,19 +7,6 @@ class="div_form" :rules="rules" > - - 1) this.tableData = []; + if (this.tableData === undefined) this.tableData = []; let obj = {}; obj.dataSource = ""; obj.itemGroupId = ""; diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue index 2f8cc52fc..d33b2440c 100644 --- a/src/views/modules/shequ/chaxun.vue +++ b/src/views/modules/shequ/chaxun.vue @@ -3,20 +3,14 @@
- 社区查询 + {{smatrFlag?'智能查询':'社区查询'}}
-
+
查居民
-
+
查房屋
@@ -24,244 +18,192 @@
- - -
+ +
查一下
-
+
- 智能查询 + {{ smatrFlag ? '关闭智能查询' : '智能查询' }}
+
+

+ 已显示‘{{ searchData.type == 'fangwu' ? '房屋' : '居民' }}’状态为{{ keyWordStr }}的搜索结果。如不满足需求， 请点击此处调整 +

-
+
- - - + + + - + - + - +
- +
-
+
- - + + @@ -281,51 +223,32 @@ - +
- +
- + + - + + + +
@@ -336,11 +259,12 @@ import nextTick from "dai-js/tools/nextTick"; import getQueryPara from "dai-js/modules/getQueryPara"; import resiInfo from "@/views/modules/cpts/resi/info"; import houseInfo from "@/views/modules/cpts/house/info"; - +import smatrRules from "./cpts/smatr-rules.vue"; export default { components: { resiInfo, houseInfo, + smatrRules }, props: { @@ -430,253 +354,7 @@ export default { width: 110, options: [], }, - // { - // itemId: "20220422102809_1011", - // label: "备注", - // columnName: "remark", - // itemType: "textarea", - // width: 110, - // options: [], - // }, - // { - // itemId: "20220422102809_1012", - // label: "居民分类", - // columnName: "resiClass", - // itemType: "textarea", - // width: 110, - // options: [], - // }, - // { - // itemId: "20220422102809_1015", - // label: "党员", - // columnName: "partyFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1016", - // label: "低保人员", - // columnName: "subsistenceAllowanceFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1017", - // label: "保障房人员", - // columnName: "ensureHouseFlag", - // itemType: "radio", - // width: 100, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1018", - // label: "失业人员", - // columnName: "unemployedFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1019", - // label: "育龄妇女", - // columnName: "fertileWomanFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1020", - // label: "退役军人", - // columnName: "veteranFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1021", - // label: "统战人员", - // columnName: "unitedFrontFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1022", - // label: "信访人员", - // columnName: "petitionOfficerFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1023", - // label: "志愿者", - // columnName: "volunteerFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1024", - // label: "老年人", - // columnName: "oldPeopleFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1025", - // label: "空巢", - // columnName: "emptyNesterFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1026", - // label: "特扶人员", - // columnName: "bereavedPersonFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1027", - // label: "失能", - // columnName: "disabledFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1028", - // label: "失智", - // columnName: "dementedFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1029", - // label: "残疾", - // columnName: "disabilityFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1030", - // label: "大病", - // columnName: "seriousIllnessFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_1031", - // label: "慢病", - // columnName: "chronicDiseaseFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_10310", - // label: "特殊人群", - // columnName: "specialCrowdFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_202204141504102", - // label: "流动人口", - // columnName: "floatingFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "20220422102809_202204141504101", - // label: "租户", - // columnName: "tenantFlag", - // itemType: "radio", - // width: 80, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, - // { - // itemId: "202208111008491", - // label: "独居老人", - // columnName: "liveAloneFlag", - // itemType: "radio", - // width: 100, - // options: [ - // { label: "是", value: "1" }, - // { label: "否", value: "0" }, - // ], - // }, + ], pageNo: 1, pageSize: window.localStorage.getItem("pageSize") || 20, @@ -692,6 +370,7 @@ export default { list: [], }, + // 显示人员详情 showedResiInfo: false, @@ -702,6 +381,12 @@ export default { currentHouseId: "", currentPage: "chaxun", //查询 预警, + + smatrFlag: false, + keyWordStr: '', + showSmatrForm: false, + rulesData : [] + }; }, computed: { @@ -726,15 +411,18 @@ export default { methods: { firstSearch() { console.log(getQueryPara("type")); - console.log(this.$route.query.type,'type'); - console.log(this.$route.query.searchKey,'search'); + console.log(this.$route.query.type, 'type'); + console.log(this.$route.query.searchKey, 'search'); // this.searchData.searchKey = getQueryPara("searchKey"); // this.searchData.type = getQueryPara("type"); this.searchData.searchKey = localStorage.getItem('homeSearchKey') || '' - this.searchData.type = localStorage.getItem('homeSearchType') || '' + this.searchData.type = localStorage.getItem('homeSearchType') || '' this.handleClickSearchBtn(); }, - + //修改搜索条件 + handleClickEditRules() { + this.showSmatrForm = true + }, computedWidth(label) { const wd = 20 * label.length; return wd > 80 ? wd : 80; @@ -743,16 +431,16 @@ export default { let _val = ""; if (item.options && item.options.length > 0) { item.options.forEach((n) => { - if (n.value == row[item.columnName] ) _val = n.label; + if (n.value == row[item.columnName]) _val = n.label; }); } - if(row.mobile == '' || row.mobile == '--'){ - row.mobile = "" - }else{ - row.mobile = row.mobile.substr(0, 3) + '****' + row.mobile.substr(7,4) + if (row.mobile != ''&&row.mobile) { + row.mobile = row.mobile.substr(0, 3) + '****' + row.mobile.substr(7, 4) + } else if(row.mobile == '' || row.mobile == '--'){ + row.mobile = "" } - row.idNum = row.idNum.substr(0, 11) + '*****' + row.idNum.substr(16,2) + row.idNum = row.idNum.substr(0, 11) + '*****' + row.idNum.substr(16, 2) return _val || row[item.columnName]; }, @@ -760,9 +448,10 @@ export default { const { searchData: { type, searchKey }, } = this; - localStorage.setItem('homeSearchType',type) - localStorage.setItem('homeSearchKey',searchKey) + localStorage.setItem('homeSearchType', type) + localStorage.setItem('homeSearchKey', searchKey) if (!searchKey) return this.$message.error("请输入搜索条件"); + this.keyWordStr = searchKey if (type == "jumin") { this.searchJumin.pageNo = 1; this.searchJumin.total = 0; @@ -771,14 +460,14 @@ export default { this.searchFangwu.pageNo = 1; this.searchFangwu.total = 0; this.getSearchFangwu(); - } else if (type == "xuqiu") { - this.searchXuqiu.pageNo = 1; - this.searchXuqiu.total = 0; - this.getSearchXuqiu(); + } this.searchStatus = "ing"; }, - + handleClickSmartSearchBtn() { + this.smatrFlag = !this.smatrFlag + this.searchData.searchKey = '' + }, handleSizeChangeSearchJumin(val) { console.log(`每页 ${val} 条`); this.searchJumin.pageSize = val; @@ -816,7 +505,7 @@ export default { this.showedHouseInfo = true; }, - getApiData() {}, + getApiData() { }, async getSearchJumin() { const url = "/actual/base/residentBaseInfo/communitySearch"; @@ -829,6 +518,7 @@ export default { searchKey, pageSize, pageNo, + smartSearchRules:this.rulesData }); this.searchJumin.loading = false; if (code === 0) { @@ -836,9 +526,9 @@ export default { this.searchJumin.total = data.total || 0; this.searchJumin.list = data.list ? data.list.map((item) => { - item = { ...item, ...item.categoryInfo }; - return item; - }) + item = { ...item, ...item.categoryInfo }; + return item; + }) : []; } else { } @@ -855,6 +545,7 @@ export default { searchKey, pageSize, pageNo, + smartSearchRules:this.rulesData }); this.searchFangwu.loading = false; if (code === 0) { @@ -862,42 +553,52 @@ export default { this.searchFangwu.total = data.total || 0; this.searchFangwu.list = data.list ? data.list.map((item) => { - const { houseType, rentFlag, purpose } = item; - item.houseType = { - 1: "楼房", - 2: "平房", - 3: "别墅", - }[houseType]; - item.rentFlag = { - 0: "自住", - 1: "出租", - 2: "闲置", - 3: "未售出", - }[rentFlag]; - item.purpose = { - 1: "住宅", - 2: "商业", - 3: "办公", - 4: "工业", - 5: "存储", - 6: "商住混用", - 7: "其它", - }[purpose]; - return item; - }) + const { houseType, rentFlag, purpose } = item; + item.houseType = { + 1: "楼房", + 2: "平房", + 3: "别墅", + }[houseType]; + item.rentFlag = { + 0: "自住", + 1: "出租", + 2: "闲置", + 3: "未售出", + }[rentFlag]; + item.purpose = { + 1: "住宅", + 2: "商业", + 3: "办公", + 4: "工业", + 5: "存储", + 6: "商住混用", + 7: "其它", + }[purpose]; + return item; + }) : []; } else { } }, - handelClickTab(type){ - console.log(type) + handelClickTab(type) { + console.log(type) this.searchData.type = type; - - this.handleClickSearchBtn() + + this.handleClickSearchBtn() // this.searchData.searchKey = '' + }, + dialogCancle(){ + this.showSmatrForm = false + }, + dialogOk(rulesData){ + this.showSmatrForm = false + if(rulesData){ + this.rulesData = rulesData || null + this.handleClickSearchBtn() + } } }, - destroyed(){ + destroyed() { localStorage.removeItem('homeSearchKey') localStorage.removeItem('homeSearchType') }, @@ -923,6 +624,7 @@ export default { max-height: 83vh; box-sizing: border-box; padding: 0 0 20px !important; + .dialog-h-content { max-height: calc(83vh - 80px); box-sizing: border-box; @@ -960,7 +662,8 @@ export default { margin: 24px auto 0; display: flex; align-items: center; - > div { + + >div { position: relative; margin-right: 30px; width: 56px; @@ -975,6 +678,7 @@ export default { &:hover { color: $c1_on; } + &.z-on { color: #ffffff; background: #0056d6; @@ -982,6 +686,7 @@ export default { &:hover { color: #ffffff; } + // &::after { // content: ""; // display: block; @@ -1075,7 +780,7 @@ export default { .btn2 { margin-left: 35px; - width: 100px; + width: 150px; height: 39px; line-height: 39px; border-radius: 6px; @@ -1085,6 +790,7 @@ export default { font-weight: 500; color: #0056d6; cursor: pointer; + img { width: 20px; height: 20px; @@ -1096,5 +802,10 @@ export default { } } } + + .rules_box { + width: 692px; + margin: 15px auto 0; + } } diff --git a/src/views/modules/shequ/cpts/smatr-rules.vue b/src/views/modules/shequ/cpts/smatr-rules.vue new file mode 100644 index 000000000..29b408f25 --- /dev/null +++ b/src/views/modules/shequ/cpts/smatr-rules.vue @@ -0,0 +1,483 @@ + + + + + + \ No newline at end of file