修改上次推送多打的一个字

src/api/statisticalReport/companyConsumptionStatistics.js

@@ -4,14 +4,14 @@ var group_name = 'oilOrderInfo'
 export default {
   getStatisticalReportByPage(data) { 
     return request({
-      url: `/xkhl-site/saasBOrderInfo/getStatisticalReportByPage`,
+      url: `/${service_name}/${group_name}/getStatisticalReportByPage`,
       method: 'post',
       data:data
     })
   },
   getAccountTypeByCompanyId(data) { 
     return request({
-      url: `/xkhl-site/saasBOrderInfo/getAccountTypeByCompanyId`,
+      url: `/${service_name}/${group_name}/getAccountTypeByCompanyId`,
       method: 'post',
       data:data
     })

src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue

@@ -184,6 +184,7 @@
         title="添加"
         :visible.sync="addDialog"
         width="55%"
+        v-if="addDialog"
       >
         <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
       </el-dialog>
@@ -220,6 +221,7 @@
         title="修改"
         :visible.sync="updateDialog"
         width="55%"
+        v-if="addDialog"
       >
         <OilCompanyMatchUpdate
           v-if="updateDialog"
@@ -571,7 +573,7 @@ export default {
       ],
       addDialog: false, // 添加弹窗
       updateDialog: false, // 修改弹窗
-      oilCompanyMatch: {},
+      oilCompanyMatch: null,
     };
   },
   computed: {
@@ -701,8 +703,8 @@ export default {
       this.getByPage();
     },
     toAdd() {
-      // 跳转到添加
       this.oilCompanyMatch = {};
+      // 跳转到添加
       this.addDialog = true;
     },
     toUpdate(id) {

src/views/finance/order/OrderPersonalInfoList.vue

@@ -694,7 +694,7 @@ export default {
               <div>
                 <div>
                   来源：
-                  {cell}
+                  { this.markData.ORDER_SOURCE[cell] }
                 </div>
                 <div>
                   支付：

src/views/login/css/index.css

@@ -1,8 +1,7 @@
 html {
     font-size: 16px !important;
 }
-
+ /* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
-/* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
 /* @media screen and (min-width:375px) {
     html {
         font-size: calc(100% + 2 * (100vw - 375px) / 39);
@@ -44,44 +43,29 @@ html {
     margin: 0;
     width: 100vw;
     height: 100vh;
-    /* background-size: calc(100vw - 25.5rem) 100%; */
+    background-size: calc(100vw - 25.5rem) 100%;
-    /* background-repeat: no-repeat; */
+    background-repeat: no-repeat;
-    /* background-position: right; */
+    background-position: right;
-    /* background-origin: border-box; */
+    background-origin: border-box;
-    /* background-attachment: fixed; */
+    background-attachment: fixed;
     animation: start .5s;
     overflow: auto;
-    /* background-image: url('../../../assets/img/login/bg@2x.png') !important; */
+    background-image: url('../../../assets/img/login/bg@2x.png') !important;
-    background: linear-gradient(to right, #D3DFFB, #FFFFFF, #F0FBFE);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-}
-
-.newlogin_container_tb img {
-    width: 554px;
-    height: 554px;
-    margin-right: 234px;
 }
 
 .newlogin_login_container {
-    /* height: 100%;
+    height: 100%;
-    width: 100%; */
+    width: 100%;
-    /* padding: 5.7rem 0 0 5.7rem; */
+    padding: 5.7rem 0 0 5.7rem;
     animation: move 1s;
     /* animation-delay:1s;
     -webkit-animation-delay:1s;  */
-    box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.1);
-    border-radius: 8px 8px 8px 8px;
-    opacity: 1;
-    padding: 52px 80px 94px 80px;
-    /* width: 460px; */
 
 }
 
 .newlogin_login_logo {
-    width: 147px;
+    width: 10.8rem;
-    height: 46px;
+    height: 3.672rem;
 }
 
 .newlogin_login_logo img {
@@ -90,7 +74,7 @@ html {
 }
 
 .newlogin_login_title {
-    color: #000000;
+    color: #1767F9;
     font-size: 1.45rem;
     margin-top: 2rem;
 }
@@ -101,14 +85,14 @@ html {
 }
 
 .newlogin_container .el-input {
-    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
+    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
-    /* border-radius: 36px; */
+    border-radius: 36px;
 }
 
-.newlogin_container .el-input__inner {
+ .newlogin_container .el-input__inner {
     border: 0px !important;
     padding-left: 50px !important;
-    /* border-radius: 36px; */
+    border-radius: 36px;
     height: 2.6rem !important;
     font-size: .8rem !important;
     padding-right: 50px !important;
@@ -116,7 +100,7 @@ html {
 }
 
 .newlogin_container .el-form-item__content .el-input {
-    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
+    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
 
 }
 
@@ -128,9 +112,8 @@ html {
 
 .newlogin_login_from_butten {
     width: 100%;
-    /* border-radius: 36px; */
+    border-radius: 36px;
-    font-size: 14px;
+    font-size: 1.16rem;
-    background-color: #409EFF !important;
 }
 
 .newlogin_container .el-form-item {
@@ -150,14 +133,12 @@ html {
 }
 
 .newlogin_container .el-button--primary {
-    background-color: #409EFF !important;
+    background: linear-gradient(to right, #1767F9, #4883ED);
-
 }
 
 .newlogin_container .el-button--primary:hover,
 .newlogin_container .el-button--primary:focus {
-    background-color: #409EFF !important;
+    background: linear-gradient(to right, #1767F9, #4883ED);
-
 
 }
 
@@ -185,7 +166,7 @@ html {
     padding-left: 20px;
     font-size: 0.8rem;
     color: #1767F9;
-    cursor: default
+    cursor:default
 }
 
 .verifyCode .el-input__inner {

src/views/login/index.vue

@@ -1,13 +1,10 @@
 <template>
     <div v-loading="this.$store.getters.loading" class="newlogin_container">
-        <div class="newlogin_container_tb">
-            <img style="" src="../../assets/img/login/img.png" alt="" />
-        </div>
         <div class="newlogin_login_container">
             <div class="newlogin_login_logo">
                 <img style="" src="../../assets/img/login/logo.png" alt="" />
             </div>
-            <div class="newlogin_login_title">欢迎使用中品调度管理平台</div>
+            <div class="newlogin_login_title">星油能源调度管理平台</div>
             <div class="newlogin_login_from_container">
                 <el-form ref="form" :model="loginForm">
                     <el-form-item>

src/views/site/oilSiteInfo/OilSiteInfoInfo.vue

@@ -193,10 +193,10 @@
                 class="kg"
                 render="row"
               >
-                <el-tag type="danger" v-if="oilSiteInfo.globalEnable === 0"
+                <el-tag type="danger" v-if="oilSiteInfo.globalEnable === 'DISABLE'"
                   >禁用</el-tag
                 >
-                <el-tag type="success" v-if="oilSiteInfo.globalEnable === 1"
+                <el-tag type="success" v-if="oilSiteInfo.globalEnable === 'ENABLE'"
                   >启用</el-tag
                 >
                 <!-- <el-switch
@@ -384,10 +384,10 @@
             <div class="cell-item">
               <span class="color-999 test-tst">油站性质</span>
               <br />
-              <span v-if="oilSiteInfo.siteNature === 1" class="inner-data"
+              <span v-if="oilSiteInfo.siteNature === 'OIL_OPERATION'" class="inner-data"
                 >自营油站</span
               >
-              <span v-if="oilSiteInfo.siteNature === 0" class="inner-data"
+              <span v-if="oilSiteInfo.siteNature === 'CHANNEL_STATION'" class="inner-data"
                 >渠道油站</span
               >
             </div>
@@ -659,42 +659,46 @@
               <span class="color-999 test-tst">是否为高速 </span>
               <br />
 
-              <span v-if="oilSiteInfo.highSpeedMark === 0" class="inner-data"
+              <span v-if="oilSiteInfo.highSpeedMark === 'NO_SPEED'" class="inner-data"
                 >非高速</span
               >
-              <span v-if="oilSiteInfo.highSpeedMark === 1" class="inner-data"
+              <span v-if="oilSiteInfo.highSpeedMark === 'HIGH_SPEED'" class="inner-data"
                 >高速</span
               >
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">司机二维码支付 </span>
               <br />
-              <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
+              <span>{{oilSiteInfo.qrcodePay== 0 ? '禁用' : oilSiteInfo.qrcodePay== 1 ? '启用' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
                 >禁用</span
               >
               <span v-if="oilSiteInfo.qrcodePay === 1" class="inner-data"
                 >启用</span
-              >
+              > -->
             </div>
           </div>
           <div class="my-cell">
             <div class="cell-item">
               <span class="color-999 test-tst">扫描油站二维码支付</span>
               <br />
-              <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
+              <span>{{oilSiteInfo.qrcodeSitePay== 0 ? '禁用' : oilSiteInfo.qrcodeSitePay== 1 ? '启用' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
                 >禁用</span
               >
               <span v-if="oilSiteInfo.qrcodeSitePay === 1" class="inner-data"
                 >启用</span
-              >
+              > -->
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">司机主动支付</span>
               <br />
-              <span v-if="oilSiteInfo.activePay === 0" class="inner-data"
+              <span v-if="oilSiteInfo.activePay === 'DISABLE'" class="inner-data"
                 >禁用</span
               >
-              <span v-if="oilSiteInfo.activePay === 1" class="inner-data"
+              <span v-if="oilSiteInfo.activePay === 'ENABLE'" class="inner-data"
                 >启用</span
               >
             </div>
@@ -703,17 +707,22 @@
             <div class="cell-item">
               <span class="color-999 test-tst">支付方式</span>
               <br />
-              <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
+              <span>{{oilSiteInfo.payMethod== 2 ? '联名卡支付' : oilSiteInfo.payMethod== 1 ? '普通支付方式' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
                 >联名卡支付</span
               >
               <span v-if="oilSiteInfo.payMethod === 1" class="inner-data"
-                >普通支付方式</span
+                >普通支付方式</span -->
-              >
+              
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">油站详情提示文案</span>
               <br />
-              <span class="inner-data">{{ oilSiteInfo.detailContent }}</span>
+              <!-- <span v-if="oilSiteInfo.detailContent !== detailContent" class="inner-data"
+                >暂无数据</span> -->
+              <span class="inner-data">  {{oilSiteInfo.detailContent== detailContent ? '' :  '暂无数据'}}
+              </span>
             </div>
           </div>
 
@@ -722,35 +731,37 @@
               <span class="color-999 test-tst">全局禁用启用</span>
               <br />
 
-              <span v-if="oilSiteInfo.globalEnable === 0" class="inner-data"
+              <span v-if="oilSiteInfo.globalEnable === 'DISABLE'" class="inner-data"
                 >禁用</span
               >
-              <span v-if="oilSiteInfo.globalEnable === 1" class="inner-data"
+              <span v-if="oilSiteInfo.globalEnable === 'ENABLE'" class="inner-data"
                 >启用</span
               >
             </div>
             <div class="cell-item">
               <span class="color-999 test-tst">上架标识</span>
               <br />
-              <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
+              <span>{{oilSiteInfo.putawayMark== 0 ? '下架' : oilSiteInfo.putawayMark== 1 ? '上架' : '暂无数据'}}
+              </span>
+              <!-- <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
                 >下架</span
               >
               <span v-if="oilSiteInfo.putawayMark === 1" class="inner-data"
                 >上架</span
-              >
+              > -->
             </div>
           </div>
           <div class="my-cell">
             <div class="cell-item">
               <span class="color-999 test-tst">审核标识</span>
               <br />
-              <span v-if="oilSiteInfo.auditMark === 0" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === 'WAITING'" class="inner-data"
                 >待审核</span
               >
-              <span v-if="oilSiteInfo.auditMark === 1" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === 'SUCCESS'" class="inner-data"
                 >审核通过</span
               >
-              <span v-if="oilSiteInfo.auditMark === -1" class="inner-data"
+              <span v-if="oilSiteInfo.auditMark === '- FAIL'" class="inner-data"
                 >审核不通过</span
               >
             </div>

src/views/statisticalReport/companyConsumptionStatistics.vue

@@ -178,6 +178,9 @@
                 <el-form-item label="赊销金额">
                   <span> {{scope.row.chargeRechargeBalance|balanceType}}</span>
                 </el-form-item>
+                <el-form-item label="充返金额">
+                  <span>{{scope.row.rechargeRebateBalance|balanceType}}</span>
+                </el-form-item>
                 <el-form-item label="消返金额">
                   <span>{{scope.row.consumeRebateBalance|balanceType}}</span>
                 </el-form-item>
@@ -189,6 +192,9 @@
                 <el-form-item label="累计赊销金额">
                   <span> {{dataListChild.sxje?dataListChild.sxje:'0.00'}}</span>
                 </el-form-item>
+                <el-form-item label="累计充返金额">
+                  <span>{{dataListChild.cfje?dataListChild.cfje:'0.00'}}</span>
+                </el-form-item>
                 <el-form-item label="累计消返金额">
                   <span>{{dataListChild.xfje?dataListChild.xfje:'0.00'}}</span>
                 </el-form-item>