From ea0acaf167634130d4432a155dbdaf300657017e Mon Sep 17 00:00:00 2001
From: bibi <541660090@qq.com>
Date: Tue, 8 Mar 2022 09:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/payment/chargeStandardBind/index.js   |  10 ++
 src/api/payment/chargeStandardManage/index.js |  10 ++
 src/views/Login/index.vue                     |   1 +
 .../ChargeStandardManage/_house/index.vue     | 131 ----------------
 .../_moment/depend/config.js                  |  46 ------
 .../_moment/depend/form.js                    |   7 -
 .../_moment/depend/form.vue                   |  72 ---------
 .../ChargeStandardManage/_moment/index.vue    | 131 ----------------
 .../_parking/depend/config.js                 |  46 ------
 .../_parking/depend/form.js                   |   7 -
 .../_parking/depend/form.vue                  |  72 ---------
 .../ChargeStandardManage/_parking/index.vue   | 131 ----------------
 .../_payMeter/depend/config.js                |  46 ------
 .../_payMeter/depend/form.js                  |   7 -
 .../_payMeter/depend/form.vue                 |  72 ---------
 .../ChargeStandardManage/_payMeter/index.vue  | 131 ----------------
 .../{_house => }/depend/config.js             |   0
 .../{_house => }/depend/form.js               |   0
 .../{_house => }/depend/form.vue              |   0
 .../Payment/ChargeStandardManage/index.vue    | 143 +++++++++++++++---
 20 files changed, 140 insertions(+), 923 deletions(-)
 create mode 100644 src/api/payment/chargeStandardBind/index.js
 create mode 100644 src/api/payment/chargeStandardManage/index.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_house/index.vue
 delete mode 100644 src/views/Payment/ChargeStandardManage/_moment/depend/config.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_moment/depend/form.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_moment/depend/form.vue
 delete mode 100644 src/views/Payment/ChargeStandardManage/_moment/index.vue
 delete mode 100644 src/views/Payment/ChargeStandardManage/_parking/depend/config.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_parking/depend/form.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_parking/depend/form.vue
 delete mode 100644 src/views/Payment/ChargeStandardManage/_parking/index.vue
 delete mode 100644 src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js
 delete mode 100644 src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue
 delete mode 100644 src/views/Payment/ChargeStandardManage/_payMeter/index.vue
 rename src/views/Payment/ChargeStandardManage/{_house => }/depend/config.js (100%)
 rename src/views/Payment/ChargeStandardManage/{_house => }/depend/form.js (100%)
 rename src/views/Payment/ChargeStandardManage/{_house => }/depend/form.vue (100%)

diff --git a/src/api/payment/chargeStandardBind/index.js b/src/api/payment/chargeStandardBind/index.js
new file mode 100644
index 0000000..c81d6bd
--- /dev/null
+++ b/src/api/payment/chargeStandardBind/index.js
@@ -0,0 +1,10 @@
+import httpService from "@/request"
+
+// 活动列表
+export function activityList(params) {
+	return httpService({
+		url: `/user/activity/list`,
+		method: 'get',
+		params: params,
+	})
+}
\ No newline at end of file
diff --git a/src/api/payment/chargeStandardManage/index.js b/src/api/payment/chargeStandardManage/index.js
new file mode 100644
index 0000000..e4f6ae6
--- /dev/null
+++ b/src/api/payment/chargeStandardManage/index.js
@@ -0,0 +1,10 @@
+import httpService from "@/request"
+
+// 收费标准列表
+export function chargesList(params) {
+	return httpService({
+		url: `/user/charges/list`,
+		method: 'get',
+		params: params,
+	})
+}
\ No newline at end of file
diff --git a/src/views/Login/index.vue b/src/views/Login/index.vue
index c96dc29..e473f0b 100644
--- a/src/views/Login/index.vue
+++ b/src/views/Login/index.vue
@@ -97,6 +97,7 @@
                 width: 90%;
                 margin-left: 30px;
                 margin-top: 20px;
+                height:38px;
                 margin-bottom: 10px;
               "
             >
