From 485704141bcb4cfcc3b6e460f23d80e6898cff12 Mon Sep 17 00:00:00 2001
From: admin-lmm <2497833386@QQ.com>
Date: Thu, 6 Jul 2023 09:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=B4=A2=E5=8A=A1=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/router/index.js                |  26 ++
 .../financial/components/cleanFinancical.vue  |  13 +
 .../financial/components/virtualFinance.vue   | 185 +++++++++++++
 jsowell-ui/src/views/financial/merchant.vue   | 258 ++++++++++++++++++
 .../pile/merchant/components/adapayMember.vue |  24 +-
 5 files changed, 498 insertions(+), 8 deletions(-)
 create mode 100644 jsowell-ui/src/views/financial/components/cleanFinancical.vue
 create mode 100644 jsowell-ui/src/views/financial/components/virtualFinance.vue

diff --git a/jsowell-ui/src/router/index.js b/jsowell-ui/src/router/index.js
index 61f3cefd9..f38d2a8d8 100644
--- a/jsowell-ui/src/router/index.js
+++ b/jsowell-ui/src/router/index.js
@@ -166,6 +166,32 @@ export const constantRoutes = [
       },
     ],
   },
+   {
+    path: "/financial/merchant",
+    component: Layout,
+     hidden: true,
+    children: [
+      {
+        path: "merchantVirtual",
+        component: () => import("@/views/financial/components/virtualFinance"),
+        name: "merchantVirtual",
+        meta: { title: "虚拟财务",activeMenu: "/financial/merchant"},
+      },
+    ],
+  },
+  {
+       path: "/financial/merchant",
+    component: Layout,
+     hidden: true,
+    children: [
+      {
+        path: "cleanFinancical",
+        component: () => import("@/views/financial/components/cleanFinancical"),
+        name: "cleanFinancical",
+        meta: { title: "清分财务",activeMenu: "/financial/merchant"},
+      },
+    ],
+   }
 ];
 
 // 动态路由，基于用户权限动态去加载
