From 3996c4405674f15ae50e99d1db956aae70735c17 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 16 Oct 2024 20:42:28 +0800
Subject: [PATCH] 10.16

---
 .../views/financialStatement/buy/tab/em.vue   |  1 -
 .../reconciliation/tab/ref.vue                |  2 -
 .../src/views/handover/info/rec/trading.vue   |  5 --
 fuintAdmin/src/views/member/index.vue         | 66 +++++++-------
 fuintAdmin/src/views/member/userLabel.vue     | 19 +++--
 .../views/oilSetting/device/device-index.vue  |  2 +-
 .../src/views/setting/device/device-index.vue |  3 +-
 fuintAdmin/src/views/setting/print/index.vue  | 85 ++++++++++---------
 .../views/staffCommission/staffCommission.vue |  1 +
 9 files changed, 86 insertions(+), 98 deletions(-)

diff --git a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
index 34e7523fa..ad18a51e9 100644
--- a/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
+++ b/fuintAdmin/src/views/financialStatement/buy/tab/em.vue
@@ -6,7 +6,6 @@
       <div style="display: flex;align-items: center ">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
           <el-form-item label="">
-
             <el-date-picker
               v-model="beginTime"
               style="width: 140px"
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
index 118549d70..b11116e45 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -28,8 +28,6 @@
             <el-option label="POS端" value="POS"/>
           </el-select>
         </el-form-item>
-
-
         <el-form-item label="" prop="payType">
           <el-select
             v-model="queryParams.payType"
diff --git a/fuintAdmin/src/views/handover/info/rec/trading.vue b/fuintAdmin/src/views/handover/info/rec/trading.vue
index 0dd985239..c9bd196c7 100644
--- a/fuintAdmin/src/views/handover/info/rec/trading.vue
+++ b/fuintAdmin/src/views/handover/info/rec/trading.vue
@@ -58,8 +58,6 @@
         <el-form-item class="f-button" style="text-align: right;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-<!--          <el-button type="primary" icon="el-icon-plus" @click = "exportExcelCashier()">导出订单</el-button>-->
-
         </el-form-item>
       </el-form>
     </div>
@@ -209,12 +207,9 @@
       />
 
     </div>
-
-
     <el-dialog
       title="订单信息"
       :visible.sync="dialogVisible">
-
       <el-descriptions :title="'订单号：'+ordersInfo.orderNo">
         <el-descriptions-item label="门店">{{ordersInfo.storeName}}</el-descriptions-item>
         <el-descriptions-item label="收银员">{{ordersInfo.createBy}}</el-descriptions-item>
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index 382d556d7..0a968d06d 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -103,43 +103,35 @@
       </div>
       <!--    </el-card>-->
 
-          <el-card style="margin-top: 20px">
-            <template>
-              <div class="ds-dbox">
-                <div class="k-one">
-                  <div class="title_">激活会员总数</div>
-                  <div class="num-size">{{total}}</div>
-                    <img class="r-bot-img" src="./imgs/hy-1.png" alt="">
-                  </div>
+      <div class="ds-dbox">
+        <div class="k-one">
+          <div class="title_">激活会员总数</div>
+          <div class="num-size">{{total}}</div>
+          <img class="r-bot-img" src="./imgs/hy-1.png" alt="">
+        </div>
 
