caoliancun/dispacth_zhongpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into caolc

Browse Source
This commit is contained in:
caolc
2023-04-20 09:27:46 +08:00
parent 565e9c7070 1765d15732
commit c1221ce4c9
3 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
View File

@@ -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>

2
src/views/finance/order/OrderTfAdd.vue
View File

@@ -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
})
}

134
src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
View File

@@ -276,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: 'personalPriceBase'
},
{
label: '版本号',
value: 'version'
label: '调价策略公式',
value: 'appPriceStrategy'
},
{
label: '创建人',
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'
// },
]
},