diff --git a/jsowell-ui/src/views/financial/components/cleanFinancical.vue b/jsowell-ui/src/views/financial/components/cleanFinancical.vue
new file mode 100644
index 000000000..b377aed34
--- /dev/null
+++ b/jsowell-ui/src/views/financial/components/cleanFinancical.vue
@@ -0,0 +1,13 @@
+<template>
+  <div class="app-container">清分财务</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/financial/components/virtualFinance.vue b/jsowell-ui/src/views/financial/components/virtualFinance.vue
new file mode 100644
index 000000000..23122a991
--- /dev/null
+++ b/jsowell-ui/src/views/financial/components/virtualFinance.vue
@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10">
+  <el-col :span="12">
+    <div class="public">
+      <div class="bgc headTitle">虚拟充值用户充电收入</div>
+      <div class="headBox">
+        <div class="conten">
+          <div> <i class="el-icon-user" style="font-size:30px"></i></div>
+          <div class="content-title">
+            <span>运营商:</span>
+            <span style="margin-left: 80px;font-size: 15px;">贵州省怀仁市新能源科技有限公司</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-col>
+  <el-col :span="12">
+    <div class="public">
+      <div class="bgc1 headTitle">充电收入汇总</div>
+       <div class="headBox">
+         <div class="conten">
+            <div> <i class="el-icon-coin" style="font-size:30px"></i></div>
+            <div class="content-title">
+              <span style="font-size:37px">132156元</span>
+            </div>
+         </div>
+      </div>
+    </div>
+  </el-col>
+    </el-row>
+    <div></div>
+   <div class="search">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <el-row :gutter="20">
+          <el-col :span="6">
+             <el-form-item label="流水单号">
+    <el-input v-model="formInline.user" placeholder="请输入流水单号"></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="充电单号">
+    <el-input v-model="formInline.user" placeholder="请输入充电单号"></el-input>
+              </el-form-item>
+          </el-col>
+           <el-col :span="6">
+            <el-form-item label="充电用户">
+    <el-input v-model="formInline.user" placeholder="请输入充电用户"></el-input>
+              </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+    <el-button type="primary" @click="onSubmit">查询</el-button>
+  </el-form-item>
+          </el-col>
+        </el-row>
+        <div v-if="buttonBoolean">
+           <el-form-item label="流水时间">
+    <el-input v-model="formInline.user" placeholder="请输入流水单号"></el-input>
+              </el-form-item>
+        </div>
+    </el-form>
+     <div class="search-arrow"
+                @click="showOrHide()"
+                
+        
+                >
+                <span>{{ showOrHideText }}</span>
+                <i :class="icon"></i></div>
+            </div>
+   </div>
+  </div>
+</template>
+
+<script>
+export default {
+   data() {
+      return {
+          showOrHideText: "显示更多查询条件",
+            buttonBoolean: false,
+            //图标，可根据自己的需求匹配
+            icon: "el-icon-caret-bottom",
+        formInline: {
+          user: '',
+          region: ''
+        }
+      }
+    },
+    methods: {
+      onSubmit() {
+        console.log('submit!');
+      },
+       showOrHide() {
+            if (this.buttonBoolean) {
+                this.icon = "el-icon-caret-bottom";
+                this.showOrHideText = "显示更多查询条件";
+                this.buttonBoolean = !this.buttonBoolean;
+            } else {
+                this.icon = "el-icon-caret-top";
+                this.showOrHideText = "收起";
+                this.buttonBoolean = !this.buttonBoolean;
+            }
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.public{
+  background: #f6f7f8;
+    border: 1px solid #ebebf0;
+}
+.bgc{
+  background: linear-gradient(90deg,#38cebf,#1fabcd)
+}
+.bgc1{
+  background: linear-gradient(90deg,#ff8564,#fe6ca0)
+}
+.headTitle{
+  height: 40px;
+  padding-left: 24px;
+  line-height: 40px;
+  color: #fff;
+}
+.content-l{
+  height: 60px;
+}
+.headBox{
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  min-height: 145px;
+  padding: 15px 0;
+  line-height: 113px;
+}
+.conten{
+  display: flex;
+  align-items: center;
+}
+.headBox-r{
+  width: 100%;
+  min-height: 145px;
+  padding: 15px 50px;
+}
+.content-title{
+  margin-left: 50px;
+}
+.search{
+  position: relative;
+    box-sizing: border-box;
+    width: 100%;
+    height: auto;
+    padding: 20px 30px 0;
+    margin-bottom: 12px;
+    margin-top: 10px;
+    background-color: #f6f7f8;
+    border: 1px solid #ebebf0;
+}
+.search-arrow{
+  position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 28px;
+    overflow: hidden;
+    text-align: center;
+    line-height: 28px;
+    background-color:#edf4ff;
+    color: #4d8cfd;
+}
+.demo-form-inline{
+  margin-bottom: 28px;
+}
+
+  // border-color: white;
+  //                   background-color: white;
+  //                   font-size: x-small;
+  //                   color: #50bfff;
+  //                   padding: 1px 2px;
+  //                   margin-left: 40%;
+  //                   margin-top: 0px;
+  //                   margin-bottom: 15px;
+</style>
\ No newline at end of file
diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue
index e69de29bb..def109084 100644
--- a/jsowell-ui/src/views/financial/merchant.vue
+++ b/jsowell-ui/src/views/financial/merchant.vue
@@ -0,0 +1,258 @@
+<template>
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            label-width="168px"
+            @submit.native.prevent
+        >
+            <el-form-item label="订单编号" prop="orderCode">
+                <el-input
+                    v-model="queryParams.orderCode"
+                    placeholder="请输入订单编号"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+
+            <el-form-item label="手机号码" prop="mobileNumber">
+                <el-input
+                    v-model="queryParams.mobileNumber"
+                    placeholder="请输入手机号码"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <div v-if="buttonBoolean">
+                  <el-form-item label="订单编号" prop="orderCode">
+                <el-input
+                    v-model="queryParams.orderCode"
+                    placeholder="请输入订单编号"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+
+                 <el-form-item label="订单编号" prop="orderCode">
+                <el-input
+                    v-model="queryParams.orderCode"
+                    placeholder="请输入订单编号"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+
+                 <el-form-item label="订单编号" prop="orderCode">
+                <el-input
+                    v-model="queryParams.orderCode"
+                    placeholder="请输入订单编号"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            </div>
+            <el-button
+                @click="showOrHide()"
+                style="
+                    border-color: white;
+                    background-color: white;
+                    font-size: x-small;
+                    color: #50bfff;
+                    padding: 1px 2px;
+                    margin-left: 40%;
+                    margin-top: 0px;
+                    margin-bottom: 15px;
+                "
+                :icon="icon"
+                >{{ showOrHideText }}
+            </el-button>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >搜索</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-col>
+            <el-button
+                type="warning"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExport"
+                v-hasPermi="['order:order:export']"
+                >导出</el-button
+            >
+        </el-row>
+        <el-table
+    :data="tableData"
+    stripe
+    border
+    style="width: 100%">
+    <el-table-column
+      prop="date"
+      label="运营商"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="name"
+      label="组织机构代码"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="address"
+      label="联系人">
+    </el-table-column>
+     <el-table-column
+      prop="address"
+      label="联系方式">
+    </el-table-column>
+     <el-table-column
+      prop="address"
+      label="入驻时间">
+    </el-table-column>
+     <el-table-column
+      prop="address"
+      label="操作">
+      <template slot-scope="scope">
+        <!--  :to="'/merchant/detail/index/' + scope.row.id" -->
+                    <router-link
+                        to="/financial/merchant/merchantVirtual"
+                        class="link-type"
+                    >
+                        <span>虚拟财务</span>
+                    </router-link>
+                   <router-link 
+                        to="/financial/merchant/cleanFinancical"
+                        class="link-type"
+                    >
+                        <span style="margin-left:10px;color: darkblue;">清分财务</span>
+                    </router-link>
+                </template>
+    </el-table-column>
+  </el-table>
+    </div>
+</template>
+
+<script>
+
+export default {
+    data() {
+        return {
+            showOrHideText: "显示更多查询条件",
+            buttonBoolean: false,
+            //图标，可根据自己的需求匹配
+            icon: "el-icon-caret-bottom",
+            queryParams:{},
+             tableData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }]
+        };
+    },
+    created() {
+    },
+    methods: {
+        showOrHide() {
+            if (this.buttonBoolean) {
+                this.icon = "el-icon-caret-bottom";
+                this.showOrHideText = "显示更多查询条件";
+                this.buttonBoolean = !this.buttonBoolean;
+            } else {
+                this.icon = "el-icon-caret-top";
+                this.showOrHideText = "收起";
+                this.buttonBoolean = !this.buttonBoolean;
+            }
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            // 获取订单列表
+            // this.getList();
+            // 获取订单总金额
+            // this.getOrderTotalData();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            // this.handleQuery();
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            // this.download(
+            //     "order/order/export",
+            //     {
+            //         ...this.queryParams,
+            //     },
+            //     `order_${new Date().getTime()}.xlsx`
+            // );
+        },
+    },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep
+    .el-descriptions--medium:not(.is-bordered)
+    .el-descriptions-item__cell {
+    padding-bottom: 4px;
+}
+::v-deep .el-descriptions__header {
+    margin-bottom: 10px;
+}
+.cardview-box {
+    width: 100%;
+    margin-bottom: 12px;
+    font-size: 16px;
+    color: #4a4a4a;
+    border: 1px solid #f0f0f0;
+}
+.cardview-static {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-content: center;
+    padding: 0 10px;
+    height: 46px;
+    line-height: 46px;
+    background-color: #f0f0f0;
+}
+.flex {
+    display: flex;
+    justify-content: space-between;
+    align-content: center;
+    margin-bottom: 10px;
+}
+</style>
diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index 886c7aa45..dab203d50 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -71,14 +71,7 @@
                     <el-form-item label="企业名称" prop="businessName">
                     <el-input type="textarea" v-model="dialogForm.businessName" maxlength="50"></el-input>
                 </el-form-item>
-                <el-form-item label="省份编码" prop="provCode">
-                     <el-cascader
-                        v-model="value"
-                        :options="options"
-                        @change="enterpriseChange"
-                        :props="cateProps"
-                    ></el-cascader>
-                </el-form-item>
+               
                 <el-form-item label="统一社会信用码" prop="socialCreditCode">
                    <el-input v-model="dialogForm.socialCreditCode" maxlength="18"></el-input>
                 </el-form-item>
@@ -137,6 +130,14 @@
                 </el-form-item>
                 <el-form-item label="银行卡对应的户名" prop="cardName">
                     <el-input v-model="dialogForm.cardName"></el-input>
+                </el-form-item>
+                 <el-form-item label="银行账户开户银行所在省份编码" prop="provCode">
+                     <el-cascader
+                        v-model="value"
+                        :options="options"
+                        @change="enterpriseChange"
+                        :props="cateProps"
+                    ></el-cascader>
                 </el-form-item>
                 </template>
                 <template v-else>
@@ -301,6 +302,13 @@ export default {
                         trigger: "blur",
                     }
                 ], 
+                cardNo:[
+                     {
+                        required: true,
+                        message: "请填写银行卡号",
+                        trigger: "blur",
+                    }
+                ],
                 // imgList: [
                 //     {
                 //         required: true,