Merge branch 'master' of http://47.92.161.104:10080/shuzhan/smart-bus-portal

src/views/base/paymentInfo-detail.vue

@@ -1,83 +1,160 @@
 <template>
-      <el-dialog
-        :visible.sync="showDialog"
-        :title="title"
-        :modal-append-to-body="false"
-        style="text-align: left"
-        @close="closeDialog"
-        width="1000px"
-        :close-on-click-modal="false"
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    width="1000px"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'160px'"
+        inline
       >
-      <div class="user-panel" v-loading="loading">
-        <el-form
-            ref="form"
-            :model="formModel"
-            :rules="ruleValidate"
-            :label-width="'150px'"
-            inline
-        >
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="所属公司" prop="companyId">
-                <el-select-tree
-                    :props="props"
-                    :options="treeData"
-                    v-model="formModel.companyId"
-                    height="200"
-                    style="width: 300px"
-                ></el-select-tree>
+              <el-select-tree
+                :props="props"
+                :options="treeData"
+                v-model="formModel.companyId"
+                height="200"
+                style="width: 300px"
+              ></el-select-tree>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="账户名称" prop="name">
-                <el-input
-                    v-model="formModel.name"
-                    placeholder="请输入账户名称"
-                    style="width: 300px"
-                ></el-input>
+              <el-input
+                v-model="formModel.name"
+                placeholder="请输入账户名称"
+                style="width: 300px"
+              ></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="微信商户号" prop="mchId">
-                <el-input
-                    v-model="formModel.mchId"
-                    placeholder="请输入微信mchId"
-                    style="width: 300px"
-                ></el-input>
+              <el-input
+                v-model="formModel.mchId"
+                placeholder="请输入微信mchId"
+                style="width: 300px"
+              ></el-input>
             </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="app_id" prop="appId">
+              <el-input
+                v-model="formModel.appId"
+                placeholder="请输入app_id"
+                style="width: 300px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="微信支付" prop="isOpenWechat">
+              <el-switch
+                v-model="formModel.isOpenWechat"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+              >
+              </el-switch>
+            </el-form-item>
+            <el-form-item label="支付宝支付" prop="isOpenAlipay">
+              <el-switch
+                v-model="formModel.isOpenAlipay"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
             <el-form-item label="微信子商户号" prop="subMchId">
-                <el-input
-                    v-model="formModel.subMchId"
-                    placeholder="请输入微信subMchId"
-                    style="width: 300px"
-                ></el-input>
+              <el-input
+                v-model="formModel.subMchId"
+                placeholder="请输入微信subMchId"
+                style="width: 300px"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="支付宝令牌" prop="appAuthToken">
-                <el-input
-                    v-model="formModel.appAuthToken"
-                    placeholder="请输入支付宝appAuthToken"
-                    style="width: 300px"
-                ></el-input>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="微信子公众号app_id" prop="subAppId">
+              <el-input
+                v-model="formModel.subAppId"
+                placeholder="请输入服务商模式下子公众号APPID"
+                style="width: 300px"
+              ></el-input>
             </el-form-item>
-           <el-form-item label="微信支付" prop="isOpenWechat">
-                    <el-switch
-                        v-model="formModel.isOpenWechat"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949">
-                    </el-switch>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="微信子公众号sub_app_secret"
+              prop="subAppSecret"
+            >
+              <el-input
+                v-model="formModel.subAppSecret"
+                placeholder="请输入sub_app_secret"
+                style="width: 300px"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="支付宝支付" prop="isOpenAlipay">
-                    <el-switch
-                        v-model="formModel.isOpenAlipay"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949">
-                    </el-switch>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="微信的回调地址" prop="wechatNotifyUrl">
+              <el-input
+                v-model="formModel.wechatNotifyUrl"
+                placeholder="请输入微信的回调地址"
+                style="width: 450px"
+              ></el-input>
             </el-form-item>
+          </el-col>
+        </el-row>
 
