消费统计

Reviewed-on: #8

src/api/finance/openTicketApi.js

@@ -11,7 +11,7 @@ export default {
   },
   getByCustomerPage(page) { // 分页查询
     return request({
-      url: `/${service_name}/${group_name}/getByCustomerPage`,
+      url: `/${service_name}/saasCustomerInvoicRecord/getByCustomerPage`,
       method: 'post',
       data: page
     })

src/api/order/orderInfo.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-var service_name = 'xkhl-finance'
+var service_name = 'xkhl-site'
 var group_name = 'oilOrderInfo'
 var New_Name = 'oilOrderInfoExcel'
 export default {
@@ -156,6 +156,13 @@ export default {
       data: orderInfo
     })
   },
+  updateC(orderInfo) { // 更新
+    return request({
+      url: `/${service_name}/saasCOrderInfo/update`,
+      method: 'put',
+      data: orderInfo
+    })
+  },
   exportExcel(page) { // 导出
     return request({
       url: `/${service_name}/${group_name}/export`,

src/api/statisticalReport/companyConsumptionStatistics.js

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

src/api/user/oilSiteOilsPrice.js

@@ -16,6 +16,12 @@ export default {
       data: page
     })
   },
+  findByRelationId(id) { // 分页查询(调度管理)
+    return request({
+      url: `/${service_name}/saasPriceAppRelationRecord/findByRelationId/${id}`,
+      method: 'get'
+    })
+  },
   save(oilSiteOilsPrice) { // 保存
     return request({
       url: `/${service_name}/${group_name}/save`,

src/utils/request.js

@@ -163,9 +163,11 @@ service.interceptors.response.use(
                     type: "error",
                     duration: 5 * 1000
                 });
+              setTimeout(() => {
                 store.dispatch("user/resetToken").then(() => {
                     location.reload();
                 });
+              }, 2000);
                 // 排除自定义的车队返回结果状态码
             } else if (
                 res.code !== 20000 &&

src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue

@@ -110,14 +110,14 @@
                 :show-overflow-tooltip="true" :min-width="item.minWidth" :width="item.width" :prop="item.prop"
                 :sortable="item.sortable" :label="item.label" :formatter="item.render" />
             </template>
-
+<!-- 
             <el-table-column fixed="right" align="center" label="操作" width="150px">
               <template slot-scope="scope">
                 <el-button :disabled="!(scope.row.orderStatus==1)" :size="$store.getters.size" type="text" @click="refundment(scope.row)">
                   转换退款
                 </el-button>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
         </div>
       </el-drawer>

src/views/finance/order/OrderInfoInfo.vue

@@ -14,8 +14,8 @@
                 <svg-icon style="color: #8cb4fd" icon-class="icongongsi-" />
               </div>
               <div class="item-text" style="display: flex; align-items: center">
-                <span>{{ orderInfo.userName }}-{{ orderInfo.customerCode }} {{ orderInfo.phone }} </span>
-                <span v-if="!dataEditor">{{ orderInfo.platNumber }}</span>
+                <span>{{ orderInfo.createName }} - {{ orderInfo.phone }} </span>
+                <span v-if="!dataEditor">{{ orderInfo.plateNumber }}</span>
                 <svg-icon v-if="!dataEditor" style="width: 20px;height:20px;cursor:pointer" icon-class="iconxiugai" @click="changeEditor" />
                 <el-input v-else ref="inputVal" v-model="orderInfo.plateNumber" style="width: 140px; margin-left: 10px" size="mini" clearable @blur="updateData" />
               </div>
@@ -27,7 +27,7 @@
                 <svg-icon style="color: #80de80" icon-class="iconweixinxiaochengxu1" />
               </div>
               <div class="item-text">
-                <span> ' markData.ORDER_SOURCE[orderInfo.orderSource]' 创建时间：{{ orderInfo.createTime }}</span>
+                <span> {{markData.ORDER_SOURCE[orderInfo.orderSource]}} 创建时间：{{ orderInfo.createTime }}</span>
               </div>
             </div>
           </el-col>
@@ -49,10 +49,10 @@
                 <svg-icon style="color: #219cdd" icon-class="iconyouka" />
               </div>
               <div class="item-text">
-                <span>{{ orderInfo.name?orderInfo.name:'个人油卡' }} 卡号：{{ orderInfo.accountCardCode }}</span>
+                <span>{{ orderInfo.name?orderInfo.name:'个人油卡' }}</span>
               </div>
             </div>
-            <el-button @click="qrcodefn">{{ orderInfo.orderWfStatus===0?'未核销':'已核销' }}</el-button>
+            <!-- <el-button @click="qrcodefn">{{ orderInfo.orderWfStatus===0?'未核销':'已核销' }}</el-button> -->
             <!-- <div ref="qrCodeUrl" class="qrcode" /> -->
           </el-col>
         </el-row>
@@ -69,9 +69,16 @@
           <el-row :gutter="20">
             <el-col :span="5">
               <div class="cell-item">
-                <span class="color-999 test-tst">订单id</span>
+                <span class="color-999 test-tst">订单编号</span>
                 <br>
-                <span class="inner-data">{{ orderInfo.orderSerialNumber }}</span>
+                <span class="inner-data">{{ orderInfo.id }}</span>
+              </div>
+            </el-col>
+            <el-col :span="5">
+              <div class="cell-item">
+                <span class="color-999 test-tst">三方渠道订单编号</span>
+                <br>
+                <span class="inner-data">{{ orderInfo.otherOrderId }}</span>
               </div>
             </el-col>
             <el-col :span="5">
@@ -88,20 +95,6 @@
                 <span class="inner-data">{{ markData.ORDER_TYPE[orderInfo.orderType] }}</span>
               </div>
             </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">是否补录订单</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.suppleMark == 0 ? '实时订单' : '补录订单' }}</span>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div class="cell-item">
-                <span class="color-999 test-tst">创建设备唯一标识码</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.deviceImei }}</span>
-              </div>
-            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="5">
@@ -132,15 +125,15 @@
                 <span class="inner-data">{{ orderInfo.failRemak }}</span>
               </div>
             </el-col>
-            <el-col :span="4">
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="5">
               <div class="cell-item">
                 <span class="color-999 test-tst">创建人</span>
                 <br>
-                <span class="inner-data">{{ orderInfo.createUser }}</span>
+                <span class="inner-data">{{ orderInfo.createName + " - "}}{{ orderInfo.createUser }}</span>
               </div>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
             <el-col :span="5">
               <div class="cell-item">
                 <span class="color-999 test-tst">创建时间</span>
@@ -148,18 +141,11 @@
                 <span class="inner-data">{{ orderInfo.createTime }}</span>
               </div>
             </el-col>
-            <!-- <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">创建来源</span>
-                <br>
-                <span class="inner-data">'markData.CLIENT_GROUP[orderInfo.createSource]'</span>
-              </div>
-            </el-col> -->
             <el-col :span="5">
               <div class="cell-item">
                 <span class="color-999 test-tst">修改人</span>
                 <br>
-                <span class="inner-data">{{ orderInfo.updateUser }}</span>
+                <span class="inner-data">{{ orderInfo.updateName + " - "}}{{ orderInfo.updateUser }}</span>
               </div>
             </el-col>
             <el-col :span="5">
@@ -169,45 +155,16 @@
                 <span class="inner-data">{{ orderInfo.updateTime }}</span>
               </div>
             </el-col>
-            <!-- <el-col :span="4">
-              <div class="cell-item">
-                <span class="color-999 test-tst">修改来源</span>
-                <br>
-                <span class="inner-data">{{ markData.CLIENT_GROUP[orderInfo.updateSource] }}</span>
-              </div>
-            </el-col> -->
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">三方渠道订单编号</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.otherOrderId }}</span>
-              </div>
-            </el-col>
             <el-col :span="5">
               <div class="cell-item">
                 <span class="color-999 test-tst">支付位置</span>
                 <br>
-                <span class="inner-data">坐标：{{ orderInfo.longitude }}，{{ orderInfo.latitude }}</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">ip地址</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.networkIp }}</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">优惠券使用标识</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.couponMark == 0 ? '未使用' : '使用' }}</span>
+                <span class="inner-data">{{ orderInfo.longitude }} - {{ orderInfo.latitude }}</span>
               </div>
             </el-col>
           </el-row>
