From a3ccc2ba87efca6c5868ee788183faa46a73d7ed Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Fri, 26 Jul 2024 14:17:58 +0800
Subject: [PATCH] no message

---
 .../dai_yunyingfenxi/tab/paym.vue             |  7 +++--
 .../dai_yunyingfenxi/tab/paytype.vue          |  3 +-
 .../financialStatement/yunyingfenxi/list.vue  | 11 ++++---
 .../yunyingfenxi/tab/int.vue                  |  5 ++--
 .../yunyingfenxi/tab/oil.vue                  |  6 ++--
 .../yunyingfenxi/tab/store.vue                |  7 +++--
 .../yunyingfenxi/tab/vip.vue                  |  2 +-
 fuintAdmin_zt/src/views/setting/pay/index.vue | 30 +++++++++----------
 8 files changed, 40 insertions(+), 31 deletions(-)

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 bc8def229..0e7a6e942 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
@@ -1,8 +1,8 @@
 <!-- 收银台订单-->
 <template>
   <div style="margin-top: 0px">
-    <el-card class="box-card">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
+    <el-card class="box-card" style="margin-top: 0px;">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s" style="margin-bottom: 15px">
           <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
                :key="index" @click="editColor(index)">
@@ -11,12 +11,13 @@
           <el-date-picker
             v-model="value2"
             type="datetimerange"
+            style="height: 32px"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
             end-placeholder="结束日期" @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 15px">
+          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
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 5a0856fc5..63fdcd48b 100644
--- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
@@ -12,11 +12,12 @@
             v-model="value2"
             type="datetimerange"
             range-separator="至"
+            style="height: 32px"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
             end-placeholder="结束日期" @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 15px">
+          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
index 188ac076b..bdd151cad 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
@@ -30,10 +30,13 @@
 
 
     </div>
-    <yunyingfenxi-vip v-if="radio1 === '会员分析'"></yunyingfenxi-vip>
-    <yunyingfenxi-oil v-if="radio1 === '油品分析'"></yunyingfenxi-oil>
-    <yunyingfenxi-store v-if="radio1 === '便利店分析'"></yunyingfenxi-store>
-    <yunyingfenxi-int v-if="radio1 === '积分商城分析'"></yunyingfenxi-int>
+    <template >
+      <yunyingfenxi-vip v-if="radio1 === '会员分析'"></yunyingfenxi-vip>
+      <yunyingfenxi-oil v-if="radio1 === '油品分析'"></yunyingfenxi-oil>
+      <yunyingfenxi-store v-if="radio1 === '便利店分析'"></yunyingfenxi-store>
+      <yunyingfenxi-int v-if="radio1 === '积分商城分析'"></yunyingfenxi-int>
+    </template>
+
   </div>
 </template>
 
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
index aff33cb00..e79d082fd 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px;margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s">
@@ -13,10 +13,11 @@
             type="datetimerange"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
+            style="height:32px"
             start-placeholder="开始日期"
             end-placeholder="结束日期" @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 15px">
+          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
index 402918b36..2cac67c44 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px; margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <div class="d-s">
@@ -9,13 +9,15 @@
           </div>
           <el-date-picker
             v-model="value2"
+            style="height:32px"
+
             type="datetimerange"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
             end-placeholder="结束日期" @click="handleQuery">
           </el-date-picker>
-          <div style="margin-left: 15px;margin-top: 15px">
+          <div style="margin-left: 15px;margin-top: 17px;width: 100%">
             <el-form-item label="" prop="deptId" style="width: 180px">
               <el-select
                 v-model="queryParams.deptId"
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
index 20d0ae79f..e63b6200b 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px; margin-right: 40px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
         <div class="d-s">
@@ -9,13 +9,14 @@
           </div>
           <el-date-picker
             v-model="value2"
+            style="height:32px"
             type="datetimerange"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"
             end-placeholder="结束日期" @click="handleQuery">
           </el-date-picker>
-          <div  style="margin-left: 15px;margin-top: 15px">
+          <div  style="margin-left: 15px;margin-top: 17px;width: 100%">
             <el-form-item label="" prop="deptId" style="width: 180px;">
               <el-select
                 v-model="queryParams.deptId"
@@ -307,7 +308,7 @@ import {parseTime} from "@/utils/fuint";
   height: 80px;
   margin-right: 20px;
   box-sizing: border-box;
-  padding: 15px 10px;
+  padding: 16px 10px;
   color: #333333;
 }
 .size_{
diff --git a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
index 74e76dbe0..63480a1ef 100644
--- a/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
@@ -1,6 +1,6 @@
 <!-- 收银台订单-->
 <template>
-  <div style="margin-top: 0px">
+  <div style="margin-top: 0px;margin-right: 20px">
     <el-card class="box-card">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
         <el-form-item label="" prop="deptId" style="width: 180px">
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue
index c3eba09f4..8381410dc 100644
--- a/fuintAdmin_zt/src/views/setting/pay/index.vue
+++ b/fuintAdmin_zt/src/views/setting/pay/index.vue
@@ -57,10 +57,10 @@
           >新增支付参数</el-button>
         </el-form-item>
       </el-form>
-    </el-card>
+<!--    </el-card>-->
 
-    <!--    列表信息-->
-    <el-card style="margin-top: 20px" >
+<!--    &lt;!&ndash;    列表信息&ndash;&gt;-->
+<!--    <el-card style="margin-top: 20px" >-->
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column prop="deptName" label="机构名称"></el-table-column>
@@ -131,11 +131,11 @@
 
     </el-card>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
+    <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="120px"  :rules="rules">
 
-          <el-form-item label="机构名称" prop="deptId">
-            <el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)">
+          <el-form-item label="机构名称" prop="deptId" >
+            <el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 300px">
               <el-option
                 v-for="item in deptListSelect"
                 :key="item.deptId"
@@ -145,7 +145,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="机构类型" prop="deptType">
-            <el-select v-model="deviceInfo.deptType" placeholder="请选择机构类型" clearable disabled>
+            <el-select v-model="deviceInfo.deptType" placeholder="请选择机构类型" clearable disabled style="width: 300px">
               <el-option label="代理商" value="1"></el-option>
               <el-option label="连锁店" value="2"></el-option>
               <el-option label="基本门店" value="3"></el-option>
@@ -153,7 +153,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="支付通道" prop="paymentChannel">
-            <el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable>
+            <el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 300px">
               <el-option
                 v-for="dict in dict.type.payment_channel"
                 :key="dict.value"
@@ -162,22 +162,22 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="机构号" prop="insCd">
-            <el-input v-model="deviceInfo.insCd"></el-input>
+          <el-form-item label="机构号" prop="">
+            <el-input v-model="deviceInfo.insCd" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="公钥" prop="publicKey">
-            <el-input v-model="deviceInfo.publicKey"></el-input>
+            <el-input v-model="deviceInfo.publicKey" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="私钥" prop="privateKey">
-            <el-input v-model="deviceInfo.privateKey"></el-input>
+            <el-input v-model="deviceInfo.privateKey" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="联系人" prop="contact">
-            <el-input v-model="deviceInfo.contact"></el-input>
+            <el-input v-model="deviceInfo.contact" style="width: 300px"></el-input>
           </el-form-item>
           <el-form-item label="联系方式" prop="information">
-            <el-input v-model="deviceInfo.information"></el-input>
+            <el-input v-model="deviceInfo.information" style="width: 300px"></el-input>
           </el-form-item>
-          <el-form-item label="支付状态" prop="appStatus">
+          <el-form-item label="支付状态" prop="appStatus" >
             <el-switch
               v-model="deviceInfo.status"
               active-value="qy"