-        </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>
-      
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="支付宝令牌" prop="appAuthToken">
+              <el-input
+                v-model="formModel.appAuthToken"
+                placeholder="请输入支付宝appAuthToken"
+                style="width: 450px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="支付宝的回调地址" prop="alipayNotifyUrl">
+              <el-input
+                v-model="formModel.alipayNotifyUrl"
+                placeholder="请输入支付宝的回调地址"
+                style="width: 450px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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";
@@ -88,126 +165,131 @@ import SelectTree from "@/components/SelectTree";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 export default {
-    props: ["businessKey", "title"],
-    data() {
-        return {
-            ruleValidate: {
-                companyId: [{ required: true, message: "物业公司不能为空", trigger: "change" }],
-                name: [{ required: true, message: "账户名称不能为空", trigger: "blur" }],
-                cycle: [{ required: true, message: "结算周期不能为空", trigger: "blur" }],
-
-            },
-            formModel:{
-                companyId:"", 
-                name:"",
-                mchId:"",
-                subMchId:"",
-                appAuthToken:"",
-                financePersonId:"",
-                financeUserId:"",
-            },
-            treeData: [],
-            personList:[],
-            userList:[],
-            companyList:[],
-            showDialog: true,
-            loading: false,
-            submitting: false,
-            props: {
-                // 配置项（必选）
-                value: "id",
-                label: "name",
-                children: "children"
-            },
-        }
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "物业公司不能为空", trigger: "change" },
+        ],
+        name: [
+          { required: true, message: "账户名称不能为空", trigger: "blur" },
+        ],
+        cycle: [
+          { required: true, message: "结算周期不能为空", trigger: "blur" },
+        ],
+      },
+      formModel: {
+        companyId: "",
+        name: "",
+        mchId: "",
+        subMchId: "",
+        appAuthToken: "",
+        financePersonId: "",
+        financeUserId: "",
+      },
+      treeData: [],
+      personList: [],
+      userList: [],
+      companyList: [],
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    this.loadTree();
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
     },
