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 lifei

Browse Source
This commit is contained in:
李飞
2023-04-20 14:29:44 +08:00
parent 08c13be954 8631597526
commit fd9192562c
19 changed files with 269 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/site/oilSiteInfo/OilInfoAdd.vue
View File

@@ -904,12 +904,8 @@ export default {
results:[],
areaTree: [],
addrCode: [], // 省市区code
options11: [{ value: 'IMSITE', label: '综合' },
options11: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
],
rules: {
// addrCode:[{ required: true, message: '省市县不能为空', trigger: 'change' }],

6
src/views/site/oilSiteInfo/OilInfoAddUpdate.vue
View File

@@ -738,12 +738,8 @@ export default {
isShowMap: true, // 高德地图div默认展示
areaTree: [],
addrCode: [], // 省市区code
options11: [{ value: 'IMSITE', label: '综合' },
options11: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
],
numbs:0,
rules: {

7
src/views/site/oilSiteInfo/OilSiteInfoAdd copy.vue
View File

@@ -425,13 +425,8 @@ export default {
},
areaTree: [],
addrCode: [], // 省市区code
options11: [{ value: 'IMSITE', label: '综合' },
options11: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
]
}
},

8
src/views/site/oilSiteInfo/OilSiteInfoAdd.vue
View File

@@ -475,12 +475,8 @@ export default {
},
areaTree: [],
addrCode: [], // 省市区code
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
options11: [
{ value: 'XOIL', label: '星油' }
],
rules: {
siteName: [

9
src/views/site/oilSiteInfo/OilSiteInfoUpdate.vue
View File

@@ -376,13 +376,8 @@ export default {
},
areaTree: [],
addrCode: [], // 省市区code
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
options11: [
{ value: 'XOIL', label: '星油' }
],
optionsBrand: [{ value: '1', label: '中国石油' },
{ value: '2', label: '中国石化' },

66
src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
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: [
{
@@ -389,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}
@@ -611,6 +656,13 @@ export default {
},
},
},
watch:{
showHistory(){
if(!n){
this.historyData = []
}
}
},
created() {
this.getByPage();
oilVehicleOwnerApi.getOils().then((res) => {
@@ -624,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('请至少选择一条数据')
@@ -673,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,

7
src/views/site/priceAdjustTask/OilSitePriceAdjustTaskUpdate.vue
View File

@@ -399,12 +399,7 @@ export default {
],
siteChannelArray: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
{ value: 'XOIL', label: '星油' }
],
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },

7
src/views/site/priceAdjustTask/OilSitePriceAdjustTaskVerify.vue
View File

@@ -229,12 +229,7 @@ export default {
],
siteChannelArray: [
{ value: 'XOIL', label: '星油' },
{ value: 'WJY', label: '万金油' },
{ value: 'LV', label: '老吕（找油网）' },
{ value: 'TY', label: '团油' },
{ value: 'YDJY', label: '一点加油（壳牌）' }
{ value: 'XOIL', label: '星油' }
],
options11: [{ value: 'IMSITE', label: '综合' },
{ value: 'XOIL', label: '星油' },