-
         </div>
       </el-card>
       <el-card shadow="never" class="box-card no-wrap">
@@ -254,13 +211,6 @@
                 <span class="inner-data">{{ orderInfo.oilsBar }}号枪</span>
               </div>
             </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">加油员</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.siteUser }}</span>
-              </div>
-            </el-col>
             <el-col :span="5">
               <div class="cell-item">
                 <span class="color-999 test-tst">油站所属品牌</span>
@@ -268,7 +218,6 @@
                 <span class="inner-data">{{ orderInfo.siteBrand | formatBrand }}</span>
               </div>
             </el-col>
-
           </el-row>
         </div>
       </el-card>
@@ -378,7 +327,7 @@
               <div class="cell-item">
                 <span class="color-999 test-tst">星油优惠金额</span>
                 <br>
-                <span class="inner-data">{{ orderInfo.xoilDiscountAmount }}￥</span>
+                <span class="inner-data">{{ orderInfo.oilDiscountAmount }}￥</span>
               </div>
             </el-col>
             <el-col :span="4">
@@ -392,9 +341,9 @@
           <el-row :gutter="20">
           <el-col :span="5">
               <div class="cell-item">
-                <span class="color-999 test-tst">加价策略/策略比例</span>
+                <span class="color-999 test-tst">加价策略</span>
                 <br>
