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

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>

171
src/views/finance/order/OrderInfoInfo.vue
View File

@@ -14,8 +14,8 @@
<svg-icon style="color: #8cb4fd" icon-class="icongongsi-" />
</div>
<div class="item-text" style="display: flex; align-items: center">
<span>{{ orderInfo.userName }}-{{ orderInfo.customerCode }} {{ orderInfo.phone }} </span>
<span v-if="!dataEditor">{{ orderInfo.platNumber }}</span>
<span>{{ orderInfo.createName }} - {{ orderInfo.phone }} </span>
<span v-if="!dataEditor">{{ orderInfo.plateNumber }}</span>
<svg-icon v-if="!dataEditor" style="width: 20px;height:20px;cursor:pointer" icon-class="iconxiugai" @click="changeEditor" />
<el-input v-else ref="inputVal" v-model="orderInfo.plateNumber" style="width: 140px; margin-left: 10px" size="mini" clearable @blur="updateData" />
</div>
@@ -27,7 +27,7 @@
<svg-icon style="color: #80de80" icon-class="iconweixinxiaochengxu1" />
</div>
<div class="item-text">
<span> ' markData.ORDER_SOURCE[orderInfo.orderSource]' 创建时间：{{ orderInfo.createTime }}</span>
<span> {{markData.ORDER_SOURCE[orderInfo.orderSource]}} 创建时间：{{ orderInfo.createTime }}</span>
</div>
</div>
</el-col>
@@ -49,10 +49,10 @@
<svg-icon style="color: #219cdd" icon-class="iconyouka" />
</div>
<div class="item-text">
<span>{{ orderInfo.name?orderInfo.name:'个人油卡' }} 卡号：{{ orderInfo.accountCardCode }}</span>
<span>{{ orderInfo.name?orderInfo.name:'个人油卡' }}</span>
</div>
</div>
<el-button @click="qrcodefn">{{ orderInfo.orderWfStatus===0?'未核销':'已核销' }}</el-button>
<!-- <el-button @click="qrcodefn">{{ orderInfo.orderWfStatus===0?'未核销':'已核销' }}</el-button> -->
<!-- <div ref="qrCodeUrl" class="qrcode" /> -->
</el-col>
</el-row>
@@ -69,9 +69,16 @@
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">订单id</span>
<span class="color-999 test-tst">订单编号</span>
<br>
<span class="inner-data">{{ orderInfo.orderSerialNumber }}</span>
<span class="inner-data">{{ orderInfo.id }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">三方渠道订单编号</span>
<br>
<span class="inner-data">{{ orderInfo.otherOrderId }}</span>
</div>
</el-col>
<el-col :span="5">
@@ -88,20 +95,6 @@
<span class="inner-data">{{ markData.ORDER_TYPE[orderInfo.orderType] }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">是否补录订单</span>
<br>
<span class="inner-data">{{ orderInfo.suppleMark == 0 ? '实时订单' : '补录订单' }}</span>
</div>
</el-col>
<el-col :span="4">
<div class="cell-item">
<span class="color-999 test-tst">创建设备唯一标识码</span>
<br>
<span class="inner-data">{{ orderInfo.deviceImei }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="5">
@@ -132,15 +125,15 @@
<span class="inner-data">{{ orderInfo.failRemak }}</span>
</div>
</el-col>
<el-col :span="4">
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">创建人</span>
<br>
<span class="inner-data">{{ orderInfo.createUser }}</span>
<span class="inner-data">{{ orderInfo.createName + " - "}}{{ orderInfo.createUser }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">创建时间</span>
@@ -148,18 +141,11 @@
<span class="inner-data">{{ orderInfo.createTime }}</span>
</div>
</el-col>
<!-- <el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">创建来源</span>
<br>
<span class="inner-data">'markData.CLIENT_GROUP[orderInfo.createSource]'</span>
</div>
</el-col> -->
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">修改人</span>
<br>
<span class="inner-data">{{ orderInfo.updateUser }}</span>
<span class="inner-data">{{ orderInfo.updateName + " - "}}{{ orderInfo.updateUser }}</span>
</div>
</el-col>
<el-col :span="5">
@@ -169,45 +155,16 @@
<span class="inner-data">{{ orderInfo.updateTime }}</span>
</div>
</el-col>
<!-- <el-col :span="4">
<div class="cell-item">
<span class="color-999 test-tst">修改来源</span>
<br>
<span class="inner-data">{{ markData.CLIENT_GROUP[orderInfo.updateSource] }}</span>
</div>
</el-col> -->
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">三方渠道订单编号</span>
<br>
<span class="inner-data">{{ orderInfo.otherOrderId }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">支付位置</span>
<br>
<span class="inner-data">坐标：{{ orderInfo.longitude }}，{{ orderInfo.latitude }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">ip地址</span>
<br>
<span class="inner-data">{{ orderInfo.networkIp }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">优惠券使用标识</span>
<br>
<span class="inner-data">{{ orderInfo.couponMark == 0 ? '未使用' : '使用' }}</span>
<span class="inner-data">{{ orderInfo.longitude }} - {{ orderInfo.latitude }}</span>
</div>
</el-col>
</el-row>
</div>
</el-card>
<el-card shadow="never" class="box-card no-wrap">
@@ -254,13 +211,6 @@
<span class="inner-data">{{ orderInfo.oilsBar }}号枪</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">加油员</span>
<br>
<span class="inner-data">{{ orderInfo.siteUser }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">油站所属品牌</span>
@@ -268,7 +218,6 @@
<span class="inner-data">{{ orderInfo.siteBrand | formatBrand }}</span>
</div>
</el-col>
</el-row>
</div>
</el-card>
@@ -378,7 +327,7 @@
<div class="cell-item">
<span class="color-999 test-tst">星油优惠金额</span>
<br>
<span class="inner-data">{{ orderInfo.xoilDiscountAmount }}￥</span>
<span class="inner-data">{{ orderInfo.oilDiscountAmount }}￥</span>
</div>
</el-col>
<el-col :span="4">
@@ -392,9 +341,9 @@
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">加价策略/策略比例</span>
<span class="color-999 test-tst">加价策略</span>
<br>
<span class="inner-data">{{ orderInfo.oilsPriceStrategy }}/{{ orderInfo.oilsPriceScale }}</span>
<span class="inner-data">{{ orderInfo.oilsPriceStrategy }}</span>
</div>
</el-col>
<el-col :span="5">
@@ -437,77 +386,6 @@
</el-row>
</div>
</el-card>
<el-card shadow="never" class="box-card no-wrap">
<div slot="header">
<span class="card-header-icon"><svg-icon style="color: #118dde" icon-class="iconjichuziliao" /></span>
<span class="card-header-text">订单账户信息</span>
</div>
<div class="card-content">
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">支付类型</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType ? orderInfo.payAccountType == 0 ? '个人账户' : '企业账户' : '' }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">是否共享企业额度</span>
<br>
<span class="inner-data">{{ orderInfo.shareCompanyQuota ? orderInfo.shareCompanyQuota == 0 ? '否' : '是' : '' }}</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">支付方式</span>
<br>
<span class="inner-data">{{ orderInfo.payChannel ? orderInfo.payChannel == 'BALANCE_PAYMENT' ? '余额支付' : '微信支付' : '' }}</span>
</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">发生金额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.occurAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.occurAmount : '' }}￥</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">当然账户余额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentBalance : '' }}￥</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">上次账户余额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastBalance : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastBalance : '' }}￥</span>
</div>
</el-col>
<el-col :span="5">
<div class="cell-item">
<span class="color-999 test-tst">当前累计消费金额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.currentTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.currentTotalConsumeAmount : '' }}￥</span>
</div>
</el-col>
<el-col :span="4">
<div class="cell-item">
<span class="color-999 test-tst">上一次累计消费金额</span>
<br>
<span class="inner-data">{{ orderInfo.payAccountType == 0 ? orderInfo.oilCustomerAccountRecord ? orderInfo.oilCustomerAccountRecord.lastTotalConsumeAmount : '' : orderInfo.oilCustomerCompanyAccountRecord ? orderInfo.oilCustomerCompanyAccountRecord.lastTotalConsumeAmount : '' }}￥</span>
</div>
</el-col>
</el-row>
</div>
</el-card>
</section>
<el-dialog
title="请扫描二维码核销"
@@ -581,6 +459,7 @@ export default {
},
computed: {
...mapGetters(['sysUserList', 'markData'])
},
created() {
console.log(this.orderInfo.orderSerialNumber, '666')
@@ -637,7 +516,7 @@ export default {
},
updateData() {
this.dataEditor = false
orderInfoApi.update(this.orderInfo).then(res => {
orderInfoApi.updateC(this.orderInfo).then(res => {
this.$message.success(res.msg)
})
},

5
src/views/finance/order/OrderInfoList.vue
View File

@@ -71,9 +71,6 @@
clearable
>
<el-option value="XOIL" label="星油" />
<el-option value="TY" label="团油" />
<el-option value="WJY" label="万金油" />
<el-option value="LV" label="老吕" />
</el-select>
</el-form-item>
<el-form-item>
@@ -1041,7 +1038,7 @@ export default {
prop: "createTime",
minWidth: 160,
sortable: "custom",
label: "创建时间",
label: "订单时间",
show: true,
render: (row, column, cell) => {
return cell;

20
src/views/finance/order/OrderPersonalInfoList.vue
View File

@@ -27,19 +27,17 @@
<el-form-item>
<el-select v-model="page.params.siteCode" placeholder="油站渠道" clearable>
<el-option value="XOIL" label="星油" />
<el-option value="TY" label="团油" />
<el-option value="WJY" label="万金油" />
</el-select>
</el-form-item>
<el-form-item>
<el-select v-model="page.params.orderStatus" placeholder="订单状态" clearable>
<el-option label="支付失败" :value="-1" />
<el-option label="待支付" :value="0" />
<el-option label="支付成功" :value="1" />
<el-option label="已取消" :value="2" />
<el-option label="已退款" :value="3" />
<el-option label="退款中" :value="4" />
<el-option label="退款失败" :value="5" />
<el-option label="支付失败" :value="'-1'" />
<el-option label="待支付" :value="'0'" />
<el-option label="支付成功" :value="'1'" />
<el-option label="已取消" :value="'2'" />
<el-option label="已退款" :value="'3'" />
<el-option label="退款中" :value="'4'" />
<el-option label="退款失败" :value="'5'" />
</el-select>
</el-form-item>
<el-form-item>
@@ -640,7 +638,7 @@ export default {
prop: "orderTime",
minWidth: 160,
sortable: "custom",
label: "创建时间",
label: "订单时间",
show: true,
render: (row, column, cell) => {
return cell;
@@ -879,7 +877,7 @@ export default {
changeRowPlate(row) {
// 修改车牌号
row.accountCardCode = null;
orderInfoApi.update(row).then((res) => {
orderInfoApi.updateC(row).then((res) => {
this.$message.success(res.msg);
this.$set(row, "editor", false);
});

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

17
src/views/finance/order/OrderTfInfoList.vue
View File

@@ -117,7 +117,7 @@
<gl-date-time-picker
style="width: 424px"
v-model="page.params.btw_createTime"
msg="创建时间"
msg="订单时间"
@keyup.enter.native="getByPage"
/>
</el-form-item>
@@ -677,8 +677,8 @@ export default {
</div>
<div class="column-info-content">
<div class="column-info-content-item">
{row.name
? row.name
{row.userName
? row.userName
: "暂无"}
-
{row.phone
@@ -690,7 +690,7 @@ export default {
v-show={row.payAccountType === 1}
class="column-info-content-item"
>
{row.name ? row.name : "暂无"}
{row.userName ? row.userName : "暂无"}
</div>
<div class="column-info-content-item" v-show={!row.editor}>
<span>{row.plateNumber}</span>
@@ -821,6 +821,7 @@ export default {
break;
case -1:
convertStatusName = '转化失败'
break;
case 2:
convertStatusName = '转换中'
break;
@@ -844,7 +845,7 @@ export default {
prop: "orderTime",
minWidth: 160,
sortable: "custom",
label: "创建时间",
label: "订单时间",
show: true,
render: (row, column, cell) => {
return cell;
@@ -976,7 +977,7 @@ export default {
methods: {
searchUserInfo(info) {
if (info && info !== "") {
sysCustomerInfoApi.searchInfo(info).then((res) => {
sysCustomerInfoApi.liekQuery(info).then((res) => {
this.sysCustomerList = res.data;
});
}
@@ -1286,6 +1287,10 @@ export default {
// 分页查询
this.addDialog = false;
this.page.params.convertCompanyCode = 1;
this.page.params = Object.assign(this.page.params,{
dateStartTime:this.page.params.btw_createTime?this.page.params.btw_createTime.split('~')[0]:'',
dateStartEnd:this.page.params.btw_createTime?this.page.params.btw_createTime.split('~')[1]:''
})
orderInfoApi.getByPage(this.page).then((res) => {
this.dataPage = res.data;
this.page.totalCount = this.dataPage.totalCount;

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: '星油' },