1. 对接交接班功能

dev
杨杰 2 years ago
parent 2f8e532c07
commit 3025da4686
  1. 22
      App.vue
  2. 63
      Utils/Api.js
  3. 57
      pages.json
  4. 3
      pages/login/login/login.vue
  5. 22
      pages/tabBar/home/home.vue
  6. 59
      pages/tabBar/user/user.vue
  7. 6
      pages/user/oil-list/oil-list.vue
  8. 202
      pages/user/select-team/select-team.vue
  9. 227
      pages/user/shift-management/shift-management.vue
  10. 128
      pages/user/shift-summary/shift-summary.vue
  11. 4
      pages/user/updateOilgun/updateOilgun.vue
  12. 4
      pages/user/updateOilprice/updateOilprice.vue
  13. BIN
      static/img/10.png
  14. 10
      uni.scss

@ -5,21 +5,23 @@
// brestUrl: 'http://192.168.3.4:9302/brest', // brestUrl: 'http://192.168.3.4:9302/brest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/', // imgUrl: 'https://192.168.3.4:9301/filesystem/',
// //
url: 'https://hsg.dctpay.com/brest', // url: 'https://hsg.dctpay.com/brest',
imgUrl: 'https://hsg.dctpay.com/filesystem/', // imgUrl: 'https://hsg.dctpay.com/filesystem/',
imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/', // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
wsssocket:'wss://hsg.dctpay.com/msg/WebSocket/', // wsssocket:'wss://hsg.dctpay.com/msg/WebSocket/',
// //
// url: 'https://hsgcs.dctpay.com/brest', url: 'https://hsgcs.dctpay.com/brest',
// imgUrl: 'https://hsgcs.dctpay.com/filesystem/', imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/', imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
// wsssocket: 'wss://hsgcs.dctpay.com/msg/WebSocket/', wsssocket: 'wss://hsgcs.dctpay.com/msg/WebSocket/',
userInfo: "", userInfo: "",
openId: '', openId: '',
code: '', code: '',
token: '', token: '',
// //
positionType:0 positionType:0,
//
positionGunPrice:0
}, },
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch')