-                <span class="inner-data">{{ orderInfo.oilsPriceStrategy }}/{{ orderInfo.oilsPriceScale }}</span>
+                <span class="inner-data">{{ orderInfo.oilsPriceStrategy }}</span>
               </div>
             </el-col>
             <el-col :span="5">
@@ -437,77 +386,6 @@
             </el-row>
         </div>
       </el-card>
-
-      <el-card shadow="never" class="box-card no-wrap">
-        <div slot="header">
-          <span class="card-header-icon"><svg-icon style="color: #118dde" icon-class="iconjichuziliao" /></span>
-          <span class="card-header-text">订单账户信息</span>
-        </div>
-        <div class="card-content">
-          <el-row :gutter="20">
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">支付类型</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payAccountType ? orderInfo.payAccountType == 0 ? '个人账户' : '企业账户' : '' }}</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">是否共享企业额度</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.shareCompanyQuota ? orderInfo.shareCompanyQuota == 0 ? '否' : '是' : '' }}</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">支付方式</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payChannel ? orderInfo.payChannel == 'BALANCE_PAYMENT' ? '余额支付' : '微信支付' : '' }}</span>
-              </div>
-            </el-col>
-          </el-row>
-
-          <el-row :gutter="20">
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">发生金额</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.occurAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.occurAmount : '' }}￥</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">当然账户余额</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentBalance : '' }}￥</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">上次账户余额</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastBalance : '' }}￥</span>
-              </div>
-            </el-col>
-            <el-col :span="5">
-              <div class="cell-item">
-                <span class="color-999 test-tst">当前累计消费金额</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentTotalConsumeAmount : '' }}￥</span>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div class="cell-item">
-                <span class="color-999 test-tst">上一次累计消费金额</span>
-                <br>
-                <span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastTotalConsumeAmount : '' }}￥</span>
-              </div>
-            </el-col>
-          </el-row>
-        </div>
-      </el-card>
-
     </section>
     <el-dialog
       title="请扫描二维码核销"
