From e1d7be00e28a542e5561a224d9fa0f6d3d7e93c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=A3=9E?= <1277061783@qq.com> Date: Wed, 19 Apr 2023 20:11:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E4=BB=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oilSiteOilsPrice/OilSiteOilsPriceList.vue | 120 +++++++++++------- 1 file changed, 75 insertions(+), 45 deletions(-) diff --git a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue index 5554cbb..59ec756 100644 --- a/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue +++ b/src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue @@ -231,78 +231,108 @@ export default { value: 'id' }, { - label: '渠道id', - value: 'id' - }, - { - label: '渠道编码', - value: 'channelCode', - remark: 'XOIL：星油 WJY：万金油 LV：老吕（找油网） TY：团油YDJY：一点加油（壳牌）', - }, - { - label: '三方油站编码', - value: 'otherSiteCode', - }, - { - label: '三方油品编码', - value: 'otherOilsCode' + label: '油站ID', + value: 'siteId' }, { - label: '油枪用逗号隔开', - value: 'oilsBar' + label: '油品类型', + value: 'oilProductType' }, { - label: '排放标准', - value: 'oilsGb' - }, + label: '启用禁用', + value:(data)=>{ + if (data.enableMark == 1){ + return ('启用'); + }else { + return ('禁用'); + } + } + }, { - label: '发改委价格', - value: 'marketPrice' + label: '基础个人价', + value: 'personalPriceBase' }, { - label: '个人加油价格', - value: this.$store.getters.user.userCompany == '1622767323771695104' ? 'personalPriceZp' : 'personalPrice', + label: '调价策略公式', + value: 'appPriceStrategy' }, { - label: '底价加油价格', - value: 'floorPrice' + label: '应用个人价', + value: 'personalPriceApp' }, { - label: '底价加油价格说明', - value: 'floorRemark' + label: '创建人ID', + value: 'createUser' }, { - label: '启用禁用', - value: 'enableMark' + label: '创建人姓名', + value: 'createUserName' }, { - label: '版本号', - value: 'version' + label: '更新人姓名', + value: 'updateUserName' }, { - label: '创建人', - value: 'createUser' + 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' + // }, ] }, From ddba00a8f1f2282bd632af2ce74a667ad9929c6a Mon Sep 17 00:00:00 2001 From: xk_jiangfeng Date: Thu, 20 Apr 2023 09:11:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue | 4 ++-- src/views/finance/order/OrderTfAdd.vue | 2 +- vue.config.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue b/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue index f2ddc92..861a497 100644 --- a/src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue +++ b/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" /> - + diff --git a/src/views/finance/order/OrderTfAdd.vue b/src/views/finance/order/OrderTfAdd.vue index df9696c..17f391b 100644 --- a/src/views/finance/order/OrderTfAdd.vue +++ b/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 }) } diff --git a/vue.config.js b/vue.config.js index 02e5a21..8eb22c6 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,7 +26,7 @@ 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.22:38080`, + target: `http://192.168.0.6:38080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''