@ -10,8 +10,8 @@ export const userLogin = params => {
//退出登录 //退出登录
export const logout = params => { export const logout = params => {
return POST('POST', `${base}/login/logout`, params).then(res => res.data); return POST('POST', `${base}/login/logout`, params).then(res => res.data);
} }
//查询数据字典 //查询数据字典
export const getDictionaryByCodeType = params => { export const getDictionaryByCodeType = params => {
return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data); return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data);
} }
@ -42,23 +42,60 @@ export const addGasOilPrice = params => {
//删除油枪 //删除油枪
export const delGunNo = params => { export const delGunNo = params => {
return POST('POST', `${base}/gasOilGunNo/delGunNo`, params).then(res => res.data); return POST('POST', `${base}/gasOilGunNo/delGunNo`, params).then(res => res.data);
} }
//修改密码 //修改密码
export const sendUserPass = params => { export const sendUserPass = params => {
return POST('POST', `${base}/secUser/sendUserPass`, params).then(res => res.data); return POST('POST', `${base}/secUser/sendUserPass`, params).then(res => res.data);
} }
//我的信息 //我的信息
export const getGasStatistical = params => { export const getGasStatistical = params => {
return POST('POST', `${base}/highGas/getGasStatistical`, params).then(res => res.data); return POST('POST', `${base}/highGas/getGasStatistical`, params).then(res => res.data);
} }
//订单列表 //订单列表
export const getGasOrderList = params => { export const getGasOrderList = params => {
return POST('GET', `${base}/highGas/getGasOrderList`, params).then(res => res.data); return POST('GET', `${base}/highGas/getGasOrderList`, params).then(res => res.data);
} }
//订单详情 //订单详情
export const getGasOrderDetail = params => { export const getGasOrderDetail = params => {
return POST('GET', `${base}/highGas/getGasOrderDetail`, params).then(res => res.data); return POST('GET', `${base}/highGas/getGasOrderDetail`, params).then(res => res.data);
} }
//交接班班组功能
//班组列表
export const getClassGroupList = params => {
return POST('GET', `${base}/gasClassGroup/getClassGroupList`, params).then(res => res.data);
}
//开启班组任务
export const startGroupTask = params => {
return POST('POST', `${base}/gasClassGroupTask/startGroupTask`, params).then(res => res.data);
}
//结束班组
export const endGroupTask = params => {
return POST('POST', `${base}/gasClassGroupTask/endGroupTask`, params).then(res => res.data);
}
//交接班组
export const swapGroupTask = params => {
return POST('POST', `${base}/gasClassGroupTask/swapGroupTask`, params).then(res => res.data);
}
//当前班次
export const getCurrentClassGroupTask = params => {
return POST('GET', `${base}/gasClassGroupTask/getCurrentClassGroupTask`, params).then(res => res.data);
}
//查询历史班次列表
export const getClassGroupTaskList = params => {
return POST('GET', `${base}/gasClassGroupTask/getClassGroupTaskList`, params).then(res => res.data);
}
//查询历史班次详情
export const getClassGroupTaskById = params => {
return POST('GET', `${base}/gasClassGroupTask/getClassGroupTaskById`, params).then(res => res.data);
}
//打印小票
export const print = params => {
return POST('GET', `${base}/gasClassGroupTask/print`, params).then(res => res.data);
}

@ -1,16 +1,26 @@
{ {
"pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages "pages": [ //pageshttps://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/login/login/login", "path": "pages/login/login/login",
"style": { "style": {
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5", "navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5", "backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path": "pages/user/shift-management/shift-management",
"style": {
"navigationBarTitleText": "班次管理",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}, {
"path": "pages/tabBar/home/home", "path": "pages/tabBar/home/home",
"style": { "style": {
"navigationBarTextStyle": "white", "navigationBarTextStyle": "white",
@ -23,7 +33,7 @@
"softinputNavBar": "none" "softinputNavBar": "none"
} }
} }
},{ }, {
"path": "pages/home/oderDetails/oderDetails", "path": "pages/home/oderDetails/oderDetails",
"style": { "style": {
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
@ -42,7 +52,7 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { }, {
"path": "pages/tabBar/user/user", "path": "pages/tabBar/user/user",
"style": { "style": {
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
@ -96,6 +106,27 @@
} }
} }
, {
"path": "pages/user/shift-summary/shift-summary",
"style": {
"navigationBarTitleText": "班次汇总",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}, {
"path": "pages/user/select-team/select-team",
"style": {
"navigationBarTitleText": "",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"enablePullDownRefresh": false
}
}
], ],
"globalStyle": { "globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",

@ -76,9 +76,6 @@
if (res.return_code == '000000' && res.return_data) { if (res.return_code == '000000' && res.return_data) {
app.globalData.userInfo = res.return_data app.globalData.userInfo = res.return_data
.object; .object;
if (res.return_data.object.gasStaff) {
app.globalData.positionType = res.return_data.object.gasStaff.positionType;
}
app.globalData.token = res.return_data.uniqueCode; app.globalData.token = res.return_data.uniqueCode;
uni.setStorage({ uni.setStorage({
key: "oiluser", key: "oiluser",

@ -68,11 +68,13 @@
pagesize: 10, pagesize: 10,
isLoadMore: false, // isLoadMore: false, //
innerAudioContext: '', // innerAudioContext: '', //
orderNo: '' // orderNo: '', //
userinfo: '' //
}; };
}, },
onShow() { onShow() {
let that = this; let that = this;
that.userinfo = app.globalData.userInfo;
that.orderList = []; that.orderList = [];
that.pageNum = 1; that.pageNum = 1;
uni.getStorage({ uni.getStorage({
@ -89,6 +91,18 @@
}, },
fail: res => {} fail: res => {}
}) })
//
if (this.userinfo.buttonList) {
for (var i = 0; i < this.userinfo.buttonList.length; i++) {
if (this.userinfo.buttonList[i].permissionCode == 'BTN_CONFIG_OIL_GUN_PURVIEW') {
app.globalData.positionType = 1
}
if (this.userinfo.buttonList[i].permissionCode == 'BTN_CONFIG_OIL_GUN_PRICE_PURVIEW') {
app.globalData.positionGunPrice = 1
}
}
}
}, },
onLoad() { onLoad() {
@ -120,9 +134,9 @@
let innerAudioContext = uni.createInnerAudioContext(); // let innerAudioContext = uni.createInnerAudioContext(); //
innerAudioContext.autoplay = false; // innerAudioContext.autoplay = false; //
innerAudioContext.src = JSON.parse(res.data).voice; // innerAudioContext.src = JSON.parse(res.data).voice; //
that.innerAudioContext = innerAudioContext; that.innerAudioContext = innerAudioContext;
that.orderList = []; that.orderList = [];
that.pageNum = 1; that.pageNum = 1;
that.getGasOrderList(); that.getGasOrderList();
that.startAudio(); that.startAudio();
console.log('收到服务器内容:' + JSON.parse(res.data).voice); console.log('收到服务器内容:' + JSON.parse(res.data).voice);

@ -31,8 +31,8 @@
<!-- 菜单功能 --> <!-- 菜单功能 -->
<view class="width100 line10"></view> <view class="width100 line10"></view>
<view class="funcss" v-for="(item,index) in funcList" :key="index" @click="jumpdesfun(item)"> <view class="funcss" v-for="(item,index) in funcList" :key="index" @click="jumpdesfun(item)">
<image :src="item.img" mode="widthFix" class="funicon"></image> <image :src="item.menuUrlImg" mode="widthFix" class="funicon"></image>
<view class="width100 font14 mart5">{{item.title}}</view> <view class="width100 font14 mart5">{{item.menuName}}</view>
</view> </view>
<view class="width100 height40p"></view> <view class="width100 height40p"></view>
</view> </view>
@ -47,26 +47,27 @@
export default { export default {
data() { data() {
return { return {
funcList: [{ funcList: [
title: '配置油枪', // {
url: '../../user/oil-list/oil-list?id=1', // title: '',
img: '../../../static/img/3.png' // url: '../../user/oil-list/oil-list?id=1',
}, // img: '../../../static/img/3.png'
{ // },
title: '配置油品价格', // {
url: '../../user/oil-list/oil-list?id=2', // title: '',
img: '../../../static/img/2.png' // url: '../../user/oil-list/oil-list?id=2',
}, // img: '../../../static/img/2.png'
{ // },
title: '修改密码', // {
url: '../../login/updatePsd/updatePsd', // title: '',
img: '../../../static/img/9.png' // url: '../../login/updatePsd/updatePsd',
}, // img: '../../../static/img/9.png'
{ // },
title: '退出登录', // {
url: '', // title: '退',
img: '../../../static/img/7.png' // url: '',
} // img: '../../../static/img/7.png'
// }
], ],
auditnum: '', // auditnum: '', //
userinfo: '', // userinfo: '', //
@ -75,7 +76,12 @@
}; };
}, },
onLoad() { onLoad() {
this.userinfo = app.globalData.userInfo; this.userinfo = app.globalData.userInfo;
for(var i =0;i<this.userinfo.menuList.length;i++){
if(this.userinfo.menuList[i].menuUrl == 'APPLETS_MER'){
this.funcList = this.userinfo.menuList[i].children;
}
}
}, },
onShow() { onShow() {
this.getGasStatistical(); this.getGasStatistical();
@ -85,7 +91,7 @@
getGasStatistical() { getGasStatistical() {
getGasStatistical().then(res => { getGasStatistical().then(res => {
if (res.return_code == '000000') { if (res.return_code == '000000') {
this.oilInfo = res.return_data; this.oilInfo = res.return_data;
} }
}); });
}, },
@ -99,12 +105,12 @@
}, },
// //
jumpdesfun(item) { jumpdesfun(item) {
if (item.title == '退出登录') { if (item.menuMobileUrl == '#') {
this.logout(); this.logout();
uni.closeSocket(); uni.closeSocket();
} }
uni.navigateTo({ uni.navigateTo({
url: item.url url: item.menuMobileUrl
}) })
}, },
//退 //退
@ -124,6 +130,7 @@
app.globalData.userInfo = ''; app.globalData.userInfo = '';
app.globalData.token = ''; app.globalData.token = '';
app.globalData.positionType = 0; app.globalData.positionType = 0;
app.globalData.positionGunPrice = 0;
uni.setStorage({ uni.setStorage({
key: "oiluser", key: "oiluser",
data: '' data: ''

@ -7,9 +7,9 @@
<view class="activeRefuel" v-for="(item,index) in oilpriceList" :key="index" @click="jumpupdatePrice(item)"> <view class="activeRefuel" v-for="(item,index) in oilpriceList" :key="index" @click="jumpupdatePrice(item)">
{{item.oilNoName}} {{item.oilNoName}}
<image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw" <image src="../../../static/img/6.png" mode="widthFix" class="imgcha iconw"
@click.stop="delOilPrice(item.oilNo)" v-if="positionType != 1"></image> @click.stop="delOilPrice(item.oilNo)" v-if="positionType == 1"></image>
</view> </view>
<view class="btn mart50" @click="jumpaddoil()" v-if="positionType != 1"> </view> <view class="btn mart50" @click="jumpaddoil()" v-if="positionType == 1"> </view>
</view> </view>
</template> </template>
@ -28,7 +28,7 @@
positionType: app.globalData.positionType // positionType: app.globalData.positionType //
} }
}, },
onLoad(Option) { onLoad(Option) {
this.typeid = Option.id; this.typeid = Option.id;
}, },
onShow() { onShow() {

@ -0,0 +1,202 @@
<template>
<view>
<view class="username paddtop10">
<view class="namecont">班组选择</view>
<picker mode="selector" style="width: 90%;" :range="classGroupList" range-key="name" @change="changeclass">
<view class="date text1" style="padding: 0 50rpx;">{{className}}</view>
</picker>
<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
</view>
<view class="width80 height40 backcor008 border-r font14 fotct fcorfff" v-if="typeid == 1"
style="position: fixed;bottom: 40px;" @click="swapGroupTask()">
交接班次
</view>
<view class="width80 height40 backcor008 border-r font14 fotct fcorfff" v-if="typeid == 2"
style="position: fixed;bottom: 40px;" @click="startGroupTask()">
开始班次
</view>
</view>
</template>
<script>
import {
startGroupTask,
getClassGroupList,
swapGroupTask
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
typeid: '', //
classGroupList: '', //
className: '', //
classId: '' ,//id
userinfo: '', //
}
},
onLoad(options) {
this.typeid = options.typeid;
this.userinfo = app.globalData.userInfo;
if (options.typeid == 1) {
uni.setNavigationBarTitle({
title: '交换班次'
})
}
if (options.typeid == 2) {
uni.setNavigationBarTitle({
title: '开始班次'
})
}
this.getClassGroupList();
},
methods: {
//
getClassGroupList() {
uni.showLoading({
title: '加载中...'
})
let datas = {
pageNum: 1,
pageSize: 9999
}
getClassGroupList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.classGroupList = res.return_data.list;
this.classId = res.return_data.list[0].id;
this.className = res.return_data.list[0].name;
}
})
},
//
changeclass(e) {
this.classId = this.classGroupList[e.target.value].id;
this.className = this.classGroupList[e.target.value].name;
},
//
startGroupTask() {
let that = this;
uni.showModal({
title: '开始班次',
content: '是否开始当前班次?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '操作中'
})
let datas = {
gasId: that.userinfo.merchantStore.id,
gasClassGroupId: that.classId
}
startGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
})
uni.navigateBack({})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}
})
},
//
swapGroupTask() {
let that = this;
uni.showModal({
title: '交换班次',
content: '是否交换当前班次?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '操作中'
})
let datas = {
gasId: that.userinfo.merchantStore.id,
gasClassGroupId: that.classId
}
swapGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
})
uni.navigateBack({})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}
})
}
}
}
</script>
<style lang="scss">
.username {
width: calc(100% - 90upx);
height: 100upx;
display: flex;
align-items: center;
background-color: rgba($color: #ffffff, $alpha: 0.1);
border-bottom: 1px solid #f6f6f6;
padding: 8upx 45upx;
input {
width: 50%;
height: 50upx;
font-size: 16px;
color: #333333;
font-weight: blod;
}
.get-code {
position: absolute;
display: flex;
align-items: center;
justify-content: center;
right: 7px;
z-index: 3;
border: 1px solid #bfbfbf;
width: 25%;
padding: 3px 5px;
border-radius: 22px;
&:after {
content: " ";
width: 1upx;
height: 50upx;
position: absolute;
z-index: 3;
margin-right: 100%;
left: 0;
top: 20upx;
}
}
.namecont {
color: #666666;
width: 28%;
}
}
</style>

@ -0,0 +1,227 @@
<template>
<view>
<view class="width94 mart20 height80">
<view class="width46 fcor333 font16 flleft backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">当前班次</view>
<view class="width100 mart15 font14">
<text class="font24" v-if="currentClassGroup.classNum">{{currentClassGroup.classNum}}</text>
<text class="font24" v-else></text>班次
</view>
</view>
<view class="width46 fcor333 font16 flright backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">加油总金额</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refuelPrice}}</text>
</view>
</view>
</view>
<view class="width94 mart20 height80">
<view class="width46 fcor333 font16 flleft backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">加油总笔数</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refuelNum}}</text></view>
</view>
<view class="width46 fcor333 font16 flright backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">加油总升数</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refuelLiters}}</text>
</view>
</view>
</view>
<view class="width94 mart20 height80">
<view class="width46 fcor333 font16 flleft backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">退款总金额</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refundPrice}}</text>
</view>
</view>
<view class="width46 fcor333 font16 flright backcor9 fotct paddtop10 paddbotm10">
<view class="width100 fcor666">退款总笔数</view>
<view class="width100 mart15 font14"><text class="font24">{{currentClassGroup.refundNum}}</text></view>
</view>
</view>
<view class="width94 mart40 alijusstart marb20">
<view class="width40 height40 backcor008 border-r font14 fotct fcorfff" style="margin-left: 5%;"
@click="startGroupTask(1)">
交接班组
</view>
<view class="width40 height40 backcor008 border-r font14 fotct fcorfff" v-if="currentClassGroup.status == 0"
style="margin-left: 10%;" @click="startGroupTask(2)">
开始班次
</view>
<view class="width40 height40 backcolor72 border-r font14 fotct fcorfff"
v-if="currentClassGroup.status == 1" style="margin-left: 10%;" @click="endGroupTask()">
结束班次
</view>
</view>
<!-- // -->
<view class="fcor333 width94 fontwig6 font15 mart20">历史班次共计{{listcount}}条数据</view>
<view v-if="classGroupTaskList == '' " class="mart20 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="width94 backcorfff headcont mart20 border-r" style="box-shadow: 0px 0px 6px #999999;"
v-for="(item,index) in classGroupTaskList" :key="index">
<view class="alijusstart width94 height30 fcor333 paddtop5">
<view class="width50 font14 fcor666 ">班次: <text class="font16 fcor333">{{item.classNum}}</text></view>
<view class="width50 font14 fcor666 fotrt">状态:
<text class="font16 fcor089" v-if="item.status == 1"> 进行中</text>
<text class="font16 fcoreb5" v-if="item.status == 2"> 已结束</text>
</view>
</view>
<view class="line1 width94"></view>
<view class="width94 mart5">
<view class="width100 height25 font14 fcor666">
班组名称: {{item.gasClassGroupName}}
</view>
<view class="width100 height25 font14 fcor666 ">
开始时间: {{item.startTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="width100 height25 font14 fcor666 " v-if="item.endTime">
结束时间: {{item.endTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
</view>
<view class="width100 height25 font14 fcor666 " v-else>
结束时间: 未结束
</view>
</view>
<view class="line1 width94 mart5"></view>
<view class="height30 backcor008 margle10 border-r font14 fotct fcorfff mart10 paddleft10 paddtright10"
style="width: 60px;" v-if="item.status == 2" @click="jumpSummary(item.classNum)">
班次汇总
</view>
<view class="height10" v-if="item.status == 2"></view>
</view>
<view class="height40p"></view>
</view>
</template>
<script>
import {
getCurrentClassGroupTask,
endGroupTask,
getClassGroupTaskList
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
userinfo: '', //
currentClassGroup: '', //
pageNum: 1,
pagesize: 10,
isLoadMore: false, //
classGroupTaskList: [], //
listcount: '' ,//
imgadres: 'noorder.png',
imagewxUrl: app.globalData.imageWxImg,
}
},
onLoad() {
this.userinfo = app.globalData.userInfo;
},
onShow() {
this.isLoadMore = true;
this.classGroupTaskList = [];
this.pageNum = 1;
this.getCurrentClassGroupTask();
this.getClassGroupTaskList();
},
onReachBottom() { //
if (!this.isLoadMore) { //
this.isLoadMore = true
this.pageNum += 1
this.getClassGroupTaskList()
}
},
methods: {
//
getCurrentClassGroupTask() {
uni.showLoading({
title: '加载中...'
})
let datas = {
gasId: this.userinfo.merchantStore.id
}
getCurrentClassGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.currentClassGroup = res.return_data;
}
})
},
//
startGroupTask(item) {
uni.navigateTo({
url: '../select-team/select-team?typeid=' + item
})
},
//
endGroupTask() {
let that = this;
uni.showModal({
title: '结束班次',
content: '是否结束当前班次?',
success: function(res) {
if (res.confirm) {
uni.showLoading({
title: '操作中'
})
let datas = {
gasId: that.userinfo.merchantStore.id
}
endGroupTask(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '操作成功',
icon: 'none',
duration: 2000
})
that.pageNum = 1;
that.isLoadMore = true
that.classGroupTaskList = [];
that.getCurrentClassGroupTask();
that.getClassGroupTaskList();
}
})
}
}
})
},
//
getClassGroupTaskList() {
uni.showLoading({
title: '加载中'
})
let datas = {
pageNum: this.pageNum,
pageSize: this.pagesize,
}
getClassGroupTaskList(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000' && res.return_data.list != '') {
this.listcount = res.return_data.total;
this.classGroupTaskList = this.classGroupTaskList.concat(res.return_data.list);
if (res.return_data.pages == this.pageNum) {
this.isLoadMore = true;
} else {
this.isLoadMore = false
}
} else {
this.listcount = 0;
this.classGroupTaskList = [];
this.isLoadMore = true
}
});
},
//
jumpSummary(item) {
uni.navigateTo({
url: '../shift-summary/shift-summary?id=' + item
})
}
}
}
</script>
<style lang="scss">
</style>

