Skip to content

Z
zh-key
Commit 5e5e4279 by huangqy
Options

提交下 

Signed-off-by: huangqy <huangqy@junmp.com.cn>
parent 0a0b22af
正在显示 包含 359 行增加 和 235 行删除
.tea/entryFiles-development/index$.web.js
......@@ -24,6 +24,7 @@ require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=7da53690ff015f
require('../../node_modules/mini-ali-ui/es/multi-liner/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/tag/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/card/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/steps/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/list/list-secondary/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/filter-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -46,3 +47,4 @@ require('../../pages/sysSetting/sysSetting?hash=7da53690ff015fafc40ebbe2de99bf33
require('../../pages/carTj/carTj?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/changeCrop/changeCrop?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/myApply/myApply?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/orderFinish/orderFinish?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
.tea/entryFiles-development/index$.worker.js
......@@ -55,6 +55,7 @@ require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=7da53690ff015f
require('../../node_modules/mini-ali-ui/es/multi-liner/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/tag/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/card/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/steps/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/list/list-secondary/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/filter-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -77,6 +78,7 @@ require('../../pages/sysSetting/sysSetting?hash=7da53690ff015fafc40ebbe2de99bf33
require('../../pages/carTj/carTj?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/changeCrop/changeCrop?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/myApply/myApply?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/orderFinish/orderFinish?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
}
self.bootstrapApp ? self.bootstrapApp({ success }) : success();
}
\ No newline at end of file
.tea/entryFiles-production/index$.web.js
......@@ -12,9 +12,6 @@ require('../../node_modules/mini-ali-ui/es/container/index?hash=7da53690ff015faf
require('../../src/components/topitem/topitem?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/antd-mini/es/Avatar/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../src/components/top/top?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/input-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/multi-liner/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/button/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/page-result/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/badge/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -22,8 +19,12 @@ require('../../node_modules/mini-ali-ui/es/tabs/index?hash=7da53690ff015fafc40eb
require('../../node_modules/mini-ali-ui/es/tabs/tab-content/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/flex/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/flex/flex-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/input-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/multi-liner/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/tag/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/card/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/steps/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/list/list-secondary/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/filter-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -33,6 +34,7 @@ require('../../node_modules/mini-ali-ui/es/tips/tips-dialog/index?hash=7da53690f
require('../../pages/index/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/dashboard/dashboard?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/my/my?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/myApply/myApply?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/applyBorrowCar/applyBorrowCar?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/orderList/orderList?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/keyList/keyList?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -44,3 +46,5 @@ require('../../pages/addCar/addCar?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd
require('../../pages/sysSetting/sysSetting?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/carTj/carTj?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/changeCrop/changeCrop?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/myApply/myApply?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/orderFinish/orderFinish?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
.tea/entryFiles-production/index$.worker.js
......@@ -39,9 +39,6 @@ require('../../node_modules/mini-ali-ui/es/container/index?hash=7da53690ff015faf
require('../../src/components/topitem/topitem?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/antd-mini/es/Avatar/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../src/components/top/top?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/input-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/multi-liner/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/button/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/page-result/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/badge/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -49,8 +46,12 @@ require('../../node_modules/mini-ali-ui/es/tabs/index?hash=7da53690ff015fafc40eb
require('../../node_modules/mini-ali-ui/es/tabs/tab-content/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/flex/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/flex/flex-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/input-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/picker-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/multi-liner/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/tag/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/card/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/steps/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/list/list-secondary/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../node_modules/mini-ali-ui/es/filter/filter-item/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -60,6 +61,7 @@ require('../../node_modules/mini-ali-ui/es/tips/tips-dialog/index?hash=7da53690f
require('../../pages/index/index?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/dashboard/dashboard?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/my/my?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/myApply/myApply?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/applyBorrowCar/applyBorrowCar?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/orderList/orderList?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/keyList/keyList?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
......@@ -71,6 +73,8 @@ require('../../pages/addCar/addCar?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd
require('../../pages/sysSetting/sysSetting?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/carTj/carTj?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/changeCrop/changeCrop?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/myApply/myApply?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
require('../../pages/orderFinish/orderFinish?hash=7da53690ff015fafc40ebbe2de99bf33c6f02acd');
}
self.bootstrapApp ? self.bootstrapApp({ success }) : success();
}
\ No newline at end of file
app.json
......@@ -15,7 +15,8 @@
"pages/sysSetting/sysSetting",
"pages/carTj/carTj",
"pages/changeCrop/changeCrop",
"pages/myApply/myApply"
"pages/myApply/myApply",
"pages/orderFinish/orderFinish"
],
"window": {
"defaultTitle": "智能车辆钥匙管理小程序",
......
pages/applyBorrowCar/applyBorrowCar.js
......@@ -164,7 +164,7 @@ Page({
http.post(getApp().globalData.service + _this.data.url.save, formData).then(res => {
if (res.Success) {
dd.redirectTo({
url: '../orderList/orderList'
url: '../myApply/myApply'
})
} else {
util.ddToast({ type: 'fail', text: res.Message })
......
pages/carUseLog/carUseLog.axml
......@@ -33,16 +33,16 @@
<view a:else>
<block a:for="{{logList}}">
<list-item
thumb="http://122.112.148.157:5000/updateImg/汽车.png"
index="{{index}}"
arrow="{{false}}"
upperSubtitle="{{item.upTime}}"
upperSubtitle="{{item.outInTime}}"
last="{{index === (logList.length - 1)}}">
{{item.realname}}
<tag a:if="{{item.type === 0 }}" type="warning" size="sm" slot="afterTitle">取车</tag>
<tag a:if="{{item.type === 1 }}" type="success" size="sm" slot="afterTitle">还车</tag>
{{item.carNumber}}
<tag a:if="{{ item.outInstate === 0 }}" type="warning" size="sm" slot="afterTitle">归还</tag>
<tag a:if="{{ item.outInstate === 1 }}" type="success" size="sm" slot="afterTitle">取出</tag>
<list-secondary
title="{{item.carNumber}}"
subtitle="{{item.carType}}"
title="{{item.boxName}}"
slot="extra" />
</list-item>
</block>
......
pages/carUseLog/carUseLog.js
......@@ -4,8 +4,6 @@ Page({
data: {
pageNo: 1,
pageSize: 10,
carNumber: '',
carList: [],
showTop: false,
select: [
{
......@@ -20,34 +18,19 @@ Page({
},
onLoad() {
this.getLogList()
this.getCarList()
},
getCarList() {
http.post(getApp().globalData.service + '/api/T_Equipment/EquipmentPageList', {pageSize: 20, tenant_id: getApp().globalData.tenantId}).then(res => {
if (res.Success) {
this.setData({
car: res.result.records,
carList: res.result.records.map(i => i.carNumber)
})
} else {
util.ddToast({ type: 'fail', text: res.Message })
}
})
},
getLogList() {
let data = {
tenant_id: getApp().globalData.tenantId,
pageNo: this.data.pageNo,
pageSize: this.data.pageSize,
userid: getApp().globalData.userInfo.roleCodeList.find(i => i === 'ld') ? '' : getApp().globalData.userInfo.userId,
carNumber: this.data.carNumber,
start_time: this.data.start_time,
end_time: this.data.end_time,
}
http.post(getApp().globalData.service + '/api/T_Equipment/HistoryEquPageList', data).then(res => {
http.post(getApp().globalData.service + '/api/T_Tj/GetPageList', data).then(res => {
if (res.Success) {
this.setData({
logList:res.result.records
logList: res.result.records
})
} else {
util.ddToast({ type: 'fail', text: res.Message })
......
pages/changeCrop/changeCrop.js
......@@ -52,7 +52,7 @@ Page({
},
handleSubmit() {
const depart = this.data.departList[this.data.value[0]]
http.post(getApp().globalData.host + this.data.url.bindTenant, { username: getApp().globalData.userInfo.userId, departIds: depart.id}).then(res => {
http.post(getApp().globalData.host + this.data.url.bindTenant, { id: getApp().globalData.userInfo.userId, departIds: depart.id}).then(res => {
if (res.success) {
login()
} else {
......
pages/keyList/keyList.axml
......@@ -10,15 +10,16 @@
last="{{index === (carList.length - 1)}}"
class="row-content"
key="{{index}}">
{{item.device_name}}-{{item.name}}
{{item.pname}}-{{item.name}}
<view
slot="extra" class="row-extra">
<view>
{{item.carNumber}}
</view>
<tag a:if ={{item.state ==="订单中"}} size="sm" type="primary">{{item.state}}</tag>
<tag a:if ={{item.state ==="订单中，未领钥匙"}} size="sm" type="primary">{{item.state}}</tag>
<tag a:if ={{item.state ==="正常"}} size="sm" type="success">{{item.state}}</tag>
<tag a:if ={{item.state ==="空箱"}} size="sm" type="success">{{item.state}}</tag>
<tag a:if ={{item.state ==="异常"}} size="sm" type="danger">{{item.state}}</tag>
</view>
</list-item>
</block>
......
pages/keyList/keyList.js
......@@ -10,10 +10,10 @@ Page({
},
getCarList () {
const _this = this
http.post(getApp().globalData.service + "/api/T_Equipment/CarList", {tenant_id: getApp().globalData.tenantId}).then(res => {
http.post(getApp().globalData.service + "/api/T_Equipment/GetBoxList", {}).then(res => {
if (res.Success) {
_this.setData({
carList: res.result
carList: res.options
})
} else {
util.ddToast({ type: 'fail', text: res.Message })
......
pages/my/my.axml
......@@ -3,7 +3,7 @@
<top personalGeneralInfo="{{personalGeneralInfo}}" insInfo='{{insInfo}}'/>
<!-- 订单 -->
<view class="mgt15" a:if="{{showOrder}}">
<container title="我的订单" thumb="../../src/assets/order.png" icon="arrow" onActionTap="showOrder">
<container title="我的任务" thumb="../../src/assets/order.png" icon="arrow">
<view class="grid" key="grid">
<view a:for="{{list}}" key="{{item.entitle}}" class="grid-item" onTap="onItemTap" data-index="{{index}}">
<view class="grid-item-wrapper">
......
pages/my/my.js
......@@ -4,31 +4,19 @@ Page({
data: {
radius: true,
personalGeneralInfo: {},
showOrder: true,
showOrder: false,
list: [
{
entitle: '待我审批',
entitle: '待审批',
icon: '../../src/assets/wait.png',
page: '../orderList/orderList?arrIndex=0',
title: '待我审批'
page: '../orderList/orderList',
title: '待审批'
},
{
entitle: '我的申请',
icon: '../../src/assets/wait.png',
page: '../orderList/orderList?arrIndex=0',
title: '我的申请'
},
{
entitle: '审批通过',
icon: '../../src/assets/disagree.png',
page: '../orderList/orderList?arrIndex=1',
title: '审批通过'
},
{
entitle: '订单完成',
entitle: '已审批',
icon: '../../src/assets/finish.png',
page: '../orderList/orderList?arrIndex=3',
title: '订单完成'
page: '../orderFinish/orderFinish',
title: '已审批'
},
],
menuList: []
......@@ -51,21 +39,19 @@ Page({
},
onLoad() {
let myMenu = []
if (getApp().globalData.userInfo.roleCodeList.find(i => i ==='gly')) {
myMenu = myMenu.concat(SYS_MENU_QUERY)
}
if (getApp().globalData.userInfo.roleCodeList.find(i => i ==='jy')) {
let roleCodeList = getApp().globalData.userInfo.roleCodeList
if (roleCodeList.find(i => i ==='jy')) {
myMenu = myMenu.concat(JY_MENU_QUERY)
}
if (getApp().globalData.userInfo.roleCodeList.find(i => i ==='ld')) {
if (roleCodeList.find(i => i ==='cgkld') || roleCodeList.find(i => i ==='bmld') || roleCodeList.find(i => i ==='zw')) {
myMenu = myMenu.concat(SHY_MENU_QUERY)
}
if (getApp().globalData.userInfo.roleCodeList.find(i => i ==='bmd')) {
myMenu = myMenu.concat(BMD_MENU_QUERY)
this.setData({
showOrder: false
showOrder: true
})
}
if (roleCodeList.find(i => i ==='gly')) {
myMenu = myMenu.concat(SYS_MENU_QUERY)
}
let obj = {}
let result = myMenu.reduce((item, next) => {
obj[next.thumb] ? '' : obj[next.thumb] = true && item.push(next)
......
pages/my/my.json
......@@ -7,6 +7,5 @@
"container": "mini-ali-ui/es/container/index",
"title": "mini-ali-ui/es/title/index",
"top": "../../src/components/top/top"
},
"allowsBounceVertical": "NO"
}
}
\ No newline at end of file
pages/orderDetail/orderDetail.axml
......@@ -5,63 +5,49 @@
<view class="form-row-label-single">{{orderInfo.borrow_code}}</view>
<view class="form-row-label-single">申请人:</view>
<view class="form-row-label-single">{{orderInfo.realname}}</view>
<view class="form-row-label-single">目的地:</view>
<view class="form-row-label-single">{{orderInfo.destination}}</view>
<view class="form-row-label-single">派车状态:</view>
<text class="form-row-label-single txte-tip" a:if="{{orderInfo.state === 0}}">待审批</text>
<text class="form-row-label-single txte-tip" a:if="{{orderInfo.state === 1}}">待取车</text>
<text class="form-row-label-single txte-tip" a:if="{{orderInfo.state === 2}}">待还车</text>
<text class="form-row-label-single txte-tip" a:if="{{orderInfo.state === 3}}">已完成</text>
<text class="form-row-label-single txte-tip" a:if="{{orderInfo.state === 4}}">驳回</text>
<view class="form-row-label-single">车辆种类:</view>
<view class="form-row-label-single">{{orderInfo.carType}}</view>
<view class="form-row-label-single">车辆类型:</view>
<view class="form-row-label-single">{{orderInfo.isPoliceCar == 0 ? '警车' : '非警车'}}</view>
<view class="form-row-label-single">开始用车时间:</view>
<view class="form-row-label-single">{{orderInfo.start_time}}</view>
<view class="form-row-label-single">预计返回时间:</view>
<view class="form-row-label-single">{{orderInfo.end_time}}</view>
<view class="form-row-label-single">工作内容:</view>
<view class="form-row-label-single">用车时长:</view>
<view class="form-row-label-single">{{orderInfo.timeNumber}}小时</view>
<view class="form-row-label-single">任务地点:</view>
<view class="form-row-label-single">{{orderInfo.destination}}</view>
<view class="form-row-label-single">任务类型:</view>
<view class="form-row-label-single">{{orderInfo.reason}}</view>
<view class="form-row-label-single">备注:</view>
<view class="form-row-label-single">{{orderInfo.bz}}</view>
<block a:if="{{orderInfo.state !== 0}}">
<view class="form-row-label-single">车辆:</view>
<view class="form-row-label-single">{{orderInfo.carNumber}}</view>
</block>
</view>
<picker onChange="carPickerChange" value="{{index}}" range="{{carNumberList}}" a:if="{{orderInfo.state == 0}}">
<view class="form-row">
<view class="form-row-label-single">车辆:</view>
<view class="form-row-label-single">{{carNumberList[index] ? carNumberList[index] : '请选择车辆'}}
<image class="row-arrow" src="http://122.112.148.157:5000/updateImg/箭头下.png" mode="aspectFill"></image>
<view class="form-row-label-single">状态:</view>
<text class="form-row-label-single txte-tip">{{ orderInfo.stateValue }}</text>
</view>
</view>
</picker>
<view a:if={{orderInfo.state !== 0}}>
<title style="margin-top: 20rpx">审批信息</title>
<view>
<title style="margin-top: 20rpx;">流程信息</title>
<view class="form-row">
<view class="form-row-label-single">审批人:</view>
<view class="form-row-label-single">{{orderInfo.sh_username}}</view>
<view class="form-row-label-single">审批意见:</view>
<view class="form-row-label-single">{{orderInfo.sh_idea}}</view>
<view class="form-row-label-single">审批时间:</view>
<view class="form-row-label-single">{{orderInfo.sh_time}}</view>
<steps direction="vertical" activeIndex="{{activeIndex}}" items="{{processList}}" showStepNumber="{{true}}"></steps>
</view>
</view>
<view a:if={{orderInfo.state === 3 || orderInfo.state === 2}}>
<view a:if={{orderInfo.detailsList.length > 0}}>
<title style="margin-top: 20rpx">用车信息</title>
<view class="form-row">
<view class="form-row-label-single" a:if={{ userInfo.userId == orderInfo.applicant_userid }}>取车码:</view>
<view class="form-row-label-single" a:if={{ userInfo.userId == orderInfo.applicant_userid }}>{{ orderInfo.detailsList[0].pickUpCode }}</view>
<view class="form-row-label-single">车辆信息:</view>
<view class="form-row-label-single">{{ orderInfo.detailsList[0].carNumber }}</view>
<view class="form-row-label-single">取车时间:</view>
<view class="form-row-label-single">{{orderInfo.pickTime}}</view>
<view class="form-row-label-single">{{ orderInfo.detailsList[0].pickTime }}</view>
<view class="form-row-label-single">还车时间:</view>
<view class="form-row-label-single">{{orderInfo.returnTime}}</view>
<view class="form-row-label-single">{{ orderInfo.detailsList[0].returnTime }}</view>
</view>
</view>
<view a:if={{showSubmit}}>
<title style="margin-top: 20rpx">审核意见</title>
<multi-liner placeholder="请输入审核意见" value="{{shIdea}}" onInput="onInput" last="{{true}}" auto-height="{{true}}" controlled="{{true}}"/>
<view class="page-submit">
<flex>
<flex-item><button type="ghost" size="mini" class="submit-approve-btn" onTap="agree" data-result="no">拒绝</button></flex-item>
<flex-item><button type="ghost" size="mini" class="submit-approve-btn" onTap="agree" data-result="no">不同意</button></flex-item>
<flex-item><button type="primary" size="mini" class="submit-approve-btn" onTap="agree" data-result="yes">同意</button></flex-item>
</flex>
</view>
......
pages/orderDetail/orderDetail.js
import http from '../../src/http'
import util from '../../src/libs/util';
import dd from 'gdt-jsapi';
Page({
data: {
orderInfo: {},
shIdea: '',
id: '',
carNumberList: [],
carList: [],
equipment_id: '',
showSubmit: false
showSubmit: false,
activeIndex: 1,
processList: [],
userInfo: {}
},
onLoad(query) {
if (query.id) {
this.setData({
id: query.id
id: query.id,
userInfo: getApp().globalData.userInfo,
showSubmit: query.showSubmit ? query.showSubmit : false
})
this.getCarList(query.id)
this.getDetail(query.id)
}
},
getDetail(id) {
this.getById(id)
},
getById(id) {
const _this = this
http.post(getApp().globalData.service + '/api/T_Borrow/GetId', {id:id}).then(res => {
if (res.Success) {
let index = _this.data.carNumberList.findIndex(i => i === res.result.carNumber)
this.setData({
orderInfo: res.result,
index: index,
equipment_id: _this.data.carList[index] ? _this.data.carList[index].carId : '',
showSubmit: res.result.state === 0 && getApp().globalData.userInfo.roleCodeList.find(i => i === 'ld') ? true : false
orderInfo: res.result
})
this.getAllProcess()
} else {
util.ddToast({ type: 'fail', text: res.Message })
}
})
},
getAllProcess() {
http.post(getApp().globalData.service + '/api/Sys_Process/GetAllProcess', {code: this.data.orderInfo.flow_type}).then(res => {
if (res.Success) {
let list = []
res.result.forEach(element => {
let des = this.data.orderInfo.processList.find(i => i.step_name == element)
list.push({
title: element,
description: des ? des.realname + '在' + des.update_time + des.audit_mind : ''
})
})
this.setData({
processList: list,
activeIndex: this.data.orderInfo.flow_state == 'True' ? list.length : res.result.findIndex(i => i == this.data.orderInfo.current_step_name) + 1
})
} else {
util.ddToast({ type: 'fail', text: res.Message })
......@@ -42,14 +63,20 @@ Page({
},
agree (event) {
const result = event.target.dataset.result
let processData = {
code: this.data.orderInfo.flow_type,
stepId: this.data.orderInfo.next_step_id,
flowGateway: result === 'yes' ? '同意' : '不同意'
}
let formData = {
id: this.data.id,
sh_idea: this.data.shIdea ? this.data.shIdea : result === 'yes' ? '同意' : '驳回',
sh_userid: getApp().globalData.userInfo.userId,
type: result === 'yes' ? 0 : 1,
equipment_id: this.data.equipment_id
id: this.data.orderInfo.id,
audit_mind: result === 'yes' ? '同意' : '不同意',
userid: getApp().globalData.userInfo.userId,
}
http.post(getApp().globalData.service + '/api/T_Borrow/Approve', formData).then(res => {
http.post(getApp().globalData.service + '/api/Sys_Process/GetProcess', processData).then(res => {
if (res.Success) {
formData = Object.assign(formData, res.result)
http.post(getApp().globalData.service + '/api/T_Borrow/ApproveBorrow', formData).then(res => {
if (res.Success) {
dd.navigateTo({
url: '../orderList/orderList'
......@@ -58,20 +85,10 @@ Page({
util.ddToast({ type: 'fail', text: res.Message })
}
})
},
getCarList(id) {
const _this = this
// http.post(getApp().globalData.service + "/api/T_Equipment/CarList", {tenant_id: getApp().globalData.tenantId}).then(res => {
// if (res.Success) {
// _this.setData({
// carNumberList: res.result.filter(i => i.state === '正常').map(j => {return j.carNumber}),
// carList: res.result.filter(i => i.state === '正常')
// })
this.getById(id)
// } else {
// util.ddToast({ type: 'fail', text: res.Message })
// }
//})
} else {
util.ddToast({ type: 'fail', text: res.Message })
}
})
},
carPickerChange(e) {
this.setData({
......
pages/orderDetail/orderDetail.json
......@@ -7,7 +7,8 @@
"picker-item": "mini-ali-ui/es/picker-item/index",
"flex": "mini-ali-ui/es/flex/index",
"flex-item": "mini-ali-ui/es/flex/flex-item/index",
"multi-liner": "mini-ali-ui/es/multi-liner/index"
"multi-liner": "mini-ali-ui/es/multi-liner/index",
"steps": "mini-ali-ui/es/steps/index"
},
"allowsBounceVertical": "NO"
}
pages/orderFinish/orderFinish.acss 0 → 100644
.row {
display: flex;
align-items: center;
padding: 0 30rpx;
}
.row-title {
flex: 1;
padding-top: 28rpx;
padding-bottom: 28rpx;
font-size: 34rpx;
color: #000;
}
.row-extra {
flex-basis: initial;
font-size: 32rpx;
color: #888;
}
.row-arrow {
width: 32rpx;
height: 32rpx;
margin-left: 16rpx;
}
.container {
background: #F5F5F5;
padding: 24rpx;
height: 100%;
}
.container-item {
margin-bottom: 10rpx;
}
.item {
background: #eeeeee;
text-align: left;
height: 220rpx;
padding-top: 5rpx;
}
.item-concent{
padding: 10rpx 10rpx;
font-size: 30rpx;
}
.txte-warn{
margin-left: 12rpx;
color: #FF8C00;
font-size: 30rpx;
}
.txte-success{
margin-left: 12rpx;
color: #67c23a;
font-size: 28rpx;
}
.txte-danger{
margin-left: 12rpx;
color: #f56c6c;
font-size: 28rpx;
}
\ No newline at end of file
pages/orderFinish/orderFinish.axml 0 → 100644
<scroll-view scroll-y="{{true}}" enable-back-to-top="{{true}}" style="height: 100vh;" onScrollToLower="onScrollToLower">
<view>
<picker onChange="bindObjPickerChange" value="{{arrIndex}}" range="{{stateObjectArray}}" range-key="name">
<view class="row">
<view class="row-title">选择订单状态</view>
<view class="row-extra">当前选择：{{stateObjectArray[arrIndex].name}}</view>
<image class="row-arrow" src="https://img.alicdn.com/tfs/TB1oVprf4vbeK8jSZPfXXariXXa-48-48.png" mode="aspectFill" />
</view>
</picker>
</view>
<page-result
type="empty"
brief ="当前并无订单数据"
local="{{false}}" a:if='{{orderList.length === 0}}'/>
<view a:for="{{orderList}}" a:else>
<view className="container">
<container className="container-item" title = '{{item.realname}}发起的用车申请'
icon="arrow"
thumb="{{ item.returnTime ? (item.returnTime > item.end_time) ? '../../src/assets/overtime.png' : '../../src/assets/car.png' : '../../src/assets/car.png' }}"
onActionTap = "showPage" data-id="{{item.id}}">
<view class="item" onTap="showPage" data-id="{{item.id}}">
<view class="item-concent">订单编号: {{item.borrow_code}}</view>
<view class="item-concent">用车时间: {{item.start_time}}</view>
<view class="item-concent">车辆: {{ item.detailsList ? item.detailsList[0].carNumber : ''}}</view>
<view class="item-concent">订单状态:
<text class="txte-warn">{{item.stateValue}}</text>
</view>
</view>
</container>
</view>
</view>
</scroll-view>
pages/orderFinish/orderFinish.js 0 → 100644
import http from '../../src/http'
import util from '../../src/libs/util';
import dd from 'gdt-jsapi';
Page({
data: {
stateObjectArray: [
{
id: 1,
name: '待审批'
},
{
id: 2,
name: '待派车'
},
{
id: 3,
name: '待取车'
},
{
id: 4,
name: '待归还'
},
{
id: 5,
name: '已完成'
},
{
id: 6,
name: '驳回'
},
{
id: 7,
name: '全部'
},
],
arrIndex: 6,
pageNo: 1,
pageSize: 10
},
onLoad(query) {
if (query.arrIndex) {
this.setData({
arrIndex: query.arrIndex
});
}
this.getOrderList()
},
getOrderList() {
let state = this.data.stateObjectArray[this.data.arrIndex].id
let data = {
pageNo: this.data.pageNo,
pageSize: this.data.pageSize,
type: 2,
state: state === 7 ? '' : state,
userid: getApp().globalData.userInfo.userId
}
http.post(getApp().globalData.service + '/api/T_Borrow/GetPageList', data).then(res => {
if (res.Success) {
this.setData({
orderList:res.result.records
})
} else {
util.ddToast({ type: 'fail', text: res.Message })
}
})
},
bindObjPickerChange(e) {
this.setData({
arrIndex: e.detail.value,
pageSize: 10
});
this.getOrderList()
},
onPullDownRefresh() {
this.setData({
pageSize: 10
})
this.getOrderList()
setTimeout(() => {
dd.stopPullDownRefresh();
}, 100);
},
showPage(event) {
let _id = event.target.dataset.id
dd.navigateTo({
url: '../orderDetail/orderDetail?id=' + _id
})
},
onScrollToLower(e) {
const _this = this
_this.setData({
pageSize: _this.data.pageSize + 8
})
this.getOrderList();
},
});
pages/orderFinish/orderFinish.json 0 → 100644
{
"defaultTitle": "已审批",
"usingComponents": {
"page-result": "mini-ali-ui/es/page-result/index",
"tabs": "mini-ali-ui/es/tabs/index",
"tab-content": "mini-ali-ui/es/tabs/tab-content/index",
"button": "mini-ali-ui/es/button/index",
"container": "mini-ali-ui/es/container/index",
"title": "mini-ali-ui/es/title/index",
"flex": "mini-ali-ui/es/flex/index",
"flex-item": "mini-ali-ui/es/flex/flex-item/index"
}
}
pages/orderList/orderList.axml
<scroll-view scroll-y="{{true}}" enable-back-to-top="{{true}}" style="height: 100vh;" onScrollToLower="onScrollToLower">
<view>
<picker onChange="bindObjPickerChange" value="{{arrIndex}}" range="{{stateObjectArray}}" range-key="name">
<view class="row">
<view class="row-title">选择订单状态</view>
<view class="row-extra">当前选择：{{stateObjectArray[arrIndex].name}}</view>
<image class="row-arrow" src="https://img.alicdn.com/tfs/TB1oVprf4vbeK8jSZPfXXariXXa-48-48.png" mode="aspectFill" />
</view>
</picker>
</view>
<page-result
type="empty"
brief ="当前并无订单数据"
......@@ -22,13 +13,9 @@
<view class="item" onTap="showPage" data-id="{{item.id}}">
<view class="item-concent">订单编号: {{item.borrow_code}}</view>
<view class="item-concent">用车时间: {{item.start_time}}</view>
<view class="item-concent">车辆: {{item.carNumber}}</view>
<view class="item-concent">任务地点: {{item.destination}}</view>
<view class="item-concent">订单状态:
<text class="txte-warn" a:if="{{item.state === 0}}">待审批</text>
<text class="txte-warn" a:if="{{item.state === 1}}">待取车</text>
<text class="txte-warn" a:if="{{item.state === 2}}">待归还</text>
<text class="txte-success" a:if="{{item.state === 3}}">已完成</text>
<text class="txte-danger" a:if="{{item.state === 4}}">驳回</text>
<text class="txte-warn">{{item.stateValue}}</text>
</view>
</view>
</container>
......
pages/orderList/orderList.js
import http from '../../src/http'
import util from '../../src/libs/util';
import login from '../../src/api/login';
import dd from 'gdt-jsapi';
Page({
data: {
stateObjectArray: [
{
id: 1,
name: '待审批'
},
{
id: 2,
name: '待派车'
},
{
id: 3,
name: '待取车'
},
{
id: 4,
name: '待归还'
},
{
id: 5,
name: '已完成'
},
{
id: 6,
name: '驳回'
},
{
id: 7,
name: '全部'
},
],
arrIndex: 5,
pageNo: 1,
pageSize: 10
},
onLoad(query) {
if (query.arrIndex) {
this.setData({
arrIndex: query.arrIndex
});
}
onLoad() {
this.getOrderList()
},
getOrderList() {
let state = this.data.stateObjectArray[this.data.arrIndex].id
let data = {
pageNo: this.data.pageNo,
pageSize: this.data.pageSize,
type: 0,
type: 1,
userid: getApp().globalData.userInfo.userId
}
http.post(getApp().globalData.service + '/api/T_Borrow/GetPageList', data).then(res => {
......@@ -64,13 +27,6 @@ Page({
}
})
},
bindObjPickerChange(e) {
this.setData({
arrIndex: e.detail.value,
pageSize: 10
});
this.getOrderList()
},
onPullDownRefresh() {
this.setData({
pageSize: 10
......@@ -83,7 +39,7 @@ Page({
showPage(event) {
let _id = event.target.dataset.id
dd.navigateTo({
url: '../orderDetail/orderDetail?id=' + _id
url: '../orderDetail/orderDetail?id=' + _id + '&showSubmit=true'
})
},
onScrollToLower(e) {
......
pages/orderList/orderList.json
{
"defaultTitle": "我的订单",
"defaultTitle": "待审批",
"usingComponents": {
"page-result": "mini-ali-ui/es/page-result/index",
"tabs": "mini-ali-ui/es/tabs/index",
......
pages/sysCar/sysCar.axml
......@@ -8,14 +8,15 @@
brief ="当前并无车辆数据"
local="{{false}}" a:if='{{carList.length === 0}}'/>
<view a:for="{{carList}}" a:else>
<list-item>
<list-item
thumb="http://122.112.148.157:5000/updateImg/汽车.png"
upperSubtitle="{{item.name}}"
lowerSubtitle="{{item.policeCar === 0 ? '警车' : '非警车'}}">
{{item.carNumber}}
<view slot="extra">
<button size="mini" type="primary" onTap="editCar" data-info="{{item}}">编辑</button>
{{item.boxName}}
</view>
<avatar name="{{item.carNumber}}" desc="{{item.carType}}" src="http://122.112.148.157:5000/updateImg/汽车.png" />
<!-- <avatar name="{{item.carNumber}}" desc="{{item.carType}}" src="http://122.112.148.157:5000/updateImg/汽车.png" /> -->
</list-item>
</view>
<view class="page-submit">
<button type="primary" formType="submit" class="submit-btn" onTap="addCar">新增</button>
</view>
</scroll-view>
\ No newline at end of file
pages/sysCar/sysCar.js
import http from '../../src/http/index'
import util from '../../src/libs/util'
import dd from 'gdt-jsapi';
Page({
data: {
......@@ -31,10 +32,9 @@ Page({
let data = {
pageNo: this.data.pageNo,
pageSize: this.data.pageSize,
tenant_id: getApp().globalData.tenantId,
carNumber: this.data.searchValue
}
http.post(getApp().globalData.service + '/api/T_Equipment/EquipmentPageList', data).then(res => {
http.post(getApp().globalData.service + '/api/T_Equipment/GetList', data).then(res => {
if (res.Success) {
this.setData({
carList: res.result.records
......
src/api/login.js
......@@ -4,7 +4,7 @@ import dd from 'gdt-jsapi';
function login() {
getApp().globalData.userInfo = {userId: '15957116480', name: '黄麒宇', roleCodeList: ['jy'],sysDepart: {id: '813f982a4b71457a92003463120a2725', departName: '办公室'}}
getApp().globalData.userInfo = {userId: '15957116480', name: '黄麒宇', roleCodeList: ['jy', 'gly', 'cgkld'],sysDepart: {id: '813f982a4b71457a92003463120a2725', departName: '办公室'}}
if (!getApp().globalData.userInfo.sysDepart) {
dd.redirectTo({ url: '/pages/changeCrop/changeCrop' })
} else {
......
src/common/constant.js
......@@ -16,29 +16,19 @@ export const JY_MENU_QUERY = [
page: '../myApply/myApply',
title: '我的申请'
},
{
thumb: '../../src/assets/carUseLog.png',
page: '../carUseLog/carUseLog',
title: '用车记录'
},
]
export const SHY_MENU_QUERY = [
{
thumb: '../../src/assets/monitor.png',
page: '../keyList/keyList',
title: '钥匙监控'
},
{
thumb: '../../src/assets/carUseLog.png',
page: '../carUseLog/carUseLog',
title: '用车记录'
thumb: '../../src/assets/carApply.png',
page: '../applyBorrowCar/applyBorrowCar',
title: '用车申请'
},
{
thumb: '../../src/assets/tj.png',
page: '../carTj/carTj',
title: '用车统计'
},
thumb: '../../src/assets/myApply.png',
page: '../myApply/myApply',
title: '我的申请'
}
]
export const SYS_MENU_QUERY = [
......@@ -50,12 +40,12 @@ export const SYS_MENU_QUERY = [
{
thumb: '../../src/assets/car.png',
page: '../sysCar/sysCar',
title: '车辆管理'
title: '车辆列表'
},
{
thumb: '../../src/assets/carApply.png',
page: '../applyBorrowCar/applyBorrowCar',
title: '用车申请'
thumb: '../../src/assets/car.png',
page: '../sysCar/sysCar',
title: '订单管理'
},
{
thumb: '../../src/assets/carUseLog.png',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论