From 2120e0ef45ea05eb80b11a965ce30fa024425475 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 19 Feb 2024 17:40:08 +0800
Subject: [PATCH] 交易登记调整
---
src/views/publicSecurity/positionManage/TransactRegist.vue | 140 +++++++++++++++++++++++++---------------------
src/api/task/labelReporting.js | 20 +++++-
2 files changed, 91 insertions(+), 69 deletions(-)
diff --git a/src/api/task/labelReporting.js b/src/api/task/labelReporting.js
index c3fce3d..bd92914 100644
--- a/src/api/task/labelReporting.js
+++ b/src/api/task/labelReporting.js
@@ -1,14 +1,24 @@
import request from '@/router/axios';
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/blade-taskLabelReportingEvent/taskLabelReportingEvent/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
-
-export const getDetail = (params) => {
+export const getDetail = (id) => {
return request({
url: "/api/blade-taskLabelReportingEvent/taskLabelReportingEvent/detail",
method: "get",
- params: {
- ...params,
- },
+ params:{
+ id
+ }
});
};
diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index b9febcd..6e5497a 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -7,20 +7,20 @@
@refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="{row, size}" slot="menu">
- <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
+ <!-- <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain
@click="lookDetail(row, 0)">查 看
- </el-button>
+ </el-button> -->
<el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain
@click="rowDel(row)">删 除
</el-button>
- <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
- @click="goAudit(row)" :disabled="row.status != 1">审 核
+ <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.confirmFlag == 1" plain
+ @click="goAudit(row)" :disabled="row.confirmFlag != 1">审 核
</el-button>
</template>
- <template slot="status" slot-scope="{row, size}">
- <el-tag :size="size" :type="showStatus(row.status).type">
- {{ showStatus(row.status).text }}
+ <template slot="confirmFlag" slot-scope="{row, size}">
+ <el-tag :size="size" :type="showStatus(row.confirmFlag).type">
+ {{ showStatus(row.confirmFlag).text }}
</el-tag>
</template>
@@ -61,10 +61,11 @@
<script>
import {
getList,
+ getDetail,
removeTask,
update,
add,
-} from "@/api/task/task"
+} from "@/api/task/labelReporting"
import {
mapGetters
@@ -128,7 +129,7 @@
border: true,
//stripe:true,
index: true,
- // viewBtn: true,
+ viewBtn: true,
addBtn: false,
editBtn: false,
delBtn: false,
@@ -137,21 +138,67 @@
columnBtn: false,
selection: true,
dialogClickModal: false,
- column: [{
+ column: [
+
+ {
+ width: 110,
span: 12,
- label: "社区",
- prop: "communityName",
+ label: "交易对象",
+ prop: "transactionObject",
searchSpan: 4,
- searchLabelWidth: 46,
+ searchLabelWidth: 100,
search: true,
- hide: true,
+ align: 'center'
+ },
+ {
+ width: 110,
+ span: 12,
+ label: "交易对象电话",
+ prop: "transactionObjectTel",
+ searchSpan: 4,
+ searchLabelWidth: 100,
+ search: true,
+ align: 'center'
+ },
+ {
+ width: 110,
+ span: 12,
+ label: "身份证号",
+ prop: "idCard",
+ searchSpan: 4,
+ searchLabelWidth: 100,
+ search: true,
+ align: 'center'
+ },
+ {
+ width: 110,
+ span: 12,
+ label: "交易数量",
+ prop: "goodsNums",
+ align: 'center'
+ },
+ {
+ width: 110,
+ span: 12,
+ label: "交易金额",
+ prop: "transactionMoney",
+ align: 'center'
+ },
+ {
+ width: 110,
+ span: 12,
+ label: "场所名称",
+ prop: "placeName",
+ searchSpan: 4,
+ searchLabelWidth: 100,
+ search: true,
align: 'center'
},
{
width: 110,
span: 12,
label: "场所负责人",
- prop: "realName",
+ prop: "principal",
searchSpan: 4,
searchLabelWidth: 100,
search: true,
@@ -160,7 +207,7 @@
width: 120,
span: 12,
label: "联系方式",
- prop: "phone",
+ prop: "principalPhone",
searchSpan: 4,
search: true,
rules: [{
@@ -172,8 +219,10 @@
overHidee: true,
span: 12,
label: "地址",
- prop: "addressName",
+ prop: "location",
searchSpan: 4,
+ minWidth:220,
+ overHidden:true,
// search: true,
rules: [{
required: true,
@@ -188,38 +237,14 @@
// search: true,
parent: false,
searchSpan: 4,
- prop: "streetCode",
- type: "tree",
- dicUrl: "/api/blade-system/region/getTownTree",
- props: {
- label: "name",
- value: "id"
- },
- rules: [{
- required: true,
- message: "请选择所属街道",
- trigger: "blur",
- },],
+ prop: "streetName",
align: 'center'
}, {
width: 156,
- // hide: true,
parent: false,
searchSpan: 4,
label: "所属社区",
- prop: "neiCode",
- // search: false,
- type: "tree",
- dicUrl: "/api/blade-system/region/tree",
- props: {
- label: "name",
- value: "id",
- },
- rules: [{
- required: true,
- message: "请选择所属社区",
- trigger: "blur",
- },],
+ prop: "communityName",
align: 'center'
},
{
@@ -230,8 +255,9 @@
label: "title",
value: "key",
},
- // type: 'select',
- // search: true,
+ type: 'select',
+ search: true,
+ searchSpan:4,
align: 'center',
width: 120,
},
@@ -241,7 +267,7 @@
editDisplay: false,
viewDisplay: false,
label: '审核状态',
- prop: 'status',
+ prop: 'confirmFlag',
type: 'radio',
slot: true,
dicData: [{
@@ -547,24 +573,10 @@
beforeOpen (done, type) {
if (["edit", "view"].includes(type)) {
- // getPlace(this.form.id).then((res) => {
- // this.form = res.data.data
- // if (this.form.imageUrls.length) {
- // this.form.imageUrls = this.form.imageUrls.split(",").filter(item => item != '').map(item => website
- // .minioUrl + item).join(',')
- // }
- // if (this.form.placePoiLabelVOList.length) {
- // let lebelTwo = this.form.placePoiLabelVOList.find(item => {
- // return item.type == 2
- // })
- // if (lebelTwo) this.form.label = String(lebelTwo.poiCode)
- // let lebelThree = this.form.placePoiLabelVOList.find(item => {
- // return item.type == 3
- // })
- // if (lebelThree) this.form.smallLabel = String(lebelThree.poiCode)
- // }
- // done()
- // })
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data
+ done()
+ })
} else {
done()
}
--
Gitblit v1.9.3