diff --git a/src/views/Payment/ChargeStandardManage/_house/index.vue b/src/views/Payment/ChargeStandardManage/_house/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_house/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div>
-    <searchForm :formItem="formItem" @getSearch="getData($event)"></searchForm>
-    <a-button style="margin: 10px" class="add-btn">添加费用</a-button>
-    <a-table
-      :columns="columns"
-      :data-source="tableData"
-      :pagination="pagination"
-      @change="handleTableChange"
-      :row-selection="{
-        selectedRowKeys: selectedRowKeys,
-        onChange: selectionChoosed,
-      }"
-      :row-key="
-        (record, index) => {
-          return record.id;
-        }
-      "
-    >
-      <span slot="action" slot-scope="text, row">
-        <a-space>
-          <a class="ant-dropdown-link" @click="edit(row)">修改</a>
-          <a class="ant-dropdown-link" @click="del([row.id])">删除</a>
-        </a-space>
-      </span>
-    </a-table>
-    <div class="action">
-      <a-dropdown :disabled="!hasSelected">
-        <a-menu slot="overlay" @click="handleMenuClick">
-          <a-menu-item key="del"> 批量删除 </a-menu-item>
-        </a-menu>
-        <a-button> 批量操作 <a-icon type="down" /> </a-button>
-      </a-dropdown>
-      <span style="margin-left: 8px">
-        <template v-if="hasSelected">
-          {{ `已选择 ${selectedRowKeys.length} 条` }}
-        </template>
-      </span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formItem, columns, pagination } from "./depend/config";
-export default {
-	data() {
-		return {
-			chargeType: "1",
-			tableData: [],
-			searchForm: {
-				name: undefined,
-			},
-			formItem,
-			columns,
-			pagination,
-			// 选择的index
-			selectedRowKeys: [],
-		};
-	},
-	mounted() {
-		// this.getData();
-	},
-	methods: {
-		async getData(data) {
-			if (data !== undefined) {
-				console.log(data);
-				this.searchForm = data;
-				console.log(this.searchForm);
-			}
-			let res = await List({
-				pageNum: this.pagination.current,
-				size: this.pagination.pageSize,
-				...this.searchForm,
-			});
-			this.tableData = res.data.rows;
-			this.pagination.total = res.data.total;
-			this.selectedRowKeys = [];
-		},
-		edit(data) {},
-		del(ids) {
-			this.$confirm({
-				title: "是否删除",
-				// okText:'删除',
-				// cancelText:'取消',
-				icon: "delete",
-				onOk: async () => {
-					let res = await Del({ ids: ids });
-					if (res.code === 200) {
-						this.$message.success(res.msg);
-						this.getData();
-					} else {
-						this.$message.error(res.msg);
-					}
-				},
-			});
-		},
-		// 选择，获取id
-		selectionChoosed(data) {
-			this.selectedRowKeys = data;
-		},
-		// 批量操作
-		handleMenuClick(data) {
-			console.log(data);
-			if (data.key === "del") {
-				this.del(this.selectedRowKeys);
-			}
-		},
-		// 跳转
-		handleTableChange(pagination) {
-			console.log(pagination);
-			const pager = { ...this.pagination };
-			pager.current = pagination.current;
-			pager.pageSize = pagination.pageSize;
-			this.pagination = pager;
-			this.getData();
-		},
-		addClose() {},
-	},
-	computed: {
-		hasSelected() {
-			return this.selectedRowKeys.length > 0;
-		},
-	},
-};
-</script>
-<style lang="less" scoped>
-.table-img {
-  width: 40px;
-  height: 40px;
-}
-</style>
diff --git a/src/views/Payment/ChargeStandardManage/_moment/depend/config.js b/src/views/Payment/ChargeStandardManage/_moment/depend/config.js
deleted file mode 100644
index 5d8ac50..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/depend/config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const formItem = [
-	{
-		type: 'input',
-		label:'费用名称',
-		prop:'name',
-		placeholder:'请输入'
-	},
-]
-export const columns = [
-	{
-		title: "费用名称",
-		dataIndex: "name",
-	},
-	{
-		title: "计费方式",
-		dataIndex: "feetype",
-	},
-	{
-		title: "计量方式",
-		dataIndex: "type",
-	},
-	{
-		title: "单价",
-		dataIndex: "price",
-	},
-	{
-		title: "单位",
-		dataIndex: "unit",
-	},
-	{
-		title: "操作",
-		dataIndex: "action",
-		key: "action",
-		width: "180",
-		fixed: "right",
-		scopedSlots: { customRender: "action" },
-	},
-]
-export const pagination = {
-	current: 1,
-	total: 0,
-	pageSize: 10,
-	showTotal: (total) => `共 ${total} 条`,
-	showSizeChanger: true,
-	showQuickJumper: true,
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_moment/depend/form.js b/src/views/Payment/ChargeStandardManage/_moment/depend/form.js
deleted file mode 100644
index f3fd958..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/depend/form.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const form = {
-	id:null,
-	brandName: undefined,
-}
-export const rules = {
-	brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_moment/depend/form.vue b/src/views/Payment/ChargeStandardManage/_moment/depend/form.vue
deleted file mode 100644
index e018c60..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/depend/form.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div>
-    <a-drawer
-      :title="drawer.title"
-      :width="720"
-      :visible="drawer.show"
-      :body-style="{ paddingBottom: '80px' }"
-      @close="addClose"
-    >
-      <div class="drawer-content">
-        基本信息
-        <a-divider></a-divider>
-        <a-form-model
-          ref="ruleForm"
-          :model="form"
-          :rules="rules"
-          layout="vertical"
-        >
-          <a-form-model-item prop="brandName" label="品牌名称">
-            <a-input
-              v-model="form.brandName"
-              placeholder="请输入品牌名称"
-              style="width: 50%"
-            ></a-input>
-          </a-form-model-item>
-        </a-form-model>
-      </div>
-      <div class="drawer-footer">
-        <a-button :style="{ marginRight: '8px' }" @click="addClose">
-          关闭
-        </a-button>
-        <a-button type="primary" @click="submit"> 提交 </a-button>
-      </div>
-    </a-drawer>
-  </div>
-</template>
-
-<script>
-export default {
-	methods: {
-		submit() {
-			console.log(this.form);
-			this.$refs.ruleForm.validate(async (valid) => {
-				if (valid) {
-					if (this.form.id === null) {
-						let res = await Insert(this.form);
-						if (res.code === 200) {
-							this.$message.success(res.msg);
-							this.addClose();
-							this.getData();
-						} else {
-							this.$message.error(res.msg);
-						}
-					} else {
-						console.log(this.form);
-						let res = await Update(this.form);
-						if (res.code === 200) {
-							this.$message.success(res.msg);
-							this.addClose();
-							this.getData();
-						} else {
-							this.$message.error(res.msg);
-						}
-					}
-				}
-			});
-		},
-	},
-};
-</script>
-
-<style></style>
diff --git a/src/views/Payment/ChargeStandardManage/_moment/index.vue b/src/views/Payment/ChargeStandardManage/_moment/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_moment/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div>
-    <searchForm :formItem="formItem" @getSearch="getData($event)"></searchForm>
-    <a-button style="margin: 10px" class="add-btn">添加费用</a-button>
-    <a-table
-      :columns="columns"
-      :data-source="tableData"
-      :pagination="pagination"
-      @change="handleTableChange"
-      :row-selection="{
-        selectedRowKeys: selectedRowKeys,
-        onChange: selectionChoosed,
-      }"
-      :row-key="
-        (record, index) => {
-          return record.id;
-        }
-      "
-    >
-      <span slot="action" slot-scope="text, row">
-        <a-space>
-          <a class="ant-dropdown-link" @click="edit(row)">修改</a>
-          <a class="ant-dropdown-link" @click="del([row.id])">删除</a>
-        </a-space>
-      </span>
-    </a-table>
-    <div class="action">
-      <a-dropdown :disabled="!hasSelected">
-        <a-menu slot="overlay" @click="handleMenuClick">
-          <a-menu-item key="del"> 批量删除 </a-menu-item>
-        </a-menu>
-        <a-button> 批量操作 <a-icon type="down" /> </a-button>
-      </a-dropdown>
-      <span style="margin-left: 8px">
-        <template v-if="hasSelected">
-          {{ `已选择 ${selectedRowKeys.length} 条` }}
-        </template>
-      </span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formItem, columns, pagination } from "./depend/config";
-export default {
-	data() {
-		return {
-			chargeType: "1",
-			tableData: [],
-			searchForm: {
-				name: undefined,
-			},
-			formItem,
-			columns,
-			pagination,
-			// 选择的index
-			selectedRowKeys: [],
-		};
-	},
-	mounted() {
-		// this.getData();
-	},
-	methods: {
-		async getData(data) {
-			if (data !== undefined) {
-				console.log(data);
-				this.searchForm = data;
-				console.log(this.searchForm);
-			}
-			let res = await List({
-				pageNum: this.pagination.current,
-				size: this.pagination.pageSize,
-				...this.searchForm,
-			});
-			this.tableData = res.data.rows;
-			this.pagination.total = res.data.total;
-			this.selectedRowKeys = [];
-		},
-		edit(data) {},
-		del(ids) {
-			this.$confirm({
-				title: "是否删除",
-				// okText:'删除',
-				// cancelText:'取消',
-				icon: "delete",
-				onOk: async () => {
-					let res = await Del({ ids: ids });
-					if (res.code === 200) {
-						this.$message.success(res.msg);
-						this.getData();
-					} else {
-						this.$message.error(res.msg);
-					}
-				},
-			});
-		},
-		// 选择，获取id
-		selectionChoosed(data) {
-			this.selectedRowKeys = data;
-		},
-		// 批量操作
-		handleMenuClick(data) {
-			console.log(data);
-			if (data.key === "del") {
-				this.del(this.selectedRowKeys);
-			}
-		},
-		// 跳转
-		handleTableChange(pagination) {
-			console.log(pagination);
-			const pager = { ...this.pagination };
-			pager.current = pagination.current;
-			pager.pageSize = pagination.pageSize;
-			this.pagination = pager;
-			this.getData();
-		},
-		addClose() {},
-	},
-	computed: {
-		hasSelected() {
-			return this.selectedRowKeys.length > 0;
-		},
-	},
-};
-</script>
-<style lang="less" scoped>
-.table-img {
-  width: 40px;
-  height: 40px;
-}
-</style>
diff --git a/src/views/Payment/ChargeStandardManage/_parking/depend/config.js b/src/views/Payment/ChargeStandardManage/_parking/depend/config.js
deleted file mode 100644
index 5d8ac50..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/depend/config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const formItem = [
-	{
-		type: 'input',
-		label:'费用名称',
-		prop:'name',
-		placeholder:'请输入'
-	},
-]
-export const columns = [
-	{
-		title: "费用名称",
-		dataIndex: "name",
-	},
-	{
-		title: "计费方式",
-		dataIndex: "feetype",
-	},
-	{
-		title: "计量方式",
-		dataIndex: "type",
-	},
-	{
-		title: "单价",
-		dataIndex: "price",
-	},
-	{
-		title: "单位",
-		dataIndex: "unit",
-	},
-	{
-		title: "操作",
-		dataIndex: "action",
-		key: "action",
-		width: "180",
-		fixed: "right",
-		scopedSlots: { customRender: "action" },
-	},
-]
-export const pagination = {
-	current: 1,
-	total: 0,
-	pageSize: 10,
-	showTotal: (total) => `共 ${total} 条`,
-	showSizeChanger: true,
-	showQuickJumper: true,
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_parking/depend/form.js b/src/views/Payment/ChargeStandardManage/_parking/depend/form.js
deleted file mode 100644
index f3fd958..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/depend/form.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const form = {
-	id:null,
-	brandName: undefined,
-}
-export const rules = {
-	brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_parking/depend/form.vue b/src/views/Payment/ChargeStandardManage/_parking/depend/form.vue
deleted file mode 100644
index e018c60..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/depend/form.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div>
-    <a-drawer
-      :title="drawer.title"
-      :width="720"
-      :visible="drawer.show"
-      :body-style="{ paddingBottom: '80px' }"
-      @close="addClose"
-    >
-      <div class="drawer-content">
-        基本信息
-        <a-divider></a-divider>
-        <a-form-model
-          ref="ruleForm"
-          :model="form"
-          :rules="rules"
-          layout="vertical"
-        >
-          <a-form-model-item prop="brandName" label="品牌名称">
-            <a-input
-              v-model="form.brandName"
-              placeholder="请输入品牌名称"
-              style="width: 50%"
-            ></a-input>
-          </a-form-model-item>
-        </a-form-model>
-      </div>
-      <div class="drawer-footer">
-        <a-button :style="{ marginRight: '8px' }" @click="addClose">
-          关闭
-        </a-button>
-        <a-button type="primary" @click="submit"> 提交 </a-button>
-      </div>
-    </a-drawer>
-  </div>
-</template>
-
-<script>
-export default {
-	methods: {
-		submit() {
-			console.log(this.form);
-			this.$refs.ruleForm.validate(async (valid) => {
-				if (valid) {
-					if (this.form.id === null) {
-						let res = await Insert(this.form);
-						if (res.code === 200) {
-							this.$message.success(res.msg);
-							this.addClose();
-							this.getData();
-						} else {
-							this.$message.error(res.msg);
-						}
-					} else {
-						console.log(this.form);
-						let res = await Update(this.form);
-						if (res.code === 200) {
-							this.$message.success(res.msg);
-							this.addClose();
-							this.getData();
-						} else {
-							this.$message.error(res.msg);
-						}
-					}
-				}
-			});
-		},
-	},
-};
-</script>
-
-<style></style>
diff --git a/src/views/Payment/ChargeStandardManage/_parking/index.vue b/src/views/Payment/ChargeStandardManage/_parking/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_parking/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div>
-    <searchForm :formItem="formItem" @getSearch="getData($event)"></searchForm>
-    <a-button style="margin: 10px" class="add-btn">添加费用</a-button>
-    <a-table
-      :columns="columns"
-      :data-source="tableData"
-      :pagination="pagination"
-      @change="handleTableChange"
-      :row-selection="{
-        selectedRowKeys: selectedRowKeys,
-        onChange: selectionChoosed,
-      }"
-      :row-key="
-        (record, index) => {
-          return record.id;
-        }
-      "
-    >
-      <span slot="action" slot-scope="text, row">
-        <a-space>
-          <a class="ant-dropdown-link" @click="edit(row)">修改</a>
-          <a class="ant-dropdown-link" @click="del([row.id])">删除</a>
-        </a-space>
-      </span>
-    </a-table>
-    <div class="action">
-      <a-dropdown :disabled="!hasSelected">
-        <a-menu slot="overlay" @click="handleMenuClick">
-          <a-menu-item key="del"> 批量删除 </a-menu-item>
-        </a-menu>
-        <a-button> 批量操作 <a-icon type="down" /> </a-button>
-      </a-dropdown>
-      <span style="margin-left: 8px">
-        <template v-if="hasSelected">
-          {{ `已选择 ${selectedRowKeys.length} 条` }}
-        </template>
-      </span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formItem, columns, pagination } from "./depend/config";
-export default {
-	data() {
-		return {
-			chargeType: "1",
-			tableData: [],
-			searchForm: {
-				name: undefined,
-			},
-			formItem,
-			columns,
-			pagination,
-			// 选择的index
-			selectedRowKeys: [],
-		};
-	},
-	mounted() {
-		// this.getData();
-	},
-	methods: {
-		async getData(data) {
-			if (data !== undefined) {
-				console.log(data);
-				this.searchForm = data;
-				console.log(this.searchForm);
-			}
-			let res = await List({
-				pageNum: this.pagination.current,
-				size: this.pagination.pageSize,
-				...this.searchForm,
-			});
-			this.tableData = res.data.rows;
-			this.pagination.total = res.data.total;
-			this.selectedRowKeys = [];
-		},
-		edit(data) {},
-		del(ids) {
-			this.$confirm({
-				title: "是否删除",
-				// okText:'删除',
-				// cancelText:'取消',
-				icon: "delete",
-				onOk: async () => {
-					let res = await Del({ ids: ids });
-					if (res.code === 200) {
-						this.$message.success(res.msg);
-						this.getData();
-					} else {
-						this.$message.error(res.msg);
-					}
-				},
-			});
-		},
-		// 选择，获取id
-		selectionChoosed(data) {
-			this.selectedRowKeys = data;
-		},
-		// 批量操作
-		handleMenuClick(data) {
-			console.log(data);
-			if (data.key === "del") {
-				this.del(this.selectedRowKeys);
-			}
-		},
-		// 跳转
-		handleTableChange(pagination) {
-			console.log(pagination);
-			const pager = { ...this.pagination };
-			pager.current = pagination.current;
-			pager.pageSize = pagination.pageSize;
-			this.pagination = pager;
-			this.getData();
-		},
-		addClose() {},
-	},
-	computed: {
-		hasSelected() {
-			return this.selectedRowKeys.length > 0;
-		},
-	},
-};
-</script>
-<style lang="less" scoped>
-.table-img {
-  width: 40px;
-  height: 40px;
-}
-</style>
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js b/src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js
deleted file mode 100644
index 5d8ac50..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/depend/config.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const formItem = [
-	{
-		type: 'input',
-		label:'费用名称',
-		prop:'name',
-		placeholder:'请输入'
-	},
-]
-export const columns = [
-	{
-		title: "费用名称",
-		dataIndex: "name",
-	},
-	{
-		title: "计费方式",
-		dataIndex: "feetype",
-	},
-	{
-		title: "计量方式",
-		dataIndex: "type",
-	},
-	{
-		title: "单价",
-		dataIndex: "price",
-	},
-	{
-		title: "单位",
-		dataIndex: "unit",
-	},
-	{
-		title: "操作",
-		dataIndex: "action",
-		key: "action",
-		width: "180",
-		fixed: "right",
-		scopedSlots: { customRender: "action" },
-	},
-]
-export const pagination = {
-	current: 1,
-	total: 0,
-	pageSize: 10,
-	showTotal: (total) => `共 ${total} 条`,
-	showSizeChanger: true,
-	showQuickJumper: true,
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js b/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js
deleted file mode 100644
index f3fd958..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export const form = {
-	id:null,
-	brandName: undefined,
-}
-export const rules = {
-	brandName:[{required:true,message:'请输入品牌名',trigger:'blur'}],
-}
\ No newline at end of file
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue b/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue
deleted file mode 100644
index e018c60..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/depend/form.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div>
-    <a-drawer
-      :title="drawer.title"
-      :width="720"
-      :visible="drawer.show"
-      :body-style="{ paddingBottom: '80px' }"
-      @close="addClose"
-    >
-      <div class="drawer-content">
-        基本信息
-        <a-divider></a-divider>
-        <a-form-model
-          ref="ruleForm"
-          :model="form"
-          :rules="rules"
-          layout="vertical"
-        >
-          <a-form-model-item prop="brandName" label="品牌名称">
-            <a-input
-              v-model="form.brandName"
-              placeholder="请输入品牌名称"
-              style="width: 50%"
-            ></a-input>
-          </a-form-model-item>
-        </a-form-model>
-      </div>
-      <div class="drawer-footer">
-        <a-button :style="{ marginRight: '8px' }" @click="addClose">
-          关闭
-        </a-button>
-        <a-button type="primary" @click="submit"> 提交 </a-button>
-      </div>
-    </a-drawer>
-  </div>
-</template>
-
-<script>
-export default {
-	methods: {
-		submit() {
-			console.log(this.form);
-			this.$refs.ruleForm.validate(async (valid) => {
-				if (valid) {
-					if (this.form.id === null) {
-						let res = await Insert(this.form);
-						if (res.code === 200) {
-							this.$message.success(res.msg);
-							this.addClose();
-							this.getData();
-						} else {
-							this.$message.error(res.msg);
-						}
-					} else {
-						console.log(this.form);
-						let res = await Update(this.form);
-						if (res.code === 200) {
-							this.$message.success(res.msg);
-							this.addClose();
-							this.getData();
-						} else {
-							this.$message.error(res.msg);
-						}
-					}
-				}
-			});
-		},
-	},
-};
-</script>
-
-<style></style>
diff --git a/src/views/Payment/ChargeStandardManage/_payMeter/index.vue b/src/views/Payment/ChargeStandardManage/_payMeter/index.vue
deleted file mode 100644
index c8e0af9..0000000
--- a/src/views/Payment/ChargeStandardManage/_payMeter/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <div>
-    <searchForm :formItem="formItem" @getSearch="getData($event)"></searchForm>
-    <a-button style="margin: 10px" class="add-btn">添加费用</a-button>
-    <a-table
-      :columns="columns"
-      :data-source="tableData"
-      :pagination="pagination"
-      @change="handleTableChange"
-      :row-selection="{
-        selectedRowKeys: selectedRowKeys,
-        onChange: selectionChoosed,
-      }"
-      :row-key="
-        (record, index) => {
-          return record.id;
-        }
-      "
-    >
-      <span slot="action" slot-scope="text, row">
-        <a-space>
-          <a class="ant-dropdown-link" @click="edit(row)">修改</a>
-          <a class="ant-dropdown-link" @click="del([row.id])">删除</a>
-        </a-space>
-      </span>
-    </a-table>
-    <div class="action">
-      <a-dropdown :disabled="!hasSelected">
-        <a-menu slot="overlay" @click="handleMenuClick">
-          <a-menu-item key="del"> 批量删除 </a-menu-item>
-        </a-menu>
-        <a-button> 批量操作 <a-icon type="down" /> </a-button>
-      </a-dropdown>
-      <span style="margin-left: 8px">
-        <template v-if="hasSelected">
-          {{ `已选择 ${selectedRowKeys.length} 条` }}
-        </template>
-      </span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formItem, columns, pagination } from "./depend/config";
-export default {
-	data() {
-		return {
-			chargeType: "1",
-			tableData: [],
-			searchForm: {
-				name: undefined,
-			},
-			formItem,
-			columns,
-			pagination,
-			// 选择的index
-			selectedRowKeys: [],
-		};
-	},
-	mounted() {
-		// this.getData();
-	},
-	methods: {
-		async getData(data) {
-			if (data !== undefined) {
-				console.log(data);
-				this.searchForm = data;
-				console.log(this.searchForm);
-			}
-			let res = await List({
-				pageNum: this.pagination.current,
-				size: this.pagination.pageSize,
-				...this.searchForm,
-			});
-			this.tableData = res.data.rows;
-			this.pagination.total = res.data.total;
-			this.selectedRowKeys = [];
-		},
-		edit(data) {},
-		del(ids) {
-			this.$confirm({
-				title: "是否删除",
-				// okText:'删除',
-				// cancelText:'取消',
-				icon: "delete",
-				onOk: async () => {
-					let res = await Del({ ids: ids });
-					if (res.code === 200) {
-						this.$message.success(res.msg);
-						this.getData();
-					} else {
-						this.$message.error(res.msg);
-					}
-				},
-			});
-		},
-		// 选择，获取id
-		selectionChoosed(data) {
-			this.selectedRowKeys = data;
-		},
-		// 批量操作
-		handleMenuClick(data) {
-			console.log(data);
-			if (data.key === "del") {
-				this.del(this.selectedRowKeys);
-			}
-		},
-		// 跳转
-		handleTableChange(pagination) {
-			console.log(pagination);
-			const pager = { ...this.pagination };
-			pager.current = pagination.current;
-			pager.pageSize = pagination.pageSize;
-			this.pagination = pager;
-			this.getData();
-		},
-		addClose() {},
-	},
-	computed: {
-		hasSelected() {
-			return this.selectedRowKeys.length > 0;
-		},
-	},
-};
-</script>
-<style lang="less" scoped>
-.table-img {
-  width: 40px;
-  height: 40px;
-}
-</style>
diff --git a/src/views/Payment/ChargeStandardManage/_house/depend/config.js b/src/views/Payment/ChargeStandardManage/depend/config.js
similarity index 100%
rename from src/views/Payment/ChargeStandardManage/_house/depend/config.js
rename to src/views/Payment/ChargeStandardManage/depend/config.js
diff --git a/src/views/Payment/ChargeStandardManage/_house/depend/form.js b/src/views/Payment/ChargeStandardManage/depend/form.js
similarity index 100%
rename from src/views/Payment/ChargeStandardManage/_house/depend/form.js
rename to src/views/Payment/ChargeStandardManage/depend/form.js
diff --git a/src/views/Payment/ChargeStandardManage/_house/depend/form.vue b/src/views/Payment/ChargeStandardManage/depend/form.vue
similarity index 100%
rename from src/views/Payment/ChargeStandardManage/_house/depend/form.vue
rename to src/views/Payment/ChargeStandardManage/depend/form.vue
diff --git a/src/views/Payment/ChargeStandardManage/index.vue b/src/views/Payment/ChargeStandardManage/index.vue
index 4a7d3f4..74ff4eb 100644
--- a/src/views/Payment/ChargeStandardManage/index.vue
+++ b/src/views/Payment/ChargeStandardManage/index.vue
@@ -1,42 +1,137 @@
 <template>
   <div>
     <div class="cardTitle">收费标准管理</div>