@ -0,0 +1,128 @@
<template>
<view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">开始时间:</view>
<view class="width50">{{classGroupTaskDetails.startTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">结束时间:</view>
<view class="width50">{{classGroupTaskDetails.endTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">加油金额汇总:</view>
<view class="width50">{{classGroupTaskDetails.refuelPrice}} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">加油笔数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refuelNum}} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">加油升数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refuelLiters}} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">退款金额汇总:</view>
<view class="width50">{{classGroupTaskDetails.refundPrice }} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">退款笔数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refundNum }} </view>
</view>
<view class="width92 fcor666 font14 mart20 alijusstart">
<view class="width30 fcor333">退款升数汇总:</view>
<view class="width50">{{classGroupTaskDetails.refundLiters}} </view>
</view>
<view class="alijusstart fotct font14 height40p backcor9 mart30 fcor333">
<view class="width25">油号</view>
<view class="width25">金额</view>
<view class="width25">升数</view>
<view class="width25">笔数</view>
</view>
<view v-if="classGroupTaskDetails.groupTaskOilCountList == '' " class="mart60 fotct font14 fcor666">
<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
</view>
<view class="width100 alijusstart fotct font14 height45 fcor666 mart5 bor-botm1 marb5" :key="index"
v-for="(item,index) in classGroupTaskDetails.groupTaskOilCountList">
<view class="width25">{{item.oilNo}}#</view>
<view class="width25">{{item.refuelPrice}}</view>
<view class="width25">{{item.refuelLiters}}</view>
<view class="width25">{{item.refuelNum}}</view>
</view>
<view class="height80"></view>
<view class="width40w height40 backcor008 border-r font14 fotct fcorfff" style="position: fixed;bottom: 15px;"
@click="print()">
打印小票
</view>
</view>
</template>
<script>
import {
getClassGroupTaskById,
print
} from '../../../Utils/Api.js';
let app = getApp();
export default {
data() {
return {
taskId: '', //id
classGroupTaskDetails: '', //
imgadres: 'noorder.png',
imagewxUrl: app.globalData.imageWxImg,
}
},
onLoad(options) {
this.taskId = options.id;
this.getClassGroupTaskById();
},
methods: {
//
getClassGroupTaskById() {
uni.showLoading({
title: '加载中...'
})
let datas = {
gasClassGroupTaskId: this.taskId
}
getClassGroupTaskById(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
this.classGroupTaskDetails = JSON.parse(res.return_data.dataCount);
}
})
},
//
print() {
uni.showLoading({
title: '打印小票'
})
let datas = {
gasClassGroupTaskId: this.taskId
}
print(datas).then(res => {
uni.hideLoading();
if (res.return_code == '000000') {
uni.showToast({
title: '打印成功',
icon: 'none',
duration: 2000
})
} else {
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
})
}
}
}
</script>
<style lang="scss">
</style>

@ -5,10 +5,10 @@
</view> </view>
<view class="activeRefuel" v-for="(item,index) in oilgunList" :key="index"> <view class="activeRefuel" v-for="(item,index) in oilgunList" :key="index">
{{item.gunNo}}号枪 {{item.gunNo}}号枪
<image src="../../../static/img/6.png" mode="widthFix" v-if="positionType != 1" class="imgcha iconw" @click.stop="delGunNo(item.id)"> <image src="../../../static/img/6.png" mode="widthFix" v-if="positionType == 1" class="imgcha iconw" @click.stop="delGunNo(item.id)">
</image> </image>
</view> </view>
<view class="btn mart50" @click="addgasoilPrice()" v-if="positionType != 1"> </view> <view class="btn mart50" @click="addgasoilPrice()" v-if="positionType == 1"> </view>
</view> </view>
</template> </template>

@ -15,7 +15,7 @@
<input placeholder="请输入优惠幅度" v-model="discountPrice" type="text" <input placeholder="请输入优惠幅度" v-model="discountPrice" type="text"
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
</view> </view>
<view class="btn mart50" @click="editGasOilPrice()" v-if="positionType != 1"> </view> <view class="btn mart50" @click="editGasOilPrice()" v-if="positionGunPrice == 1"> </view>
</view> </view>
</template> </template>
@ -34,7 +34,7 @@
oilNo: '', // oilNo: '', //
oilDetails: '', // oilDetails: '', //
userinfo: '' ,// userinfo: '' ,//
positionType: app.globalData.positionType // positionGunPrice: app.globalData.positionGunPrice //
} }
}, },
onLoad(options) { onLoad(options) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

@ -248,7 +248,10 @@ $uni-font-size-paragraph:30upx;
.backcolor32 { .backcolor32 {
background-color: #32649d; background-color: #32649d;
} }
.backcolor72{
background-color: #eb5823;
}
//渐变 //渐变
.backcorlr{ .backcorlr{
background: linear-gradient(to right, #fe1a1a, #ff722e); background: linear-gradient(to right, #fe1a1a, #ff722e);
@ -323,7 +326,10 @@ $uni-font-size-paragraph:30upx;
.width50 { .width50 {
width: 50%; width: 50%;
} }
.width46 {
width: 46%;
}
.width40 { .width40 {
width: 40%; width: 40%;
} }

Loading…
Cancel
Save