diff --git a/miniprogram/pages/reportRepair/assign/again/again.wxml b/miniprogram/pages/reportRepair/assign/again/again.wxml
index 693b7d7..ac04843 100644
--- a/miniprogram/pages/reportRepair/assign/again/again.wxml
+++ b/miniprogram/pages/reportRepair/assign/again/again.wxml
@@ -21,37 +21,6 @@
待审核
-
- 报修信息
-
-
- 设备名称
- 320828282828320828282828320828282828320828282828v
-
-
- 设备地址
- 302会议室
-
-
- 维修描述
- 电脑蓝屏
-
-
- 损坏凭证
-
-
-
-
-
- 报修人
- 13652025563
-
-
- 报修时间
- 2024-06-10 23:59:59
-
-
-
反馈
@@ -70,11 +39,11 @@
请选择重新选择故障类型
-
+
+ 提交
- 提交
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.js b/miniprogram/pages/reportRepair/assign/detail/detail.js
index ee2a093..32dde06 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.js
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.js
@@ -13,6 +13,7 @@ Page({
*/
data: {
IMG_NAME: app.IMG_NAME,
+ title: '详情',
id: '',
detail: {},
files: {},
@@ -47,12 +48,12 @@ Page({
detail.statusName = getStatusName(detail.status)
// 附件
let files = res.files
- files.repair = files.repair.map(item=>{
- item.url = app.IMG_NAME + item.url
+ files.repair = files.repair.map(item => {
+ item.url = app.IMG_NAME + item.url
return item
})
- files.voice = files.voice.map(item=>{
- item.url = app.IMG_NAME + item.url
+ files.voice = files.voice.map(item => {
+ item.url = app.IMG_NAME + item.url
return item
})
_this.setData({
@@ -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}`,
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.wxml b/miniprogram/pages/reportRepair/assign/detail/detail.wxml
index d053058..64d41f0 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.wxml
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.wxml
@@ -6,7 +6,7 @@
返回
- 详情
+ {{title}}
@@ -73,18 +73,32 @@
故障图片/视频
-
+
+
+ 派单反馈
+
+
+ 反馈人员
+ 王军
+
+
+ 反馈描述
+ 类型不一致类型不一致类型不一致类型不一致类型不一致
+
+
+
- 无效申请
- 确认损坏
- 提交反馈
+ 重新派单
+ 无效申请
+ 确认损坏
+ 提交反馈
\ No newline at end of file
diff --git a/miniprogram/pages/reportRepair/assign/detail/detail.wxss b/miniprogram/pages/reportRepair/assign/detail/detail.wxss
index d012a94..4f0e116 100644
--- a/miniprogram/pages/reportRepair/assign/detail/detail.wxss
+++ b/miniprogram/pages/reportRepair/assign/detail/detail.wxss
@@ -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;
}
diff --git a/miniprogram/pages/reportRepair/assign/record/record.js b/miniprogram/pages/reportRepair/assign/record/record.js
index b01fd9d..a0c523b 100644
--- a/miniprogram/pages/reportRepair/assign/record/record.js
+++ b/miniprogram/pages/reportRepair/assign/record/record.js
@@ -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('已关闭')
},
/**