From 3bce353d07a91c0861b776636446fe673801ed32 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 23 May 2024 08:55:54 +0800
Subject: [PATCH] 样式优化及无诈审核优化
---
src/views/place/tenanthold.vue | 2
src/views/publicSecurity/campusExclusion.vue | 30 +-
vue.config.js | 6
src/views/publicSecurity/components/auditBase.vue | 194 +++++++++++++++++++
src/views/publicSecurity/disputeExclusion.vue | 28 +-
src/views/userHouse/houseHoldList.vue | 5
src/views/publicSecurity/noExplosionManage.vue | 114 ++++++-----
src/views/place/components/auditBase.vue | 158 +++++++--------
src/views/publicSecurity/SchoolCheckManage.vue | 8
9 files changed, 377 insertions(+), 168 deletions(-)
diff --git a/src/views/place/components/auditBase.vue b/src/views/place/components/auditBase.vue
index ead97ba..c70f425 100644
--- a/src/views/place/components/auditBase.vue
+++ b/src/views/place/components/auditBase.vue
@@ -1,95 +1,93 @@
<template>
- <div class="cur-container-box">
- <avue-form ref="replyForm" :option="option" v-model="form" :close-on-click-modal="false">
+ <div class="cur-container-box">
+ <avue-form ref="replyForm" :option="option" v-model="form" :close-on-click-modal="false">
- <template slot-scope="{size}" slot="menuForm">
- <el-button type="primary" :size="size" @click="handleSubmit">通 过</el-button>
- <el-button :size="size" @click="handleReset">驳 回</el-button>
- </template>
+ <template slot-scope="{size}" slot="menuForm">
+ <el-button type="primary" :size="size" @click="handleSubmit">通 过</el-button>
+ <el-button :size="size" @click="handleReset">驳 回</el-button>
+ </template>
- </avue-form>
- </div>
+ </avue-form>
+ </div>
</template>
<script>
-import {
+ import {
setCheckPlaceExt
-} from "@/api/place/place"
+ } from "@/api/place/place"
-export default {
+ export default {
inject: ["placeElement"],
- data () {
- return {
- form: {},
- option: {
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- span: 23,
- row: true,
- label: "审批意见",
- prop: "confirmNotion",
- type: 'textarea',
- minRows: 3,
- maxRows: 5,
- rules: [],
- }
- ]
- },
- }
+ data() {
+ return {
+ form: {},
+ option: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ span: 23,
+ row: true,
+ label: "审批意见",
+ prop: "confirmNotion",
+ type: 'textarea',
+ minRows: 3,
+ maxRows: 5,
+ rules: [],
+ }]
+ },
+ }
},
methods: {
- handleSubmit () {
- setCheckPlaceExt({
- confirmFlag: 2,
- id: this.placeElement.curAuditRow.placeExtId,
- confirmNotion: this.form.confirmNotion
- }).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- this.$refs.replyForm && this.$refs.replyForm.resetForm()
- this.placeElement.auditBasePopup = false
+ handleSubmit() {
+ setCheckPlaceExt({
+ confirmFlag: 2,
+ id: this.placeElement.curAuditRow.placeExtId,
+ confirmNotion: this.form.confirmNotion
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.replyForm && this.$refs.replyForm.resetForm()
+ this.placeElement.auditBasePopup = false
- this.placeElement.onLoad(this.placeElement.page)
- })
- },
+ this.placeElement.onLoad(this.placeElement.page)
+ })
+ },
- handleReset () {
- if ('confirmNotion' in this.form && this.form.confirmNotion.trim() == '' || !this.form.confirmNotion) {
- this.$message({
- type: 'warning',
- message: "请输入审批意见!",
- })
+ handleReset() {
+ if ('confirmNotion' in this.form && this.form.confirmNotion.trim() == '' || !this.form.confirmNotion) {
+ this.$message({
+ type: 'warning',
+ message: "请输入审批意见!",
+ })
- return
- }
+ return
+ }
- setCheckPlaceExt({
- confirmFlag: 3,
- id: this.placeElement.curAuditRow.placeExtId,
- confirmNotion: this.form.confirmNotion
- }).then(() => {
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- this.$refs.replyForm && this.$refs.replyForm.resetForm()
- this.placeElement.auditBasePopup = false
+ setCheckPlaceExt({
+ confirmFlag: 3,
+ id: this.placeElement.curAuditRow.placeExtId,
+ confirmNotion: this.form.confirmNotion
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.replyForm && this.$refs.replyForm.resetForm()
+ this.placeElement.auditBasePopup = false
- this.placeElement.onLoad(this.placeElement.page)
- })
- },
+ this.placeElement.onLoad(this.placeElement.page)
+ })
+ },
}
-}
+ }
</script>
<style lang="scss" scoped>
-.cur-container-box {
+ .cur-container-box {
display: flex;
flex-direction: column;
width: 100%;
@@ -97,18 +95,18 @@
overflow: hidden;
.content-box {
- margin: 0 4px;
- padding: 0 16px;
- height: 0;
- flex: 1;
- overflow: hidden;
- overflow-y: auto;
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
}
.footer-btn-box {
- margin-top: 10px;
- display: flex;
- justify-content: center;
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
}
-}
+ }
</style>
\ No newline at end of file
diff --git a/src/views/place/tenanthold.vue b/src/views/place/tenanthold.vue
index 2c40a8f..63fe48d 100644
--- a/src/views/place/tenanthold.vue
+++ b/src/views/place/tenanthold.vue
@@ -49,7 +49,7 @@
</span>
</el-dialog>
- <el-dialog title="场所数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <el-dialog title="租客数据导入" append-to-body :visible.sync="excelBox" width="555px">
<avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
<template slot="excelTemplate">
<el-button size="small" type="primary" @click="handleTemplate">
diff --git a/src/views/publicSecurity/SchoolCheckManage.vue b/src/views/publicSecurity/SchoolCheckManage.vue
index fc7db32..bcfecd8 100644
--- a/src/views/publicSecurity/SchoolCheckManage.vue
+++ b/src/views/publicSecurity/SchoolCheckManage.vue
@@ -92,7 +92,7 @@
</div>
</div>
- <!-- <div class="yh-pic-box">
+ <div class="yh-pic-box">
<div class="yh-pic-name">
整改后图片
</div>
@@ -101,15 +101,15 @@
<el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"></el-image>
</div>
</div>
- </div> -->
- <!-- <div class="yh-remark">
+ </div>
+ <div class="yh-remark">
<div class="yh-remark-name">
整改后描述
</div>
<div class="yh-remark-value">
{{ item.rectificationRemark }}
</div>
- </div> -->
+ </div>
</div>
</div>
</el-drawer>
diff --git a/src/views/publicSecurity/campusExclusion.vue b/src/views/publicSecurity/campusExclusion.vue
index a968f25..0ad9144 100644
--- a/src/views/publicSecurity/campusExclusion.vue
+++ b/src/views/publicSecurity/campusExclusion.vue
@@ -121,7 +121,7 @@
datetime: "",
selectionList: [],
option: {
- labelWidth: 96,
+ labelWidth: 110,
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
@@ -143,7 +143,7 @@
selection: true,
dialogClickModal: false,
column: [{
- width: 110,
+ width: 130,
span: 12,
label: "姓名",
prop: "name",
@@ -158,7 +158,7 @@
label: "图片",
prop: "images",
type: "upload",
- labelWidth: 120,
+ labelWidth: 110,
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
@@ -168,15 +168,17 @@
},
span: 24,
}, {
- width: 110,
- span: 12,
+ width: 140,
+ span: 24,
label: "描述",
+ type: 'textarea',
prop: "remark",
searchSpan: 4,
searchLabelWidth: 60,
search: true,
align: 'center',
labelWidth: 110,
+ overHidden: true,
}, {
label: '是否问题',
align: 'center',
@@ -185,10 +187,10 @@
slot: true,
dicData: [{
label: '是',
- value: 1
+ value: "1"
}, {
label: '否',
- value: 2
+ value: "2"
}],
width: 90,
},
@@ -200,10 +202,10 @@
slot: true,
dicData: [{
label: '是',
- value: 1
+ value: "1"
}, {
label: '否',
- value: 2
+ value: "2"
}],
width: 90,
},
@@ -215,10 +217,10 @@
slot: true,
dicData: [{
label: '是',
- value: 1
+ value: "1"
}, {
label: '否',
- value: 2
+ value: "2"
}],
width: 90,
}, {
@@ -307,13 +309,13 @@
slot: true,
dicData: [{
label: '待审核',
- value: 1
+ value: "1"
}, {
label: '通过',
- value: 2
+ value: "2"
}, {
label: '驳回',
- value: 3
+ value: "3"
}],
align: 'center',
labelWidth: 110,
diff --git a/src/views/publicSecurity/components/auditBase.vue b/src/views/publicSecurity/components/auditBase.vue
new file mode 100644
index 0000000..56d6d03
--- /dev/null
+++ b/src/views/publicSecurity/components/auditBase.vue
@@ -0,0 +1,194 @@
+<template>
+ <div class="cur-container-box">
+ <avue-form ref="replyForm" :option="option" v-model="form" :close-on-click-modal="false">
+
+ <template slot-scope="{size}" slot="menuForm">
+ <el-button type="primary" :size="size" @click="handleSubmit(2)">通 过</el-button>
+ <el-button :size="size" @click="handleSubmit(3)">驳 回</el-button>
+ </template>
+
+ <template slot-scope="{ row, size, index }" slot="houseCode">
+ <el-select v-model="form.houseCode" filterable remote :remote-method="onRemoteMethod" @change="onSelectChange"
+ placeholder="请选择标准地址" reserve-keyword>
+ <el-option v-for="item in standardAddressList" :key="item.houseCode"
+ :label="item.placeName+'------详细地址：'+item.location" :value="item.houseCode">
+ </el-option>
+ </el-select>
+ </template>
+
+ </avue-form>
+ </div>
+</template>
+
+<script>
+ import {
+ setCheckPlaceExt,
+ getPlaceAddressList,
+ getList
+ } from "@/api/place/place"
+
+ import {
+ getTaskNoFraudReportingList,
+ removeTask,
+ update,
+ add,
+ applyTaskExamine
+ } from "@/api/task/task"
+
+ export default {
+ inject: ["placeElement"],
+
+ data() {
+ return {
+ id: '',
+ form: {},
+ type: '',
+ standardAddressList: [], //标准地址数据
+ option: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ span: 23,
+ prop: "houseCode",
+ slot: true,
+ label: "标准地址",
+ // labelWidth: 120,
+ display: false
+ },
+ {
+ span: 23,
+ row: true,
+ label: "审批意见",
+ prop: "confirmNotion",
+ type: 'textarea',
+ minRows: 3,
+ maxRows: 5,
+ rules: [],
+ }
+ ]
+ },
+ }
+ },
+
+ watch: {
+
+ },
+
+ methods: {
+
+ onSelectChange(e) {
+ console.log("selectChange===>", e);
+ // this.getPlaceAddressListRequest()
+ },
+ init(row) {
+ this.id = row.taskId
+ this.type = row.type
+ let houseCodeColumn = this.findObject(this.option.column, 'houseCode')
+ console.log("*******77777************" + this.type)
+ if (this.type == 2) {
+ console.log("*******777778************" + this.type)
+
+ houseCodeColumn.display = true
+ } else {
+ console.log("*******777779************" + this.type)
+
+ houseCodeColumn.display = false
+ }
+ this.getPlaceAddressListRequest()
+ },
+ onRemoteMethod(query) {
+ console.log("remote===>", query)
+ this.getPlaceAddressListRequest(query)
+ },
+ getPlaceAddressListRequest(query) {
+ getList(1, 10, {
+ neiName: query
+ }).then(res => {
+ this.standardAddressList = res.data.data.records;
+ })
+ },
+
+ handleSubmit(status) {
+ let auditForm = {
+ id: this.id,
+ status: status,
+ remark: this.form.confirmNotion,
+ houseCode: this.form.houseCode,
+ reportType: 6
+ }
+ applyTaskExamine(auditForm).then(res => {
+ if (res.data.code == 200) {
+ this.placeElement.visible = false
+ this.placeElement.onLoad(this.placeElement.page)
+ this.$message.warning("审核成功")
+ }
+ })
+ // setCheckPlaceExt({
+ // confirmFlag: 2,
+ // id: this.placeElement.curAuditRow.placeExtId,
+ // confirmNotion: this.form.confirmNotion
+ // }).then(() => {
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // })
+ // this.$refs.replyForm && this.$refs.replyForm.resetForm()
+ // this.placeElement.auditBasePopup = false
+
+ // this.placeElement.onLoad(this.placeElement.page)
+ // })
+ },
+
+ handleReset() {
+ if ('confirmNotion' in this.form && this.form.confirmNotion.trim() == '' || !this.form.confirmNotion) {
+ this.$message({
+ type: 'warning',
+ message: "请输入审批意见!",
+ })
+
+ return
+ }
+
+ setCheckPlaceExt({
+ confirmFlag: 3,
+ id: this.placeElement.curAuditRow.placeExtId,
+ confirmNotion: this.form.confirmNotion
+ }).then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ })
+ this.$refs.replyForm && this.$refs.replyForm.resetForm()
+ this.placeElement.auditBasePopup = false
+
+ this.placeElement.onLoad(this.placeElement.page)
+ })
+ },
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .cur-container-box {
+ display: flex;
+ flex-direction: column;
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+
+ .content-box {
+ margin: 0 4px;
+ padding: 0 16px;
+ height: 0;
+ flex: 1;
+ overflow: hidden;
+ overflow-y: auto;
+ }
+
+ .footer-btn-box {
+ margin-top: 10px;
+ display: flex;
+ justify-content: center;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/publicSecurity/disputeExclusion.vue b/src/views/publicSecurity/disputeExclusion.vue
index a69e36f..40b9a72 100644
--- a/src/views/publicSecurity/disputeExclusion.vue
+++ b/src/views/publicSecurity/disputeExclusion.vue
@@ -121,7 +121,7 @@
datetime: "",
selectionList: [],
option: {
- labelWidth: 96,
+ labelWidth: 110,
searchLabelWidth: 96,
searchShow: true,
searchMenuSpan: 3,
@@ -143,7 +143,7 @@
selection: true,
dialogClickModal: false,
column: [{
- width: 110,
+ width: 130,
span: 12,
label: "姓名",
prop: "name",
@@ -158,7 +158,7 @@
label: "图片",
prop: "images",
type: "upload",
- labelWidth: 120,
+ labelWidth: 110,
listType: "picture-img",
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
@@ -168,15 +168,17 @@
},
span: 24,
}, {
- width: 110,
+ width: 140,
span: 12,
label: "描述",
prop: "remark",
+ type: 'textarea',
searchSpan: 4,
searchLabelWidth: 60,
search: true,
align: 'center',
labelWidth: 110,
+ overHidden: true,
}, {
label: '是否问题',
align: 'center',
@@ -185,10 +187,10 @@
slot: true,
dicData: [{
label: '是',
- value: 1
+ value: "1"
}, {
label: '否',
- value: 2
+ value: "2"
}],
width: 90,
},
@@ -200,10 +202,10 @@
slot: true,
dicData: [{
label: '是',
- value: 1
+ value: "1"
}, {
label: '否',
- value: 2
+ value: "2"
}],
width: 90,
},
@@ -215,10 +217,10 @@
slot: true,
dicData: [{
label: '是',
- value: 1
+ value: "1"
}, {
label: '否',
- value: 2
+ value: "2"
}],
width: 90,
}, {
@@ -307,13 +309,13 @@
slot: true,
dicData: [{
label: '待审核',
- value: 1
+ value: "1"
}, {
label: '通过',
- value: 2
+ value: "2"
}, {
label: '驳回',
- value: 3
+ value: "3"
}],
align: 'center',
labelWidth: 110,
diff --git a/src/views/publicSecurity/noExplosionManage.vue b/src/views/publicSecurity/noExplosionManage.vue
index b472c6e..efda03d 100644
--- a/src/views/publicSecurity/noExplosionManage.vue
+++ b/src/views/publicSecurity/noExplosionManage.vue
@@ -40,8 +40,10 @@
<el-dialog :visible.sync="visible" append-to-body destroy-on-close title="审核" width="30%"
custom-class="flow-design-dialog" :before-close="handleClose">
- <audit-base @handleSubmit="submitAudit"></audit-base>
+ <audit-base ref="auditBase" @handleSubmit="submitAudit"></audit-base>
</el-dialog>
+
+
<el-drawer title="无诈申请" :visible.sync="isDetail" :append-to-body="true" size="40%" direction="rtl">
<div class="title">
<div class="icon">{{ refreshNum }}</div>
@@ -87,11 +89,12 @@
</div>
<div class="yh-pic-box">
<div class="yh-pic-name">
- 上报图片
+ 上报附件
</div>
<div class="yh-pic-list">
<div class="pic-item" v-for="pic in item.imageUrlsList">
- <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit" :preview-src-list="item.imageUrlsList"></el-image>
+ <el-image style="width: 100px; height: 100px" :src="pic" :fit="fit"
+ :preview-src-list="item.imageUrlsList"></el-image>
</div>
</div>
</div>
@@ -110,6 +113,7 @@
applyTaskExamine
} from "@/api/task/task"
+ import auditBase from './components/auditBase'
import {
mapGetters
} from "vuex"
@@ -143,16 +147,16 @@
export default {
data() {
//手机号格式校验
- let validatorPhone = function(rule, value, callback) {
- if (value) {
- if (!/^1[3456789]\d{9}$/.test(value)) {
- callback(new Error('手机号格式有误！'))
- } else {
- callback()
- }
- }
- callback()
- }
+ // let validatorPhone = function(rule, value, callback) {
+ // if (value) {
+ // if (!/^1[3456789]\d{9}$/.test(value)) {
+ // callback(new Error('手机号格式有误！'))
+ // } else {
+ // callback()
+ // }
+ // }
+ // callback()
+ // }
return {
isDetail: false,
@@ -238,7 +242,6 @@
search: true,
searchSpan: 4,
searchLabelWidth: 96,
- align: 'center'
}, {
label: "所属街道",
prop: "streetName",
@@ -327,11 +330,12 @@
provide() {
return {
- placeElement: this,
+ placeElement: this
}
},
components: {
+ auditBase,
campusReporting,
hotelReporting,
labelReporting,
@@ -403,6 +407,8 @@
}
}
},
+
+
methods: {
// 点击展开收缩
flodQL(index) {
@@ -559,6 +565,10 @@
reportType: row.reportType
}
this.visible = true
+ var that = this
+ this.$nextTick(() => {
+ that.$refs.auditBase.init(row)
+ })
},
colseDetail() {
@@ -621,23 +631,23 @@
delete row.smallLabel
- add({
- ...row,
- label
- }).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
+ // add({
+ // ...row,
+ // label
+ // }).then(
+ // () => {
+ // this.onLoad(this.page)
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // })
+ // done()
+ // },
+ // (error) => {
+ // window.console.log(error)
+ // loading()
+ // }
+ // )
},
rowUpdate(row, index, done, loading) {
@@ -659,23 +669,23 @@
delete row.smallLabel
- update({
- ...row,
- label
- }).then(
- () => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!",
- })
- done()
- },
- (error) => {
- window.console.log(error)
- loading()
- }
- )
+ // update({
+ // ...row,
+ // label
+ // }).then(
+ // () => {
+ // this.onLoad(this.page)
+ // this.$message({
+ // type: "success",
+ // message: "操作成功!",
+ // })
+ // done()
+ // },
+ // (error) => {
+ // window.console.log(error)
+ // loading()
+ // }
+ // )
},
rowDel(row) {
@@ -728,7 +738,7 @@
type: "warning",
})
.then(() => {
- return remove(this.ids)
+ // return remove(this.ids)
})
.then(() => {
this.onLoad(this.page)
@@ -778,7 +788,7 @@
this.onLoad(this.page, this.query)
},
onLoad(page, params = {}) {
- const {} = this.query
+ this.query = {}
let values = {
...params,
}
@@ -795,7 +805,7 @@
}
})
}
- data.records.forEach(item => {})
+ // data.records.forEach(item => {})
this.page.total = data.total
this.data = data.records
this.loading = false
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index bd5009c..55a8680 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -203,7 +203,9 @@
selectionList: [],
labelFlag: false,
editLabelFlge: false,
- query: {},
+ query: {
+ relationship: 1
+ },
loading: true,
page: {
pageSize: 10,
@@ -1013,6 +1015,7 @@
searchChange(params, done) {
this.query = params
this.page.currentPage = 1
+ params.relationship = 1
this.onLoad(this.page, params)
done()
},
diff --git a/vue.config.js b/vue.config.js
index c823fab..e3847bf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,7 +38,7 @@
proxy: {
"/api/blade-resource/oss": {
//本地服务接口地址
- // target: "http://192.168.31.188:9528",
+ // target: "http://localhost:9528",
target: "https://srgdjczzxtpt.com:2080/api",
// target: "https://kt39592615.goho.co",
// target: "http://z4042833u6.wicp.vip",
@@ -54,7 +54,7 @@
},
"/api": {
//本地服务接口地址
- target: "http://192.168.1.50:9528",
+ target: "http://192.168.204.1:9528",
// target: "https://srgdjczzxtpt.com:2080/api",
// target: "https://kt39592615.goho.co",
// target: "http://z4042833u6.wicp.vip",
@@ -70,4 +70,4 @@
},
},
},
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3