From 9e164fc8649d78a53330397dee43fb06177608f5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 2 Aug 2024 17:53:40 +0800
Subject: [PATCH] no message

---
 fuintAdmin/src/assets/styles/fuint.scss       |  31 ++
 .../views/oilSetting/device/device-index.vue  |  60 ++++
 .../views/setting/device/content/canshu.vue   |  89 +++++
 .../views/setting/device/content/youqiji.vue  | 304 ++++++++++++++++++
 .../src/views/setting/device/device-index.vue |  68 ++++
 fuintAdmin_zt/src/assets/styles/index.scss    |  22 ++
 .../dai_yunyingfenxi/tab/paym.vue             |  16 +-
 .../dai_yunyingfenxi/tab/paytype.vue          |  16 +-
 .../yunyingfenxi/tab/int.vue                  |  12 +-
 .../yunyingfenxi/tab/oil.vue                  |  12 +-
 .../yunyingfenxi/tab/store.vue                | 108 +++----
 .../yunyingfenxi/tab/vip.vue                  |  14 +-
 12 files changed, 663 insertions(+), 89 deletions(-)
 create mode 100644 fuintAdmin/src/views/oilSetting/device/device-index.vue
 create mode 100644 fuintAdmin/src/views/setting/device/content/canshu.vue
 create mode 100644 fuintAdmin/src/views/setting/device/content/youqiji.vue
 create mode 100644 fuintAdmin/src/views/setting/device/device-index.vue

diff --git a/fuintAdmin/src/assets/styles/fuint.scss b/fuintAdmin/src/assets/styles/fuint.scss
index 3de2f1b18..199ae0cf5 100644
--- a/fuintAdmin/src/assets/styles/fuint.scss
+++ b/fuintAdmin/src/assets/styles/fuint.scss
@@ -105,6 +105,37 @@
     }
 }
 
