diff --git a/common/http.api.js b/common/http.api.js
index 16caa68..2f61b04 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -29,6 +29,10 @@ const install = (Vue, vm) => {
getOrdersType:(params = {})=>vm.$u.get(config.adminPath+'/property/workOrdersType/list',params),
//报事报修订单类型
getRepairTypes:(params = {})=>vm.$u.get(config.adminPath+'/property/workOrdersType/queryList',params),
+
+ //工单详情
+ getRepairDetail:(params = {}, id) => vm.$u.get(config.adminPath+`/property/workOrders/{id}`,params),
+
//新增订单
addOrder:(params = {})=>vm.$u.post(config.adminPath+'/property/workOrders',params),
//新增报事报修
diff --git a/components/SelectUser.vue b/components/SelectUser.vue
index 02a0def..cb4a5af 100644
--- a/components/SelectUser.vue
+++ b/components/SelectUser.vue
@@ -13,7 +13,8 @@
-
+
+ 搜索
@@ -24,7 +25,7 @@
{{ item.name }}({{ item.department }})
-
+
@@ -58,13 +59,18 @@
data() {
return {
keyword: '',
- selected: []
+ selected: [],
+ allList: [], // 存放所有数据
+ filteredList: []
}
},
- computed: {
- filteredList() {
- if (!this.keyword) return this.list;
- return this.list.filter(item => item.name.includes(this.keyword) || item.value.includes(this.keyword));
+ watch: {
+ list: {
+ handler(newVal) {
+ this.allList = [...newVal];
+ this.filteredList = [...newVal];
+ },
+ immediate: true
}
},
methods: {
@@ -89,7 +95,18 @@
this.$emit('confirm', this.selected);
this.close();
},
- onSearch() {}
+ // 搜索方法
+ handleSearch() {
+ if (!this.keyword) {
+ this.filteredList = [...this.allList];
+ return;
+ }
+
+ this.filteredList = this.allList.filter(item =>
+ item.name.includes(this.keyword) ||
+ (item.department && item.department.includes(this.keyword))
+ );
+ }
}
}
@@ -147,38 +164,48 @@
right: 30rpx;
}
- .search-bar {
- display: flex;
- align-items: center;
- background: #F7F7F7;
- border-radius: 29rpx;
- height: 58rpx;
- padding-left: 20rpx;
- margin-left: 34rpx;
- margin-right: 34rpx;
- margin-top: 26rpx;
- }
- .search-icon {
- width: 27rpx;
- height: 27rpx;
- margin-right: 8rpx;
- }
- .search-input {
- border: none;
- font-size: 26rpx;
- flex: 1;
- color: #000;
+ .search-bar {
+ display: flex;
+ align-items: center;
+ background: #F7F7F7;
+ border-radius: 29rpx;
+ height: 58rpx;
+ padding-left: 20rpx;
+ margin-left: 34rpx;
+ margin-right: 34rpx;
+ margin-top: 26rpx;
+ }
+ .search-icon {
+ width: 27rpx;
+ height: 27rpx;
+ margin-right: 8rpx;
+ }
+ .search-input {
+ border: none;
+ font-size: 26rpx;
+ flex: 1;
+ color: #000;
+ background: transparent;
+ }
+ .search-btn {
+ font-size: 26rpx;
+ color: #0090FF;
+ padding: 0 20rpx;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
.user-list {
flex: 1;
- overflow-y: auto;
- margin-top: 20rpx;
- padding-left: 52rpx;
+ overflow-y: auto;
+ margin-top: 20rpx;
+ padding-left: 52rpx;
padding-right: 52rpx;
}
- .user-item {
+ .user-item {
height: 88rpx;
display: flex;
align-items: center;
@@ -207,8 +234,8 @@
background: #0090FF;
color: #fff;
border-radius: 44rpx;
- font-size: 36rpx;
- margin-top: 50rpx;
+ font-size: 36rpx;
+ margin-top: 50rpx;
margin-bottom: 50rpx;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 3ca434f..98be3c5 100644
--- a/pages.json
+++ b/pages.json
@@ -351,6 +351,18 @@
"style": {
"navigationBarTitleText": "新增报事报修"
}
+ },
+ {
+ "path": "pages/sys/user/myRepair/repairDetail",
+ "style": {
+ "navigationBarTitleText": "报事详情"
+ }
+ },
+ {
+ "path": "pages/sys/user/myRepair/addSuc",
+ "style": {
+ "navigationStyle": "custom"
+ }
},
{
"path": "pages/sys/user/myRepair/selectLocation",
diff --git a/pages/sys/user/mine.vue b/pages/sys/user/mine.vue
index feba15d..a3a6ab4 100644
--- a/pages/sys/user/mine.vue
+++ b/pages/sys/user/mine.vue
@@ -19,7 +19,7 @@
-
+
{{ item.text }}
@@ -40,36 +40,45 @@
nickname: '',
phone:''
},
- list: [{
- icon: '/static/ic_mine_info.png',
- text: '我的信息'
- },
- {
- icon: '/static/ic_mine_pay.png',
- text: '我的缴费'
- },
- {
- icon: '/static/ic_mine_repair.png',
- text: '我的报修'
- },
- {
- icon: '/static/ic_mine_visitor.png',
- text: '我的访客'
- },
- {
+ list: [
+ // {
+ // id:0,
+ // icon: '/static/ic_mine_info.png',
+ // text: '我的信息'
+ // },
+ // {
+ // id:1,
+ // icon: '/static/ic_mine_pay.png',
+ // text: '我的缴费'
+ // },
+ // {
+ // id:2,
+ // icon: '/static/ic_mine_repair.png',
+ // text: '我的报修'
+ // },
+ // {
+ // id:3,
+ // icon: '/static/ic_mine_visitor.png',
+ // text: '我的访客'
+ // },
+ {
+ id:4,
icon: '/static/ic_mine_check.png',
text: '我的考勤'
},
- {
+ {
+ id:5,
icon: '/static/ic_mine_pwd.png',
text: '修改密码'
},
- {
+ {
+ id:6,
icon: '/static/ic_mine_version.png',
text: '系统版本',
extra: 'v1.00.01'
},
- {
+ {
+ id:7,
icon: '/static/ic_mine_setting2.png',
text: '设置'
}
diff --git a/pages/sys/user/myRepair/addRepair.vue b/pages/sys/user/myRepair/addRepair.vue
index 94994af..d25bf04 100644
--- a/pages/sys/user/myRepair/addRepair.vue
+++ b/pages/sys/user/myRepair/addRepair.vue
@@ -141,7 +141,11 @@
// 关闭页面前发送事件通知前页面刷新
uni.$emit('refreshData', '');
// 返回上一页
- uni.navigateBack();
+ uni.navigateBack();
+ const itemStr = encodeURIComponent(JSON.stringify(this.repairInfo));
+ uni.navigateTo({
+ url: "/pages/sys/user/myRepair/addSuc?item=" + itemStr,
+ });
}else{
uni.showToast({
title: res.msg,
diff --git a/pages/sys/user/myRepair/addSuc.vue b/pages/sys/user/myRepair/addSuc.vue
new file mode 100644
index 0000000..a769a35
--- /dev/null
+++ b/pages/sys/user/myRepair/addSuc.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+ 查看进度
+
+
+
+
+
+ 提交成功
+
+
+ 提交成功后我们将及时为您服务
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/sys/user/myRepair/myRepair.vue b/pages/sys/user/myRepair/myRepair.vue
index 6e28bbb..ded84d8 100644
--- a/pages/sys/user/myRepair/myRepair.vue
+++ b/pages/sys/user/myRepair/myRepair.vue
@@ -32,7 +32,7 @@
建立时间:{{ item.createTime }}
- 报事内容:{{ item.typeName }}
+ 工单类型:{{ item.typeName }}
报事位置:{{ item.location }}
服务评价
@@ -179,7 +179,7 @@
goDetail(item) {
const itemStr = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
- url: "/pages/sys/workbench/order/orderDetail?item=" + itemStr,
+ url: "/pages/sys/user/myRepair/repairDetail?item=" + itemStr,
});
},
showDetail(item) {
diff --git a/pages/sys/user/myRepair/repairDetail.vue b/pages/sys/user/myRepair/repairDetail.vue
new file mode 100644
index 0000000..981c5ef
--- /dev/null
+++ b/pages/sys/user/myRepair/repairDetail.vue
@@ -0,0 +1,263 @@
+
+
+
+
+ 工单编号:{{ detail.orderNo }}
+
+ 上报人信息
+ 发起人:{{ detail.initiatorPeople }}
+ 联系电话:{{ detail.initiatorPhone }}
+
+
+ 保修信息
+ 工单名称:{{ detail.orderName }}
+ 工单类型:{{ detail.typeName }}
+ 处理地点:{{ detail.location }}
+ 备注:{{ detail.remark }}
+ 工单图片:
+
+
+
+
+
+
+ 负责人信息
+ 负责人:{{ detail.handlerText }}
+ 联系电话:{{ detail.handlerPhone }}
+
+
+
+
+ 进度跟踪
+
+
+ {{ status.createTime.substring(0,11)}}
+ {{ status.createTime.substring(11,16) }}
+
+
+
+
+
+
+
+ {{ getStatusLabel(status.status) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/sys/workbench/inspection/inspectionOpt.vue b/pages/sys/workbench/inspection/inspectionOpt.vue
index 955d406..814589b 100644
--- a/pages/sys/workbench/inspection/inspectionOpt.vue
+++ b/pages/sys/workbench/inspection/inspectionOpt.vue
@@ -152,13 +152,13 @@
});
},
beforeSubmit() {
- if(!this.isSign){
- uni.showToast({
- title: '请先签到',
- icon: 'none'
- });
- return
- }
+ // if(!this.isSign){
+ // uni.showToast({
+ // title: '请先签到',
+ // icon: 'none'
+ // });
+ // return
+ // }
if (this.info.inspectionResults == 1) {
// 直接提交
this.submit();
diff --git a/pages/sys/workbench/inspection/inspectionProcess.vue b/pages/sys/workbench/inspection/inspectionProcess.vue
index 63b4835..8488c2d 100644
--- a/pages/sys/workbench/inspection/inspectionProcess.vue
+++ b/pages/sys/workbench/inspection/inspectionProcess.vue
@@ -30,6 +30,27 @@
{{ item.pointName }}
{{ item.pointStartTime.substring(0,16) }} - {{ item.pointEndTime.substring(0,16) }}
+
+
+
+
+ 完成巡检
+
+ {{ item.inspectionResults == 1 ? '正常' : '异常' }}
+
+
+
+
+ 提报时间 {{ item.inspectorName || '未知' }}
+
+
+
+ 处理时间:{{ item.actualInspectionTime || '未知' }}
+
+
+
+ 完成时间:{{ item.remarks || '无' }}
+
@@ -44,6 +65,7 @@
{{ item.inspectionResults == 1 ? '正常' : '异常' }}
+
@@ -109,13 +131,13 @@
uni.navigateTo({
url: `/pages/sys/workbench/inspection/inspectionOpt?item=${detailItemStr}`
});
- },
-
- goDetail(item) {
- // const detailItemStr = encodeURIComponent(JSON.stringify(item));
- // uni.navigateTo({
- // url: `/pages/sys/workbench/inspection/inspectionDetail?item=${detailItemStr}`
- // });
+ },
+
+ goDetail(item) {
+ // const detailItemStr = encodeURIComponent(JSON.stringify(item));
+ // uni.navigateTo({
+ // url: `/pages/sys/workbench/inspection/inspectionDetail?item=${detailItemStr}`
+ // });
}
}
}
@@ -191,6 +213,35 @@
background: #2f6aff
}
+
+
+ /* 子项 */
+ .sub-item {
+ display: flex;
+ align-items: center;
+ margin-bottom: 16rpx;
+ }
+
+ .sub-item:last-child {
+ margin-bottom: 0;
+ }
+
+ /* 子项圆点 */
+ .sub-dot {
+ width: 16rpx;
+ height: 16rpx;
+ border-radius: 50%;
+ background-color: #BFBFBF;
+ margin-right: 20rpx;
+ flex-shrink: 0;
+ }
+
+ /* 子项文字 */
+ .sub-text {
+ font-size: 26rpx;
+ color: #666;
+ }
+
/* 右侧卡片 */
.card {}
diff --git a/pages/sys/workbench/order/orderDetail.vue b/pages/sys/workbench/order/orderDetail.vue
index a9d92e8..9191397 100644
--- a/pages/sys/workbench/order/orderDetail.vue
+++ b/pages/sys/workbench/order/orderDetail.vue
@@ -9,7 +9,7 @@
联系电话:{{ detail.initiatorPhone }}
- 保修信息
+ 报修信息
工单名称:{{ detail.orderName }}
工单类型:{{ detail.typeName }}
处理地点:{{ detail.location }}
diff --git a/static/ic_sub_suc.png b/static/ic_sub_suc.png
new file mode 100644
index 0000000..f451364
Binary files /dev/null and b/static/ic_sub_suc.png differ