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 it_s

Browse Source
pull/7/head
xk_jiangfeng 2 years ago
parent 661855a53e 11a63070f1
commit d56fec340b
3 changed files with 145 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/api/user/oilSiteOilsPrice.js
  2. 2
      src/utils/request.js
  3. 186
      src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue

6
src/api/user/oilSiteOilsPrice.js
Unescape View File

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

2
src/utils/request.js
Unescape View File

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

186
src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
Unescape View File

@ -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: '渠道编码',
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'
// },
]
},
@ -359,14 +434,14 @@ export default {
prop: "siteName",
label: "油站名称",
show: true,
minWidth:200,
minWidth: 200,
render: (row, column, cell) => {
let typeData = {
type: row.globalEnable == 'ENABLE' ? 'success' : 'info',
value: row.globalEnable == 'ENABLE' ? '启用' : '禁用'
}
return <div>
<el-tag type={typeData.type} > {typeData.value} </el-tag>
<el-tag type={typeData.type} > {typeData.value} </el-tag>
<span style='margin-left:20px'>{cell}</span>
<br />
{row.siteId}
@ -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('请至少选择一条数据')
@ -643,7 +731,7 @@ export default {
},
modifyStrategy(id) {
oilSiteOilsPriceApi.get(id.id).then((res) => {
this.oilSiteOilsPrice = res.data
this.oilSiteOilsPrice = res.data
// Object.assign(res.data, {
// personalPriceApp: id.personalPriceApp,
// personalPriceBase: id.personalPriceBase,

Write Preview
Loading…
Cancel
Save