From 501897d1f0643963fd1d8d10deae6befcb381bc3 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Fri, 12 Apr 2024 17:53:08 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/counterfraudReportDetail.vue | 8
api/doorplateAddress/doorplateAddress.js | 56 +++--
subPackage/house/member/index.vue | 91 +++++---
subPackage/search/index.vue | 130 ++++++++++++
subPackage/house/houseNumber/index.vue | 69 +++++-
subPackage/workbench/views/selfCheckDetail.vue | 8
subPackage/counterfraud/addReport.vue | 39 ++-
/dev/null | 0
common/common.js | 2
subPackage/house/roomDetails/index.vue | 30 +-
subPackage/reside/edit.vue | 67 ++++++
pages/home/index.vue | 47 ++--
common/setting.js | 4
13 files changed, 405 insertions(+), 146 deletions(-)
diff --git a/api/doorplateAddress/doorplateAddress.js b/api/doorplateAddress/doorplateAddress.js
index 1a2d90f..b48c1a9 100644
--- a/api/doorplateAddress/doorplateAddress.js
+++ b/api/doorplateAddress/doorplateAddress.js
@@ -1,13 +1,13 @@
-import http from '@/http/api.js'
-import {
- devUrl,
- prodUrl,
- contentType
-} from '@/common/setting'
-
-import {
- clientId,
- clientSecret
+import http from '@/http/api.js'
+import {
+ devUrl,
+ prodUrl,
+ contentType
+} from '@/common/setting'
+
+import {
+ clientId,
+ clientSecret
} from '@/common/setting'
// 获取楼栋集合数据
@@ -44,22 +44,32 @@
// 获取当前房屋/出租屋信息
export const getHouseRentInfo = (code) => {
- return http.request({
- url: 'blade-doorplateAddress/doorplateAddress/getHouseRentInfo',
- method: 'GET',
- params: {
- code
- }
- })
+ if (typeof(code) == 'string') {
+ return http.request({
+ url: 'blade-doorplateAddress/doorplateAddress/getHouseRentInfo',
+ method: 'GET',
+ params: {
+ code
+ }
+ })
+ } else {
+ return http.request({
+ url: 'blade-doorplateAddress/doorplateAddress/getHouseRentInfo',
+ method: 'GET',
+ params: code
+ })
+ }
+
}
export const uploadFile = (file) => {
return uni.uploadFile({
- url: (process.env.NODE_ENV === 'development' ? devUrl : prodUrl ) + '/blade-resource/oss/endpoint/put-file',
+ url: (process.env.NODE_ENV === 'development' ? devUrl : prodUrl) +
+ '/blade-resource/oss/endpoint/put-file',
filePath: file,
- name: 'file',
- header: {
- Authorization: uni.getStorageSync('accessToken')
+ name: 'file',
+ header: {
+ Authorization: uni.getStorageSync('accessToken')
}
})
}
@@ -84,6 +94,4 @@
...params
}
})
-}
-
-
+}
\ No newline at end of file
diff --git a/common/common.js b/common/common.js
index e4db5b0..cc660a2 100644
--- a/common/common.js
+++ b/common/common.js
@@ -131,7 +131,7 @@
url: '/pages/circle/index'
},
{
- name: '驾驶舱',
+ name: '警务辖区数据统计',
iconPathSelected: '/static/img/tabbar-05-selected.png',
iconPath: '/static/img/tabbar-05.png',
url: '/pages/statistics/index'
diff --git a/common/setting.js b/common/setting.js
index d954d12..1d2fd98 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl: 'http://z4042833u6.wicp.vip',
- devUrl: 'http://192.168.2.111:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.2.111:9528',
+ devUrl: 'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index b05167f..99724cd 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -9,9 +9,10 @@
</view>
</u-navbar>
- <!-- <view class="search-bar" :style="{background:background.top}">
+ <view class="search-bar" :style="{background:background.top}">
<u-search placeholder="请输入关键字" v-model="keyword" :showAction="true" actionText="搜索" :animation="true"
- :actionStyle="{color:'#fff'}" bgColor="#fff" @change="changeKeyword"></u-search>
+ :actionStyle="{color:'#fff'}" bgColor="#fff" @change="changeKeyword" @custom="navToSearchList"
+ @search="navToSearchList"></u-search>
<view class="mask" v-if="searchList.length"></view>
<view class="search-content bgc-ff" v-if="searchList.length">
<scroll-view class="search-scroll" :scroll-y="true">
@@ -22,7 +23,7 @@
</view>
</scroll-view>
</view>
- </view> -->
+ </view>
<view class="swiper" :style="{background:background.banner}">
<u-swiper :list="bannerList" height="320rpx" radius="10" @click="navToArticle"></u-swiper>
@@ -85,7 +86,7 @@
<view class="module-item-box flex a-i-c j-c-c ">
<u-icon name="/static/icon/nav-16.png" width="90rpx" height="90rpx"></u-icon>
<view class="module-text flex f-d-c j-c-s-b" style="margin-left: 20rpx;">
- <text class="f-32 fw">扫一扫</text>
+ <text class="f-32 fw">警务扫码</text>
<text class="f-26 opacity">场所采集</text>
</view>
</view>
@@ -223,7 +224,7 @@
<view class="house-nav bgc-ff p-20 mb-20" v-if="isShowHouse">
<u-collapse accordion :border="false" ref="myCollapse">
- <u-collapse-item name="1" title="楼盘表"></uni-title>
+ <u-collapse-item name="1" :title="roleType == 3?'辖区楼盘': '楼盘表'"></uni-title>
<view class="flex flex-wrap">
<view class="cell flex a-i-c" v-for="(item, index) in houseDataList.slice(0, 6)"
@click.native="pushPage(item)" :key="index" :style="{backgroundColor:background.top}">
@@ -694,15 +695,12 @@
this.getMenuList()
});
}
-
-
},
deep: true,
// immediate: true
},
isBailer(newVal, oldVal) {
-
if (newVal == true) {
this.tabs.splice(1, 0, {
name: '警务服务',
@@ -713,11 +711,8 @@
}]
})
}
-
immediate: true
}
-
-
},
// onPullDownRefresh() {
// this.$store.dispatch("getMenuList").then(res => {
@@ -729,19 +724,12 @@
// },
methods: {
-
- // handleOpenChange() {
- // this.$nextTick(() => {
- // this.$refs.myCollapse.init();
- // });
- // },
-
changeKeyword(val) {
console.log(val);
searchContent({
searchKey: val,
current: 1,
- size: 90,
+ size: 10,
indexName: "jczz"
}).then(res => {
console.log(res)
@@ -760,22 +748,29 @@
break;
case "经营场所":
uni.navigateTo({
- url: `/subPackage/house/houseNumber/index?stdId=${item.tableId}`
+ url: `/subPackage/house/houseNumber/index?stdId=${item.tableId}&from=search`
})
break;
case "房屋":
uni.navigateTo({
- url: `/subPackage/house/roomDetails/index?id=${item.tableId}`
+ url: `/subPackage/house/roomDetails/index?id=${item.tableId}&from=search`
})
break;
default:
+ uni.navigateTo({
+ url: `/subPackage/house/member/index?id=${item.tableId}&from=search`
+ })
break;
}
},
navToSearchList(val) {
uni.navigateTo({
- url: `/subPackage/search/index?keyword=${val}`
+ url: `/subPackage/search/index?keyword=${val}`,
+ success: (res) => {
+ this.keyword = "";
+ this.searchList = [];
+ }
})
},
@@ -1071,7 +1066,6 @@
if (index3 != -1) {
console.log(uni.getStorageSync("activeRole").roleName, 11111);
this.isBailer = true;
-
// this.tabs.splice(1, 0, {
// name: '警务服务',
// list: [{
@@ -1084,10 +1078,9 @@
} else {
this.isBailer = false;
let itemIndex = this.tabs.findIndex(item => item.name.trim() == "警务服务")
- // if (itemIndex != -1) {
- // this.tabs.splice(itemIndex, 1);
- // }
-
+ if (itemIndex != -1) {
+ this.tabs.splice(itemIndex, 1);
+ }
}
return;
diff --git a/static/icon/nav-24.png b/static/icon/nav-24.png
deleted file mode 100644
index 9ca85a7..0000000
--- a/static/icon/nav-24.png
+++ /dev/null
Binary files differ
diff --git a/subPackage/counterfraud/addReport.vue b/subPackage/counterfraud/addReport.vue
index 500afe8..a27050a 100644
--- a/subPackage/counterfraud/addReport.vue
+++ b/subPackage/counterfraud/addReport.vue
@@ -124,7 +124,8 @@
time: Number(new Date()),
showSelectDate: false,
dangerCount: 0, //隐患项数量
- isEdit: false
+ isEdit: false,
+ files: []
}
},
@@ -223,16 +224,28 @@
getSelected() {
let arr = [];
+ let files = [];
let count = 0;
for (let i = 0, ii = this.questionList.length; i < ii; i++) {
for (let k = 0, kk = this.questionList[i].children.length; k < kk; k++) {
// if (this.questionList[i].children[k].state != null) {
- arr.push({
- itemId: this.questionList[i].children[k].id,
- // state: this.questionList[i].children[k].state,
- imageUrls: this.setImages(this.questionList[i].children[k].urls),
- // remark: this.questionList[i].children[k].remark || ""
- })
+
+ if (this.questionList[i].children[k].urls.length) {
+ // files.push(this.questionList[i].children[k].id)
+ arr.push({
+ itemId: this.questionList[i].children[k].id,
+ // state: this.questionList[i].children[k].state,
+ imageUrls: this.setImages(this.questionList[i].children[k].urls),
+ // remark: this.questionList[i].children[k].remark || ""
+ })
+ }
+
+ // arr.push({
+ // itemId: this.questionList[i].children[k].id,
+
+ // imageUrls: this.setImages(this.questionList[i].children[k].urls),
+
+ // })
// if (this.questionList[i].children[k].state == 0) {
// count += 1;
// }
@@ -240,7 +253,9 @@
}
}
this.dangerCount = count;
+ // this.files = files;
return arr;
+
},
setImages(key) {
@@ -302,11 +317,15 @@
// })
// this.info.imageUrls = urls.join(",")
// }
- this.info.taskPlaceRecordVOList = this.getSelected()
- console.log("data===>", this.getSelected());
+
+ if (!this.getSelected().length) {
+ this.$showTips("您还没有上传附件");
+ return;
+ } else {
+ this.info.taskPlaceRecordVOList = this.getSelected()
+ }
if (this.isEdit) {
this.info.status = 1;
-
updateCounterfraudReport(this.info).then(res => {
uni.hideLoading();
if (res.code == 200) {
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index b11f335..4f81259 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -194,6 +194,11 @@
value: '未完善'
},
{
+ title: '无诈类别',
+ name: 'noExplosionCategory',
+ value: '未完善'
+ },
+ {
title: '场所负责人',
name: 'principal',
value: '未完善'
@@ -345,7 +350,8 @@
header: {},
},
signatureUrl: "",
- info: {}
+ info: {},
+ from: ""
}
},
async onLoad(option) {
@@ -359,11 +365,14 @@
if (option.addressType) {
this.addressType = option.addressType
}
- if (this.addressType == 4) {
+ if (this.addressType == 4 || option.from) {
this.placeId = this.stdId
}
if (option.eventType) {
this.eventType = option.eventType;
+ }
+ if (option.from) {
+ this.from = option.from;
}
this.getBuildingDetail()
@@ -410,14 +419,25 @@
// duration: 9999999
// })
// })
+ let params = ""
+
+ if (this.from == 'search') {
+ params = {
+ id: this.placeId
+ }
+ } else {
+ params = {
+ houseCode: this.addressType == 4 ? "" : this.stdId,
+ addressType: this.addressType,
+ id: this.placeId
+ }
+ }
+
+
const {
code,
data
- } = await getPlaceDetail({
- houseCode: this.addressType == 4 ? "" : this.stdId,
- addressType: this.addressType,
- id: this.placeId
- })
+ } = await getPlaceDetail(params)
if (code !== 200) {
uni.showToast({
title: "数据请求失败",
@@ -433,21 +453,24 @@
const placePoiLabelVOList = data?.placePoiLabelVOList || {}
this.neiName = doorplateAddressEntity.neiName || '未完善'
this.houseNumberData.forEach((item, index) => {
- if (!data[item.name]) {
+ if (data[item.name] === "undefined") {
item.value = data.doorplateAddressEntity[item.name] || '未完善'
} else {
- item.value = data[item.name] || '未完善'
+ if (item.name == 'label') {
+ if (data.placePoiLabelVOList.length) {
+ item.value = data.placePoiLabelVOList[data.placePoiLabelVOList.length - 1]
+ .labelName;
+ }
+ } else {
+ item.value = data[item.name] || '未完善'
+ }
+
}
- if (item.name == 'label' && data.placePoiLabelVOList.length) {
- // let labelArr = []
- // placePoiLabelVOList.forEach(item => {
- // labelArr.push(item.labelName)
- // })
- // item.value = labelArr.join('、')
- item.value = data.placePoiLabelVOList[data.placePoiLabelVOList.length - 1]
- .labelName;
- }
+ // if (item.name == 'label' && data.placePoiLabelVOList.length) {
+ // item.value = data.placePoiLabelVOList[data.placePoiLabelVOList.length - 1]
+ // .labelName;
+ // }
if (item.name == 'isNine') {
item.value = data.isNine == 1 ? "是" : "否"
}
@@ -490,6 +513,14 @@
'dictValue').name
})
}
+ if (item.name == "noExplosionCategory" && data.noExplosionCategory) {
+ this.getBizDict('noExplosionCategory', (list) => {
+ item.value = this.$getIndex(list, data.noExplosionCategory, 'dictKey',
+ 'dictValue').name
+ })
+ }
+
+
})
if (data.grid) {
@@ -545,7 +576,7 @@
},
cscjClick() {
// this.$u.func.globalNavigator('/subPackage/workbench/views/cscj?stdId=' + this.stdId)
- if (this.info.source == 3) {
+ if (this.info.source == 3 || this.from == 'search') {
this.$u.func.globalNavigator(
`/subPackage/workbench/views/cscj?houseCode=${this.info.houseCode}&addressType=${this.addressType}`
)
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index 8e9c919..941b1bd 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -3,7 +3,7 @@
<view class="main">
<view class="content">
- <view class="top">
+ <view class="top" v-if="from != 'search'">
<ocr-navigator @onSuccess="recognizeSuccess()" certificateType="idCard" :opposite="false">
<view class="top-item flex j-c-s-b a-i-c bgc-ff">
<view class="flex a-i-c">
@@ -310,14 +310,14 @@
<u-button @click="navigator" type="primary" :plain="true" text="返回首页"></u-button>
</view>
</view> -->
+ <block v-if="from != 'search' ">
+ <view class="footer flex j-c-s-b a-i-c bgc-ff" v-if="type == 2 && from == 'family'">
+ <button class="del-btn footer-btn" @click="delAction">删除</button>
+ <button class="save-btn footer-btn" @click="submit">保存</button>
+ </view>
- <view class="footer flex j-c-s-b a-i-c bgc-ff" v-if="type == 2 && from == 'family'">
- <button class="del-btn footer-btn" @click="delAction">删除</button>
- <button class="save-btn footer-btn" @click="submit">保存</button>
- </view>
-
- <footer-btn v-if="(type == 1 && from == 'family') || !from" :text="addOrUpdateTitle" @click="submit" />
-
+ <footer-btn v-if="(type == 1 && from == 'family') || !from" :text="addOrUpdateTitle" @click="submit" />
+ </block>
<!-- <view class="footer flex j-c-s-b a-i-c bgc-ff" v-if="(type == 1 && from == 'family') || !from">
<ocr-navigator @onSuccess="recognizeSuccess()" certificateType="idCard" :opposite="false"
style="width:48%;">
@@ -544,7 +544,7 @@
navtivePlaceDefault: [],
residentadDefault: [],
isEdit: false,
- from: "",
+ from: "", //页面跳入来源 family 我的家人 search 搜索
type: "",
id: "",
showSelectBirthday: false,
@@ -556,7 +556,8 @@
volunteerOrg: "",
volunteerOrgTemp: "",
showVolunteerOrg: false,
- houseTag: ""
+ houseTag: "",
+ dataFrom: ""
}
},
created() {
@@ -568,38 +569,51 @@
async onLoad(option) {
this.minDate = Number(new Date('1900-01-01')); //设置出生日期选择器最小值
this.goOutMinDate = Number(new Date('1970-01-01')); //设置外出时间选择器最小值
- const data = JSON.parse(option.data)
- console.log("data==>", data)
- this.houseCode = data.houseCode;
this.getRegionList()
- this.type = data.type;
- if (data.id) {
- this.id = data.id;
- }
- if (data.type == 1) {
- uni.setNavigationBarTitle({
- title: "添加成员"
- })
- this.isEdit = false;
- this.addOrUpdateTitle = "保存"
- await this.getAllBizDict()
- this.setCardTypeDefault()
- this.getHouseDetail();
- }
- if (data.type == 2) {
- this.isEdit = true;
- this.addOrUpdateTitle = "修改"
- uni.setNavigationBarTitle({
- title: "编辑成员资料"
- })
- this.getHouseholdInfo(data)
- }
- if (option.from) {
- this.from = option.from;
+ if (option.data) {
+ const data = JSON.parse(option.data);
+ this.houseCode = data.houseCode;
+ this.type = data.type;
+ if (data.id) {
+ this.id = data.id;
+ }
if (data.type == 1) {
- this.houseCode = uni.getStorageSync("siteInfo").houseCode
+ uni.setNavigationBarTitle({
+ title: "添加成员"
+ })
+ this.isEdit = false;
+ this.addOrUpdateTitle = "保存"
+ await this.getAllBizDict()
+ this.setCardTypeDefault()
+ this.getHouseDetail();
+ }
+ if (data.type == 2) {
+ this.isEdit = true;
+ this.addOrUpdateTitle = "修改"
+ uni.setNavigationBarTitle({
+ title: "编辑成员资料"
+ })
+ this.getHouseholdInfo(data)
}
}
+
+ if (option.from) {
+
+ this.from = option.from;
+ if (option.from == 'family') {
+ if (data.type == 1) {
+ this.houseCode = uni.getStorageSync("siteInfo").houseCode
+ }
+ } else {
+ this.id = option.id;
+ uni.setNavigationBarTitle({
+ title: "住户信息"
+ })
+ this.getHouseholdInfo()
+ }
+ }
+
+
this.form.roleName = uni.getStorageSync("activeRole").roleName;
},
@@ -793,6 +807,7 @@
id: this.id
}).then(res => {
if (res.code == 200) {
+ console.log(res.data);
this.form = res.data;
let data = res.data;
for (let i in this.selectDefaultIndex) {
diff --git a/subPackage/house/roomDetails/index.vue b/subPackage/house/roomDetails/index.vue
index 0f035a7..2fea785 100644
--- a/subPackage/house/roomDetails/index.vue
+++ b/subPackage/house/roomDetails/index.vue
@@ -11,7 +11,7 @@
</view>
</view>
- <view class="house-address f-26" v-if="from">
+ <view class="house-address f-26" v-if="from == 'scan'">
<text>标准地址：</text>
<text>{{houseInfo.addressName}}</text>
</view>
@@ -223,28 +223,24 @@
],
currentTime: null,
unitName: "",
- from: "",
+ from: "", //页面跳入来源 scan 扫码 search 搜索
roleType: 1 //1居民 2其它角色
}
},
- onLoad(e) {
- if (e.id) {
+ onLoad(option) {
+ if (option.id) {
const {
id,
unit
- } = e
+ } = option
this.currentId = id;
this.unitName = unit;
} else {
this.currentId = uni.getStorageSync("siteInfo").houseCode
}
-
- if (e.from) {
- this.from = e.from;
+ if (option.from) {
+ this.from = option.from;
}
-
-
-
},
mounted() {
@@ -294,7 +290,15 @@
},
// 获取租户信息
async getHouseRentInfoList() {
- const res = await getHouseRentInfo(this.currentId)
+ let params = ""
+ if (this.from == 'search') {
+ params = {
+ houseId: this.currentId
+ }
+ } else {
+ params = this.currentId;
+ }
+ const res = await getHouseRentInfo(params)
if (res.code !== 200) {
uni.showToast({
title: "数据加载失败",
@@ -322,7 +326,7 @@
this.houseInfo.houseTitle = aoiName || subAoi
this.houseInfo.buildingName = buildingName
this.houseInfo.addressName = addressName
- if (this.from && this.houseInfo.houseTitle) {
+ if (this.from == 'scan' && this.houseInfo.houseTitle) {
uni.setNavigationBarTitle({
title: `${this.houseInfo.houseTitle}${this.houseInfo.buildingName}${this.houseInfo.unitName}${this.houseInfo.houseName }室`
})
diff --git a/subPackage/reside/edit.vue b/subPackage/reside/edit.vue
index 9cc0f24..4eab179 100644
--- a/subPackage/reside/edit.vue
+++ b/subPackage/reside/edit.vue
@@ -36,12 +36,38 @@
+ <view class="cell flex j-c-s-b a-i-c bgc-ff" @click="showPopup = true">
+ <text class="f-28">须知说明</text>
+ <u-icon name="arrow-right"></u-icon>
+ </view>
+
+
<button class="submit-btn" @click="sumitInfo">提交</button>
<button class="list-btn" @click="navigatorPage">我申请的记录</button>
-
+ <u-popup mode="center" :show="showPopup" :round="10" @close="showPopup = false" :closeable="true">
+ <view class="explain">
+ <view class="explain-title f-30 fw">
+ 须知说明
+ </view>
+ <view class="explain-content">
+ <scroll-view class="explain-scroll" :scroll-y="true">
+ 办理居住证需要先在居住地派出所办理居住登记，办理居住登记需填写《江西省流动人口居住登记表》并提供本人身份证或户口簿、本人近期两张一寸彩色相片和居住地址证明。居住登记满6个月后，可到居住地派出所申领居住证。居住地址证明包括：1、租房：租赁合同；房东房产证（不动产证、土地证或购房合同）及身份证。2、自有（亲属）房屋：房产证、不动产证、土地证或购房合同；如非本人房产还需提供与产权人关系证明。3、居住在单位、就读学校宿舍的：单位出具的住宿证明。
+ 对于实际居住6个月以上，符合合法稳定住所、合法稳定就业、连续就读条件之一的；以及符合人才引进在居住地就业创业的，可以在办理完居住登记后直接到派出所申领居住证。1、以合法稳定住所为由申请的，需提交办理时间满6个月的房屋产权证明。2、以合法稳定就业为由申请的，需提交办理满6个月的工商营业执照或在居住地连续缴纳6个月以上的社保、公积金：养老保险、公积金之一；3、以连续就读为由申请的，需提交学生证或就读学校出具的其他能够证明连续就读满半年的材料。4、符合人才引进类的，需满足以下条件：
+ （一）具有国家承认大专及以上学历的人员，提供学历证书；
+ 提
+ (二）具有中级及以上专业技术职称的人员，提供专业技术等级证书；
+ 投
+ (三)持有高级工及以上国家职业资格证书的人员，提供职业资格证书；
+ (四)工业园区组织人事部门认定的企业急需人才，提供有关组织人事部门出具的认定文件；
+ (五)县级以上组织部门或人力资源社会保障部门认定的企业急需人才，提供有关组织人事部门出具的认定文件；
+ 符合以上第（一）至第（五）条件的，还要提供以下材料：就业的，提供与用人单位签订的半年以上期限的劳动（聘用）合同或企业为其缴纳的社会保险凭证；创业的，提供工商营业执照或事业单位法人证书。
+ （六）个人在当地投资30万以上的人员，提供营业执照。
+ </scroll-view>
+ </view>
+ </view>
+ </u-popup>
</view>
-
</template>
<script>
@@ -115,7 +141,8 @@
}],
},
isEdit: false,
- houseHoldInfo: {}
+ houseHoldInfo: {},
+ showPopup: false
}
},
@@ -317,4 +344,38 @@
color: #fff;
margin-top: 50rpx;
}
+
+ .cell {
+ padding: 20rpx;
+ margin: 20rpx 30rpx 0;
+
+ }
+
+ .explain {
+ padding: 20rpx;
+ width: 650rpx;
+
+ .explain-title {
+ text-align: center;
+ padding: 20rpx 0;
+ }
+
+ .explain-content {
+ width: 100%;
+ height: 750rpx;
+ padding: 20rpx 0;
+ box-sizing: border-box;
+
+ }
+ }
+
+ .explain-scroll {
+ width: 100%;
+ height: 100%;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ text-indent: 2em;
+ text-align: justify;
+ white-space: pre-line;
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/search/index.vue b/subPackage/search/index.vue
index 02409e3..2af5586 100644
--- a/subPackage/search/index.vue
+++ b/subPackage/search/index.vue
@@ -1,8 +1,136 @@
<template>
+ <view class="">
+ <z-paging ref="paging" v-model="list" @query="queryList" @onRefresh="refreshList"
+ loading-more-no-more-text="没有更多了" :auto-show-back-to-top="true">
+ <view class="tab" slot="top">
+ <u-search placeholder="请输入关键字" v-model="keyword" :showAction="true" actionText="搜索" :animation="true"
+ @custom="onSearch" @search="onSearch"></u-search>
+ </view>
+ <view class="list ">
+ <view class="list-item bgc-ff flex j-c-s-b a-ic" v-for="(i,k) in list" :key="k" @click="searchLink(i)">
+ <text class="search-content f-28">{{i.title}}</text>
+ <view class="search-tag f-26 c-main">
+ {{i.typeName}}
+ </view>
+ </view>
+ </view>
+ </z-paging>
+ </view>
</template>
<script>
+ import {
+ searchContent
+ } from "@/api/system/index"
+
+ export default {
+
+ data() {
+ return {
+ keyword: "",
+ list: [],
+
+ }
+ },
+ onLoad(option) {
+ this.keyword = option.keyword;
+ },
+
+ methods: {
+ refreshList() {
+ this.$refs.paging.reload();
+ },
+
+ onSearch() {
+ this.$refs.paging.reload();
+ },
+
+ queryList(pageNo, pageSize) {
+ searchContent({
+ current: pageNo,
+ size: pageSize,
+ searchKey: this.keyword,
+ indexName: "jczz"
+ }).then(res => {
+ this.$refs.paging.complete(res.data.records);
+ })
+ },
+
+
+ //搜索内容跳转
+ searchLink(item) {
+ //通知公告，经营场所，房屋，住户
+ switch (item.typeName) {
+ case "通知公告":
+ uni.navigateTo({
+ url: "/subPackage/article/detail?id=${item.tableId}&type=${item.type}"
+ })
+ break;
+ case "经营场所":
+ uni.navigateTo({
+ url: `/subPackage/house/houseNumber/index?stdId=${item.tableId}&from=search`
+ })
+ break;
+ case "房屋":
+ uni.navigateTo({
+ url: `/subPackage/house/roomDetails/index?id=${item.tableId}&from=search`
+ })
+ break;
+ default:
+ uni.navigateTo({
+ url: `/subPackage/house/member/index?id=${item.tableId}&from=search`
+ })
+ break;
+ }
+ },
+
+ }
+ }
</script>
-<style>
+<style lang="scss">
+ page {
+ background-color: #f5f5f5;
+ }
+
+ .tab {
+ width: 100%;
+ height: 88rpx;
+ // position: fixed;
+ /*#ifdef H5*/
+ top: 88rpx;
+ /*#endif*/
+ /*#ifdef MP-WEIXIN*/
+ top: 0;
+ /*#endif*/
+ left: 0;
+ background-color: #fff;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ z-index: 999;
+ }
+
+ .list {
+ margin-top: 20rpx;
+ padding: 0 30rpx;
+ }
+
+ .list-item {
+ padding: 20rpx;
+ margin-bottom: 20rpx;
+ border-radius: 10rpx;
+
+ .search-content {
+ width: 80%;
+ }
+
+ .search-tag {
+ padding: 0 10rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ border-radius: 8rpx;
+ background-color: rgb(236, 244, 255);
+ border: 1px solid currentColor;
+ }
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/counterfraudReportDetail.vue b/subPackage/workbench/views/counterfraudReportDetail.vue
index bf9fe7c..756bac9 100644
--- a/subPackage/workbench/views/counterfraudReportDetail.vue
+++ b/subPackage/workbench/views/counterfraudReportDetail.vue
@@ -44,10 +44,10 @@
<block v-for="(item,index) in itemList">
<block v-for="(i,k) in item.children">
<block v-for="(n,m) in info.taskPlaceRecordVOList">
- <!-- <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 1">
- <text class="item-left">{{i.title}}</text>
- <text>不存在</text>
- </view> -->
+ <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId">
+ <text class="item-left fw">{{item.title}}</text>
+ <!-- <text>不存在</text> -->
+ </view>
<u-collapse :value="ids" v-if="i.id == n.itemId" ref="collapse">
<u-collapse-item :name="n.itemId" :title="i.title" :disabled="true" :clickable="false"
:isLink="false">
diff --git a/subPackage/workbench/views/selfCheckDetail.vue b/subPackage/workbench/views/selfCheckDetail.vue
index 6c3a4c5..758d721 100644
--- a/subPackage/workbench/views/selfCheckDetail.vue
+++ b/subPackage/workbench/views/selfCheckDetail.vue
@@ -86,10 +86,10 @@
<block v-for="(item,index) in itemList">
<block v-for="(i,k) in item.children">
<block v-for="(n,m) in info.taskPlaceRecordVOList">
- <!-- <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 1">
- <text class="item-left">{{i.title}}</text>
- <text>不存在</text>
- </view> -->
+ <view class="item-row flex j-c-s-b a-i-c" v-if="i.id == n.itemId && n.state == 0">
+ <text class="item-left fw">{{item.title}}</text>
+ <!-- <text>不存在</text> -->
+ </view>
<u-collapse :value="ids" v-if="i.id == n.itemId && n.state == 0" ref="collapse">
<u-collapse-item :name="n.itemId" :title="i.title" value="存在" :disabled="true"
:clickable="false" :isLink="false">
--
Gitblit v1.9.3