From 464fd6b546172a6559e7ea2a5759a0cb51e23f9a Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Wed, 19 Apr 2023 10:12:23 +0800
Subject: [PATCH] 123123

---
 src/api/finance/oilCompanyOrderMatchTask.js                | 4 ++--
 src/layout/components/Navbar.vue                           | 2 +-
 src/layout/components/Sidebar/Logo.vue                     | 2 +-
 src/settings.js                                            | 2 +-
 src/utils/get-page-title.js                                | 2 +-
 src/views/finance/order/OrderTfInfoList.vue                | 2 +-
 src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue | 4 ++--
 vue.config.js                                              | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/api/finance/oilCompanyOrderMatchTask.js b/src/api/finance/oilCompanyOrderMatchTask.js
index e2fb108..b4823ae 100644
--- a/src/api/finance/oilCompanyOrderMatchTask.js
+++ b/src/api/finance/oilCompanyOrderMatchTask.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 var service_name = 'xkhl-finance'
-var group_name = 'oilCompanyOrderMatchTask'
+var group_name = 'saasCompanyOrderMatchTask'
 export default {
   getByPage(page) { // 分页查询
     return request({
@@ -61,7 +61,7 @@ export default {
   },
   audit(oilCompanyOrderMatchTask) { // 任务审核
     return request({
-      url: `/${service_name}/${group_name}/audit`,
+      url: `/xkhl-site/${group_name}/audit`,
       method: 'POST',
       data: oilCompanyOrderMatchTask
     })
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3ac2b02..bc62ca3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -32,7 +32,7 @@
             </div>
           </div>
         </el-tooltip>-->
-        <span class="right-menu-item hover-effect sys-name">星油能源运营管理平台</span>
+        <span class="right-menu-item hover-effect sys-name">星油能源调度管理平台</span>
 
         <el-tooltip :enterable="false" content="菜单搜索" effect="dark" placement="bottom">
           <menu-search id="header-search" class="right-menu-item hover-effect" />
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index e2ce396..884b1a9 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -17,7 +17,7 @@
             </router-link>
             <router-link v-else key="expand" class="sidebar-logo-link" to="/">
                 <img v-if="logo" :src="logo" class="sidebar-logo" />
-                <!-- <h1 class="sidebar-title">星油能源运营管理平台</h1> -->
+                <!-- <h1 class="sidebar-title">星油能源调度管理平台</h1> -->
             </router-link>
         </transition>
     </div>
diff --git a/src/settings.js b/src/settings.js
index 15f6af2..a36a3d8 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,5 +1,5 @@
 module.exports = {
-  title: '星油能源运营管理平台',
+  title: '星油能源调度管理平台',
 
   /**
    * 是否显示设置
diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js
index c225013..b01a536 100644
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || '星油能源运营管理平台'
+const title = defaultSettings.title || '星油能源调度管理平台'
 
 export default function getPageTitle(key) {
   return title
diff --git a/src/views/finance/order/OrderTfInfoList.vue b/src/views/finance/order/OrderTfInfoList.vue
index efb02f3..e496d87 100644
--- a/src/views/finance/order/OrderTfInfoList.vue
+++ b/src/views/finance/order/OrderTfInfoList.vue
@@ -839,7 +839,7 @@ export default {
         //   </div>
         // } },
         {
-          prop: "createTime",
+          prop: "orderTime",
           minWidth: 160,
           sortable: "custom",
           label: "创建时间",
diff --git a/src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue b/src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue
index d006f8a..deb0509 100644
--- a/src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue
+++ b/src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue
@@ -456,12 +456,12 @@ export default {
         {
           prop: "oilProductCode",
           width: 150,
-          label: "油品/底价",
+          label: "基础个人价",
           show: true,
           render: (row, column, cell) => {
             return <div>
               <span class="colorhui">油品：</span><span>{cell}</span><br/>
-              <span class="colorhui">当前底价：</span><span>{row.currentFloorPrice}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
+              <span class="colorhui">当前基础个人价：</span><span>{row.currentFloorPrice}</span><i v-show={row.floorPriceIgnore==1} class="el-icon-s-check"></i>
                   </div>
           },
         },
diff --git a/vue.config.js b/vue.config.js
index 080c65e..21c0a95 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
     return path.join(__dirname, dir);
 }
 
-const name = defaultSettings.title || "星油能源运营管理平台";
+const name = defaultSettings.title || "星油能源调度管理平台";
 const port = 9528;
 
 module.exports = {