@@ -581,6 +459,7 @@ export default {
   },
   computed: {
     ...mapGetters(['sysUserList', 'markData'])
+    
   },
   created() {
     console.log(this.orderInfo.orderSerialNumber, '666')
@@ -637,7 +516,7 @@ export default {
     },
     updateData() {
       this.dataEditor = false
-      orderInfoApi.update(this.orderInfo).then(res => {
+      orderInfoApi.updateC(this.orderInfo).then(res => {
         this.$message.success(res.msg)
       })
     },

src/views/finance/order/OrderInfoList.vue

@@ -71,9 +71,6 @@
               clearable
             >
               <el-option value="XOIL" label="星油" />
-              <el-option value="TY" label="团油" />
-              <el-option value="WJY" label="万金油" />
-              <el-option value="LV" label="老吕" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -1041,7 +1038,7 @@ export default {
           prop: "createTime",
           minWidth: 160,
           sortable: "custom",
-          label: "创建时间",
+          label: "订单时间",
           show: true,
           render: (row, column, cell) => {
             return cell;

src/views/finance/order/OrderPersonalInfoList.vue

@@ -27,19 +27,17 @@
               <el-form-item>
                 <el-select v-model="page.params.siteCode" placeholder="油站渠道" clearable>
                   <el-option value="XOIL" label="星油" />
-                  <el-option value="TY" label="团油" />
-                  <el-option value="WJY" label="万金油" />
                 </el-select>
               </el-form-item>
               <el-form-item>
                 <el-select v-model="page.params.orderStatus" placeholder="订单状态" clearable>
-                  <el-option label="支付失败" :value="-1" />
-                  <el-option label="待支付" :value="0" />
-                  <el-option label="支付成功" :value="1" />
-                  <el-option label="已取消" :value="2" />
-                  <el-option label="已退款" :value="3" />
-                  <el-option label="退款中" :value="4" />
-                  <el-option label="退款失败" :value="5" />
+                  <el-option label="支付失败" :value="'-1'" />
+                  <el-option label="待支付" :value="'0'" />
+                  <el-option label="支付成功" :value="'1'" />
+                  <el-option label="已取消" :value="'2'" />
+                  <el-option label="已退款" :value="'3'" />
+                  <el-option label="退款中" :value="'4'" />
+                  <el-option label="退款失败" :value="'5'" />
                 </el-select>
               </el-form-item>
               <el-form-item>
@@ -640,7 +638,7 @@ export default {
           prop: "orderTime",
           minWidth: 160,
           sortable: "custom",
-          label: "创建时间",
+          label: "订单时间",
           show: true,
           render: (row, column, cell) => {
             return cell;
@@ -879,7 +877,7 @@ export default {
     changeRowPlate(row) {
       // 修改车牌号
       row.accountCardCode = null;
-      orderInfoApi.update(row).then((res) => {
+      orderInfoApi.updateC(row).then((res) => {
         this.$message.success(res.msg);
         this.$set(row, "editor", false);
       });

src/views/finance/order/OrderTfAdd.vue

@@ -257,7 +257,7 @@ export default {
     },
     parentCompanyOrginQuery(value) { // 远程搜索企业
       if (value) {
-        oilCompanyInfoApi.getLikeByName({ 'name': value }).then(res => {
+        oilCompanyInfoApi.getLikeByNameSuccess({ 'name': value }).then(res => {
           this.companyList = res.data
         })
       }

src/views/finance/order/OrderTfInfoList.vue

@@ -117,7 +117,7 @@
                 <gl-date-time-picker
                   style="width: 424px"
                   v-model="page.params.btw_createTime"
-                  msg="创建时间"
+                  msg="订单时间"
                   @keyup.enter.native="getByPage"
                 />
               </el-form-item>
@@ -677,8 +677,8 @@ export default {
                 </div>
                 <div class="column-info-content">
                   <div class="column-info-content-item">
-                    {row.name
-                      ? row.name
+                    {row.userName
+                      ? row.userName
                       : "暂无"}
                     -
                     {row.phone
@@ -690,7 +690,7 @@ export default {
                     v-show={row.payAccountType === 1}
                     class="column-info-content-item"
                   >
-                    {row.name ? row.name : "暂无"}
+                    {row.userName ? row.userName : "暂无"}
                   </div>
                   <div class="column-info-content-item" v-show={!row.editor}>
                     <span>{row.plateNumber}</span>
@@ -821,6 +821,7 @@ export default {
               break;
               case -1:
               convertStatusName = '转化失败'
+              break;
               case 2:
               convertStatusName = '转换中'
               break;
@@ -844,7 +845,7 @@ export default {
           prop: "orderTime",
           minWidth: 160,
           sortable: "custom",
-          label: "创建时间",
+          label: "订单时间",
           show: true,
           render: (row, column, cell) => {
             return cell;
@@ -976,7 +977,7 @@ export default {
   methods: {
     searchUserInfo(info) {
       if (info && info !== "") {
-        sysCustomerInfoApi.searchInfo(info).then((res) => {
+        sysCustomerInfoApi.liekQuery(info).then((res) => {
           this.sysCustomerList = res.data;
         });
       }
@@ -1286,6 +1287,10 @@ export default {
       // 分页查询
       this.addDialog = false;
       this.page.params.convertCompanyCode = 1;
+      this.page.params = Object.assign(this.page.params,{
+        dateStartTime:this.page.params.btw_createTime?this.page.params.btw_createTime.split('~')[0]:'',
+        dateStartEnd:this.page.params.btw_createTime?this.page.params.btw_createTime.split('~')[1]:''
+      })
       orderInfoApi.getByPage(this.page).then((res) => {
         this.dataPage = res.data;
         this.page.totalCount = this.dataPage.totalCount;

src/views/login/css/index.css

@@ -1,6 +1,7 @@
 html {
     font-size: 16px !important;
 }
+
 /* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
 /* @media screen and (min-width:375px) {
     html {
@@ -43,29 +44,44 @@ html {
     margin: 0;
     width: 100vw;
     height: 100vh;
-    background-size: calc(100vw - 25.5rem) 100%;
-    background-repeat: no-repeat;
-    background-position: right;
-    background-origin: border-box;
-    background-attachment: fixed;
+    /* background-size: calc(100vw - 25.5rem) 100%; */
+    /* background-repeat: no-repeat; */
+    /* background-position: right; */
+    /* background-origin: border-box; */
+    /* 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%;
-    width: 100%;
-    padding: 5.7rem 0 0 5.7rem;
+    /* height: 100%;
+    width: 100%; */
+    /* 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: 10.8rem;
-    height: 3.672rem;
+    width: 147px;
+    height: 46px;
 }
 
 .newlogin_login_logo img {
@@ -74,7 +90,7 @@ html {
 }
 
 .newlogin_login_title {
-    color: #1767F9;
+    color: #000000;
     font-size: 1.45rem;
     margin-top: 2rem;
 }
@@ -85,14 +101,14 @@ html {
 }
 
 .newlogin_container .el-input {
-    box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
-    border-radius: 36px;
+    /* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
+    /* border-radius: 36px; */
 }
 
 .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;
@@ -100,7 +116,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; */
 
 }
 
@@ -112,8 +128,9 @@ html {
 
 .newlogin_login_from_butten {
     width: 100%;
-    border-radius: 36px;
-    font-size: 1.16rem;
+    /* border-radius: 36px; */
+    font-size: 14px;
+    background-color: #409EFF !important;
 }
 
 .newlogin_container .el-form-item {
@@ -133,12 +150,14 @@ html {
 }
 
 .newlogin_container .el-button--primary {
-    background: linear-gradient(to right, #1767F9, #4883ED);
+    background-color: #409EFF !important;
+
 }
 
 .newlogin_container .el-button--primary:hover,
 .newlogin_container .el-button--primary:focus {
-    background: linear-gradient(to right, #1767F9, #4883ED);
+    background-color: #409EFF !important;
+
 
 }
 

src/views/login/index.vue

@@ -1,10 +1,13 @@
 <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/OilInfoAdd.vue

@@ -904,12 +904,8 @@ export default {
       results:[],
       areaTree: [],
       addrCode: [], // 省市区code
-      options11: [{ value: 'IMSITE', label: '综合' },
+      options11: [
         { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
       ],
       rules: {
         // addrCode:[{ required: true, message: '省市县不能为空', trigger: 'change' }],

src/views/site/oilSiteInfo/OilInfoAddUpdate.vue

@@ -738,12 +738,8 @@ export default {
       isShowMap: true, // 高德地图div默认展示
       areaTree: [],
       addrCode: [], // 省市区code
-      options11: [{ value: 'IMSITE', label: '综合' },
+      options11: [
         { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
       ],
       numbs:0,
        rules: {

src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue

@@ -425,13 +425,8 @@ export default {
       },
       areaTree: [],
       addrCode: [], // 省市区code
-      options11: [{ value: 'IMSITE', label: '综合' },
+      options11: [
         { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
-
       ]
     }
   },

src/views/site/oilSiteInfo/OilSiteInfoAdd.vue

@@ -475,12 +475,8 @@ export default {
       },
       areaTree: [],
       addrCode: [], // 省市区code
-      options11: [{ value: 'IMSITE', label: '综合' },
-        { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
+      options11: [
+        { value: 'XOIL', label: '星油' }
       ],
       rules: {
         siteName: [

src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue

@@ -376,13 +376,8 @@ export default {
       },
       areaTree: [],
       addrCode: [], // 省市区code
-      options11: [{ value: 'IMSITE', label: '综合' },
-        { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
-
+      options11: [
+        { value: 'XOIL', label: '星油' }
       ],
       optionsBrand: [{ value: '1', label: '中国石油' },
         { value: '2', label: '中国石化' },

src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue

@@ -132,6 +132,11 @@
                         <svg-icon icon-class="iconicon-" />调价策略
                       </el-button>
                     </el-dropdown-item>
+                    <el-dropdown-item @click.native="showHistoryFn(scope.row)">
+                      <el-button :size="$store.getters.size" type="text">
+                        <svg-icon icon-class="iconicon-" />变更历史
+                      </el-button>
+                    </el-dropdown-item>
                     <!-- <el-dropdown-item @click.native="getRecordList(scope.row.id)">
                       <el-button :size="$store.getters.size" type="text">
                         <svg-icon icon-class="iconicon-" />生效历史记录
@@ -153,7 +158,45 @@
           <!-- 分页组件结束 -->
         </div>
       </ListLayout>
+      <!-- 历史记录弹窗 -->
+      <el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%">
+        <el-table :data="historyData" style="width: 100%">
+          <el-table-column prop="createTime" label="创建时间" />
           
+          <el-table-column prop="name" label="基础个人价">
+            <template slot-scope="scope">
+              <div>
+                <div>上次 {{ scope.row.lastPersonalPriceBase }}</div>
+                <div>当前 {{ scope.row.afterPersonalPriceBase }}</div>
+              </div>
+              </template>
+          </el-table-column>
+          <el-table-column prop="address" label="个人价调价策略">
+            <template slot-scope="scope">
+              <div>
+                <div>上次 {{ scope.row.lastAppPriceStrategy }}</div>
+                <div>当前 {{ scope.row.afterAppPriceStrategy }}</div>
+              </div>
+              </template>
+          </el-table-column>
+          <el-table-column prop="address" label="应用个人价">
+            <template slot-scope="scope">
+              <div>
+                <div>上次 {{ scope.row.lastPrice }}</div>
+                <div>当前 {{ scope.row.finalPrice }}</div>
+              </div>
+              </template>
+          </el-table-column>
+          <el-table-column prop="address" label="创建人">
+            <template slot-scope="scope">
+              <div>
+                <div>{{ scope.row.createUserName }}</div>
+                <div> {{ scope.row.createUser }}</div>
+              </div>
+              </template>
+          </el-table-column>
+        </el-table>
+      </el-dialog>
       <!-- 导出弹窗 -->
       <el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%">
         <OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog"
@@ -221,6 +264,8 @@ export default {
   },
   data() {
     return {
+      showHistory: false,
+      historyData: [],
       userCompany: this.$store.getters.user.userCompany,
       mappingData: [
         {
@@ -231,78 +276,108 @@ export default {
               value: 'id'
             },
             {
-              label: '渠道id',
-              value: 'id'
+              label: '油站ID',
+              value: 'siteId'
             },
             {
-              label: '渠道编码',
-              value: 'channelCode',
-              remark: 'XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油YDJY：一点加油（壳牌）',
-            },
-            {
-              label: '三方油站编码',
-              value: 'otherSiteCode',
-            },
-            {
-              label: '三方油品编码',
-              value: 'otherOilsCode'
-            },
-            {
-              label: '油枪用逗号隔开',
-              value: 'oilsBar'
-            },
-            {
-              label: '排放标准',
-              value: 'oilsGb'
-            },
-            {
-              label: '发改委价格',
-              value: 'marketPrice'
-            },
-            {
-              label: '个人加油价格',
-              value: this.$store.getters.user.userCompany == '1622767323771695104' ? 'personalPriceZp' : 'personalPrice',
-            },
-            {
-              label: '底价加油价格',
-              value: 'floorPrice'
-            },
-            {
-              label: '底价加油价格说明',
-              value: 'floorRemark'
+              label: '油品类型',
+              value: 'oilProductType'
             },
             {
               label: '启用禁用',
-              value: 'enableMark'
+              value:(data)=>{
+               if (data.enableMark == 1){
+                return ('启用');
+               }else {
+                return ('禁用');
+               }
+            }
           }, 
             {
-              label: '版本号',
-              value: 'version'
+              label: '基础个人价',
+              value: 'personalPriceBase'
             },
             {
-              label: '创建人',
+              label: '调价策略公式',
+              value: 'appPriceStrategy'
+            },
+            {
+              label: '应用个人价',
+              value: 'personalPriceApp'
+            },
+            {
+              label: '创建人ID',
               value: 'createUser'
             },
+            {
+              label: '创建人姓名',
+              value: 'createUserName'
+            },
+            {
+              label: '更新人姓名',
+              value: 'updateUserName'
+            },
+            {
+              label: '更新人ID',
+              value: 'updateUser'
+            },
             {
               label: '创建时间',
               value: 'createTime'
             },
             {
-              label: '创建来源',
-              value: 'createSource'
-            },
-            {
-              label: '修改人',
-              value: 'updateUser'
-            },
-            {
-              label: '修改时间',
+              label: '更新时间',
               value: 'updateTime'
             },
             {
-              label: '调价策略',
-              value: 'appPriceStrategy'
+              label: '创建来源',
+              value: 'createSource'
             },
+            // {
+            //   label: '渠道id',
+            //   value: 'id'
+            // },
+            // {
+            //   label: '渠道编码',
+            //   value: 'channelCode',
+            //   remark: 'XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油YDJY：一点加油（壳牌）',
+            // },
+            // {
+            //   label: '三方油站编码',
+            //   value: 'otherSiteCode',
+            // },
+            // {
+            //   label: '三方油品编码',
+            //   value: 'otherOilsCode'
+            // },
+            // {
+            //   label: '油枪用逗号隔开',
+            //   value: 'oilsBar'
+            // },
+            // {
+            //   label: '排放标准',
+            //   value: 'oilsGb'
+            // },
+            // {
+            //   label: '发改委价格',
+            //   value: 'marketPrice'
+            // },
+            // {
+            //   label: '个人加油价格',
+            //   value: this.$store.getters.user.userCompany == '1622767323771695104' ? 'personalPriceZp' : 'personalPrice',
+            // },
+            // {
+            //   label: '底价加油价格',
+            //   value: 'floorPrice'
+            // },
+            // {
+            //   label: '底价加油价格说明',
+            //   value: 'floorRemark'
+            // },
+            // {
+            //   label: '版本号',
+            //   value: 'version'
+            // },
           ]
         },
 
@@ -581,6 +656,13 @@ export default {
       },
     },
   },
+  watch:{
+    showHistory(){
+      if(!n){
+        this.historyData = []
+      }
+    }
+  },
   created() {
     this.getByPage();
     oilVehicleOwnerApi.getOils().then((res) => {
@@ -594,6 +676,12 @@ export default {
     window.addEventListener("resize", this.getHeight, false);
   },
   methods: {
+    showHistoryFn(row) {
+      oilSiteOilsPriceApi.findByRelationId(row.id).then(res => {
+        this.historyData = res.data;
+        this.showHistory = true
+      })
+    },
     toOutPutPiliang() {
       if (this.multipleSelection.length < 1) {
         this.$message.warning('请至少选择一条数据')

src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue

@@ -399,12 +399,7 @@ export default {
 
       ],
       siteChannelArray: [
-        { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
-
+        { value: 'XOIL', label: '星油' }
       ],
       options11: [{ value: 'IMSITE', label: '综合' },
         { value: 'XOIL', label: '星油' },

src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue

@@ -229,12 +229,7 @@ export default {
 
       ],
       siteChannelArray: [
-        { value: 'XOIL', label: '星油' },
-        { value: 'WJY', label: '万金油' },
-        { value: 'LV', label: '老吕（找油网）' },
-        { value: 'TY', label: '团油' },
-        { value: 'YDJY', label: '一点加油（壳牌）' }
-
+        { value: 'XOIL', label: '星油' }
       ],
       options11: [{ value: 'IMSITE', label: '综合' },
         { value: 'XOIL', label: '星油' },

src/views/statisticalReport/companyConsumptionStatistics.vue

@@ -178,9 +178,6 @@
                 <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>
@@ -192,9 +189,6 @@
                 <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>

vue.config.js

@@ -1,19 +1,19 @@
-"use strict";
-const path = require("path");
-const defaultSettings = require("./src/settings.js");
+'use strict'
+const path = require('path')
+const defaultSettings = require('./src/settings.js')
 
 function resolve(dir) {
-    return path.join(__dirname, dir);
+  return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || "星油能源调度管理平台";
-const port = 9528;
+const name = defaultSettings.title || '星油能源调度管理平台'
+const port = 9528
 
 module.exports = {
-    publicPath: "./",
-    outputDir: "dist",
-    assetsDir: "./static",
-    lintOnSave: process.env.NODE_ENV === "development",
+  publicPath: './',
+  outputDir: 'dist',
+  assetsDir: './static',
+  lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false, // 改为false可一定程度上解决浏览器f12查看到源码的问题
   devServer: {
     disableHostCheck: true,
@@ -26,24 +26,24 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         // target: "http://uat.xingoil.com/adminapi",
         // target: 'https://www.xingoil.com/adminapi',
-                target: `http://192.168.0.27:38080`,
+        target: `http://192.168.0.22:38080`,
         changeOrigin: true,
         pathRewrite: {
-                    ["^" + process.env.VUE_APP_BASE_API]: ""
+          ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
       [process.env.VUE_APP_UPLOAD_URL]: {
         target: `http://192.168.0.31:38080`,
         changeOrigin: true,
         pathRewrite: {
-                    ["^" + process.env.VUE_APP_BASE_API]: ""
+          ['^' + process.env.VUE_APP_BASE_API]: ''
         }
       },
       [process.env.VUE_APP_BASE_LSM_API]: {
         target: `http://121.41.3.91:8085`,
         changeOrigin: true,
         pathRewrite: {
-                    ["^" + process.env.VUE_APP_BASE_LSM_API]: ""
+          ['^' + process.env.VUE_APP_BASE_LSM_API]: ''
         }
       }
     }
@@ -52,91 +52,91 @@ module.exports = {
     name: name,
     resolve: {
       alias: {
-                "@": resolve("src") // 别名。开启后@表示src下目录
+        '@': resolve('src') // 别名。开启后@表示src下目录
       }
     },
     externals: {
-            "./cptable": "var cptable",
-            AMap: "AMap"
+      './cptable': 'var cptable',
+      AMap: 'AMap'
     }
   },
   chainWebpack(config) {
-        config.plugins.delete("preload"); // TODO: need test
-        config.plugins.delete("prefetch"); // TODO: need test
-        config.entry.app = ["babel-polyfill", "./src/main.js"];
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+    config.entry.app = ['babel-polyfill', './src/main.js']
     // set svg-sprite-loader
     config.module
-            .rule("svg")
-            .exclude.add(resolve("src/icons"))
-            .end();
-        config.module
-            .rule("icons")
-            .test(/\.svg$/)
-            .include.add(resolve("src/icons"))
+      .rule('svg')
+      .exclude.add(resolve('src/icons'))
       .end()
-            .use("svg-sprite-loader")
-            .loader("svg-sprite-loader")
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
       .options({
-                symbolId: "icon-[name]"
+        symbolId: 'icon-[name]'
       })
-            .end();
+      .end()
 
     if (process.env.use_analyzer) {
       // 分析
       config
-                .plugin("webpack-bundle-analyzer")
-                .use(require("webpack-bundle-analyzer").BundleAnalyzerPlugin);
+        .plugin('webpack-bundle-analyzer')
+        .use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
     }
 
     // set preserveWhitespace
     config.module
-            .rule("vue")
-            .use("vue-loader")
-            .loader("vue-loader")
+      .rule('vue')
+      .use('vue-loader')
+      .loader('vue-loader')
       .tap(options => {
-                options.compilerOptions.preserveWhitespace = true;
-                return options;
+        options.compilerOptions.preserveWhitespace = true
+        return options
       })
-            .end();
+      .end()
 
-        config;
+    config
     // https://webpack.js.org/configuration/devtool/#development.when(process.env.NODE_ENV === 'development', config => config.devtool('cheap-source-map'))
 
-        config.when(process.env.NODE_ENV !== "development", config => {
+    config.when(process.env.NODE_ENV !== 'development', config => {
       config
-                .plugin("ScriptExtHtmlWebpackPlugin")
-                .after("html")
-                .use("script-ext-html-webpack-plugin", [
+        .plugin('ScriptExtHtmlWebpackPlugin')
+        .after('html')
+        .use('script-ext-html-webpack-plugin', [
           {
             // `runtime` must same as runtimeChunk name. default is `runtime`
             inline: /runtime\..*\.js$/
           }
         ])
-                .end();
+        .end()
       config.optimization.splitChunks({
-                chunks: "all",
+        chunks: 'all',
         cacheGroups: {
           libs: {
-                        name: "chunk-libs",
+            name: 'chunk-libs',
             test: /[\\/]node_modules[\\/]/,
             priority: 10,
-                        chunks: "initial" // only package third parties that are initially dependent
+            chunks: 'initial' // only package third parties that are initially dependent
           },
           elementUI: {
-                        name: "chunk-elementUI", // split elementUI into a single package
+            name: 'chunk-elementUI', // split elementUI into a single package
             priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
             test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
           },
           commons: {
-                        name: "chunk-commons",
-                        test: resolve("src/components"), // can customize your rules
+            name: 'chunk-commons',
+            test: resolve('src/components'), // can customize your rules
             minChunks: 3, // minimum common number
             priority: 5,
             reuseExistingChunk: true
           }
         }
-            });
-            config.optimization.runtimeChunk("single");
-        });
+      })
+      config.optimization.runtimeChunk('single')
+    })
+  }
 }
-};