This commit is contained in:
SelfRidicule 2024-08-14 11:44:30 +08:00
parent 760502fbb9
commit eb8f4d0c3d
5 changed files with 110 additions and 51 deletions

View File

@ -21,37 +21,6 @@
<view class="tag">待审核</view>
</view>
<view class="reportView">
<view class="topTitle">报修信息</view>
<view class="selfLine"></view>
<view class="itemView">
<view class="label">设备名称</view>
<view class="content">320828282828320828282828320828282828320828282828v</view>
</view>
<view class="itemView">
<view class="label">设备地址</view>
<view class="content">302会议室</view>
</view>
<view class="itemView">
<view class="label">维修描述</view>
<view class="content">电脑蓝屏</view>
</view>
<view class="itemView">
<view class="label">损坏凭证</view>
<view class="content">
<view wx:for="{{10}}" class="imgView" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/index/banner/1.jpg'}});"></view>
</view>
</view>
<view class="itemView">
<view class="label">报修人</view>
<view class="content">13652025563</view>
</view>
<view class="itemView">
<view class="label">报修时间</view>
<view class="content">2024-06-10 23:59:59</view>
</view>
</view>
<view class="reportView">
<view class="topTitle">反馈</view>
<view class="selfLine"></view>
@ -70,11 +39,11 @@
<view class="selfLine"></view>
<view class="itemLineCenterView">
<view class="label">请选择重新选择故障类型</view>
<van-icon name="arrow" color="gray" size="34rpx"/>
<van-icon name="arrow" color="gray" size="34rpx" />
</view>
<view class="tijiaoBtn">提交</view>
</view>
</view>
<view class="tijiaoBtn">提交</view>
</view>

View File

@ -13,6 +13,7 @@ Page({
*/
data: {
IMG_NAME: app.IMG_NAME,
title: '详情',
id: '',
detail: {},
files: {},
@ -47,11 +48,11 @@ Page({
detail.statusName = getStatusName(detail.status)
// 附件
let files = res.files
files.repair = files.repair.map(item=>{
files.repair = files.repair.map(item => {
item.url = app.IMG_NAME + item.url
return item
})
files.voice = files.voice.map(item=>{
files.voice = files.voice.map(item => {
item.url = app.IMG_NAME + item.url
return item
})
@ -117,13 +118,21 @@ Page({
},
// 无效
invalid() {
jumpInvalid() {
let _this = this
wx.navigateTo({
url: `/pages/reportRepair/assign/nullify/nullify?id=${_this.data.id}`,
})
},
// 重新派单
jumpAgain() {
let _this = this
wx.navigateTo({
url: `/pages/reportRepair/assign/again/again?id=${_this.data.id}`,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/

View File

@ -6,7 +6,7 @@
<van-icon name="arrow-left" color="#ffffff" size="30rpx" />
<view class="label">返回</view>
</view>
<view class="title">详情</view>
<view class="title">{{title}}</view>
</view>
<view class="contentView">
@ -73,18 +73,32 @@
<view class="label">故障图片/视频</view>
<view class="content">
<view class="imgContentView">
<van-uploader file-list="{{ files.repair }}" show-upload="{{false}}" deletable="{{false}}"/>
<van-uploader file-list="{{ files.repair }}" show-upload="{{false}}" deletable="{{false}}" />
</view>
</view>
</view>
</view>
<view class="reportView" wx:if="{{detail.status == 3}}">
<view class="topTitle">派单反馈</view>
<view class="selfLine"></view>
<view class="itemLineView">
<view class="label">反馈人员</view>
<view class="content">王军</view>
</view>
<view class="itemLineView">
<view class="label">反馈描述</view>
<view class="content">类型不一致类型不一致类型不一致类型不一致类型不一致</view>
</view>
</view>
</view>
<view class="bottomFixView">
<view class="btn red" bind:tap="invalid">无效申请</view>
<view class="btn" bind:tap="jumpAffirm">确认损坏</view>
<view class="btn" bind:tap="jumpFeedback">提交反馈</view>
<view class="btn" bind:tap="jumpAgain" wx:if="{{detail.status == 3}}">重新派单</view>
<view class="btn red" bind:tap="jumpInvalid" wx:if="{{detail.status == 1}}">无效申请</view>
<view class="btn" bind:tap="jumpAffirm" wx:if="{{detail.status == 1}}">确认损坏</view>
<view class="btn" bind:tap="jumpFeedback" wx:if="{{detail.status == 1}}">提交反馈</view>
</view>
</view>

View File

@ -1,5 +1,6 @@
.containerView.public {
background: none;
padding-bottom: 180rpx;
}
.elHidden {
@ -174,29 +175,53 @@
vertical-align: middle;
}
.mainView .reportView .itemLineView {
display: flex;
justify-content: flex-start;
align-items: flex-start;
margin: 0 30rpx;
padding: 30rpx 0;
border-bottom: 2rpx solid rgb(126, 126, 126, 0.2);
}
.mainView .reportView .itemLineView .label {
flex-shrink: 0;
width: 200rpx;
font-size: 30rpx;
color: gray;
}
.mainView .reportView .itemLineView .content {
font-size: 30rpx;
word-break: break-all;
}
.bottomFixView {
position: fixed;
z-index: 999;
left: 0;
bottom: 0;
height: 140rpx;
width: 100vw;
border-top: 1rpx solid rgb(126, 126, 126, 0.2);
padding: 40rpx 0 40rpx;
border-top: 2rpx solid rgb(126, 126, 126, 0.2);
background: white;
display: flex;
justify-content: flex-end;
align-items: center;
flex-wrap: wrap;
}
.bottomFixView .btn {
box-sizing: border-box;
border-radius: 6rpx;
margin-right: 30rpx;
padding: 12rpx 24rpx;
margin-bottom: 30rpx;
padding: 20rpx 36rpx;
background: #579ff8;
font-size: 26rpx;
font-size: 28rpx;
color: white;
}

View File

@ -70,8 +70,10 @@ Page({
})
// 获取数据
let userId = _this.data.userData.id
// 角色是否是:网格长
if (true) {
// 角色id
let dataType = _this.data.userData.dataType
// 是否展示
if (dataType == 7) {
_this.setData({
tabTitle: '重新派单', // tab 标题
resendOrderVisible: true, // 重新派单显示
@ -224,9 +226,10 @@ Page({
// 跳转-详情
jumpDetail(e) {
console.log('detail', e);
let _this = this
let id = e.currentTarget.dataset.obj.id
wx.navigateTo({
url: '/pages/reportRepair/assign/detail/detail?id=' + id,
url: `/pages/reportRepair/assign/detail/detail?id=${id}&title=${_this.data.tabTitle}`,
})
},
@ -249,7 +252,46 @@ Page({
*/
onShow() {
let _this = this;
//
_this.setData({
// 重新派单
resendOrder: {
pageNum: 1,
pageSize: 10,
type: 'anew',
dataList: [],
isDataAll: false,
},
// 待派单
pendingOrder: {
pageNum: 1,
pageSize: 10,
type: 'wait',
dataList: [],
isDataAll: false,
},
// 已派单
assignOrder: {
pageNum: 1,
pageSize: 10,
type: 'already',
dataList: [],
isDataAll: false,
},
// 已关闭
closeOrder: {
pageNum: 1,
pageSize: 10,
type: 'close',
dataList: [],
isDataAll: false,
},
})
// 数据
_this.getDataList('重新派单')
_this.getDataList('待派单')
_this.getDataList('已派单')
_this.getDataList('已关闭')
},
/**