Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/companyPayment.js

@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData) {
+  return request.post(constant.serverUrl + "/base/companyPaymentInfo/pageList", formData);
+}
+
+function create() {
+  return request.get(constant.serverUrl + "/base/companyPaymentInfo/create");
+}
+
+function edit(id) {
+  return request.get(constant.serverUrl + "/base/companyPaymentInfo/edit/" + id);
+}
+
+function add(formModel) {
+  return request.post(constant.serverUrl + "/base/companyPaymentInfo/add", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel) {
+  return request.post(constant.serverUrl + "/base/companyPaymentInfo/update", formModel, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id) {
+  return request.post(constant.serverUrl + "/base/companyPaymentInfo/delete/" + id);
+}
+
+function batchRemove(idList) {
+  return request.post(constant.serverUrl + "/base/companyPaymentInfo/batchDelete", idList, {
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+
+export default {
+    create, edit, add, update, remove, batchRemove, pageList
+}

src/routers/modules/base.js

@@ -550,7 +550,8 @@ var routers = [
                         roles: ["admin"],
                         title: '外出记录'
                 }
-        }, {
+        }, 
+        {
                 path: '/base/checkinInfo/list',
                 name: 'baseCheckinInfo',
                 component: () => import('@/views/base/checkinInfo-list.vue'),
@@ -558,6 +559,15 @@ var routers = [
                         roles: ["admin"],
                         title: '租户管理'
                 }
+        },
+        {
+                path: '/base/companyPayment/list',
+                name: 'baseCompanyPayment',
+                component: () => import('@/views/base/companyPayment-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '物业公司收款账户管理'
+                }
         }
 ]
 

src/views/base/companyPayment-detail.vue

@@ -0,0 +1,173 @@
+<template>
+      <el-dialog
+        :visible.sync="showDialog"
+        :title="title"
+        :modal-append-to-body="false"
+        style="text-align: left"
+        @close="closeDialog"
+        :close-on-click-modal="false"
+      >
+      <div class="user-panel" v-loading="loading">
+        <el-form
+            ref="form"
+            :model="formModel"
+            :rules="ruleValidate"
+            :label-width="'180px'"
+            inline
+        >
+            <el-form-item label="物业公司" prop="companyId">
+                <el-select v-model="formModel.companyId" filterable>
+                    <el-option
+                        v-for="result in companyList"
+                        :key="result.id"
+                        :label="result.name"
+                        :value="result.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="账户名称" prop="name">
+                <el-input
+                    v-model="formModel.name"
+                    placeholder="请输入账户名称"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="微信mchId" prop="mchId">
+                <el-input
+                    v-model="formModel.mchId"
+                    placeholder="请输入微信mchId"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="微信subMchId" prop="subMchId">
+                <el-input
+                    v-model="formModel.subMchId"
+                    placeholder="请输入微信subMchId"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+            <el-form-item label="支付宝appAuthToken" prop="appAuthToken">
+                <el-input
+                    v-model="formModel.appAuthToken"
+                    placeholder="请输入支付宝appAuthToken"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+
+        </el-form>
+      </div>
+        <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit" :loading="submitting"
+            >确 定</el-button
+        >
+        </span>
+      </el-dialog>
+      
+</template>
+<script>
+import Constant from "@/constant";
+import companyPaymentApi from "@/api/base/companyPayment";
+import companyInfoApi from "@/api/base/companyInfo";
+export default {
+    props: ["businessKey", "title"],
+    data() {
+        return {
+            ruleValidate: {
+                companyId: [{ required: true, message: "物业公司不能为空", trigger: "blur" }],
+                name: [{ required: true, message: "账户名称不能为空", trigger: "blur" }],
+                mchId: [{ required: true, message: "微信mchId不能为空", trigger: "blur" }],
+                subMchId: [{ required: true, message: "微信subMchId不能为空", trigger: "blur" }],
+                appAuthToken: [{ required: true, message: "支付宝appAuthToken不能为空", trigger: "blur" }],
+            },
+            formModel:{
+                companyId:"",
+                name:"",
+                mchId:"",
+                subMchId:"",
+                appAuthToken:"",
+            },
+            companyList:[],
+            showDialog: true,
+            loading: false,
+            submitting: false,
+        }
+    },
+    methods: {
+        closeDialog() {
+            this.$emit("close", false);
+        },
+        handleSubmit() {
+            var self = this;
+
+            this.$refs["form"].validate((valid) => {
+                if (valid) {
+                (function () {
+                    var id = self.formModel.id;
+
+                    alert(JSON.stringify(self.formModel))
+
+                    if (id == null || id.length == 0) {
+                        return companyPaymentApi.add(self.formModel);
+                    } else {
+                        return companyPaymentApi.update(self.formModel);
+                    }
+                })().then(function (response) {
+                    var jsonData = response.data;
+
+                    if (jsonData.result) {
+                    self.$message({
+                        message: "保存成功!",
+                        type: "success",
+                    });
+
+                    self.$emit("close", true);
+                    } else {
+                    self.$message({
+                        message: jsonData.message + "",
+                        type: "warning",
+                    });
+
+                    self.$emit("close", false);
+                    }
+                });
+                }
+            });
+        },
+    },
+    mounted: function () {
+        var self = this;
+
+        companyInfoApi.list().then((resp) => {
+            var jsonData = resp.data;
+            this.companyList = jsonData.data;
+        });
+
+        (function () {
+        if (self.businessKey.length == 0) {
+            return companyPaymentApi.create();
+        } else {
+            return companyPaymentApi.edit(self.businessKey);
+        }
+        })()
+        .then((response) => {
+            var jsonData = response.data;
+            self.loading = false;
+
+            if (jsonData.result) {
+            self.formModel = jsonData.data;
+            } else {
+            self.$message.error(jsonData.message + "");
+            }
+        })
+        .catch((error) => {
+            self.$message.error(error + "");
+        });
+    },
+}
+</script>
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>

src/views/base/companyPayment-list.vue

@@ -0,0 +1,238 @@
+<template>
+    <div>
+        <el-breadcrumb separator=">">
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item>
+            <a href="#">系统管理</a>
+        </el-breadcrumb-item>
+        <el-breadcrumb-item>
+            <a href="#">物业公司收款账户管理</a>
+        </el-breadcrumb-item>
+        </el-breadcrumb>
+        <el-divider></el-divider>
+        <el-form
+            ref="queryForm"
+            :model="queryModel"
+            inline
+            class="demo-form-inline"
+            >
+            <el-form-item label="物业公司" prop="companyId">
+                <el-select size="mini" v-model="queryModel.companyId" filterable>
+                    <el-option
+                        v-for="result in companyList"
+                        :key="result.id"
+                        :label="result.name"
+                        :value="result.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="账户名称" prop="name">
+                <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+            </el-form-item>
+
+            <el-form-item>
+                <el-button
+                type="primary"
+                size="mini"
+                icon="ios-search"
+                @click="changePage(1)"
+                :loading="loading"
+                >查询</el-button
+                >&nbsp;
+                <el-button
+                type="info"
+                size="mini"
+                style="margin-left: 8px"
+                @click="handleReset('queryForm')"
+                >重置</el-button
+                >&nbsp;
+            </el-form-item>
+        </el-form>
+        <el-divider></el-divider>
+        <el-row class="button-group">
+        <el-button
+            type="primary"
+            size="small"
+            plain
+            icon="el-icon-circle-plus"
+            @click="handleAdd(null)"
+        >新增</el-button>
+        </el-row>
+        <el-table
+            :data="tableData"
+            style="min-height:400px;"
+            row-key="id"
+            stripe
+            border
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+            @selection-change="handleSelectionChange"
+            >
+            <el-table-column prop="companyName"  label="物业公司" ></el-table-column>
+            <el-table-column prop="name"  label="账户名称" ></el-table-column>
+            <el-table-column prop="mchId"  label="微信mchId" ></el-table-column>
+            <el-table-column prop="subMchId"  label="微信subMchId" ></el-table-column>
+            <el-table-column prop="appAuthToken"  label="支付宝appAuthToken"  ></el-table-column>
+            <el-table-column prop="createTime"  label="创建时间"  ></el-table-column>
+            <el-table-column label="操作">
+                <template slot-scope="{row}">
+                <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>
+                <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <el-pagination
+            :current-page.sync="pageIndex"
+            :total="totalElements"
+            :page-sizes="pageSizeList"
+            @current-change="changePage"
+            @size-change="pageSizeChange"
+            layout="total, sizes, prev, pager, next, jumper"
+        ></el-pagination>
+        <companyPayment-detail
+            v-if="showModal"
+            :businessKey="businessKey"
+            :title="modalTitle"
+            @close="onDetailModalClose"
+        ></companyPayment-detail>
+    </div>
+</template>
+<script>
+import Constant from "@/constant";
+import companyPaymentApi from "@/api/base/companyPayment";
+import companyInfoApi from "@/api/base/companyInfo";
+import companyPaymentDetail from "./companyPayment-detail";
+export default {
+     name: "baseCompanyPayment",
+     data() {
+         return{
+            queryModel:{
+                companyId:"",
+                name:"",
+            },
+            companyList:[],
+            loading: false,
+            tableData: [],
+            pageIndex: 1,
+            pageSize: 10,
+            totalPages: 0,
+            totalElements: 0,
+            pageSizeList: [10, 20, 30],
+            multipleSelection: [],
+            showModal: false,
+         }
+    },
+    methods: {
+        changePage(pageIndex) {
+            var self = this;
+
+            self.loading = true;
+
+            var formData = new FormData();
+
+            formData.append("pageIndex", self.pageIndex);
+            formData.append("pageSize", self.pageSize);
+
+            formData.append("companyId", self.queryModel.companyId);
+            formData.append("name", self.queryModel.name);
+
+            companyPaymentApi.pageList(formData).then(function (response) {
+                self.loading = false;
+
+                var jsonData = response.data.data;
+
+                self.tableData = jsonData.data;
+                self.totalPages = jsonData.totalPages;
+                self.totalElements = jsonData.recordsTotal;
+            })
+            .catch((error) => {
+            self.loading = false;
+            // self.$message.error(error + "");
+            });
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
+        handleReset(name) {
+            this.$refs[name].resetFields();
+        },
+        pageSizeChange(pageSize) {
+            this.pageSize = pageSize;
+        },
+        handleAdd() {
+            this.modalTitle = "新增";
+            this.businessKey = "";
+            this.showModal = true;
+        },
+        handleEdit(record) {
+            this.modalTitle = "编辑";
+            this.businessKey = record.id;
+            this.showModal = true;
+        },
+        onDetailModalClose(refreshed) {
+            //保存成功后回调
+            this.showModal = false;
+
+            if (refreshed) {
+                this.changePage(this.pageIndex);
+            }
+        },
+        handleDelete(record) {
+            var self = this;
+
+            self.$confirm("是否确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+                companyPaymentApi.remove(record.id).then(function (response) {
+                    var jsonData = response.data;
+
+                    if (jsonData.result) {
+                    // var index = self.tableData.indexOf(record);
+                    // self.tableData.splice(index, 1);
+                    self.changePage(self.pageIndex);
+
+                    self.$message({
+                        type: "success",
+                        message: "删除成功!",
+                    });
+                    }
+                });
+            });
+        },
+        
+    },
+    components: {
+        "companyPayment-detail": companyPaymentDetail,
+    },
+    mounted() {
+        this.changePage(1);
+
+        companyInfoApi.list().then((resp) => {
+            var jsonData = resp.data;
+            this.companyList = jsonData.data;
+        });
+    },
+}
+</script>
+<style scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>