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

Merge pull request 'lifei' (#13) from lifei into master

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
曹连存
2023-05-10 06:21:27 +00:00
parent e7fca62c03 27459621fa
commit b083229d5e
11 changed files with 145 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -12,7 +12,7 @@ VUE_APP_UPLOAD_PRIVATE_URL = '/api/xkhl-dict/imageHandler/uploadProtectedImg'
VUE_APP_DOMAIN = '192.168.0.199:38080'
# 开发环境，不会进行加密，会打印出数据
VUE_APP_ENV = 'development'
VUE_APP_ENV = 'production'
#production

2
src/api/AdjustTask/AdjustTask.js
View File

@@ -1,6 +1,6 @@
import request from '@/utils/request'
var service_name = 'xkhl-site'
var group_name = 'xoilDispatchSitePriceAdjustTask'
var group_name = 'saasDispatchSitePriceAdjustTask'
export default {
getByPage(page) { // 站点分页查询
return request({

7
src/api/user/oilVehicleOwner.js
View File

@@ -30,6 +30,13 @@ export default {
data: oilVehicleOwner
})
},
saveDispat(oilVehicleOwner) { // 新保存(调度管理)
return request({
url: `/xkhl-user/saasCustomerPlatenum/save `,
method: 'post',
data: oilVehicleOwner
})
},
saveSite(oilVehicleOwner) { // 保存
return request({
url: `/${service_name}/${group_name}/saveSite`,

7
src/views/driver/vehicle/OilVehicleOwnerAdd.vue
View File

@@ -197,9 +197,14 @@ export default {
}
},
save() {
// 保存
// 保存
oilVehicleOwnerApi.saveDispatch(this.oilVehicleOwner).then((res) => {
this.$message.success(res.msg);
this.$emit("closeDialog");
this.$emit("getByPage");
});
// 新保存
oilVehicleOwnerApi.saveDispat(this.oilVehicleOwner).then((res) => {
this.$emit("closeDialog");
this.$emit("getByPage");
this.oilVehicleOwner = {};

2
src/views/driver/vehicle/OilVehicleOwnerList.vue
View File

@@ -194,7 +194,7 @@
direction="ltr"
destroy-on-close
>
<OilVehicleOwnerAdd @getByPage="getByPage" @closeDialog="closeDialog" />
<OilVehicleOwnerAdd v-if="addDialog" @getByPage="getByPage" @closeDialog="closeDialog" />
</el-drawer>
<!-- 导出抽屉 -->

4
src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
View File

@@ -575,7 +575,7 @@ export default {
],
addDialog: false, // 添加弹窗
updateDialog: false, // 修改弹窗
oilCompanyMatch: {},
oilCompanyMatch: null,
};
},
computed: {
@@ -705,8 +705,8 @@ export default {
this.getByPage();
},
toAdd() {
// 跳转到添加
this.oilCompanyMatch = {};
// 跳转到添加
this.addDialog = true;
},
toUpdate(id) {

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

@@ -694,7 +694,7 @@ export default {
<div>
<div>
来源：
{cell}
{ this.markData.ORDER_SOURCE[cell] }
</div>
<div>
支付：

190
src/views/site/oilCompanySiteDiaodu/adjustStrategyPiliangAdd.vue
View File

@@ -1,14 +1,6 @@
<template>
<el-dialog
title=""
:visible="true"
:show-close="false"
top="20vh"
width="500px"
:close-on-click-modal="false"
center
custom-class="custom-dialog"
><el-form label-width="80px" class="addStyle">
<el-dialog title="" :visible="true" :show-close="false" top="20vh" width="500px" :close-on-click-modal="false" center
custom-class="custom-dialog"><el-form label-width="80px" class="addStyle">
<div class="adjust-frame">
<div class="titleStyle">
<p style="margin:0;color:#409EFF">新增快速调价任务</p>
@@ -17,48 +9,22 @@
<span>{{ multipleSelection.length }}</span>
</div>
</div>
<img
class="close"
@click="
controlWindows.dialogAdjustStrategyPiliangAdd = false
"
src="@/assets/img/close_fill.png"
alt=""
/>
<img class="close" @click="
controlWindows.dialogAdjustStrategyPiliangAdd = false
" src="@/assets/img/close_fill.png" alt="" />
<div style="margin: 0 35px;">
<template>
<div style="margin:40px 0 20px;">
<span style="margin: 15px 0; display: block;"
>任务名称</span
>
<el-input
type="textarea"
:rows="2"
placeholder="请输入内容"
v-model="taskName"
></el-input>
<span style="margin: 15px 0; display: block;">任务名称</span>
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="taskName"></el-input>
</div>
<el-divider></el-divider>
<div
style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 20px;"
>
<div style="display:flex;align-items: center;justify-content: space-between;margin-bottom: 20px;">
<div class="mubiaocelue">
<div
class="special-exhibition"
style="margin: -7px 0 12px;"
>
<span style="margin-right: 10px"
>目标策略公式</span
>
<input
class="strategy-input"
type="text"
v-model="
convertPersonalPriceSyncStrategy
"
@keyup="inputHandle"
@blur="blurHandle"
/>
<div class="special-exhibition" style="margin: -7px 0 12px;">
<span style="margin-right: 10px">目标策略公式</span>
<input class="strategy-input" type="text" v-model="convertPersonalPriceSyncStrategy
" @keyup="inputHandle" @blur="blurHandle" />
</div>
<div style="margin: 0 0 0 auto;">
执行时基础个人价变更
@@ -66,11 +32,7 @@
</div>
<div class="mubiaocelue">
<el-radio-group v-model="radio">
<el-radio
:label="1"
@click.native.prevent="selectRadio"
>立即应用到个人价</el-radio
>
<el-radio :label="1" @click.native.prevent="selectRadio">立即应用到个人价</el-radio>
</el-radio-group>
<el-radio-group v-model="dijiaRadio">
<el-radio :label="0">忽略</el-radio>
@@ -81,23 +43,13 @@
<el-divider></el-divider>
<div class="mubiaocelue" style="margin-bottom: 30px;">
<span>任务类型</span>
<el-radio-group
v-model="taskTypeRadio"
style="margin:0"
>
<el-radio-group v-model="taskTypeRadio" style="margin:0">
<el-radio :label="1">实时</el-radio>
<el-radio :label="2">预约</el-radio>
<el-date-picker
popper-class="disableButton"
:disabled="taskTypeRadio !== 2"
v-model="startTime"
clearable
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetime"
placeholder="预约时间"
:picker-options="pickerOptions"
/>
<el-date-picker popper-class="disableButton" :disabled="taskTypeRadio !== 2"
v-model="startTime" clearable format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="预约时间"
:picker-options="pickerOptions" />
</el-radio-group>
</div>
<!-- <div class="personal-block">
@@ -133,26 +85,12 @@
<span class="dialog-footer">
<template>
<el-button
style="margin-right: 20px;"
type="info"
@click="
controlWindows.dialogAdjustStrategyPiliangAdd = false
"
>取 消</el-button
>
<el-popconfirm
confirm-button-text="确定"
cancel-button-text="取消"
icon="el-icon-info"
icon-color="red"
title="一旦提交，将立即生效！是否确认提交？"
placement="top"
@onConfirm="confirm"
>
<el-button type="primary" slot="reference"
>提交</el-button
>
<el-button style="margin-right: 20px;" type="info" @click="
controlWindows.dialogAdjustStrategyPiliangAdd = false
">取 消</el-button>
<el-popconfirm confirm-button-text="确定" cancel-button-text="取消" icon="el-icon-info" icon-color="red"
title="一旦提交，将立即生效！是否确认提交？" placement="top" @onConfirm="confirm">
<el-button type="primary" slot="reference">提交</el-button>
</el-popconfirm>
</template>
</span>
@@ -164,6 +102,12 @@
import AdjustTask from "@/api/AdjustTask/AdjustTask";
import { parseTime } from "@/utils/disableTime.js";
import moment from "moment";
let xxx = () => {
let b = new Date();
// 获取分钟设置分钟
b.setMinutes(b.getMinutes() + 15);
return `${b.getHours()}:${b.getMinutes()}:${b.getSeconds()} - 23:59:00`
};
export default {
props: {
controlWindows: Object,
@@ -180,15 +124,33 @@ export default {
taskName: "",
startTime: "",
userCompany: this.$store.getters.user.userCompany,
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
pickerOptions: {
xxfn(){
},
selectableRange:
parseTime(
new Date(moment().format("YYYY-MM-DD HH:mm:ss")),
"{hh}:{ii}:{ss}"
) + "- 23:59:00"
disabledDate(time) {
// return time.getTime() < Date.now() - 8.64e7;
// Date对象 获取当前时间+加15分钟和每一个time作比较 如果小于 返回true 禁用 如果大于等于 返回false 启用
// 获取当前时间
let b = new Date();
// 获取分钟设置分钟
// b.setMinutes(b.getMinutes() + 15);
b.setDate(b.getDate() -1)
// 判断当前时间分钟大不大于设置分钟
if (time>b) {
// 错误
return false
// 正确
} else {
return true
}
},
selectableRange: xxx()
// parseTime(
// new Date(moment().add(15,'minutes').format("YYYY-MM-DD HH:mm:ss")),
// "{hh}:{ii}:{ss}"
// ) + "- 23:59:00"
}
};
},
@@ -285,9 +247,9 @@ export default {
data,
this.radio
? {
convertPersonalPrice:
item.convertPersonalPrice
}
convertPersonalPrice:
item.convertPersonalPrice
}
: {}
)
);
@@ -334,26 +296,32 @@ export default {
margin-top: 20px;
text-align: center;
}
::v-deep {
.el-divider--horizontal {
margin: 30px 0;
}
.custom-dialog {
border-radius: 15px;
// .el-dialog__header {
// padding: 10px 20px !important;
// }
.el-dialog__body {
padding: 0 20px 10px;
}
.adjust-frame {
position: relative;
> p {
>p {
margin: 0;
color: #333;
font-size: 15px;
}
> .close {
>.close {
position: absolute;
width: 35px;
height: 35px;
@@ -362,24 +330,30 @@ export default {
}
}
}
.exhibition {
padding: 0;
li {
display: flex;
margin-bottom: 15px;
span {
flex: 1;
&:nth-of-type(1) {
color: #a9a9a9;
padding-right: 15px;
text-align: right;
}
&:nth-of-type(2) {
text-align: left;
}
}
}
}
.tip {
display: block;
width: 150px;
@@ -387,6 +361,7 @@ export default {
line-height: 25px;
color: #f00;
}
.special-exhibition {
padding-right: 15px;
box-sizing: border-box;
@@ -395,34 +370,44 @@ export default {
width: 220px;
line-height: 30px;
background: rgba(211, 211, 211, 0.5);
> span {
>span {
flex: 1;
&:nth-of-type(1) {
text-align: right;
}
&:nth-of-type(2) {
text-align: left;
padding-left: 20px;
}
}
> input {
>input {
width: 100px;
height: 20px;
}
}
.addStyle .el-form-item--medium .el-form-item__label {
text-align: start;
}
.addStyle .el-form-item__content .el-radio-group {
box-shadow: none !important;
}
.titleStyle {
display: flex;
div {
margin-left: auto;
margin-right: 45px;
}
.el-form-item--medium {
.el-form-item__label,
.el-form-item__content {
line-height: 17px;
@@ -430,14 +415,17 @@ export default {
}
}
}
.dialog-footer {
display: flex;
justify-content: end;
margin-bottom: 10px;
}
.mubiaocelue {
display: flex;
flex-direction: column;
div {
margin: 10px 0;
}

57
src/views/site/oilSiteInfo/OilSiteInfoInfo.vue
View File

@@ -193,10 +193,10 @@
class="kg"
render="row"
>
<el-tag type="danger" v-if="oilSiteInfo.globalEnable === 0"
<el-tag type="danger" v-if="oilSiteInfo.globalEnable === 'DISABLE'"
>禁用</el-tag
>
<el-tag type="success" v-if="oilSiteInfo.globalEnable === 1"
<el-tag type="success" v-if="oilSiteInfo.globalEnable === 'ENABLE'"
>启用</el-tag
>
<!-- <el-switch
@@ -384,10 +384,10 @@
<div class="cell-item">
<span class="color-999 test-tst">油站性质</span>
<br />
<span v-if="oilSiteInfo.siteNature === 1" class="inner-data"
<span v-if="oilSiteInfo.siteNature === 'OIL_OPERATION'" class="inner-data"
>自营油站</span
>
<span v-if="oilSiteInfo.siteNature === 0" class="inner-data"
<span v-if="oilSiteInfo.siteNature === 'CHANNEL_STATION'" class="inner-data"
>渠道油站</span
>
</div>
@@ -659,42 +659,46 @@
<span class="color-999 test-tst">是否为高速 </span>
<br />
<span v-if="oilSiteInfo.highSpeedMark === 0" class="inner-data"
<span v-if="oilSiteInfo.highSpeedMark === 'NO_SPEED'" class="inner-data"
>非高速</span
>
<span v-if="oilSiteInfo.highSpeedMark === 1" class="inner-data"
<span v-if="oilSiteInfo.highSpeedMark === 'HIGH_SPEED'" class="inner-data"
>高速</span
>
</div>
<div class="cell-item">
<span class="color-999 test-tst">司机二维码支付 </span>
<br />
<span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
<span>{{oilSiteInfo.qrcodePay== 0 ? '禁用' : oilSiteInfo.qrcodePay== 1 ? '启用' : '暂无数据'}}
</span>
<!-- <span v-if="oilSiteInfo.qrcodePay === 0" class="inner-data"
>禁用</span
>
<span v-if="oilSiteInfo.qrcodePay === 1" class="inner-data"
>启用</span
>
> -->
</div>
</div>
<div class="my-cell">
<div class="cell-item">
<span class="color-999 test-tst">扫描油站二维码支付</span>
<br />
<span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
<span>{{oilSiteInfo.qrcodeSitePay== 0 ? '禁用' : oilSiteInfo.qrcodeSitePay== 1 ? '启用' : '暂无数据'}}
</span>
<!-- <span v-if="oilSiteInfo.qrcodeSitePay === 0" class="inner-data"
>禁用</span
>
<span v-if="oilSiteInfo.qrcodeSitePay === 1" class="inner-data"
>启用</span
>
> -->
</div>
<div class="cell-item">
<span class="color-999 test-tst">司机主动支付</span>
<br />
<span v-if="oilSiteInfo.activePay === 0" class="inner-data"
<span v-if="oilSiteInfo.activePay === 'DISABLE'" class="inner-data"
>禁用</span
>
<span v-if="oilSiteInfo.activePay === 1" class="inner-data"
<span v-if="oilSiteInfo.activePay === 'ENABLE'" class="inner-data"
>启用</span
>
</div>
@@ -703,17 +707,22 @@
<div class="cell-item">
<span class="color-999 test-tst">支付方式</span>
<br />
<span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
<span>{{oilSiteInfo.payMethod== 2 ? '联名卡支付' : oilSiteInfo.payMethod== 1 ? '普通支付方式' : '暂无数据'}}
</span>
<!-- <span v-if="oilSiteInfo.payMethod === 2" class="inner-data"
>联名卡支付</span
>
<span v-if="oilSiteInfo.payMethod === 1" class="inner-data"
>普通支付方式</span
>
>普通支付方式</span -->
</div>
<div class="cell-item">
<span class="color-999 test-tst">油站详情提示文案</span>
<br />
<span class="inner-data">{{ oilSiteInfo.detailContent }}</span>
<!-- <span v-if="oilSiteInfo.detailContent !== detailContent" class="inner-data"
>暂无数据</span> -->
<span class="inner-data"> {{oilSiteInfo.detailContent== detailContent ? '' : '暂无数据'}}
</span>
</div>
</div>
@@ -722,35 +731,37 @@
<span class="color-999 test-tst">全局禁用启用</span>
<br />
<span v-if="oilSiteInfo.globalEnable === 0" class="inner-data"
<span v-if="oilSiteInfo.globalEnable === 'DISABLE'" class="inner-data"
>禁用</span
>
<span v-if="oilSiteInfo.globalEnable === 1" class="inner-data"
<span v-if="oilSiteInfo.globalEnable === 'ENABLE'" class="inner-data"
>启用</span
>
</div>
<div class="cell-item">
<span class="color-999 test-tst">上架标识</span>
<br />
<span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
<span>{{oilSiteInfo.putawayMark== 0 ? '下架' : oilSiteInfo.putawayMark== 1 ? '上架' : '暂无数据'}}
</span>
<!-- <span v-if="oilSiteInfo.putawayMark === 0" class="inner-data"
>下架</span
>
<span v-if="oilSiteInfo.putawayMark === 1" class="inner-data"
>上架</span
>
> -->
</div>
</div>
<div class="my-cell">
<div class="cell-item">
<span class="color-999 test-tst">审核标识</span>
<br />
<span v-if="oilSiteInfo.auditMark === 0" class="inner-data"
<span v-if="oilSiteInfo.auditMark === 'WAITING'" class="inner-data"
>待审核</span
>
<span v-if="oilSiteInfo.auditMark === 1" class="inner-data"
<span v-if="oilSiteInfo.auditMark === 'SUCCESS'" class="inner-data"
>审核通过</span
>
<span v-if="oilSiteInfo.auditMark === -1" class="inner-data"
<span v-if="oilSiteInfo.auditMark === '- FAIL'" class="inner-data"
>审核不通过</span
>
</div>

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

@@ -192,7 +192,7 @@
<template slot-scope="scope">
<div>
<div>{{ scope.row.createUserName }}</div>
<div> {{ scope.row.createUser }}</div>
<div> {{ scope.row.createUser?'暂无数据':scope.row.createUser}}</div>
</div>
</template>
</el-table-column>
@@ -595,7 +595,7 @@ export default {
<div>
<div>
<span>更新人</span>
<span>{row.createUserName}</span>
<span>{row.createUserName === undefined ? ':'+'暂无数据' :row.createUserName}</span>
</div>
<div>
<span>更新时间</span>

2
vue.config.js
View File

@@ -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.27:38080`,
target: `http://119.177.60.118:8000/adminapi`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''