+ .card-change {
+   padding: 20px;
+   //width: 80% !important;
+   background: #ffffff;
+   border-radius: 4px;
+   min-height: 600px;
+ }
+ .card-change-1 {
+   padding: 20px 20px 20px 20px;
+   margin-left: 20px;
+   margin-top: 4px;
+
+   //width: 80% !important;
+   background: #ffffff;
+   border-radius: 4px;
+   min-height: 600px;
+ }
+ .card-change2-1 {
+   padding: 0px 20px 5px 20px;
+   margin-left: 20px;
+   //width: 80% !important;
+   background: #ffffff;
+   border-radius: 4px;
+ }
+ .card-change2 {
+   padding: 20px;
+   //width: 80% !important;
+   background: #ffffff;
+   border-radius: 4px;
+ }
+
 /** 表单布局 **/
 .form-header {
     font-size:15px;
diff --git a/fuintAdmin/src/views/oilSetting/device/device-index.vue b/fuintAdmin/src/views/oilSetting/device/device-index.vue
new file mode 100644
index 000000000..447c886cc
--- /dev/null
+++ b/fuintAdmin/src/views/oilSetting/device/device-index.vue
@@ -0,0 +1,60 @@
+<script >
+
+export default {
+  data(){
+    return{
+      activeindex:0,
+      tablist:[
+        {
+          name:'打印机配置',
+        },
+        {
+          name:'汽机油机配置',
+        },
+        {
+          name:'参数配置',
+        },
+      ]
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="tab-box">
+      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.tab-box{
+  width: 100%;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  padding: 0px 50px;
+}
+
+.f-box{
+  height: 40px;
+  color: #999999;
+  margin-right: 50px;
+  display: flex;
+  align-items: center;
+
+}
+.active{
+  color: #FF9655 !important;
+  border-bottom: 2px solid #FF9655 !important;
+}
+.container{
+  background: #F4F5F9;
+  box-sizing: border-box;
+  //padding: 20px;
+}
+.tabder-box{
+  width: 85%;
+}
+</style>
diff --git a/fuintAdmin/src/views/setting/device/content/canshu.vue b/fuintAdmin/src/views/setting/device/content/canshu.vue
new file mode 100644
index 000000000..dc3881f44
--- /dev/null
+++ b/fuintAdmin/src/views/setting/device/content/canshu.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="app-container">
+    <div class="card-change">
+      <div style="margin-bottom: 20px">
+        <div style="margin-bottom: 20px">
+          加油数量保留两位小数，后面余数部分规则
+          <el-tooltip placement="right-start" effect="light">
+            <div slot="content">
+              舍弃余数:例如35.669，将会直接舍去0.009部分，只保留35.66四舍五入:例如
+              <br/>
+              35.669，将会根据四舍五入规则把数量保留为35.67 逢一进一:小数第三位只要
+              <br/>
+              大于0，就自动往前进一，例如35.661，数量保留为35.67，如果是35.660，数
+              <br/>
+              量保留为35.66
+            </div>
+            <i class="el-icon-warning" style="color: red"></i>
+          </el-tooltip>
+        </div>
+        <el-radio-group v-model="sum" class="vertical-radio-group">
+          <el-radio class="radioo" label="舍弃余数">舍弃余数</el-radio>
+          <el-radio class="radioo" label="四舍五入">四舍五入</el-radio>
+          <el-radio class="radioo" label="逢一进一">逢一进一</el-radio>
+        </el-radio-group>
+
+      </div>
+      <div>
+        <div style="margin-bottom: 20px">
+          金额保留两位小数，后面余数部分规则
+          <el-tooltip content="舍弃余数:例如35.669，将会直接舍去0.009部分，只保留35.66四舍五入:例如35.669，将会根据四舍五入规则把数量保留为35.67 逢一进一:小数第三位只要大于0，就自动往前进一，例如35.661，数量保留为35.67，如果是35.660，数量保留为35.66"
+                      placement="right-start" effect="light" >
+            <div slot="content">
+              舍弃余数:例如35.669，将会直接舍去0.009部分，只保留35.66四舍五入:例如
+              <br/>
+              35.669，将会根据四舍五入规则把数量保留为35.67 逢一进一:小数第三位只要
+              <br/>
+              大于0，就自动往前进一，例如35.661，数量保留为35.67，如果是35.660，数
+              <br/>
+              量保留为35.66
+            </div>
+
+            <i class="el-icon-warning" style="color: red"></i>
+          </el-tooltip>
+        </div>
+        <el-radio-group v-model="money" class="vertical-radio-group">
+          <el-radio class="radioo" label="舍弃余数">舍弃余数</el-radio>
+          <el-radio class="radioo" label="四舍五入">四舍五入</el-radio>
+          <el-radio class="radioo" label="逢一进一">逢一进一</el-radio>
+        </el-radio-group>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+
+export default {
+  name: "canshu",
+
+  data() {
+    return {
+      sum:'舍弃余数',
+      money:'舍弃余数',
+      sumcon:'',
+      moneycon:''
+    };
+  },
+  created() {
+  },
+  methods: {
+  }
+};
+</script>
+<style lang="scss" scoped>
+.app-container{
+
+}
+.vertical-radio-group {
+  display: flex;
+  flex-direction: column;
+}
+.radioo {
+  margin-bottom: 18px;
+}
+</style>
+
diff --git a/fuintAdmin/src/views/setting/device/content/youqiji.vue b/fuintAdmin/src/views/setting/device/content/youqiji.vue
new file mode 100644
index 000000000..f0aa69ee2
--- /dev/null
+++ b/fuintAdmin/src/views/setting/device/content/youqiji.vue
@@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <div class="card-change">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="" prop="legalRepresentativeContact">
+
+          <el-select
+            v-model="queryParams.orgId"
+            clearable
+            placeholder="请选择设备类型"
+          >
+            <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="" prop="legalRepresentativeContact">
+          <el-input
+            v-model="queryParams.legalRepresentativeContact"
+            placeholder="请输入设备名称"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </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"
+            @click="handleAdd"
+          >新增设备</el-button>
+        </el-form-item>
+      </el-form>
+<!--      v-hasPermi="['setting:app:add']"-->
+
+      <div style="height: 70vh;overflow: auto">
+      <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="orgName" label="设备类型"></el-table-column>
+        <el-table-column align="center" prop="unifiedSocialCreditCode" label="设备名称"></el-table-column>
+        <el-table-column align="center" prop="appId" label="设备id"></el-table-column>
+        <el-table-column align="center" prop="appKey" label="密钥"></el-table-column>
+        <el-table-column align="center" prop="createByName" label="创建人"></el-table-column>
+        <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column  label="操作" align="center" width="200" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="edit(scope.row)"
+              v-hasPermi="['setting:app:edit']"
+            >编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="del(scope.row)"
+              v-hasPermi="['setting:app:delete']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      </div>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+
+    </div>
+
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
+      <el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
+        <el-form-item label="设备类型" prop="orgId">
+          <el-select
+            v-model="deviceInfo.orgId"
+            clearable
+            placeholder="设备类型"
+            style="width: 300px;"
+          >
+            <el-option v-for="item in deviceTypeList" :key="item" :label="item"  :value="item">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="设备名称" prop="unifiedSocialCreditCode">
+          <el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 300px;"></el-input>
+        </el-form-item>
+        <el-form-item label="设备id" prop="appId">
+          <el-input v-model="deviceInfo.appId" style="width: 300px;"></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" @click="submitForm('deviceForm')">取消</el-button>
+          <el-button  @click="submitForm('deviceForm')">提交</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+
+export default {
+  name: "youqiji",
+
+  data() {
+    return {
+      tableData: [],
+      deviceTypeList: [
+        "BY",
+        "LY",
+        "DD",
+      ],
+
+      deviceInfo: {
+        id: null,            // 自增id
+        orgName: '',   // 机构名称
+        orgId: '',   // 机构名称
+        unifiedSocialCreditCode: '',   // 统一社会信用代码
+        appId: '',   // 小程序appID
+        appKey: '',   // 密钥
+        legalRepresentativeName: '',   // 法人姓名
+        legalRepresentativeWechat: '',   // 法人微信
+        legalRepresentativeContact: '',   // 法人联系方式
+        appStatus: false,   // 小程序状态
+        createByName: '',
+      },
+      rule: {
+        orgId: [{required: true, message: '请选择机构名称', trigger: 'blur'},],
+        unifiedSocialCreditCode: [{required: true, message: '请填写统一社会信用代码', trigger: 'blur'},],
+        appId: [{required: true, message: '请填写小程序appID', trigger: 'blur'},],
+        appKey: [{required: true, message: '请填写密钥', trigger: 'blur'},],
+        legalRepresentativeName: [{required: true, message: '请填写法人姓名', trigger: 'blur'},],
+        legalRepresentativeWechat: [{required: true, message: '请填写法人微信号', trigger: 'blur'},],
+        legalRepresentativeContact: [{required: true, message: '请填写法人联系方式', trigger: 'blur'},],
+      },
+      // 是否显示弹出层
+      open: false,
+      title:"",
+      total:0,
+      // 查询参数
+      queryParams: {
+        page: 1,
+        pageSize: 10,
+        orgName:'',
+        orgId:'',
+        legalRepresentativeContact:'',
+        appStatus:'',
+      },
+    };
+  },
+  created() {
+    this.getList()
+    this.getDeptList()
+  },
+  methods: {
+    getDeptList() {
+      // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
+      //   this.deptList = response.data.records;
+      // })
+    },
+    getList(){
+      // getAppListApi(this.queryParams).then(res=>{
+      //   this.tableData = res.data.records;
+      //   this.total = res.data.total
+      // })
+    },
+    getsSubmitDeviceInfo(){},
+
+    submitForm(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          // 表单验证通过，可以提交数据
+          // 示例：调用 API 提交数据
+          this.submitDeviceInfo();
+        } else {
+          // 表单验证失败，不执行任何操作
+          return false;
+        }
+      });
+    },
+    submitDeviceInfo() {
+      // 在这里调用接口提交设备信息数据
+
+      let filter = this.deptList.filter(item => item.deptId == this.deviceInfo.orgId);
+
+      this.deviceInfo.orgName = filter[0].deptName
+
+      if (this.deviceInfo.id) {
+        // updateAppApi(this.deviceInfo).then(res=>{
+        //   if(res.code === 200) {
+        //     this.getList()
+        //     this.open = false
+        //   }
+        //
+        // })
+      }else {
+        // saveAppApi(this.deviceInfo).then(res=>{
+        //   if(res.code === 200) {
+        //     this.getList()
+        //     this.open = false
+        //   }
+        // })
+      }
+    },
+    changeStatus(data){
+      console.log(123123123)
+      // updateAppApi(data).then(res=>{
+      //   if(res.code === 200) {
+      //     this.$message({
+      //       type: 'success',
+      //       message: '修改状态成功!'
+      //     });
+      //     this.getList()
+      //   }
+      //
+      // })
+    },
+    handleQuery(){
+      this.getList()
+    },
+    resetQuery(){
+      this.queryParams = {
+        page: 1,
+        pageSize: 10,
+        deviceName:'',
+      },
+        this.getList()
+    },
+    handleAdd(e) {
+      this.clean()
+      this.open = true;
+      this.title = "新增小程序配置"
+    },
+    edit(e) {
+      this.clean()
+      this.open = true;
+      this.title = "编辑小程序配置"
+      this.deviceInfo = e
+      console.log('提交设备信息数据:', this.deviceInfo);
+
+    },
+    del(e) {
+
+      this.$confirm('此操作将永久删除该设备, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        // deleteAppApi(e.id).then(res=>{
+        //   if (res.code == 200) {
+        //     this.$message({
+        //       type: 'success',
+        //       message: '删除成功!'
+        //     });
+        //     this.getList()
+        //   }
+        // })
+
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+
+
+
+    },
+    clean() {
+      this.deviceInfo= {
+        id: null,            // 自增id
+        orgName: '',   // 机构名称
+        unifiedSocialCreditCode: '',   // 统一社会信用代码
+        appId: '',   // 小程序appID
+        appKey: '',   // 密钥
+        legalRepresentativeName: '',   // 法人姓名
+        legalRepresentativeWeChat: '',   // 法人微信
+        legalRepresentativeContact: '',   // 法人联系方式
+        appStatus: false,   // 小程序状态
+        createByName: '',
+      }
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+.common-dialog >>> .el-upload--picture-card {
+  width: 60px;
+  height: 50px;
+  line-height: 60px;
+}
+.app-container{
+
+}
+</style>
+
diff --git a/fuintAdmin/src/views/setting/device/device-index.vue b/fuintAdmin/src/views/setting/device/device-index.vue
new file mode 100644
index 000000000..1eeee6663
--- /dev/null
+++ b/fuintAdmin/src/views/setting/device/device-index.vue
@@ -0,0 +1,68 @@
+<script >
+
+import PrintIndex from "@/views/setting/print/index.vue";
+import Canshu from "@/views/setting/device/content/canshu.vue";
+import Youqiji from "@/views/setting/device/content/youqiji.vue";
+
+export default {
+  components: {Youqiji, Canshu, PrintIndex},
+  data(){
+    return{
+      activeindex:0,
+      tablist:[
+        {
+          name:'打印机配置',
+        },
+        {
+          name:'汽机油机配置',
+        },
+        {
+          name:'参数配置',
+        },
+      ]
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="container">
+    <div class="tab-box">
+      <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
+    </div>
+    <printIndex v-if="activeindex == 0"></printIndex>
+    <canshu  v-if="activeindex == 2"></canshu>
+    <youqiji  v-if="activeindex == 1"></youqiji>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.tab-box{
+  width: 100%;
+  background: #fff;
+  display: flex;
+  box-sizing: border-box;
+  padding: 0px 50px;
+}
+
+.f-box{
+  height: 40px;
+  color: #999999;
+  margin-right: 50px;
+  display: flex;
+  align-items: center;
+
+}
+.active{
+  color: #FF9655 !important;
+  border-bottom: 2px solid #FF9655 !important;
+}
+.container{
+  background: #F4F5F9;
+  box-sizing: border-box;
+  //padding: 20px;
+}
+.tabder-box{
+  width: 85%;
+}
+</style>
diff --git a/fuintAdmin_zt/src/assets/styles/index.scss b/fuintAdmin_zt/src/assets/styles/index.scss
index 03b44a4ba..4cbbefec3 100644
--- a/fuintAdmin_zt/src/assets/styles/index.scss
+++ b/fuintAdmin_zt/src/assets/styles/index.scss
@@ -131,7 +131,29 @@ padding: 20px;
   border-radius: 4px;
   min-height: 600px;
 }
+.card-change-1 {
+  padding: 20px 20px 20px 20px;
+  margin-left: 20px;
+  margin-top: 4px;
 
+  //width: 80% !important;
+  background: #ffffff;
+  border-radius: 4px;
+  min-height: 600px;
+}
+.card-change2-1 {
+  padding: 0px 20px 5px 20px;
+  margin-left: 20px;
+  //width: 80% !important;
+  background: #ffffff;
+  border-radius: 4px;
+}
+.card-change2 {
+  padding: 20px;
+  //width: 80% !important;
+  background: #ffffff;
+  border-radius: 4px;
+}
 .components-container {
   margin: 30px 50px;
   position: relative;
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
index baa107cc2..61584244a 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
@@ -1,9 +1,9 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
-    <el-card class="box-card" style="margin-top: 0px;" shadow="never">
+  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+    <div class="card-change2-1" style="" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
-        <div class="d-s" style="margin-bottom: 15px;justify-content: space-between">
+        <div class="d-s" style="margin-bottom: 0px;justify-content: space-between">
           <div class="d-s">
             <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
                  :key="index" @click="editColor(index)">
@@ -50,8 +50,8 @@
           <div class="title_">{{ item.payMoneyChannel?item.payMoneyChannel/10000:0 }}</div>
         </div>
       </div>
-    </el-card>
-    <el-card class="box-card" style="min-height: 500px;" shadow="never">
+    </div>
+    <div class="card-change-1" style="min-height: 500px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -110,7 +110,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
   </div>
 </template>
@@ -332,7 +332,7 @@ export default {
 <style scoped>
 .box-card {
   width: 100%;
-  margin: 0px 20px 20px 20px;
+  margin: 0px 20px 4px 20px;
   border: none;
   box-shadow: none;
 }
@@ -343,7 +343,7 @@ export default {
 
 .table-box {
   width: 100%;
-  height: 45vh;
+  height: 46vh;
   overflow: auto;
 }
 
diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
index 823376c9e..5de2acaac 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -1,8 +1,8 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
-    <el-card class="box-card" shadow="never">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
+  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+    <div class="card-change2" style="margin-left: 20px; padding-top: 0px;padding-bottom: 5px" shadow="never" >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="justify-content: space-between">
           <div class="d-s">
           <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
@@ -61,8 +61,8 @@
           <div class="title_">{{ orderStatistics.storeId?orderStatistics.storeId:0 }}</div>
         </div>
       </div>
-    </el-card>
-    <el-card class="box-card" style="min-height: 500px;" shadow="never">
+    </div>
+    <div class="card-change"  style="min-height: 500px; margin-left: 20px;margin-top: 4px" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -85,7 +85,7 @@
           </el-table-column>
           <el-table-column prop="refMoney" align="center" label="累计退款金额（元）"></el-table-column>
           <el-table-column prop="refCount" align="center" label="累计退款笔数"></el-table-column>
-          <el-table-column align="center" prop="date" label="统计日期">
+          <el-table-column align="center" prop="date" label="统计日期" width="200">
             <template>
               {{this.value2[0]}} 至 {{this.value2[1]}}
             </template>
@@ -100,7 +100,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
   </div>
 </template>
 
@@ -299,7 +299,7 @@ export default {
 <style scoped>
 .box-card {
   width: 100%;
-  margin: 0px 20px 20px 20px;
+  margin: 0px 20px 4px 20px;
   border: none;
   box-shadow: none;
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index 185d5930f..3c0888532 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
-    <el-card class="box-card" shadow="never">
+  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+    <div class="card-change2-1" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s"  style="justify-content: space-between;width: 100%">
           <div class="d-s">
@@ -57,8 +57,8 @@
           <div class="title_">{{ orderStatistics.integrals || 0 }}</div>
         </div>
       </div>
-    </el-card>
-    <el-card class="box-card" style="min-height: 500px;" shadow="never">
+    </div>
+    <div class="card-change-1" style="min-height: 500px;" shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -92,7 +92,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
   </div>
 </template>
@@ -287,7 +287,7 @@ export default {
 <style scoped>
 .box-card {
   width: 100%;
-  margin: 0px 20px 20px 20px;
+  margin: 0px 20px 4px 20px;
   border: none;
   box-shadow: none;
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index c79d2e4f4..cf0f20f4f 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 15px; padding-right: 40px; background: #f6f8f9;">
-    <el-card class="box-card" shadow="never">
+  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+    <div class="card-change2-1" shadow="never" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s" style="justify-content: space-between;width: 100%">
           <div class="d-s">
@@ -67,8 +67,8 @@
           <div class="title_">{{orderStatistics.amount0 || 0}}</div>
         </div>
       </div>
-          </el-card>
-          <el-card class="box-card" style="min-height: 500px;" shadow="never">
+          </div>
+      <div class="card-change-1" style="min-height: 500px;" shadow="never">
 
 
       <div class="table-box" >
@@ -134,7 +134,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
 
   </div>
 </template>
@@ -331,7 +331,7 @@ import {parseTime} from "@/utils/fuint";
 <style scoped>
 .box-card{
   width: 100%;
-  margin: 0px 20px 20px 20px;
+  margin: 0px 20px 4px 20px;
   border: none;
   box-shadow: none;
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index a91f7bc7b..e46fcf15d 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div style="padding-top: 15px; padding-right: 40px; background: #f6f8f9;" shadow="never">
-    <el-card class="box-card">
+  <div style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px" >
+    <div class="card-change2-1" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="justify-content: space-between;width: 100%">
           <div class="d-s">
@@ -58,59 +58,59 @@
           <div class="title_">{{orderStatistics.cvg || 0}}</div>
         </div>
       </div>
-      </el-card>
-      <el-card class="box-card" style="min-height: 500px;" shadow="never">
-      <div class="table-box">
-        <el-table
-          :data="orderList"
-          style="width: 100%">
-          <el-table-column type="index" width="50" align="center" label="序号"/>
-          <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
-          <el-table-column prop="payAmounts" label="累计交易金额 (万元)"  align="center">
-            <template slot-scope="scope">
-              {{(scope.row.payAmounts/10000).toFixed(6)}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="counts" label="累计交易笔数"  align="center"></el-table-column>
-          <el-table-column prop="goodsNums" label="累计销售商品数量"  align="center"></el-table-column>
-          <el-table-column label="商品信息" align="center">
-                <el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
-                  <template slot-scope="scope">
-                    {{(scope.row.payAmounts/10000).toFixed(6)}}
-                  </template>
-                </el-table-column>
-
-          </el-table-column>
-          <el-table-column label="热销品类信息" align="center">
-
-                <el-table-column prop="cvgName" label="品类名称" width="100" align="center"></el-table-column>
-                <el-table-column prop="cvgNum" label="销售数量 (件)" width="100" align="center"></el-table-column>
-                <el-table-column prop="cvgAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
-
-          </el-table-column>
-          <el-table-column label="热销商品信息" align="center">
-                <el-table-column prop="goodsName" label="商品名称" width="100" align="center"></el-table-column>
-                <el-table-column prop="goodsNum" label="销售数量" width="100" align="center"></el-table-column>
-                <el-table-column prop="goodsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
-<!--                <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
-          </el-table-column>
-          <el-table-column prop="statDate" label="统计日期" width="200" align="center">
-
-          </el-table-column>
-
-        </el-table>
       </div>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <div class="card-change-1" style="min-height: 500px;" shadow="never">
+        <div class="table-box">
+          <el-table
+            :data="orderList"
+            style="width: 100%">
+            <el-table-column type="index" width="50" align="center" label="序号"/>
+            <el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
+            <el-table-column prop="payAmounts" label="累计交易金额 (万元)"  align="center">
+              <template slot-scope="scope">
+                {{(scope.row.payAmounts/10000).toFixed(6)}}
+              </template>
+            </el-table-column>
+            <el-table-column prop="counts" label="累计交易笔数"  align="center"></el-table-column>
+            <el-table-column prop="goodsNums" label="累计销售商品数量"  align="center"></el-table-column>
+            <el-table-column label="商品信息" align="center">
+                  <el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
+                  <el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
+                  <el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
+                    <template slot-scope="scope">
+                      {{(scope.row.payAmounts/10000).toFixed(6)}}
+                    </template>
+                  </el-table-column>
 
-    </el-card>
+            </el-table-column>
+            <el-table-column label="热销品类信息" align="center">
+
+                  <el-table-column prop="cvgName" label="品类名称" width="100" align="center"></el-table-column>
+                  <el-table-column prop="cvgNum" label="销售数量 (件)" width="100" align="center"></el-table-column>
+                  <el-table-column prop="cvgAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
+
+            </el-table-column>
+            <el-table-column label="热销商品信息" align="center">
+                  <el-table-column prop="goodsName" label="商品名称" width="100" align="center"></el-table-column>
+                  <el-table-column prop="goodsNum" label="销售数量" width="100" align="center"></el-table-column>
+                  <el-table-column prop="goodsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
+  <!--                <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
+            </el-table-column>
+            <el-table-column prop="statDate" label="统计日期" width="200" align="center">
+
+            </el-table-column>
+
+          </el-table>
+        </div>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+      </div>
 
   </div>
 </template>
@@ -306,7 +306,7 @@ import {parseTime} from "@/utils/fuint";
 <style scoped>
 .box-card{
   width: 100%;
-  margin: 0px 20px 20px 20px;
+  margin: 0px 20px 4px 20px;
   border: none;
   box-shadow: none;
 }
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index e155ba0b0..763fceeb1 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -1,7 +1,7 @@
 <!-- 收银台订单-->
 <template>
-  <div class=""  style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
-    <el-card class="box-card"  shadow="never">
+  <div class=""  style="padding-top: 20px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
+    <div class="card-change2-1" style="padding-top: 20px" shadow="never">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
           <el-select
@@ -51,8 +51,8 @@
           <div class="title_">{{orderStatistics.balanceSum || 0}}</div>
         </div>
       </div>
-          </el-card>
-          <el-card class="box-card" style="min-height: 500px;"  shadow="never">
+          </div>
+          <div class="card-change-1" style="min-height: 500px;"  shadow="never">
       <div class="table-box">
         <el-table
           :data="orderList"
@@ -85,7 +85,7 @@
         @pagination="getList"
       />
 
-    </el-card>
+    </div>
   </div>
 </template>
 
@@ -228,7 +228,7 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
 <style scoped>
   .box-card{
     width: 100%;
-    margin: 0px 20px 20px 20px;
+    margin: 0px 20px 4px 20px;
     border: none;
     box-shadow: none;
   }
@@ -246,7 +246,7 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
     width: 100%;
     display: flex;
     align-items: center;
-    margin-bottom: 15px;
+    //margin-bottom: 15px;
   }
   .k_{
     width: 200px;