From 99582ce083a779ef8860420c58286fb06714574d Mon Sep 17 00:00:00 2001
From: user <2602926751@qq.com>
Date: Fri, 27 Oct 2023 17:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintCashierWeb/src/router/index.js           |  53 ++++++++
 .../views/cashier/NewComponents/Recharge.vue  |  20 ++-
 fuintCashierWeb/src/views/cashier/index.vue   |  49 ++++---
 .../orderComponents/order_Integral.vue        | 121 ++++++++++++++++--
 fuintCashierWeb/src/views/details/index.vue   |  15 +++
 5 files changed, 228 insertions(+), 30 deletions(-)
 create mode 100644 fuintCashierWeb/src/views/details/index.vue

diff --git a/fuintCashierWeb/src/router/index.js b/fuintCashierWeb/src/router/index.js
index 8bc43ca77..cea25d5ba 100644
--- a/fuintCashierWeb/src/router/index.js
+++ b/fuintCashierWeb/src/router/index.js
@@ -55,6 +55,59 @@ export const constantRoutes = [
         component: () => import('@/views/home/index'),
         name: 'Index',
         meta: { title: '系统首页', icon: 'dashboard', affix: true }
+      },
+      {
+        path: 'cashier',
+        component: () => import('@/views/cashier/index'),
+        name: 'cashier',
+        meta: { title: '收银', icon: 'dashboard', affix: true },
+        children:[
+          {
+            path: '/homeindex',
+            name: 'homeindex',
+            component: () => import('@/views/cashier/NewComponents/homeindex'),
+          },
+          {
+            path: '/Recharge',
+            name: 'Recharge',
+            component: () => import('@/views/cashier/NewComponents/Recharge'),
+          },
+          {
+            path: '/Order',
+            name: 'Order',
+            component: () => import('@/views/cashier/NewComponents/Order'),
+          },
+          {
+            path: '/Vip',
+            name: 'Vip',
+            component: () => import('@/views/cashier/NewComponents/Vip'),
+          },
+          {
+            path: '/WriteOff',
+            name: 'WriteOff',
+            component: () => import('@/views/cashier/NewComponents/WriteOff'),
+          },
+          {
+            path: '/credit',
+            name: 'credit',
+            component: () => import('@/views/cashier/NewComponents/credit'),
+          },
+          {
+            path: '/Integral',
+            name: 'Integral',
+            component: () => import('@/views/cashier/NewComponents/Integral'),
+          },
+          {
+            path: '/Handover',
+            name: 'Handover',
+            component: () => import('@/views/cashier/NewComponents/Handover'),
+          },
+          {
+            path: '/details',
+            name: 'details',
+            component: () => import('@/views/details/index'),
+          },
+        ]
       }
     ]
   }
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Recharge.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Recharge.vue
index d8b4995a0..e8ee04301 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Recharge.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Recharge.vue
@@ -1,11 +1,11 @@
 <template>
-    <div class="app-center">
+    <div class="app-center" v-if="ph == true">
       <div class="background-bj">
         <div class="dispul">
           <div class="input-sousuo">
             <input type="text" placeholder="会员手机号，会员卡号，会员密码" >
           </div>
-          <div class="anniu">
+          <div class="anniu" @click="govipDetails()">
             <div>搜索</div>
           </div>
         </div>
@@ -15,12 +15,26 @@
 </template>
 
 <script>
+  import details from '../../details/index'
     export default {
       name: "Recharge",
       data(){
           return{
-
+            ph:true,
           }
+      },
+      components:{
+        details
+      },
+      methods:{
+        govipDetails(){
+          this.$router.push({
+            path:'/details',
+            query:{
+              id:1
+            }
+          })
+        }
       }
 
     }
diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue
index 7b9b2cec6..2bdb60fb3 100644
--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/fuintCashierWeb/src/views/cashier/index.vue
@@ -185,19 +185,21 @@
         </div>
         <div class="app-left-title">蓝鲸油站收银 </div>
       </div>