-                <div class="k-two">
-                  <div class="title_">今日新增/昨日新增</div>
-                  <div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>
-                  <img class="r-bot-img" src="./imgs/hy-2.png" alt="">
-                </div>
-                <div class="k-three">
-                  <div class="title_">充值总人数</div>
-                  <div class="num-size">{{rechargeTotal || 0}}</div>
-                  <img class="r-bot-img" src="./imgs/hy-3.png" alt="">
-                </div>
-                <div class="k-four">
-                  <div class="title_">储值总余额</div>
-                  <div class="num-size">{{balance}}</div>
-                  <img class="r-bot-img" src="./imgs/hy-4.png" alt="">
-                </div>
-                <div class="k-five">
-                  <div class="title_">积分总余额</div>
-                  <div class="num-size">{{point}}</div>
-                  <img class="r-bot-img" src="./imgs/hy-5.png" alt="">
-                </div>
-              </div>
-
-            </template>
-          </el-card>
-
-      <!--    <el-card style="margin-top: 20px">-->
-
-      <div style="height: 58vh;overflow: auto;margin-top: 15px">
+        <div class="k-two">
+          <div class="title_">今日新增/昨日新增</div>
+          <div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>
+          <img class="r-bot-img" src="./imgs/hy-2.png" alt="">
+        </div>
+        <div class="k-three">
+          <div class="title_">充值总人数</div>
+          <div class="num-size">{{rechargeTotal || 0}}</div>
+          <img class="r-bot-img" src="./imgs/hy-3.png" alt="">
+        </div>
+        <div class="k-four">
+          <div class="title_">储值总余额</div>
+          <div class="num-size">{{balance}}</div>
+          <img class="r-bot-img" src="./imgs/hy-4.png" alt="">
+        </div>
+        <div class="k-five">
+          <div class="title_">积分总余额</div>
+          <div class="num-size">{{point}}</div>
+          <img class="r-bot-img" src="./imgs/hy-5.png" alt="">
+        </div>
+      </div>
+      <div style="height: 50vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
         <el-table ref="tables" v-loading="loading" :data="list" border
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
@@ -689,7 +681,7 @@ export default {
       tabindex: 0,
       tabs: [
         {
-          name: "会员信息",
+          name: "会员信息1",
         },
         {
           name: "群发记录",
diff --git a/fuintAdmin/src/views/member/userLabel.vue b/fuintAdmin/src/views/member/userLabel.vue
index 85892ffbc..792fc8220 100644
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 15px;padding-bottom: 5px; padding-right: 40px; background: #f6f8f9;">
-    <el-card class="box-card" shadow="never">
+  <div style="box-sizing: border-box;padding: 10px; background: #f6f8f9;">
+    <div class="wit_box" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
 
         <el-form-item label="" prop="labelName" style="width: 180px">
@@ -34,10 +34,6 @@
         </el-form-item>
 
       </el-form>
-
-
-      <!--    </el-card>-->
-      <!--    <el-card class="box-card" style="min-height: 500px;" shadow="never">-->
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -97,7 +93,7 @@
         :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
-    </el-card>
+    </div>
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
@@ -283,7 +279,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 79vh;
+  height: 77vh;
   overflow: auto;
 }
 
@@ -341,5 +337,10 @@ export default {
   color: #fff;
 
 }
-
+.wit_box{
+  background: #fff;
+  box-sizing: border-box;
+  padding: 15px;
+  border-radius: 10px;
+}
 </style>
diff --git a/fuintAdmin/src/views/oilSetting/device/device-index.vue b/fuintAdmin/src/views/oilSetting/device/device-index.vue
index 447c886cc..4f677ef75 100644
--- a/fuintAdmin/src/views/oilSetting/device/device-index.vue
+++ b/fuintAdmin/src/views/oilSetting/device/device-index.vue
@@ -6,7 +6,7 @@ export default {
       activeindex:0,
       tablist:[
         {
-          name:'打印机配置',
+          name:'',
         },
         {
           name:'汽机油机配置',
diff --git a/fuintAdmin/src/views/setting/device/device-index.vue b/fuintAdmin/src/views/setting/device/device-index.vue
index 1eeee6663..baac05691 100644
--- a/fuintAdmin/src/views/setting/device/device-index.vue
+++ b/fuintAdmin/src/views/setting/device/device-index.vue
@@ -24,7 +24,6 @@ export default {
   }
 }
 </script>
-
 <template>
   <div class="container">
     <div class="tab-box">
@@ -51,6 +50,7 @@ export default {
   margin-right: 50px;
   display: flex;
   align-items: center;
+  cursor: pointer;
 
 }
 .active{
@@ -59,6 +59,7 @@ export default {
 }
 .container{
   background: #F4F5F9;
+  height: 93vh;
   box-sizing: border-box;
   //padding: 20px;
 }
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index a4f4a80c7..d531654c5 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -1,25 +1,55 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <div class="wit-b">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
         <el-form-item label="" prop="name">
           <el-input
             v-model="queryParams.deviceName"
-            placeholder="设备名称"
+            placeholder="请输入配置名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-
+        <el-form-item label="" prop="payChannel">
+          <el-select
+            v-model="queryParams.payChannel"
+            clearable
+            placeholder="请选择设备功能"
+          >
+            <el-option label="小程序" value="applet"/>
+            <el-option label="收银台" value="cashier"/>
+            <el-option label="POS端" value="POS"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="payChannel">
+          <el-select
+            v-model="queryParams.payChannel"
+            clearable
+            placeholder="请选择关联员工"
+          >
+            <el-option label="小程序" value="applet"/>
+            <el-option label="收银台" value="cashier"/>
+            <el-option label="POS端" value="POS"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="payChannel">
+          <el-select
+            v-model="queryParams.payChannel"
+            clearable
+            placeholder="请选择设备状态"
+          >
+            <el-option label="小程序" value="applet"/>
+            <el-option label="收银台" value="cashier"/>
+            <el-option label="POS端" value="POS"/>
+          </el-select>
+        </el-form-item>
         <el-form-item style="float: right; margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button>
-
         </el-form-item>
       </el-form>
-
       <el-table :data="tableData" style="width: 100%" border>
         <el-table-column align="center" type="index" label="序号"></el-table-column>
         <el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column>
@@ -33,23 +63,6 @@
         </el-table-column>
         <el-table-column align="center" prop="machineCode" label="设备终端号"></el-table-column>
         <el-table-column align="center" prop="msign" label="设备密钥"></el-table-column>
-
-        <!--      <el-table-column  align="center" prop="userId" label="用户id"></el-table-column>-->
-        <!--      <el-table-column prop="appKey" label="应用id(APP_KEY)"></el-table-column>-->
-        <!--      <el-table-column prop="appSecret" label="应用密钥(APP_SECRET)"></el-table-column>-->
-        <!--      <el-table-column prop="appPublicKey" label="应用公钥(key)"></el-table-column>-->
-        <!--      <el-table-column prop="platformPublicKey" label="平台公钥(publicKey)"></el-table-column>-->
-        <!--      <el-table-column prop="accessToken" label="token"></el-table-column>-->
-        <!--      <el-table-column prop="isAcquiesce" label="isAcquiesce">-->
-        <!--        <template slot-scope="scope">-->
-        <!--          <el-switch-->
-        <!--            v-model="scope.row.isAcquiesce"-->
-        <!--            @change="submitDeviceInfo(scope.row)"-->
-        <!--            active-color="#13ce66"-->
-        <!--            inactive-color="#ff4949">-->
-        <!--          </el-switch>-->
-        <!--        </template>-->
-        <!--      </el-table-column>-->
         <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -77,8 +90,7 @@
         @pagination="getList"
       />
 
-    </el-card>
-
+    </div>
     <el-dialog :title="title" :close-on-click-modal="false" :before-close="handleCancel" :visible.sync="open" width="30%"
                append-to-body >
       <el-form ref="form" :model="deviceInfo" label-width="80px">
@@ -116,24 +128,6 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <!--          <el-form-item label="用户id" prop="userId">-->
-          <!--            <el-input v-model="deviceInfo.userId"></el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="应用id" prop="appKey">-->
-          <!--            <el-input v-model="deviceInfo.appKey"></el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="应用密钥" prop="appSecret">-->
-          <!--            <el-input v-model="deviceInfo.appSecret"></el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="应用公钥" prop="appPublicKey">-->
-          <!--            <el-input v-model="deviceInfo.appPublicKey"></el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="平台公钥" prop="platformPublicKey">-->
-          <!--            <el-input v-model="deviceInfo.platformPublicKey"></el-input>-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="token" prop="accessToken">-->
-          <!--            <el-input v-model="deviceInfo.accessToken"></el-input>-->
-          <!--          </el-form-item>-->
           <el-form-item label="启用状态" prop="isAcquiesce">
             <el-switch
               v-model="deviceInfo.acquiesce"
@@ -378,5 +372,12 @@ export default {
   height: 50px;
   line-height: 60px;
 }
+.wit-b{
+  background: #fff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 15px;
+  height: 86vh;
+}
 </style>
 
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index f65292b82..0713221b3 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -985,6 +985,7 @@ export default {
 .app-container {
   width: 100%;
   background: #f6f8f9;
+  height: 93vh;
   margin: 0;
   padding: 0;
 }