-    <a-tabs v-model="chargeType" @change="changeType">
-      <a-tab-pane key="1" tab="房屋收费标准"> 
-		  <house/>
-	  </a-tab-pane>
-      <a-tab-pane key="2" tab="仪表收费标准">
-		  <pay-meter/>
-	  </a-tab-pane>
-      <a-tab-pane key="3" tab="车位收费标准">
-		  <parking/>
-	  </a-tab-pane>
-      <a-tab-pane key="4" tab="临时收费标准">
-		  <moment/>
-	  </a-tab-pane>
+    <a-tabs v-model="searchForm.modelType" @change="changeType">
+      <a-tab-pane :key="1" tab="房屋收费标准"> </a-tab-pane>
+      <a-tab-pane :key="2" tab="仪表收费标准"> </a-tab-pane>
+      <a-tab-pane :key="3" tab="车位收费标准"> </a-tab-pane>
+      <a-tab-pane :key="4" tab="临时收费标准"> </a-tab-pane>
     </a-tabs>
+    <searchForm :formItem="formItem" @getSearch="getData($event)"></searchForm>
+    <a-button style="margin: 10px" class="add-btn">添加费用</a-button>
+    <a-table
+      :columns="columns"
+      :data-source="tableData"
+      :pagination="pagination"
+      @change="handleTableChange"
+      :row-selection="{
+        selectedRowKeys: selectedRowKeys,
+        onChange: selectionChoosed,
+      }"
+      :row-key="
+        (record, index) => {
+          return record.id;
+        }
+      "
+    >
+      <span slot="action" slot-scope="text, row">
+        <a-space>
+          <a class="ant-dropdown-link" @click="edit(row)">修改</a>
+          <a class="ant-dropdown-link" @click="del([row.id])">删除</a>
+        </a-space>
+      </span>
+    </a-table>
+    <div class="action">
+      <a-dropdown :disabled="!hasSelected">
+        <a-menu slot="overlay" @click="handleMenuClick">
+          <a-menu-item key="del"> 批量删除 </a-menu-item>
+        </a-menu>
+        <a-button> 批量操作 <a-icon type="down" /> </a-button>
+      </a-dropdown>
+      <span style="margin-left: 8px">
+        <template v-if="hasSelected">
+          {{ `已选择 ${selectedRowKeys.length} 条` }}
+        </template>
+      </span>
+    </div>
   </div>
 </template>
 
 <script>