-      <div class="app-left-box" v-for="(item,index) in tabarr" :class="{'bule': leftindex == index }" :key="index" @click="gocomponents(index)">
+      <div class="app-left-box" v-for="(item,index) in tabarr" :class="{'bule': leftindex == index }" :key="index" @click="gocomponents(index,item.path)">
         <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
       </div>
     </div>
 
-    <homeindex v-if="leftindex == 0"></homeindex>
-    <Recharge v-if="leftindex == 1"></Recharge>
-    <Order v-if="leftindex == 2"></Order>
-    <vip v-if="leftindex == 3"></vip>
-    <WriteOff v-if="leftindex == 4"></WriteOff>
-    <credit v-if="leftindex == 5"></credit>
-    <Integral v-if="leftindex == 6"></Integral>
-    <Handover v-if="leftindex == 7"></Handover>
+<!--    <homeindex v-if="leftindex == 0"></homeindex>-->
+<!--    <Recharge v-if="leftindex == 1"></Recharge>-->
+<!--    <Order v-if="leftindex == 2"></Order>-->
+<!--    <vip v-if="leftindex == 3"></vip>-->
+<!--    <WriteOff v-if="leftindex == 4"></WriteOff>-->
+<!--    <credit v-if="leftindex == 5"></credit>-->
+<!--    <Integral v-if="leftindex == 6"></Integral>-->
+<!--    <Handover v-if="leftindex == 7"></Handover>-->
+    <router-view/>
+
     <div style="width: 100%;padding:200px " v-if="leftindex != 0 && leftindex != 1 && leftindex != 2  && leftindex != 3  && leftindex != 4 && leftindex != 5 && leftindex != 6 && leftindex != 7">
       <el-empty  description="暂未开发"></el-empty>
     </div>
