From 8b4858535b373bfaec2606b504590e1691300cf0 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 02 Jan 2024 14:41:27 +0800
Subject: [PATCH] 更新
---
subPackage/workbench/views/editExamine.vue | 2
subPackage/house/member/index.vue | 2
subPackage/house/houseNumber/index.vue | 179 +++++++++------
subPackage/workbench/views/cscj.vue | 2
api/user.js | 12 +
common/setting.js | 4
subPackage/workbench/views/reportAudit.vue | 198 ++++++++++++------
subPackage/bs/views/addRepair.vue | 53 ++--
subPackage/workbench/views/audit.vue | 13
subPackage/workbench/views/report.vue | 139 ++++++-----
10 files changed, 365 insertions(+), 239 deletions(-)
diff --git a/api/user.js b/api/user.js
index 9cd92a0..37cd93c 100644
--- a/api/user.js
+++ b/api/user.js
@@ -90,7 +90,7 @@
return http.request({
url: '/blade-system/user/update',
method: 'POST',
- data: data
+ data: data
})
}
@@ -117,6 +117,16 @@
})
}
+// 获取人员类型
+export const getPeopleType = (params) => {
+ return http.request({
+ url: '/blade-system/user/getPeopleType',
+ method: 'GET',
+ params: params
+ })
+}
+
+
export default {
token,
diff --git a/common/setting.js b/common/setting.js
index 4fbaf20..fa048c6 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -9,10 +9,10 @@
// 版本号
version: '2.0.0',
// 开发环境接口Url
- devUrl: 'http://z4042833u6.wicp.vip',
+ // devUrl: 'http://z4042833u6.wicp.vip',
// devUrl: 'http://192.168.0.106:9528',
// devUrl: 'https://srgdjczzxtpt.com:2080/api',
- // devUrl:'https://kt39592615.goho.co',
+ devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl:"http://192.168.0.103:9528/",
// 数据中台接口url
diff --git a/subPackage/bs/views/addRepair.vue b/subPackage/bs/views/addRepair.vue
index 8cbbb4b..18e2be5 100644
--- a/subPackage/bs/views/addRepair.vue
+++ b/subPackage/bs/views/addRepair.vue
@@ -19,7 +19,7 @@
<u-input v-model="info.phone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="事发位置" prop="address" :borderBottom="false" >
+ <u-form-item label="事发位置" prop="address" :borderBottom="false">
<view class="address-row flex">
<view class="address-content f-28" v-if="info.address">
{{info.address}}
@@ -27,7 +27,7 @@
<view class="address-content f-28 c-99" v-if="!info.address">
请选择地址
</view>
- <view class="location-btn c-main f-24" @click="getLocation()">
+ <view class="location-btn c-main f-24" @click="getLocation()">
获取地址
</view>
</view>
@@ -77,9 +77,9 @@
phone: "",
remark: "",
type: -1,
- address:"",
- lat:"",
- lng:""
+ address: "",
+ lat: "",
+ lng: ""
},
rules: {
'realName': {
@@ -115,22 +115,22 @@
},
onShow() {
this.curSelectSite = uni.getStorageSync('siteInfo')
- this.info.addressCode = this.curSelectSite.id
+ this.info.addressCode = this.curSelectSite.houseCode
console.log(this.curSelectSite);
},
methods: {
-
- getLocation(){
+
+ getLocation() {
uni.chooseLocation({
- success:(res)=>{
- this.$set(this.info,"address",res.address);
- this.$set(this.info,"lat",res.latitude);
- this.$set(this.info,"lng",res.longitude)
+ success: (res) => {
+ this.$set(this.info, "address", res.address);
+ this.$set(this.info, "lat", res.latitude);
+ this.$set(this.info, "lng", res.longitude)
}
})
},
-
-
+
+
sumitInfo() {
const that = this
this.$refs.form.validate().then(valid => {
@@ -221,22 +221,25 @@
color: #fff;
margin-top: 50rpx;
}
- .address-row{
- flex:1;
+
+ .address-row {
+ flex: 1;
justify-content: flex-end;
- align-items:center;
+ align-items: center;
}
- .address-content{
- width:calc(100% - 116rpx - 20rpx);
- margin-right:20rpx;
+
+ .address-content {
+ width: calc(100% - 116rpx - 20rpx);
+ margin-right: 20rpx;
}
- .location-btn{
- width:116rpx;
- height:46rpx;
+
+ .location-btn {
+ width: 116rpx;
+ height: 46rpx;
line-height: 46rpx;
border-radius: 4rpx;
- border:1px solid currentColor;
- padding:0;
+ border: 1px solid currentColor;
+ padding: 0;
background-color: #fff;
text-align: center;
}
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index 6c566ba..cf67b3f 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -4,7 +4,7 @@
<view class="item">
<box-title title="门牌号信息"></box-title>
<line-item :list="houseNumberData"></line-item>
- <view class="cell flex j-c-s-b a-i-c" @click="navToEventDetail()" v-if="eventType">
+ <view class="cell flex j-c-s-b a-i-c" @click="navToEventDetail()" v-if="eventType">
<view class="cell-title">历史事件</view>
<view class="flex a-i-c">
<view class="cell-value mr-20">{{eventType ==1?"邻里纠纷":"噪音扰民"}}</view>
@@ -38,6 +38,13 @@
</view>
</template>
</line-item>
+ <view class="cell flex j-c-s-b a-i-c" @click="navTo(1)">
+ <view class="cell-title">历史事件</view>
+ <view class="flex a-i-c">
+ <view class="cell-value mr-20"></view>
+ <u-icon name="arrow-right"></u-icon>
+ </view>
+ </view>
</view>
<view class="item">
<view class="box-title">
@@ -50,8 +57,15 @@
</view>
<line-item :list="policeData"></line-item>
<line-item :list="firemanData"></line-item>
+ <view class="cell flex j-c-s-b a-i-c" @click="navTo(2)">
+ <view class="cell-title">历史事件</view>
+ <view class="flex a-i-c">
+ <view class="cell-value mr-20"></view>
+ <u-icon name="arrow-right"></u-icon>
+ </view>
+ </view>
</view>
- </view>
+ </view>
<u-toast ref="uToast"></u-toast>
<view class="btn-box">
<view class="sl-box" @click="csjlClick">
@@ -74,7 +88,9 @@
getPlaceDetail
} from '@/api/place/place.js'
import boxTitle from '../components/boxTitle/index2.vue'
- import { minioBaseUrl } from "../../../common/setting";
+ import {
+ minioBaseUrl
+ } from "../../../common/setting";
export default {
components: {
lineItem,
@@ -136,27 +152,28 @@
value: '未完善'
}
],
- collectData: [{
- title: '场所照片',
- name: 'imageUrls',
- isUseSlot: true,
- value: '未完善'
- },
- {
- title: '场所负责人',
- name: 'username',
- value: '未完善'
- },
- {
- title: '采集人',
- name: 'createUser',
- value: '未完善'
- },
- {
- title: '采集时间',
- name: 'createTime',
- value: '未完善'
- },
+ collectData: [
+ // {
+ // title: '场所照片',
+ // name: 'imageUrls',
+ // isUseSlot: true,
+ // value: '未完善'
+ // // },
+ // {
+ // title: '场所负责人',
+ // name: 'username',
+ // value: '未完善'
+ // },
+ // {
+ // title: '采集人',
+ // name: 'createUser',
+ // value: '未完善'
+ // },
+ // {
+ // title: '采集时间',
+ // name: 'createTime',
+ // value: '未完善'
+ // },
// {
// title: '历史事件',
// value: '未完善'
@@ -183,26 +200,27 @@
value: '未完善'
}
],
- firemanData: [{
- title: '消防照片',
- value: '未完善'
- },
- {
- title: '采集人',
- value: '未完善'
- },
- {
- title: '消防责任人',
- value: '未完善'
- },
- {
- title: '采集时间',
- value: '未完善'
- },
- {
- title: '历史事件',
- value: '未完善'
- }
+ firemanData: [
+ // {
+ // title: '消防照片',
+ // value: '未完善'
+ // },
+ // {
+ // title: '采集人',
+ // value: '未完善'
+ // },
+ // {
+ // title: '消防责任人',
+ // value: '未完善'
+ // },
+ // {
+ // title: '采集时间',
+ // value: '未完善'
+ // },
+ // {
+ // title: '历史事件',
+ // value: '未完善'
+ // }
],
id: 1,
lngLat: {
@@ -210,34 +228,34 @@
lng: ''
},
marker: [],
- addressType:2,
- placeId:"",
- eventType:0 ,//历史事件类型 1邻里纠纷 2噪音扰民
- neiName:"" ,//社区名称
- placeName:"" //场所名称
+ addressType: 2,
+ placeId: "",
+ eventType: 0, //历史事件类型 1邻里纠纷 2噪音扰民
+ neiName: "", //社区名称
+ placeName: "" //场所名称
}
},
onLoad(option) {
- console.log("oload=>",option)
+ console.log("oload=>", option)
this.stdId = option.stdId
- if(option.addressType){
+ if (option.addressType) {
this.addressType = option.addressType
}
- if(this.addressType ==4){
+ if (this.addressType == 4) {
this.placeId = this.stdId
}
- if(option.eventType){
+ if (option.eventType) {
this.eventType = option.eventType;
}
this.getBuildingDetail()
},
-
- watch:{
- id(newVal,oldVal){
+
+ watch: {
+ id(newVal, oldVal) {
console.log(newVal)
}
},
-
+
methods: {
async getBuildingDetail() {
// this.$nextTick(() => {
@@ -251,7 +269,7 @@
code,
data
} = await getPlaceDetail({
- houseCode: this.addressType==4?"":this.stdId,
+ houseCode: this.addressType == 4 ? "" : this.stdId,
addressType: this.addressType,
id: this.placeId
})
@@ -263,32 +281,32 @@
})
return
}
- if(data){
+ if (data) {
this.placeName = data.placeName;
const doorplateAddressEntity = data?.doorplateAddressEntity || {}
const placePoiLabelVOList = data?.placePoiLabelVOList || {}
-
+
this.neiName = doorplateAddressEntity.neiName || '未完善'
-
+
this.houseNumberData.forEach(item => {
if (!data[item.name]) {
item.value = data.doorplateAddressEntity[item.name] || '未完善'
} else {
item.value = data[item.name] || '未完善'
}
-
+
if (item.name == 'label' && data.label) {
-
+
let labelArr = []
placePoiLabelVOList.forEach(item => {
labelArr.push(item.labelName)
})
-
+
item.value = labelArr.join('、')
}
})
-
- if(data.grid){
+
+ if (data.grid) {
this.gridData.forEach(item => {
if (!data.grid[item.name]) {
item.value = data.grid[item.name] || '未完善'
@@ -297,18 +315,18 @@
}
})
}
-
+
this.collectData.forEach(item => {
if (!data.doorplateAddressEntity[item.name]) {
item.value = data.doorplateAddressEntity[item.name] || '未完善'
} else {
item.value = data.doorplateAddressEntity[item.name] || '未完善'
- if(item.name == "imageUrls" ){
+ if (item.name == "imageUrls") {
item.value = minioBaseUrl + data.doorplateAddressEntity[item.name] || '未完善'
}
}
})
-
+
this.policeData.forEach(item => {
if (!data.doorplateAddressEntity[item.name]) {
item.value = data.doorplateAddressEntity[item.name] || '未完善'
@@ -316,7 +334,7 @@
item.value = data.doorplateAddressEntity[item.name] || '未完善'
}
})
-
+
const {
lat,
lng
@@ -341,16 +359,25 @@
},
cscjClick() {
// this.$u.func.globalNavigator('/subPackage/workbench/views/cscj?stdId=' + this.stdId)
- this.$u.func.globalNavigator(`/subPackage/workbench/views/cscj?houseCode=${this.stdId}&addressType=${this.addressType}`)
+ this.$u.func.globalNavigator(
+ `/subPackage/workbench/views/cscj?houseCode=${this.stdId}&addressType=${this.addressType}`)
},
csjlClick() {
let url = `/subPackage/workbench/views/csjl?stdId=${this.stdId}&name=${this.placeName}&from=place`
// this.$u.func.globalNavigator('/subPackage/workbench/views/csjl?stdId=' + this.stdId)
this.$u.func.globalNavigator(url)
},
-
- navToEventDetail(){
+
+ navToEventDetail() {
this.$u.func.globalNavigator(`eventDetail?type=${this.eventType}`)
+ },
+
+ navTo(type) {
+ if (type == 1) {
+ this.$u.func.globalNavigator(`/subPackage/workbench/views/report?code=${this.stdId}`)
+ } else {
+ this.$u.func.globalNavigator(`/subPackage/workbench/views/audit?code=${this.stdId}`)
+ }
}
},
}
@@ -439,17 +466,19 @@
background-color: green;
border-radius: 0rpx 10rpx 10rpx 0rpx;
}
-
-
+
+
.cell {
padding: 25rpx 20rpx;
font-size: 32rpx;
background-color: #fff;
border-bottom: 1rpx solid #f6f6f6;
+
.cell-title {
flex-shrink: 0;
width: 200rpx;
}
+
.cell-value {
color: #989898;
word-wrap: break-word;
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index 7b6dacc..9dad534 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -686,7 +686,7 @@
navTo() {
let data = JSON.parse(JSON.stringify(this.form));
this.$u.func.globalNavigator(
- `/subPackage/bs/views/bsList?data=${JSON.stringify(data)}`)
+ `householdLabel?data=${JSON.stringify(data)}`)
}
}
}
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index c013c57..9d4a8a0 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -74,6 +74,7 @@
frequency: '',
reportType: "",
selectDate: [],
+ houseCode: ""
}
},
@@ -89,9 +90,10 @@
this.tabIndex = 1;
this.currentStatus = 1;
}
+ if (option.code) {
+ this.houseCode = option.code;
+ }
this.getList()
-
-
},
onReachBottom() {
this.currentPage++
@@ -125,8 +127,11 @@
frequency: this.frequency,
}
if (this.selectDate.length) {
- params.startTime = this.selectDate[0],
- params.endTime = this.selectDate[1]
+ params.startTime = this.selectDate[0]
+ params.endTime = this.selectDate[1]
+ }
+ if (this.houseCode) {
+ params.houseCode = this.houseCode;
}
if (this.reportType) {
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index dd3b3b0..29a5776 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -26,7 +26,7 @@
<u-input border="none" v-model="categoryValue" disabled disabledColor="#ffffff"
placeholder="请选择">
</u-input>
- <u-icon v-if="!currentId" slot="right" name="arrow-right"></u-icon>
+ <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<!-- <view v-if="showLabelList.length" class="label" style="border-bottom:1px solid eff1f3;">
<view v-for="(item,index) in showLabelList" :key="index" class="activeLabel">
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index 6abcb34..fa62515 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -141,7 +141,7 @@
this.form.location = address
this.form.lat = latitude;
this.form.lng = longitude;
- this.jwd = `${Number(longitude).toFixed(6)},${Number(data.latitude).toFixed(6)}`
+ this.jwd = `${Number(longitude).toFixed(6)},${Number(latitude).toFixed(6)}`
}
})
},
diff --git a/subPackage/workbench/views/report.vue b/subPackage/workbench/views/report.vue
index d1ccf30..bcc50f4 100644
--- a/subPackage/workbench/views/report.vue
+++ b/subPackage/workbench/views/report.vue
@@ -5,13 +5,13 @@
<view class="tab">
<u-tabs :list="tabList" :scrollable="false" :current="tabIndex" @click="changeTab"
:inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}">
-
+
<view class="tab-filter flex j-c-c a-i-c" slot="right" @click="showDateModal">
<text class="f-28">时间筛选</text>
<u-icon name="arrow-down"></u-icon>
</view>
-
- </u-tabs>
+
+ </u-tabs>
<view class="search">
<u-search placeholder="请输入需要查询信息的姓名" v-model="keyWord" :clearabled="true" :showAction="true"
:animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
@@ -23,7 +23,9 @@
<view class="list-item bgc-ff mb-20" v-for="item in reportList" :key="item.id" @click="pushPage(item)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{ findObjValue(item.type, typeList, 'type').name }}</text>
- <u-tag class="u_tag" size="mini" plain plainFill :text="findObjValue(item.confirmFlag, tabList, 'status').name" :type="findObjValue(item.confirmFlag, tabList, 'status').type"></u-tag>
+ <u-tag class="u_tag" size="mini" plain plainFill
+ :text="findObjValue(item.confirmFlag, tabList, 'status').name"
+ :type="findObjValue(item.confirmFlag, tabList, 'status').type"></u-tag>
</view>
<view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">姓名</text>
@@ -32,10 +34,10 @@
<view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">手机</text>
<text class="f-28 c-66">{{ item.phone }}</text>
- </view>
- <view class="item-row flex a-i-c j-c-s-b">
- <text class="f-28">事发地</text>
- <text class="address f-28 c-66">{{ item.address || "" }}</text>
+ </view>
+ <view class="item-row flex a-i-c j-c-s-b">
+ <text class="f-28">事发地</text>
+ <text class="address f-28 c-66">{{ item.address || "" }}</text>
</view>
<view class="item-row flex a-i-c j-c-s-b f-28">
<text>时间</text>
@@ -44,7 +46,7 @@
</view>
</view>
<u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
- <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
+ <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
</view>
</template>
@@ -54,7 +56,7 @@
} from '@/api/task/taskReportForRepairs.js'
import dateRangeModal from '@/components/dateRangeModal/modal.vue';
export default {
- components:{
+ components: {
dateRangeModal
},
data() {
@@ -65,66 +67,69 @@
size: 10
},
tabList: [
-
+
{
- name: "全部",
- status: "",
- },
+ name: "全部",
+ status: "",
+ },
{
name: "待处理",
- status: 1,
+ status: 1,
type: 'warning'
},
{
name: "处理中",
- status: 2,
+ status: 2,
type: 'success'
},
{
name: "已处理",
- status: 3,
+ status: 3,
type: 'error'
},
- ],
- typeList: [
- {
- name: "公共维修",
- type: 1
- },
- {
- name: "居家维修",
- type: 2
- },
- {
- name: "矛盾纠纷",
- type: 3
- },
- {
- name: "投诉举报",
- type: 4
- },
- {
- name: "企业商户上报",
- type: 5
- }
+ ],
+ typeList: [{
+ name: "公共维修",
+ type: 1
+ },
+ {
+ name: "居家维修",
+ type: 2
+ },
+ {
+ name: "矛盾纠纷",
+ type: 3
+ },
+ {
+ name: "投诉举报",
+ type: 4
+ },
+ {
+ name: "企业商户上报",
+ type: 5
+ }
],
tabIndex: 0,
- tabStatus:"",
+ tabStatus: "",
keyWord: '',
loadingStatus: 'nomore',
- selectDate:[]
+ selectDate: [],
+ houseCode: ""
}
},
-
+
onLoad(option) {
- if(option.from){
+ if (option.from) {
this.tabIndex = 1;
this.tabStatus = 1;
}
+ if (option.code) {
+ this.houseCode = option.code;
+ }
},
-
- onShow() {
- this.currentRole = uni.getStorageSync("activeRole")
+
+ onShow() {
+ this.currentRole = uni.getStorageSync("activeRole")
this.reportList = []
this.getPageList()
},
@@ -139,13 +144,18 @@
realName: this.keyWord,
confirmFlag: this.tabStatus
}
- if(this.selectDate.length){
- params.startTime = this.selectDate[0],
- params.endTime = this.selectDate[1]
- }
- const { roleName } = this.currentRole
+ if (this.selectDate.length) {
+ params.startTime = this.selectDate[0],
+ params.endTime = this.selectDate[1]
+ }
+ if (this.houseCode) {
+ params.addressCode = this.houseCode;
+ }
+ const {
+ roleName
+ } = this.currentRole
const res = await getPage({
- ...params,
+ ...params,
roleName,
...this.pagingParams
})
@@ -157,7 +167,7 @@
} = res
if (code !== 200) {
uni.showToast({
- title: '数据请求失败',
+ title: '数据请求失败',
icon: 'error'
})
return
@@ -175,7 +185,7 @@
this.getPageList()
},
clearConfirm() {
- this.keyWord = ''
+ this.keyWord = ''
this.searchConfirm()
},
resetParams() {
@@ -188,22 +198,22 @@
})
return res
},
- pushPage(item) {
+ pushPage(item) {
const data = JSON.stringify(item)
- // this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?id='+id)
- this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?data='+data)
+ // this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?id='+id)
+ this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?data=' + data)
},
-
- showDateModal(){
+
+ showDateModal() {
this.$refs.dateRane.open();
},
-
- handleRestDate(){
+
+ handleRestDate() {
this.selectDate = [];
this.resetParams();
this.getPageList()
},
- handleComfirmDate(val){
+ handleComfirmDate(val) {
this.selectDate = val;
this.resetParams();
this.getPageList()
@@ -219,13 +229,15 @@
.hander {
background-color: #fff;
-.tab {
+
+ .tab {
width: 100%;
}
.tab-filter {
padding: 0 20rpx;
}
+
.search {
padding: 20rpx 70rpx;
}
@@ -246,6 +258,7 @@
.item-row {
padding: 10rpx 0;
+
.address {
width: 75%;
text-align: right;
diff --git a/subPackage/workbench/views/reportAudit.vue b/subPackage/workbench/views/reportAudit.vue
index 84200d0..434a349 100644
--- a/subPackage/workbench/views/reportAudit.vue
+++ b/subPackage/workbench/views/reportAudit.vue
@@ -5,20 +5,20 @@
<view class="line"></view>
<view class="text">基本信息</view>
</view> -->
- <caption-row title="基本信息" />
+ <caption-row title="基本信息" />
<view class="basic-data">
<lineItem :dataInfo="basicData"></lineItem>
</view>
</view>
- <view class="pic-box" v-if="imgUrls.length">
+ <view class="pic-box" v-if="imgUrls.length">
<!-- <view class="title-box">
<view class="line"></view>
<view class="text">事件照片</view>
</view> -->
- <caption-row title="事件照片" />
+ <caption-row title="事件照片" />
<view class="pic-data">
- <view class="mr-20 " v-for="(i,k) in imgUrls" :key="k">
- <u-image class="img" :src="i" width="80" height="80" @click="previewImg(i)"></u-image>
+ <view class="mr-20 " v-for="(i,k) in imgUrls" :key="k">
+ <u-image class="img" :src="i" width="80" height="80" @click="previewImg(i)"></u-image>
</view>
</view>
</view>
@@ -27,16 +27,18 @@
<view class="line"></view>
<view class="text">审核信息</view>
</view> -->
- <caption-row title="审核信息" />
+ <caption-row title="审核信息" />
<view class="audit-form">
<u-form labelWidth="70" :model="form" class="form" ref="form">
- <u-form-item label="事件状态" @click="showPicker" class="form-item">
+ <!-- <u-form-item label="事件状态" @click="showPicker" class="form-item">
<u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"
border="none" :placeholder="defaultPlaceholder" inputAlign="right" color="#333"></u--input>
<u-icon slot="right" name="arrow-right" v-show="from == 'list'"></u-icon>
- </u-form-item>
- <u-form-item label="处理情况" class="form-item" v-if="from == 'list' || (from == 'record' && form.confirmNotion)">
- <u--input v-model="form.confirmNotion" :border="from == 'list'?'surround':'none'" inputAlign="right" color="#333" :disabled="from == 'record'?true:false"></u--input>
+ </u-form-item> -->
+ <u-form-item label="处理情况" class="form-item"
+ v-if="from == 'list' || (from == 'record' && form.confirmNotion)">
+ <u--input v-model="form.confirmNotion" :border="from == 'list'?'surround':'none'"
+ inputAlign="right" color="#333" :disabled="from == 'record'?true:false"></u--input>
</u-form-item>
</u-form>
</view>
@@ -44,11 +46,18 @@
<!-- <view class="bottom" v-if="from == 'list'">
<u-button type="primary" @click="submit">提交处理</u-button>
</view> -->
-
- <footer-btn @click="submit" v-if="from == 'list'"></footer-btn>
-
- <u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
- :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker>
+
+ <!-- <footer-btn @click="submit" v-if="from == 'list'"></footer-btn> -->
+
+
+ <view class="footer flex a-i-c j-c-s-b" v-if="from == 'list'">
+ <button class="footer-btn" @click="submit()">处置</button>
+ <button class="footer-btn">转办</button>
+ </view>
+
+ <u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false"
+ :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false"
+ @confirm="handleConfirm"></u-picker>
</view>
</template>
@@ -58,7 +67,12 @@
import {
checkReportForRepairsData
} from '@/api/task/taskReportForRepairs.js'
- import { minioBaseUrl } from "@/common/setting.js"
+ import {
+ getPeopleType
+ } from '@/api/user.js'
+ import {
+ minioBaseUrl
+ } from "@/common/setting.js"
export default {
components: {
captionRow,
@@ -67,27 +81,27 @@
data() {
return {
basicData: [{
- label: '事发地',
+ label: '事发地',
name: 'address',
value: '未完善'
},
{
- label: '姓名',
+ label: '姓名',
name: 'realName',
value: '未完善'
},
{
- label: '手机号码',
+ label: '手机号码',
name: 'phone',
value: '未完善'
},
{
- label: '事件类型',
+ label: '事件类型',
name: 'type',
value: '未完善'
},
{
- label: '事件描述',
+ label: '事件描述',
name: 'remark',
value: '未完善'
}
@@ -116,9 +130,9 @@
form: {
confirmFlag: '',
confirmNotion: ''
- },
- defaultPlaceholder: "",
- defaultColums: 0,
+ },
+ defaultPlaceholder: "",
+ defaultColums: 0,
imgUrls: [],
currentId: '',
defaultData: {},
@@ -138,13 +152,26 @@
},
]
],
- from:"list"
+ from: "list",
+ peopleList: [
+ [{
+ name: "网格员",
+ type: 1
+ },
+ {
+ name: "物业人员",
+ type: 2
+ }
+ ],
+
+ ]
+
}
},
onLoad(option) {
// const { id } = option
// this.currentId = id
- if(option.from){
+ if (option.from) {
this.from = option.from;
}
const {
@@ -156,27 +183,34 @@
this.setDefaultValue()
},
methods: {
-
- showPicker(){
- if(this.from == "list"){
+
+ getPeopleList() {
+ getPeopleType().then(res => {
+
+ })
+ },
+
+ showPicker() {
+ if (this.from == "list") {
this.isPickerShow = true;
}
},
-
-
- setImgUrl(url){
+
+
+ setImgUrl(url) {
return `${minioBaseUrl}${url}`
},
-
+
async checkReportForRepairs() {
const {
confirmFlag,
confirmNotion
} = this.form
const res = await checkReportForRepairsData({
- // id: this.currentId,
+ // id: this.currentId,
id: this.defaultData.id,
- confirmFlag: this.findObjValue(confirmFlag, this.columns[0], 'name').status,
+ // confirmFlag: this.findObjValue(confirmFlag, this.columns[0], 'name').status,
+ confirmFlag: 3,
confirmNotion
})
@@ -200,28 +234,28 @@
})
},
- setDefaultValue() {
- console.log(this.defaultData);
- this.basicData.forEach(item => {
- item.value = this.defaultData[item.name] || '未完善'
- if (item.name === 'type') {
- item.value = this.findObjValue(item.value, this.typeList, 'type').name || '未完善'
- }
+ setDefaultValue() {
+ console.log(this.defaultData);
+ this.basicData.forEach(item => {
+ item.value = this.defaultData[item.name] || '未完善'
+ if (item.name === 'type') {
+ item.value = this.findObjValue(item.value, this.typeList, 'type').name || '未完善'
+ }
})
this.imgUrls = this.$setImageUrl(this.defaultData.imageUrls);
//if(this.defaultData.imageUrls){
- // let list = this.defaultData.imageUrls.split(",")
- // let arr = []
- // for(let i of list){
- // arr.push(`${minioBaseUrl}${i}`);
- // }
- //}
-
- let columns = this.columns[0]
- this.defaultColums = columns.findIndex(item => item.status == this.defaultData.confirmFlag)
- this.defaultPlaceholder = columns[this.defaultColums].name
+ // let list = this.defaultData.imageUrls.split(",")
+ // let arr = []
+ // for(let i of list){
+ // arr.push(`${minioBaseUrl}${i}`);
+ // }
+ //}
+
+ let columns = this.columns[0]
+ this.defaultColums = columns.findIndex(item => item.status == this.defaultData.confirmFlag)
+ this.defaultPlaceholder = columns[this.defaultColums].name
},
-
+
submit() {
this.checkReportForRepairs()
},
@@ -235,14 +269,14 @@
})
return res
},
-
- previewImg(url){
+
+ previewImg(url) {
uni.previewImage({
- urls:this.imgUrls,
- current:url
+ urls: this.imgUrls,
+ current: url
})
},
-
+
}
}
</script>
@@ -264,9 +298,10 @@
}
.pic-box {
+
// margin-top: 20rpx;
.pic-data {
- padding:0 20rpx;
+ padding: 0 20rpx;
display: flex;
flex-wrap: wrap;
margin-top: 20rpx;
@@ -277,7 +312,8 @@
// margin-top: 20rpx;
.audit-form {
- padding:0 20rpx;
+ padding: 0 20rpx;
+
.form {
font-size: 30rpx;
@@ -300,15 +336,15 @@
border-top: 1rpx solid #f6f6f6;
}
- .title-box {
- display: flex;
+ .title-box {
+ display: flex;
align-items: center;
font-size: 30rpx;
- .line {
- width: 6rpx;
- height: 30rpx;
- margin-right: 10rpx;
+ .line {
+ width: 6rpx;
+ height: 30rpx;
+ margin-right: 10rpx;
background-color: #017BFC;
}
@@ -322,4 +358,34 @@
/deep/ .uni-input-placeholder {
font-size: 30rpx;
}
+
+ .footer {
+ width: 100%;
+ padding: 20rpx 30rpx;
+ box-sizing: border-box;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ background-color: #fff;
+ z-index: 10;
+ padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
+ z-index: 999;
+ background-color: #fff;
+ box-shadow: 0rpx 0rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
+
+ .footer-btn {
+ width: 300rpx;
+ height: 78rpx;
+ border-radius: 8rpx;
+ font-size: 32rpx;
+ color: #fff;
+ border: none;
+ background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);
+ }
+
+ .footer-btn:after {
+ border: none;
+ }
+
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3