From 4522ab3fe8bd45ee753ef187448c1e884bbc601f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Apr 2024 11:09:27 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web
---
src/views/backblask/BackblastPubRecord.vue | 137 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 30 deletions(-)
diff --git a/src/views/backblask/BackblastPubRecord.vue b/src/views/backblask/BackblastPubRecord.vue
index 82751f4..0a845ea 100644
--- a/src/views/backblask/BackblastPubRecord.vue
+++ b/src/views/backblask/BackblastPubRecord.vue
@@ -10,6 +10,21 @@
v-text="textDispose(row, 'policemanPhoneflag', 'policemanPhone')">
</el-button>
</template>
+
+ <template slot-scope="{row, size,index}" slot="peopleForm" >
+ <el-table :data="form.backblastPubPersonEntityList" v-if="form.backblastPubPersonEntityList">
+ <el-table-column width="100" property="name" label="姓名"
+ label-class-name="workOrderStyle"></el-table-column>
+ <el-table-column width="150" property="telephone" label="手机号" label-class-name="workOrderStyle">
+ </el-table-column>
+ <el-table-column width="160" property="idCard" label="身份证号" label-class-name="workOrderStyle">
+ </el-table-column>
+ <el-table-column width="150" property="occupation" label="职业" label-class-name="workOrderStyle">
+ </el-table-column>
+ <el-table-column width="160" property="address" label="居住地" label-class-name="workOrderStyle">
+ </el-table-column>
+ </el-table>
+ </template>
<!-- <template slot="menuLeft">
<el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">导出
</el-button>
@@ -80,50 +95,91 @@
dialogClickModal: false,
column: [
{
- label: "宣传地址",
+ label: "地址",
prop: "address",
- align: 'center',
- minWidth: 210,
- labelWidth:120,
+ // align: 'center',
+ minWidth: 180,
+ labelWidth: 120,
search: true,
searchSpan: 5,
overHidden: true,
- row:true,
- span:24,
+ row: true,
+ span: 24,
}, {
- label: "宣传内容",
+ label: "宣防内容",
prop: "pubContent",
- labelWidth:120,
- align: 'center',
- type:"textarea",
- row:true,
- span:24,
- overHidden:true,
+ labelWidth: 120,
+ // align: 'center',
+ type: "textarea",
+ row: true,
+ span: 24,
+ overHidden: true,
+ },
+
+ {
+ label: "是否下载国家反诈app",
+ prop: "isFzApp",
+ labelWidth: 120,
+ // align: 'center',
+ type: "select",
+ row: true,
+ span: 24,
+ overHidden: true,
+ hide: true,
+ dicData: [{
+ label: "是",
+ value: 1
+ },
+ {
+ label: "否",
+ value: 2
+ }
+ ],
},
{
- label: "宣传图片",
+ label: "是否打开预警共能",
+ prop: "isOpenAlarm",
+ labelWidth: 120,
+ // align: 'center',
+ type: "select",
+ row: true,
+ span: 24,
+ overHidden: true,
+ hide: true,
+ dicData: [{
+ label: "是",
+ value: 1
+ },
+ {
+ label: "否",
+ value: 2
+ }
+ ],
+ },
+ {
+ label: "宣防佐证照片",
prop: "pubUrls",
// align: 'center',
fileType: 'img',
- labelWidth:120,
+ labelWidth: 120,
type: "upload",
listType: "picture-card",
dataType: "string",
width: 110,
- row:true,
- span:24,
+ row: true,
+ span: 24,
}, {
- label: "宣传时间",
+ label: "时间",
prop: "createTime",
align: 'center',
- labelWidth:120,
+ labelWidth: 120,
width: 156,
- row:true,
+ row: true,
}, {
label: "民警姓名",
prop: "policeman",
align: 'center',
- labelWidth:120,
+ labelWidth: 120,
search: true,
searchSpan: 4,
// searchLabelWidth: 96,
@@ -134,31 +190,47 @@
prop: "policemanPhone",
align: 'center',
slot: true,
- labelWidth:120,
+ labelWidth: 120,
search: true,
searchLabelWidth: 110,
searchSpan: 4,
width: 120
}, {
- label: "地区",
+ label: "所属街道",
prop: "townName",
align: 'center',
search: true,
- searchSpan: 3,
+ searchSpan: 4,
searchLabelWidth: 46,
labelWidth: 120,
width: 156,
- searchPlaceholder: '请输入地区'
+ searchPlaceholder: '请输入街道'
}, {
label: "辖区派出所",
prop: "pcsName",
align: 'center',
- labelWidth:120,
- search: true,
+ labelWidth: 120,
+ search: false,
searchSpan: 4,
searchLabelWidth: 96,
- searchPlaceholder: '请输入辖区派出所'
- }],
+ searchPlaceholder: '请输入辖区派出所',
+ hide:true
+ },
+ {
+ label: "宣防对象",
+ prop: "people",
+ align: 'center',
+ labelWidth: 120,
+ search: false,
+ searchSpan: 4,
+ searchLabelWidth: 96,
+ searchPlaceholder: '请输入辖区派出所',
+ hide:true,
+ span:24,
+ slot: true,
+ formslot: true
+ },
+ ],
},
data: []
}
@@ -368,7 +440,8 @@
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
-
+ console.log("===>",res);
+ this.$set(this.form,"backblastPubPersonEntityList",res.data.data.backblastPubPersonEntityList)
})
done()
} else {
@@ -417,4 +490,8 @@
.avue-upload__icon {
line-height: 6;
}
+
+.workOrderStyle {
+ font-weight: normal;
+}
</style>
--
Gitblit v1.9.3