@@ -257,16 +259,16 @@ export default {
     return {
       activeName: 'second',
       tabarr:[
-        {name:'收银台',icon:'el-icon-s-platform'},
-        {name:'充值',icon: 'el-icon-s-finance'},
-        {name:'订单',icon: 'el-icon-s-order'},
-        {name:'会员',icon: 'el-icon-s-custom'},
-        {name:'核销',icon: 'el-icon-s-check'},
-        {name:'挂账',icon:'el-icon-s-claim'},
-        {name:'积分',icon:'el-icon-s-data'},
-        {name:'交班',icon: 'el-icon-s-flag'},
+        {name:'收银台',icon:'el-icon-s-platform',path:'/homeindex'},
+        {name:'充值',icon: 'el-icon-s-finance',path:'/Recharge'},
+        {name:'订单',icon: 'el-icon-s-order',path:'/Order'},
+        {name:'会员',icon: 'el-icon-s-custom',path:'/Vip'},
+        {name:'核销',icon: 'el-icon-s-check',path:'/WriteOff'},
+        {name:'挂账',icon:'el-icon-s-claim',path:'/credit'},
+        {name:'积分',icon:'el-icon-s-data',path:'/Integral'},
+        {name:'交班',icon: 'el-icon-s-flag',path:'/Handover'},
       ],
-      leftindex:0,
+      leftindex:'',
       oilList:[
         {color:'#e5f0ff'},
         {color:'#fff2e5'},
@@ -348,6 +350,7 @@ export default {
       isSearch: false
     };
   },
+
   mounted() {
     const app = this;
     // 监听扫码枪按键
@@ -398,6 +401,8 @@ export default {
     }
   },
   created() {
+    console.log(this.$route.query.id)
+    this.leftindex = this.$route.query.id
     // this.initCashier();
     // this.getCartList();
   },
@@ -408,8 +413,14 @@ export default {
     handleClick(tab, event) {
       console.log(tab, event);
     },
-    gocomponents(index){
+    gocomponents(index,path){
       this.leftindex = index
+      this.$router.push({
+        path:path,
+        query:{
+          id:index
+        }
+      })
     },
     // 初始化数据
     initCashier() {
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
index 895e4864b..0161662c6 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
@@ -3,7 +3,10 @@
     <div>
       <el-tabs type="border-card">
         <el-tab-pane label="用户管理">
-
+          <el-alert
+            title="当前页面订单为油站小程序端用户在积分商城兑换的订单记录,如有付款金额,付款订单请在增值性订单列表中查看,类型为:积分商城"
+            type="error">
+          </el-alert>
             <div class="top-dis">
               <div class="top-app-sou">
                 <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
@@ -22,16 +25,16 @@
             <div class="wgang">
               <el-tabs v-model="activeName" @tab-click="handleClick">
                 <el-tab-pane label="全部订单" name="first"></el-tab-pane>
-                <el-tab-pane>
+                <el-tab-pane name="first1">
                   <div slot="label" class="hgang"> 待处理/待发货 <span class="hongdian">1</span>  </div>
                 </el-tab-pane>
-                <el-tab-pane>
+                <el-tab-pane name="first2">
                   <div slot="label" class="hgang"> 已完成/已发货 <span class="hongdian">1</span>  </div>
                 </el-tab-pane>
-                <el-tab-pane>
+                <el-tab-pane name="first3">
                   <div slot="label" class="hgang"> 已拒绝/已退款 <span class="hongdian">1</span>  </div>
                 </el-tab-pane>
-                <el-tab-pane>
+                <el-tab-pane name="first4">
                   <div slot="label" class="hgang"> 未付款订单 <span class="hongdian">1</span>  </div>
                 </el-tab-pane>
 
@@ -140,7 +143,10 @@
 
         </el-tab-pane>
         <el-tab-pane label="配置管理">
-
+          <el-alert
+            title="PC积分收银台在线兑换订单记录,收银台订单无需确认操作,如有付款金额,付款订单请在增值性订单列表中查看,类型为:积分收银"
+            type="error">
+          </el-alert>
            <div class="bottom-dis">
             <div slot="header" class="clearfix">
               <span>统计</span>
@@ -151,7 +157,105 @@
                 <div class="size-bole">55</div>
               </div>
             </div>
-       </div>
+            </div>
+          <div class="table-box">
+            <el-table
+              :data="tableData"
+              style="width: 100%">
+              <el-table-column type="expand">
+                <template slot-scope="props">
+                  <el-form label-position="left" inline class="demo-table-expand">
+                    <el-form-item label="名称">
+                      <span>{{ props.row.name }}</span>
+                    </el-form-item>
+                  </el-form>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="date"
+                label="用户信息"
+                width="150">
+              </el-table-column>
+              <el-table-column label="余额">
+                <el-table-column
+                  prop="name"
+                  label="储值卡"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="升值卡"
+                  width="120">
+                </el-table-column>
+
+              </el-table-column>
+              <el-table-column label="会员等级">
+                <el-table-column
+                  prop="province"
+                  label="汽油"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="city"
+                  label="柴油"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="city"
+                  label="天然气"
+                  width="120">
+                </el-table-column>
+              </el-table-column>
+              <el-table-column label="统计">
+                <el-table-column
+                  prop="province"
+                  label="加油金"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="city"
+                  label="积分"
+                  width="120">
+                </el-table-column>
+                <el-table-column
+                  prop="city"
+                  label="消费次数"
+                  width="120">
+                </el-table-column>
+              </el-table-column>
+
+              <el-table-column
+                prop="zip"
+                label="实体卡号"
+                width="220">
+              </el-table-column>
+
+              <el-table-column
+                prop="zip"
+                label="状态"
+                width="120">
+              </el-table-column>
+
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-edit"
+                  >更多操作</el-button>
+
+                </template>
+              </el-table-column>
+
+            </el-table>
+          </div>
+          <div class="pagination-box">
+            <el-pagination
+              background
+              layout="prev, pager, next"
+              :total="1000">
+            </el-pagination>
+          </div>
         </el-tab-pane>
 
       </el-tabs>
@@ -163,8 +267,9 @@
       name: "order_Integral",
       data(){
         return{
+          labelPosition: 'right',
           radio1:'',
-          activeName: 'second',
+          activeName: 'first',
           formLabelAlign: {
             name: '',
             },
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
new file mode 100644
index 000000000..bc4ae0e06
--- /dev/null
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -0,0 +1,15 @@
+<template>
+    <div>
+      详情页
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "index"
+    }
+</script>
+
+<style scoped>
+
+</style>