From 7237b76c8fe87df70ae2e3b4a03cf675140960fc Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 May 2024 16:05:10 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jczz_web
---
src/views/place/tenanthold.vue | 58 +++++++++++--------
src/views/cGovernance/taskECallTwo/index.vue | 76 ++++++++++++------------
src/api/task/eCallEventTwo.js | 4
3 files changed, 74 insertions(+), 64 deletions(-)
diff --git a/src/api/task/eCallEventTwo.js b/src/api/task/eCallEventTwo.js
index 130af9e..fb04ae1 100644
--- a/src/api/task/eCallEventTwo.js
+++ b/src/api/task/eCallEventTwo.js
@@ -12,12 +12,12 @@
})
}
-export const getDetail = (id) => {
+export const getDetail = (orderId) => {
return request({
url: '/api/blade-eCallEventTwo/eCallEventTwo/detail',
method: 'get',
params: {
- id
+ orderId
}
})
}
diff --git a/src/views/cGovernance/taskECallTwo/index.vue b/src/views/cGovernance/taskECallTwo/index.vue
index 8bee266..1f0957d 100644
--- a/src/views/cGovernance/taskECallTwo/index.vue
+++ b/src/views/cGovernance/taskECallTwo/index.vue
@@ -120,6 +120,18 @@
}, ],
},
{
+ width: 156,
+ label: "诉求主题",
+ prop: "issueTitle",
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请选择诉求主题",
+ trigger: "blur",
+ }],
+ },
+ {
width: 100,
label: "诉求来源",
prop: "issueOrigin",
@@ -147,24 +159,6 @@
}, ],
// search: true,
},
-
- {
- width: 156,
- overHidden: true,
- label: "诉求主题",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- prop: "issueTitle",
- search: true,
- searchSpan: 4,
- rules: [{
- required: true,
- message: "请选择诉求主题",
- trigger: "blur",
- }],
- },
-
{
label: "诉求内容",
parent: false,
@@ -187,10 +181,10 @@
type: "select",
dicData: [{
label: "个人",
- value: 0
+ value: "0"
}, {
label: "企业",
- value: 1
+ value: "1"
}],
// hide: true,
// search: true,
@@ -218,10 +212,10 @@
type: "select",
dicData: [{
label: "男",
- value: 0
+ value: "0"
}, {
label: "女",
- value: 1
+ value: "1"
}],
rules: [{
required: false,
@@ -229,7 +223,7 @@
trigger: "blur",
},
{
- validator: validatorPhone,
+ // validator: validatorPhone,
trigger: 'blur'
}
],
@@ -254,10 +248,15 @@
// format: "yyyy-MM-dd",
// valueFormat: "yyyy-MM-dd",
rules: [{
- required: true,
- message: "请选择现场联系电话",
- trigger: "blur",
- }, ],
+ required: false,
+ message: "请输入现场联系电话",
+ trigger: "blur",
+ },
+ {
+ validator: validatorPhone,
+ trigger: 'blur'
+ }
+ ],
},
{
label: "网格",
@@ -374,19 +373,19 @@
type: "select",
dicData: [{
label: "咨询",
- value: 0
+ value: "0"
}, {
label: "投诉",
- value: 1
+ value: "1"
}, {
label: "求助",
- value: 2
+ value: "2"
}, {
label: "举报",
- value: 3
+ value: "3"
}, {
label: "建议",
- value: 4
+ value: "4"
}],
// hide: true,
},
@@ -414,10 +413,10 @@
type: "select",
dicData: [{
label: "一般",
- value: 0
+ value: "0"
}, {
label: "即办",
- value: 1
+ value: "1"
}],
// hide: true,
},
@@ -504,13 +503,13 @@
type: "select",
dicData: [{
label: "受理",
- value: 0
+ value: "0"
}, {
label: "处理中",
- value: 1
+ value: "1"
}, {
label: "已归档",
- value: 2
+ value: "2"
}],
// hide: true,
},
@@ -822,8 +821,9 @@
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.orderId).then((res) => {
this.form = res.data.data
+ this.form.sceneAddr = [this.form.sceneGeoLng, this.form.sceneGeoLat, this.form.sceneAddr].join(',')
// if (this.form.imageUrls.length > 0) {
// var urls = []
// var names = this.form.imageUrls.split(",")
diff --git a/src/views/place/tenanthold.vue b/src/views/place/tenanthold.vue
index f70d668..a7c816a 100644
--- a/src/views/place/tenanthold.vue
+++ b/src/views/place/tenanthold.vue
@@ -28,6 +28,14 @@
<template slot-scope="{row, size}" slot="householdLabelList">
{{ labelDispose(row.householdLabelList) }}
</template>
+
+ <template slot="menuLeft">
+ <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
+
</avue-crud>
<el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
@@ -41,14 +49,16 @@
</span>
</el-dialog>
- <!-- <el-dialog :title="'编辑标签 ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
- <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
+ <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">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
</avue-form>
- <span slot="footer" class="dialog-footer">
- <el-button size="small" @click="editLabelFlge = false">取 消</el-button>
- <el-button size="small" type="primary" @click="onsubmit">确 定</el-button>
- </span>
- </el-dialog> -->
+ </el-dialog>
+
</basic-container>
</template>
@@ -187,8 +197,7 @@
dialogType: 'dialog',
dialogClickModal: false,
menuFixed: 'right',
- column: [
- {
+ column: [{
width: 110,
label: "姓名",
prop: "name",
@@ -237,7 +246,7 @@
hide: false,
// display: false,
width: 60,
- align:"center",
+ align: "center",
label: "性别",
prop: "gender",
type: "select",
@@ -281,7 +290,7 @@
prop: "aoiName",
search: true,
searchSpan: 4,
- overHidden:true,
+ overHidden: true,
display: false
},
@@ -321,8 +330,8 @@
label: "户籍地址",
prop: "hukouRegistration",
// hide: true,
- minWidth:150,
- overHidden:true,
+ minWidth: 150,
+ overHidden: true,
},
{
@@ -336,17 +345,16 @@
// labelWidth: 110,
searchSpan: 3,
searchLabelWidth: 60,
- editDisplay:false,
+ editDisplay: false,
label: "未成年",
search: true,
prop: "minors",
type: "select",
- align:"center",
- dicData: [
- {
+ align: "center",
+ dicData: [{
label: "全部",
value: ""
- },{
+ }, {
label: "是",
value: 2
},
@@ -722,7 +730,7 @@
done()
},
handleExport() {
- this.$confirm("是否导出住户数据?", "提示", {
+ this.$confirm("是否导出租客数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
@@ -733,17 +741,19 @@
}
data = Qs.stringify(data)
exportBlob(
- `/api/blade-household/household/export-household?${this.website.tokenHeader}=${getToken()}&` + data
+ `/api/blade-houseTenant/houseTenant/export-tenant?${this.website.tokenHeader}=${getToken()}&` + data
).then(res => {
- downloadXls(res.data, `住户数据表${dateNow()}.xlsx`)
+ downloadXls(res.data, `租客数据表${dateNow()}.xlsx`)
NProgress.done()
})
})
},
handleTemplate() {
- exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
- downloadXls(res.data, "住户数据模板.xlsx")
- })
+ exportBlob(
+ `/api/blade-houseTenant/houseTenant/downLoadTenantTemplate?${this.website.tokenHeader}=${getToken()}`).then(
+ res => {
+ downloadXls(res.data, "租客数据模板.xlsx")
+ })
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
--
Gitblit v1.9.3