-    created() {
-        this.loadTree();
-    },
-    methods: {
-        closeDialog() {
-            this.$emit("close", false);
-        },
-        handleSubmit() {
-            var self = this;
+    handleSubmit() {
+      var self = this;
 
-            this.$refs["form"].validate((valid) => {
-                if (valid) {
-                (function () {
-                    var id = self.formModel.id;
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
 
-                    if (id == null || id.length == 0) {
-                        return paymentInfoApi.add(self.formModel);
-                    } else {
-                        return paymentInfoApi.update(self.formModel);
-                    }
-                })().then(function (response) {
-                    var jsonData = response.data;
+            if (id == null || id.length == 0) {
+              return paymentInfoApi.add(self.formModel);
+            } else {
+              return paymentInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
 
-                    if (jsonData.result) {
-                    self.$message({
-                        message: "保存成功!",
-                        type: "success",
-                    });
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
 
-                    self.$emit("close", true);
-                    } else {
-                    self.$message({
-                        message: jsonData.message + "",
-                        type: "warning",
-                    });
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
 
-                    self.$emit("close", false);
-                    }
-                });
-                }
-            });
-        },
-        loadTree() {
-            companyInfoApi.treeList().then(resp => {
-                var jsonData = resp.data;
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    loadTree() {
+      companyInfoApi.treeList().then((resp) => {
+        var jsonData = resp.data;
 
-                if (jsonData.result) {
-                this.treeData = jsonData.data;
-                } else {
-                this.$message.error(jsonData.message + "");
-                }
-            });
-        },
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
     },
-    mounted: function () {
-        var self = this;
+  },
+  mounted: function () {
+    var self = this;
+
+    companyInfoApi.treeList().then((resp) => {
+      var jsonData = resp.data;
+      this.companyList = jsonData.data;
+    });
 
-        companyInfoApi.treeList().then((resp) => {
-            var jsonData = resp.data;
-            this.companyList = jsonData.data;
-        });
+    (function () {
+      if (self.businessKey.length == 0) {
+        return paymentInfoApi.create();
+      } else {
+        return paymentInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
 
-        (function () {
-        if (self.businessKey.length == 0) {
-            return paymentInfoApi.create();
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
         } else {
-            return paymentInfoApi.edit(self.businessKey);
+          self.$message.error(jsonData.message + "");
         }
-        })()
-        .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 + "");
-        });
-    },
-    components: {
-        "el-select-tree": SelectTree
-    }
-}
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+};
 </script>
 <style scoped>
 .user-panel {

src/views/base/paymentInfo-list.vue

@@ -1,119 +1,157 @@
 <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-tree
-                size="mini"
-                :props="props"
-                :options="companyResult"
-                v-model="queryModel.companyId"
-                height="200"
-                ></el-select-tree>
-            </el-form-item>
-            <el-form-item label="账户名称" prop="name">
-                <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
-            </el-form-item>
+  <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-tree
+          size="mini"
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>
+      </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-form-item>
         <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="isOpenWechat"  label="支持微信支付"  >
-                <template slot-scope="{row}">
-                    <el-switch
-                        v-model="row.isOpenWechat"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949"
-                        @change="handlChange(row)">
-                    </el-switch>
-                </template>
-            </el-table-column>
-            <el-table-column prop="isOpenAlipay"  label="支持支付宝支付"  >
-                <template slot-scope="{row}">
-                    <el-switch
-                        v-model="row.isOpenAlipay"
-                        active-color="#13ce66"
-                        inactive-color="#ff4949"
-                        @change="handlChange(row)">
-                    </el-switch>
-                </template>
-            </el-table-column>
-            <el-table-column prop="createTime"  label="创建时间"  ></el-table-column>
-            <el-table-column label="操作" fixed="right" width="180px">
-                <template slot-scope="{row}">
-                <el-link size="mini" type="primary" @click="handleEdit(row)">编辑</el-link>-
-                <el-link size="mini" type="danger" @click="handleDelete(row)">删除</el-link>
-                </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>
-        <paymentInfo-detail
-            v-if="showModal"
-            :businessKey="businessKey"
-            :title="modalTitle"
-            @close="onDetailModalClose"
-        ></paymentInfo-detail>
-    </div>
+          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="所属公司"
+        width="120px"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="账户名称"
+        width="120px"
+      ></el-table-column>
+      <el-table-column
+        prop="mchId"
+        label="微信mchId"
+        width="120px"
+      ></el-table-column>
+      <el-table-column
+        prop="appId"
+        label="微信appId"
+        width="190px"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="subMchId"
+        label="微信subMchId"
+        width="120px"
+      ></el-table-column>
+      <el-table-column
+        prop="appAuthToken"
+        label="支付宝appAuthToken"
+        show-overflow-tooltip
+        width="190px"
+      ></el-table-column>
+      <el-table-column prop="isOpenWechat" label="支持微信支付" width="120px">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.isOpenWechat"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="handlChange(row)"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column prop="isOpenAlipay" label="支持支付宝支付" width="130px">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.isOpenAlipay"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="handlChange(row)"
+          >
+          </el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="170px"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="130px">
+        <template slot-scope="{ row }">
+          <el-link size="mini" type="primary" @click="handleEdit(row)"
+            >编辑</el-link
+          >-
+          <el-link size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-link
+          >
+        </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>
+    <paymentInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></paymentInfo-detail>
+  </div>
 </template>
 <script>
 import Constant from "@/constant";
@@ -123,188 +161,191 @@ import companyInfoApi from "@/api/bus/companyInfo";
 import SelectTree from "@/components/SelectTree";
 import "nprogress/nprogress.css"; // progress bar style
 export default {
-     name: "BasePaymentInfoList",
-     data() {
-         return{
-            queryModel:{
-                companyId:"",
-                name:"",
-            },
-            treeData: [],
-            companyList:[],
-            loading: false,
-            tableData: [],
-            pageIndex: 1,
-            pageSize: 10,
-            totalPages: 0,
-            totalElements: 0,
-            pageSizeList: [10, 20, 30],
-            multipleSelection: [],
-            companyResult: [],
-            showModal: false,
-            props: {
-                // 配置项（必选）
-                value: "id",
-                label: "name",
-                children: "children"
-            },
-         }
-    },
-    created() {
-        var self = this;
+  name: "BasePaymentInfoList",
+  data() {
+    return {
+      queryModel: {
+        companyId: "",
+        name: "",
+      },
+      treeData: [],
+      companyList: [],
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      companyResult: [],
+      showModal: false,
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    var self = this;
 
-        companyInfoApi.treeList().then(function (response) {
-            var jsonData = response.data;
-            if (jsonData.result) {
-                self.companyResult = jsonData.data;
-            }
-        });
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
 
-        this.loadTree();
-    },
-    methods: {
-        changePage(pageIndex) {
-            var self = this;
+    this.loadTree();
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
 
-            self.loading = true;
+      self.loading = true;
 
-            var formData = new FormData();
+      var formData = new FormData();
 
-            formData.append("pageIndex", self.pageIndex);
-            formData.append("pageSize", self.pageSize);
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
 
-            formData.append("companyId", self.queryModel.companyId);
-            formData.append("name", self.queryModel.name);
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("name", self.queryModel.name);
 
-            paymentInfoApi.pageList(formData).then(function (response) {
-                self.loading = false;
+      paymentInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
 
-                var jsonData = response.data.data;
+          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;
-        },
-        handleManagePayService(record) {
-
-            var path = "/base/PayService/list";
-            
-
-            this.$store.dispatch('tagsView/delView', {
-                name: "basePayServiceList",
-                path: path
-            }).then(({ visitedViews }) => {
-                this.$router.push({ 
-                path: path,
-                query:{
-                    companyId: record.companyId
-                }
-                });
-            });
-        },
-        onDetailModalClose(refreshed) {
-            //保存成功后回调
-            this.showModal = false;
-
-            if (refreshed) {
-                this.changePage(this.pageIndex);
-            }
-        },
-        handleDelete(record) {
-            var self = this;
-
-            self.$confirm("是否确认删除?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-                })
-                .then(() => {
-                paymentInfoApi.remove(record.id).then(function (response) {
-                    var jsonData = response.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;
+    },
+    handleManagePayService(record) {
+      var path = "/base/PayService/list";
 
-                    if (jsonData.result) {
-                    // var index = self.tableData.indexOf(record);
-                    // self.tableData.splice(index, 1);
-                    self.changePage(self.pageIndex);
+      this.$store
+        .dispatch("tagsView/delView", {
+          name: "basePayServiceList",
+          path: path,
+        })
+        .then(({ visitedViews }) => {
+          this.$router.push({
+            path: path,
+            query: {
+              companyId: record.companyId,
+            },
+          });
+        });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
 
-                    self.$message({
-                        type: "success",
-                        message: "删除成功!",
-                    });
-                    }
-                });
-            });
-        },
-        loadTree() {
-            companyInfoApi.treeList().then(resp => {
-                var jsonData = resp.data;
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    handleDelete(record) {
+      var self = this;
 
-                if (jsonData.result) {
-                this.treeData = jsonData.data;
-                } else {
-                this.$message.error(jsonData.message + "");
-                }
-            });
-        },
-        handlChange(record){
-            var self = this;
-            var formData = new FormData();
-            self.loading = true;
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          paymentInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
 
-            formData.append("id", record.id);
-            formData.append("wechatPay", record.isOpenWechat);
-            formData.append("aliPay", record.isOpenAlipay);
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
 
-            paymentInfoApi.updateWechatPayOrAliPay(formData).then(function (response) {
-                var jsonData = response.data;
-                self.loading = false;
-                if (jsonData.result) {
-                    self.changePage(self.pageIndex);
-                }
-                else{
-                    self.$message.error(jsonData.message + "");
-                }
-            });
-        },
-        
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
     },
-    components: {
-        "paymentInfo-detail": paymentInfoDetail,
-        "el-select-tree": SelectTree
+    loadTree() {
+      companyInfoApi.treeList().then((resp) => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
     },
-    mounted() {
-        this.changePage(1);
+    handlChange(record) {
+      var self = this;
+      var formData = new FormData();
+      self.loading = true;
+
+      formData.append("id", record.id);
+      formData.append("wechatPay", record.isOpenWechat);
+      formData.append("aliPay", record.isOpenAlipay);
 
-        companyInfoApi.treeList().then((resp) => {
-            var jsonData = resp.data;
-            this.companyList = jsonData.data;
+      paymentInfoApi
+        .updateWechatPayOrAliPay(formData)
+        .then(function (response) {
+          var jsonData = response.data;
+          self.loading = false;
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+          } else {
+            self.$message.error(jsonData.message + "");
+          }
         });
     },
-}
+  },
+  components: {
+    "paymentInfo-detail": paymentInfoDetail,
+    "el-select-tree": SelectTree,
+  },
+  mounted() {
+    this.changePage(1);
+
+    companyInfoApi.treeList().then((resp) => {
+      var jsonData = resp.data;
+      this.companyList = jsonData.data;
+    });
+  },
+};
 </script>
 <style scoped>
 .el-breadcrumb {

src/views/bus/companyInfo-detail.vue

@@ -128,9 +128,6 @@ export default {
         regionId: [
           { required: true, message: "地区不能为空", trigger: "blur" },
         ],
-        parentId : [
-          { required: true, message: "上级单位不能为空", trigger: "blur" },
-        ],
         sortNo : [
           { required: true, message: "序号不能为空", trigger: "blur" },
         ],

src/views/merchant/accountInfo-detail.vue

@@ -119,6 +119,8 @@ export default {
           },
         ],
         phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+        bankName: [{ required: true, message: "不能为空", trigger: "blur" }],
+        bankNumber: [{ required: true, message: "不能为空", trigger: "blur" }],
       },
       showDialog: true,
       loading: false,

src/views/merchant/withdrawalRecord-list.vue

@@ -96,7 +96,7 @@
       <el-table-column
         prop="accountInfo.companyName"
         label="所属公司"
-        width="180"
+        width="150"
       ></el-table-column>
       <el-table-column
         prop="accountInfo.name"
@@ -104,14 +104,22 @@
         width="150"
       ></el-table-column>
       <el-table-column
-        prop="capitalInfo.withdrawalAmount"
-        label="可提现金额"
+        prop="accountInfo.bankName"
+        label="银行名称"
+        show-overflow-tooltip
         width="150"
       ></el-table-column>
+      <el-table-column
+        prop="accountInfo.bankNumber"
+        label="银行卡账号"
+        show-overflow-tooltip
+        width="200"
+      ></el-table-column>
       <el-table-column
         prop="withdrawalNo"
         label="提现编号"
-        width="180"
+        width="250"
+        show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         prop="applyWithdrawalAmount"