pull/2/head^2
caolc 2 years ago
parent c7b78e553a
commit 464fd6b546
  1. 4
      src/api/finance/oilCompanyOrderMatchTask.js
  2. 2
      src/layout/components/Navbar.vue
  3. 2
      src/layout/components/Sidebar/Logo.vue
  4. 2
      src/settings.js
  5. 2
      src/utils/get-page-title.js
  6. 2
      src/views/finance/order/OrderTfInfoList.vue
  7. 4
      src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue
  8. 2
      vue.config.js

@ -1,6 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
var service_name = 'xkhl-finance' var service_name = 'xkhl-finance'
var group_name = 'oilCompanyOrderMatchTask' var group_name = 'saasCompanyOrderMatchTask'
export default { export default {
getByPage(page) { // 分页查询 getByPage(page) { // 分页查询
return request({ return request({
@ -61,7 +61,7 @@ export default {
}, },
audit(oilCompanyOrderMatchTask) { // 任务审核 audit(oilCompanyOrderMatchTask) { // 任务审核
return request({ return request({
url: `/${service_name}/${group_name}/audit`, url: `/xkhl-site/${group_name}/audit`,
method: 'POST', method: 'POST',
data: oilCompanyOrderMatchTask data: oilCompanyOrderMatchTask
}) })

@ -32,7 +32,7 @@
</div> </div>
</div> </div>
</el-tooltip>--> </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"> <el-tooltip :enterable="false" content="菜单搜索" effect="dark" placement="bottom">
<menu-search id="header-search" class="right-menu-item hover-effect" /> <menu-search id="header-search" class="right-menu-item hover-effect" />

@ -17,7 +17,7 @@
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<img v-if="logo" :src="logo" class="sidebar-logo" /> <img v-if="logo" :src="logo" class="sidebar-logo" />
<!-- <h1 class="sidebar-title">星油能源运营管理平台</h1> --> <!-- <h1 class="sidebar-title">星油能源调度管理平台</h1> -->
</router-link> </router-link>
</transition> </transition>
</div> </div>

@ -1,5 +1,5 @@
module.exports = { module.exports = {
title: '星油能源运营管理平台', title: '星油能源调度管理平台',
/** /**
* 是否显示设置 * 是否显示设置

@ -1,6 +1,6 @@
import defaultSettings from '@/settings' import defaultSettings from '@/settings'
const title = defaultSettings.title || '星油能源运营管理平台' const title = defaultSettings.title || '星油能源调度管理平台'
export default function getPageTitle(key) { export default function getPageTitle(key) {
return title return title

@ -839,7 +839,7 @@ export default {
// </div> // </div>
// } }, // } },
{ {
prop: "createTime", prop: "orderTime",
minWidth: 160, minWidth: 160,
sortable: "custom", sortable: "custom",
label: "创建时间", label: "创建时间",

@ -456,12 +456,12 @@ export default {
{ {
prop: "oilProductCode", prop: "oilProductCode",
width: 150, width: 150,
label: "油品/底价", label: "基础个人价",
show: true, show: true,
render: (row, column, cell) => { render: (row, column, cell) => {
return <div> return <div>
<span class="colorhui">油品</span><span>{cell}</span><br/> <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> </div>
}, },
}, },

@ -6,7 +6,7 @@ function resolve(dir) {
return path.join(__dirname, dir); return path.join(__dirname, dir);
} }
const name = defaultSettings.title || "星油能源运营管理平台"; const name = defaultSettings.title || "星油能源调度管理平台";
const port = 9528; const port = 9528;
module.exports = { module.exports = {

Loading…
Cancel
Save