-import house from "./_house/index.vue"
-import payMeter from "./_house/index.vue"
-import parking from "./_house/index.vue"
-import moment from "./_house/index.vue"
+import { formItem, columns, pagination } from "./depend/config";
+import { chargesList } from "@/api/payment/chargeStandardManage";
 export default {
-	components: {
-		house,payMeter,parking,moment
-	},
 	data() {
 		return {
-			chargeType: "1",
+			tableData: [],
+			searchForm: {
+				name: undefined,
+				modelType: 1,
+			},
+			formItem,
+			columns,
+			pagination,
+			// 选择的index
+			selectedRowKeys: [],
 		};
 	},
+	mounted() {
+		this.getData
+	},
 	methods: {
-		changeType(data) {
+		changeType(data){
+			this.getData()
+		},
+		async getData(data) {
+			if (data !== undefined) {
+				console.log(data);
+				this.searchForm = data;
+				console.log(this.searchForm);
+			}
+			let res = await chargesList({
+				pageNum: this.pagination.current,
+				size: this.pagination.pageSize,
+				...this.searchForm,
+			});
+			this.tableData = res.data.rows;
+			this.pagination.total = res.data.total;
+			this.selectedRowKeys = [];
+		},
+		edit(data) {},
+		del(ids) {
+			this.$confirm({
+				title: "是否删除",
+				// okText:'删除',
+				// cancelText:'取消',
+				icon: "delete",
+				onOk: async () => {
+					let res = await Del({ ids: ids });
+					if (res.code === 200) {
+						this.$message.success(res.msg);
+						this.getData();
+					} else {
+						this.$message.error(res.msg);
+					}
+				},
+			});
+		},
+		// 选择，获取id
+		selectionChoosed(data) {
+			this.selectedRowKeys = data;
+		},
+		// 批量操作
+		handleMenuClick(data) {
+			console.log(data);
+			if (data.key === "del") {
+				this.del(this.selectedRowKeys);
+			}
+		},
+		// 跳转
+		handleTableChange(pagination) {
+			console.log(pagination);
+			const pager = { ...this.pagination };
+			pager.current = pagination.current;
+			pager.pageSize = pagination.pageSize;
+			this.pagination = pager;
+			this.getData();
+		},
+		addClose() {},
+	},
+	computed: {
+		hasSelected() {
+			return this.selectedRowKeys.length > 0;
 		},
 	},
 };
 </script>
-<style lang="less" scoped>
-</style>
+<style lang="less" scoped></style>