From 670dccc4628ef130f2a79f717b429be0a3b1d429 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Mon, 28 Feb 2022 17:30:57 +0800
Subject: [PATCH] zx

---
 .eslintrc.js                                  |   2 +-
 src/api/manage/index.js                       |  46 +++++++
 src/router/manage.js                          |   4 +-
 src/views/Manage/CustomerList/_detail.vue     |   2 +-
 src/views/Manage/CustomerList/index.vue       | 129 ++++++++----------
 .../Manage/SettleRequestManage/_detail.vue    |  83 ++++++-----
 .../Manage/SettleRequestManage/index.vue      | 123 ++++++++---------
 7 files changed, 216 insertions(+), 173 deletions(-)
 create mode 100644 src/api/manage/index.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 0c40f7a..2cf5402 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -18,7 +18,7 @@ module.exports = {
         "vue"
     ],
     "rules": {
-        indent: ['error', 'tab'],
+        indent: ['offset', '2'],
         'no-console': 'off',
     }
 };
\ No newline at end of file
diff --git a/src/api/manage/index.js b/src/api/manage/index.js
new file mode 100644
index 0000000..0504090
--- /dev/null
+++ b/src/api/manage/index.js
@@ -0,0 +1,46 @@
+import httpService from "@/request"
+
+// 入住申请-查询所有的入驻申请记录
+export function getAllRequest(params) {
+	return httpService({
+		url: `/user/settledApplication/list`,
+		method: 'get',
+		params: params,
+	})
+}
+
+// 入住申请-根据入驻申请主键id查询详情
+export function getRequestDetail(params) {
+	return httpService({
+		url: `/user/settledApplication/findDetailsById`,
+		method: 'get',
+		params: params,
+	})
+}
+
+// 入住申请-通过/驳回入驻申请
+export function isPass(params) {
+	return httpService({
+		url: `/user/settledApplication/isPass`,
+		method: 'post',
+		params: params,
+	})
+}
+
+// 客户列表-查询所有客户信息
+export function getCustomerList(params) {
+	return httpService({
+		url: `/user/customerList/list`,
+		method: 'get',
+		params: params,
+	})
+}
+
+// 客户列表-根据客户主键id查询详情
+export function getCustomerDetail(params) {
+	return httpService({
+		url: `/user/customerList/findDetailsById`,
+		method: 'get',
+		params: params,
+	})
+}
\ No newline at end of file
diff --git a/src/router/manage.js b/src/router/manage.js
index a7c4ff2..b3d885c 100644
--- a/src/router/manage.js
+++ b/src/router/manage.js
@@ -29,11 +29,11 @@ export default [
 	{
 		path: '/Manage/SettleRequestManage/customer_detail',
 		name: "customer_detail",
-		title: "查看详情",
+		title: "查看客户详情",
 		hide: true,
 		icon: 'container',
 		component: resolve => require(['@/views/Manage/CustomerList/_detail'], resolve),
-		meta: {title: '查看详情'},
+		meta: {title: '查看客户详情'},
 	},
 	{
 		path: '/Manage/VillageManage',
diff --git a/src/views/Manage/CustomerList/_detail.vue b/src/views/Manage/CustomerList/_detail.vue
index db41b8b..30e49b9 100644
--- a/src/views/Manage/CustomerList/_detail.vue
+++ b/src/views/Manage/CustomerList/_detail.vue
@@ -6,7 +6,7 @@
       <div class="content">
         <a-descriptions title="基本信息" :column="3">
           <a-descriptions-item label="企业名称">
-            浙江比利时物业有限公司
+            上海比利时物业有限公司
           </a-descriptions-item>
           <a-descriptions-item label="公司地址">
             湖南省湘潭市岳塘区红旗街道 8 单元 111 室
diff --git a/src/views/Manage/CustomerList/index.vue b/src/views/Manage/CustomerList/index.vue
index 04edead..9b1b8b2 100644
--- a/src/views/Manage/CustomerList/index.vue
+++ b/src/views/Manage/CustomerList/index.vue
@@ -5,10 +5,15 @@
     <!-- 搜索 -->
     <div class="search-box">
       <a-space size="large">
-        <a-input placeholder="请输入申请人/公司名" />
-        <a-select style="width: 200px" placeholder="选择状态" />
-        <a-button type="primary">查 询</a-button>
-        <a-button>重 置</a-button>
+        <a-input placeholder="请输入申请人/公司名" v-model="searchForm.name" />
+        <a-select style="width: 200px" placeholder="选择状态" v-model="searchForm.status">
+			<a-select-option :value="1">全部数据</a-select-option>
+			<a-select-option :value="2">已到期</a-select-option>
+			<a-select-option :value="3">未到期</a-select-option>
+			<a-select-option :value="4">临近到期</a-select-option>
+		</a-select>
+        <a-button type="primary" @click="handlerSearch">查 询</a-button>
+        <a-button @click="handlerReset">重 置</a-button>
       </a-space>
     </div>
     <!-- 表格 -->
@@ -40,74 +45,55 @@
         "
       >
         <!-- 操作 -->
-        <span slot="action" slot-scope="scope">
-          <a @click="detail(scope)">详情</a>
+        <span slot="action" slot-scope="text,record">
+          <a @click="detail(record)">详情</a>
         </span>
-        <span slot="formatter" slot-scope="scope">{{
+        <!-- <span slot="formatter" slot-scope="scope">{{
           scope === 1 ? "可" : ""
-        }}</span>
+        }}</span> -->
       </a-table>
     </div>
   </div>
 </template>
 
 <script>
+import {getCustomerList} from "@/api/manage/index.js"
 export default {
 	data() {
 		return {
 			// 搜索项
 			searchForm: {
 				name: "",
-				code: "",
+				status: 1,
+				pageNum: 1,
+				size: 10,
 			},
 			//   列
 			columns: [
 				{
-					title: "Name",
-					dataIndex: "name",
+					title: "公司名",
+					dataIndex: "companyName",
+					key: "companyName",
 					width: "200",
 				},
 				{
-					title: "Gender",
-					dataIndex: "gender",
+					title: "联系人",
+					dataIndex: "contactsName",
+					key: "contactsName",
 					width: "200",
 				},
 				{
-					title: "Gender1",
-					dataIndex: "gender1",
-					width: "200",
-				},
-				{
-					title: "Gender2",
-					dataIndex: "gender2",
-					width: "200",
-				},
-				{
-					title: "Gender3",
-					dataIndex: "gender3",
-					width: "200",
-				},
-				{
-					title: "Gender4",
-					dataIndex: "gender4",
-					width: "200",
-				},
-				{
-					title: "Gender5",
-					dataIndex: "gender5",
-					width: "200",
-				},
-				{
-					title: "Gender6",
-					dataIndex: "gender6",
-					width: "200",
-				},
-				{
-					title: "status",
-					dataIndex: "status",
-					scopedSlots: { customRender: "formatter" },
+					title: "联系人手机",
+					dataIndex: "contactsTel",
+					key: "contactsTel",
 					width: "200",
 				},
+				// {
+				// 	title: "status",
+				// 	dataIndex: "status",
+				// 	scopedSlots: { customRender: "formatter" },
+				// 	width: "200",
+				// },
 				{
 					title: "操作",
 					dataIndex: "action",
@@ -118,23 +104,7 @@ export default {
 				},
 			],
 			//   数据
-			tableData: [
-				{
-					name: "11",
-					id: 1,
-					status: 1,
-				},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-			],
+			tableData: [],
 			//   分页
 			pagination: {
 				current: 1,
@@ -148,26 +118,45 @@ export default {
 			selectedRowKeys: [],
 		};
 	},
-	mounted(){},
+	mounted() {
+		this.getData();
+	},
 	computed: {
 		hasSelected() {
 			return this.selectedRowKeys.length > 0;
 		},
 	},
 	methods: {
-		detail(){
+		getData() {
+			getCustomerList(this.searchForm).then(res => {
+				let data = res.data;
+				this.tableData = data.rows;
+				this.pagination.total = data.total;
+			})
+		},
+		detail(index){
+			console.log(index)
 			this.$router.push({name:'customer_detail'})
 		},
 		onSelectChange(selectedRowKeys) {
 			console.log("selectedRowKeys changed: ", selectedRowKeys);
 			this.selectedRowKeys = selectedRowKeys;
 		},
+		//查询
+		handlerSearch() {
+			this.getData()
+		},
+		//重置
+		handlerReset() {
+			this.searchForm.name = '';
+			this.searchForm.status = 1;
+			this.getData()
+		},
+		//分页
 		handleTableChange(pagination) {
-			console.log(pagination);
-			const pager = { ...this.pagination };
-			pager.current = pagination.current;
-			pager.pageSize = pagination.pageSize;
-			this.pagination = pager;
+			this.searchForm.size = pagination.pageSize;
+			this.searchForm.pageNum = pagination.current;
+			this.getData();
 		},
 	},
 };
diff --git a/src/views/Manage/SettleRequestManage/_detail.vue b/src/views/Manage/SettleRequestManage/_detail.vue
index 8bb78fd..06b589e 100644
--- a/src/views/Manage/SettleRequestManage/_detail.vue
+++ b/src/views/Manage/SettleRequestManage/_detail.vue
@@ -6,48 +6,46 @@
       <div class="content">
         <a-descriptions title="基本信息" :column="3">
           <a-descriptions-item label="企业名称">
-            浙江比利时物业有限公司
+            {{infoList.companyName}}
           </a-descriptions-item>
           <a-descriptions-item label="公司地址">
-            湖南省湘潭市岳塘区红旗街道 8 单元 111 室
+            {{infoList.companyAddressDetails}}
           </a-descriptions-item>
-          <a-descriptions-item label="社会信用代码"
-            >39123m13841bdi123341
+          <a-descriptions-item label="社会信用代码">
+            {{infoList.socialCreditCode}}
           </a-descriptions-item>
-          <a-descriptions-item label="法人名称"> 陈晨 </a-descriptions-item>
+          <a-descriptions-item label="法人名称"> {{infoList.legalPersonName}} </a-descriptions-item>
           <a-descriptions-item label="法人身份证号"
-            >621222199804287702</a-descriptions-item
+            >{{infoList.legalPersonIdCard}}</a-descriptions-item
           >
           <a-descriptions-item label="执照有效期限">
-            2021/04/09 至 2021/04/09</a-descriptions-item
+            {{infoList.licenseTimeStart}} 至 
+            {{infoList.licenseTimeEnd == null ? '长期' : infoList.licenseTimeEnd}}</a-descriptions-item
           >
         </a-descriptions>
         <a-descriptions title="法人身份证照" :column="1">
           <a-descriptions-item label="头像面" @click="download(this.img)"
-            ><img :src="img" alt=""
-          /></a-descriptions-item>
+            >
+            <img :src="item.url" alt="" v-for="(item, index) in infoList.idCardFrontImgList" :key="index">
+            </a-descriptions-item>
           <a-descriptions-item label="国徽面"
-            ><img :src="img" alt=""
-          /></a-descriptions-item>
+            ><img :src="item.url" alt="" v-for="(item, index) in infoList.idCardBackImgList" :key="index">
+            </a-descriptions-item>
           <a-descriptions-item label="营业执照"
-            ><img :src="img" alt=""
-          /></a-descriptions-item>
+            ><img :src="item.url" alt="" v-for="(item, index) in infoList.businessLicenseImgList" :key="index">
+            </a-descriptions-item>
           <a-descriptions-item label="其他附件"
-            ><img :src="img" alt="" /><img :src="img" alt="" /><img
-              :src="img"
-              alt="" /><img :src="img" alt="" /><img :src="img" alt="" /><img
-              :src="img"
-              alt=""
-          /></a-descriptions-item>
+            ><img :src="item.url" alt="" v-for="(item, index) in infoList.othersImgList" :key="index">
+            </a-descriptions-item>
         </a-descriptions>
         <a-descriptions title="联系人信息" :column="3">
-          <a-descriptions-item label="联系人"> 周立 </a-descriptions-item>
+          <a-descriptions-item label="联系人"> {{infoList.contactsName}} </a-descriptions-item>
           <a-descriptions-item label="联系人号码">
-            18716191912
+            {{infoList.contactsTel}}
           </a-descriptions-item>
-          <a-descriptions-item label="邮箱">hpzs@sina.com </a-descriptions-item>
+          <a-descriptions-item label="邮箱">{{infoList.contactsEmail}} </a-descriptions-item>
           <a-descriptions-item label="联系人地址">
-            陕西省铜川市宜君县哭泉乡 10 单元 98 室
+            {{infoList.contactsAddressDetails}}
           </a-descriptions-item>
         </a-descriptions>
       </div>
@@ -69,11 +67,11 @@
           <a-form-item
             label="审核类型"
           >
-            <a-select v-model="form.type" style="width: 120px">
-                <a-select-option value="1">
+            <a-select v-model="appForm.status" style="width: 120px">
+                <a-select-option :value="1">
                     通过
                 </a-select-option>
-                <a-select-option value="2">
+                <a-select-option :value="2">
                     驳回
                 </a-select-option>
             </a-select>
@@ -81,7 +79,7 @@
           <a-form-item
             label="审核留言"
           >
-            <a-textarea v-model="form.remark" style="" :auto-size="{ minRows: 5, maxRows: 8 }"></a-textarea>
+            <a-textarea v-model="appForm.reviewRemakes" style="" :auto-size="{ minRows: 5, maxRows: 8 }"></a-textarea>
           </a-form-item>
         </a-form>
       </div>
@@ -90,28 +88,47 @@
 </template>
 
 <script>
+import {getRequestDetail,isPass} from "@/api/manage/index.js"
 export default {
 	data() {
 		return {
 			form:{
-				type:'1',
-				remark:''
+				id: undefined
 			},
+      appForm: {
+        id: undefined,
+        status: 1,
+        reviewRemakes: ''
+      },
+      infoList: [],
 			auditShow: false,
 			detailData: {},
-			img: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimgcdn.scol.com.cn%2FNEWS_1F3371B8BC0CD062D6AF69E363F8E32A.JPG&refer=http%3A%2F%2Fimgcdn.scol.com.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1643355029&t=835fe0ff21af86e6996eb308794df217",
-		};
+    };
+	},
+	mounted() {
+		this.form.id = this.$route.query.id;
+    this.appForm.id = this.$route.query.id;
+    this.getData()
 	},
 	methods: {
+    getData() {
+      getRequestDetail(this.form).then(res => {
+        let data = res.data;
+        this.infoList = data;
+      })
+    },
 		download() {},
 		cancel() {
 			this.$router.go(-1);
 		},
 		auditSubmit(){
-			this.auditShow=false
+      isPass(this.appForm).then( () => {
+        
+      })
+			this.auditShow = false
 		},
 		auditCancel(){
-			this.auditShow=false
+			this.auditShow = false
 		}
 	},
 };
diff --git a/src/views/Manage/SettleRequestManage/index.vue b/src/views/Manage/SettleRequestManage/index.vue
index 2a975d9..1f07ccd 100644
--- a/src/views/Manage/SettleRequestManage/index.vue
+++ b/src/views/Manage/SettleRequestManage/index.vue
@@ -5,10 +5,14 @@
     <!-- 搜索 -->
     <div class="search-box">
       <a-space size="large">
-        <a-input placeholder="请输入申请人/公司名" />
-        <a-select style="width: 200px" placeholder="选择状态" />
-        <a-button type="primary">查 询</a-button>
-        <a-button>重 置</a-button>
+        <a-input v-model="searchForm.companyName" placeholder="请输入申请人/公司名" />
+        <a-select v-model="searchForm.status" style="width: 200px" placeholder="选择状态">
+			<a-select-option :value="1">待确认</a-select-option>
+			<a-select-option :value="2">审核通过</a-select-option>
+			<a-select-option :value="3">审核驳回</a-select-option>
+		</a-select>
+        <a-button type="primary" @click="handlerSearch">查 询</a-button>
+        <a-button @click="handlerReset">重 置</a-button>
       </a-space>
     </div>
     <!-- 表格 -->
@@ -40,11 +44,11 @@
         "
       >
         <!-- 操作 -->
-        <span slot="action" slot-scope="scope">
-          <a @click="detail(scope)">详情</a>
+        <span slot="action" slot-scope="text,record">
+          <a @click="detail(record)">详情</a>
         </span>
         <span slot="formatter" slot-scope="scope">{{
-          scope === 1 ? "可" : ""
+          scope === 1 ? "待确认" : (scope === 2 ? "通过" : "驳回")
         }}</span>
       </a-table>
     </div>
@@ -52,58 +56,36 @@
 </template>
 
 <script>
+import {getAllRequest} from "@/api/manage/index.js"
 export default {
 	data() {
 		return {
 			// 搜索项
 			searchForm: {
-				name: "",
-				code: "",
+				companyName: "",
+				status: 1,
+				pageNum: 1,
+				size: 10,
 			},
 			//   列
 			columns: [
 				{
-					title: "Name",
-					dataIndex: "name",
+					title: "公司名",
+					dataIndex: "companyName",
 					width: "200",
 				},
 				{
-					title: "Gender",
-					dataIndex: "gender",
+					title: "负责人",
+					dataIndex: "directorName",
 					width: "200",
 				},
 				{
-					title: "Gender1",
-					dataIndex: "gender1",
+					title: "负责人联系方式",
+					dataIndex: "directorTel",
 					width: "200",
 				},
 				{
-					title: "Gender2",
-					dataIndex: "gender2",
-					width: "200",
-				},
-				{
-					title: "Gender3",
-					dataIndex: "gender3",
-					width: "200",
-				},
-				{
-					title: "Gender4",
-					dataIndex: "gender4",
-					width: "200",
-				},
-				{
-					title: "Gender5",
-					dataIndex: "gender5",
-					width: "200",
-				},
-				{
-					title: "Gender6",
-					dataIndex: "gender6",
-					width: "200",
-				},
-				{
-					title: "status",
+					title: "状态",
 					dataIndex: "status",
 					scopedSlots: { customRender: "formatter" },
 					width: "200",
@@ -118,23 +100,7 @@ export default {
 				},
 			],
 			//   数据
-			tableData: [
-				{
-					name: "11",
-					id: 1,
-					status: 1,
-				},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-				{},
-			],
+			tableData: [],
 			//   分页
 			pagination: {
 				current: 1,
@@ -148,27 +114,52 @@ export default {
 			selectedRowKeys: [],
 		};
 	},
-	mounted(){},
+	mounted() {
+		this.getData();
+	},
 	computed: {
 		hasSelected() {
 			return this.selectedRowKeys.length > 0;
 		},
 	},
 	methods: {
+		getData() {
+			getAllRequest(this.searchForm).then(res => {
+				let data = res.data;
+				this.tableData = data.rows;
+				this.pagination.total = data.total;
+			})
+		},
 		detail(data){
-			console.log(data);
-			this.$router.push({name:'settle_detail'})
+			let id = data.id
+			this.$router.push(
+				{
+					name:'settle_detail',
+					query: {
+						id: id
+					}
+				}
+			)
 		},
 		onSelectChange(selectedRowKeys) {
 			console.log("selectedRowKeys changed: ", selectedRowKeys);
 			this.selectedRowKeys = selectedRowKeys;
 		},
+		//查询
+		handlerSearch() {
+			this.getData()
+		},
+		//重置
+		handlerReset() {
+			this.searchForm.companyName = '';
+			this.searchForm.status = 1;
+			this.getData()
+		},
+		//分页
 		handleTableChange(pagination) {
-			console.log(pagination);
-			const pager = { ...this.pagination };
-			pager.current = pagination.current;
-			pager.pageSize = pagination.pageSize;
-			this.pagination = pager;
+			this.searchForm.size = pagination.pageSize;
+			this.searchForm.pageNum = pagination.current;
+			this.getData();
 		},
 	},
 };