diff --git a/common/betone_components/betone-list.vue b/common/betone_components/betone-list.vue
index 31fa58a..e7a6f47 100644
--- a/common/betone_components/betone-list.vue
+++ b/common/betone_components/betone-list.vue
@@ -81,7 +81,7 @@
@click.stop="openWorkOrder(item)">查看
确认
+ type="primary" @click="openModel(item,'submitOrder')">确认
驳回
+
+
+
+ 请确认是否进行接单？
+
+
@@ -152,12 +158,20 @@ export default {
reportUnit: '',//提报单位
},
tagColor: {
- 维修中: "#3A62D7",
- 待确认: "#81B337",
- 待维修: "#3A62D7",
- 待提报: "#81B337",
- 待维修: '#E99D42',
- 已完成: "#CECECE",
+ 待提报: "#409eff",
+ 待接单: "#67c23a",
+ 待维修: " #409eff",
+ 确认方案: "#409eff",
+ 维修中: '#e6a23',
+ 待评价:"#67c23a",
+ 待付款:"#67c23a",
+ 维修中:"#e6a23",
+ 已驳回:"#f56c6c",
+ 待审批:"#409eff",
+ 已通过:"#409eff",
+ 待确认:"#67c23a",
+ 待提交:'#67c23a',
+ 已完成: "#909399",
},
current: 0,
@@ -184,6 +198,8 @@ export default {
repairShow: false,//维修人员 去人维修完成弹框
paymentShow: false,//客服确付款
+
+ submitOrderShow:false,//维修人员确认接单
};
},
computed: {
@@ -432,6 +448,9 @@ export default {
if (type == 'paymentInfo') {
this.paymentShow = true
}
+ if (type == 'submitOrder') {
+ this.submitOrderShow = true
+ }
this.rowInfo = item
},
@@ -525,6 +544,19 @@ export default {
this.$u.api.cloneOrder(query).then(res => {
this.paymentShow = false
this.BetLoading.hide();
+ if (res.code == 200) {
+ uni.showToast({ title: "确认成功", icon: "none" });
+ this.submitOrderShow = false
+ this.getRecordsList()
+ }
+ })
+ },
+ // 维修人员确认接单
+ submitOrderShowFn(){
+ let query_ = {
+ id: this.rowInfo.id
+ }
+ this.$u.api.servicemanReceive(query_).then(res => {
if (res.code == 200) {
uni.showToast({ title: "确认成功", icon: "none" });
this.getRecordsList()
diff --git a/pages/home/components/swiper.vue b/pages/home/components/swiper.vue
index 08196f1..8d6a15f 100644
--- a/pages/home/components/swiper.vue
+++ b/pages/home/components/swiper.vue
@@ -81,7 +81,7 @@ export default {
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(34, 34, 34, 0.5);
- height: 260rpx;
+ height: 210rpx;
display: flex;
align-items: center;
flex: 1;
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 54ce35b..30c9730 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -5,7 +5,7 @@
科研医疗建筑运维平台
-
+
工作台
@@ -19,7 +19,7 @@
{{ item.name }}
-
+
@@ -56,10 +56,10 @@ export default {
onShow() {
this.$nextTick(() => {
this.$refs.tabbarRef.getPermission();
- // this.BetLoading.show();
- // setTimeout(() => {
- // this.BetLoading.hide();
- // }, 1000);
+ // this.BetLoading.show();
+ // setTimeout(() => {
+ // this.BetLoading.hide();
+ // }, 1000);
});
//工作台
this.getUserInfo()
@@ -100,7 +100,7 @@ export default {
getUserInfo() {
this.$u.api.getUserInfo().then(res => {
if (res.code == 200) {
- if (res.data?.backGroundPic!=undefined) {
+ if (res.data?.backGroundPic != undefined) {
this.swiperList.push(res.data.backGroundPic)
} else {
this.swiperList.push(require("@/static/images/home/lab.png"))
@@ -111,9 +111,14 @@ export default {
})
},
goPage(item) {
- uni.navigateTo({
- url: item.pagePath,
- });
+ if (item.pagePath == '') {
+ uni.showToast({ title: "功能正在完善中，敬请期待！", icon: "none" });
+ } else {
+ uni.navigateTo({
+ url: item.pagePath,
+ });
+ }
+
},
scanCode() {
uni.scanCode({
diff --git a/pages/inspection/quest.vue b/pages/inspection/quest.vue
index 0c3a6a0..c708dd7 100644
--- a/pages/inspection/quest.vue
+++ b/pages/inspection/quest.vue
@@ -41,14 +41,14 @@
确认
+ @click.stop="openWorkOrder(item, 'tsak')">确认
接单
+ @click="openWorkOrder(item, 'tsak')">接单
巡检
+ @click="openWorkOrder(item, 'tsak')">巡检
@@ -61,24 +61,24 @@
审批
+ @click="openWorkOrder(item, 'repair')">审批
评价
- 确认付款
+ 确认付款
审批
+ @click="openWorkOrder(item, 'repair')">审批
提交
+ @click="openWorkOrder(item, 'repair')">提交
维修完成
@@ -96,7 +96,8 @@
value-name="id" title="选择维修人员">
-
+
维修是否完成？
@@ -124,17 +125,24 @@ export default {
requirementCode: "",
type: '',//状态
reportUnit: '',//提报单位
- statusSearch:'',//巡检任务状态
+ statusSearch: '',//巡检任务状态
},
userInfo: {},//用户信息
rowInfo: {},//选中行数据
tagColor: {
- 维修中: "#3A62D7",
- 待确认: "#81B337",
- 待维修: "#3A62D7",
- 待提报: "#81B337",
+ 待巡检: "#67c23a",
+ 巡检中: "#e6a23",
+ 待确认: '#67c23a',
+ 待派单: "#409eff",
+ 待接单: "#67c23a",
已完成: "#CECECE",
- 待维修: '#E99D42'
+ 待提交: "#67c23a",
+ 待审批 :"#409eff",
+ 维修中:"#e6a23",
+ 待确认:"#67c23a",
+ 待评价:"#67c23a",
+ 维修完成:"#67c23a",
+ 待付款:"#67c23a",
},
tabList: [],
tasktabList: [],
@@ -165,7 +173,7 @@ export default {
rowInfo: {},//获取列表数据
repairCompleteShow: false,//维修完成
- paymentShow:false,//确认付款是否完成
+ paymentShow: false,//确认付款是否完成
};
},
computed: {
@@ -277,7 +285,7 @@ export default {
this.getRecordsList()
},
// 巡检维修 tab切换
- subsectionChangeTab(index){
+ subsectionChangeTab(index) {
this.current = index;
this.searchInfo.statusSearch = this.tasktabList[index].key == '9999' ? '' : this.tasktabList[index].key
this.isNomore = false
@@ -296,11 +304,11 @@ export default {
});
},
//跳转工单
- openWorkOrder(item,type) {
+ openWorkOrder(item, type) {
let param = {
id: item.id,
type: 'view',
- details:type
+ details: type
}
uni.navigateTo({
url: `/pages/inspection/questOrder${this.$u.queryParams(param)}`,
@@ -308,7 +316,7 @@ export default {
},
subsectionChange(e) {
this.subsectionCurrent = e;
- this.searchInfo.statusSearch=''
+ this.searchInfo.statusSearch = ''
this.getRecordsList()
},
// 指派
@@ -346,7 +354,7 @@ export default {
if (type == 'repairComplete') {
this.repairCompleteShow = true
}
- if(type =='paymentInfo'){
+ if (type == 'paymentInfo') {
this.paymentShow = true
}
this.rowInfo = item
@@ -366,7 +374,7 @@ export default {
})
},
// 确认付款是否完成
- paymentFn(){
+ paymentFn() {
let query = {
id: this.rowInfo.id,
}
@@ -440,7 +448,7 @@ export default {
if ((item == 5 && this.dataTypes == 3) || (item == 5 && this.dataTypes == 4)) {
return '维修完成'
}
- if ((item == 6 && this.dataTypes == 3) || (item == 6 && this.dataTypes == 2)||(item == 6 && this.dataTypes == 1)) {
+ if ((item == 6 && this.dataTypes == 3) || (item == 6 && this.dataTypes == 2) || (item == 6 && this.dataTypes == 1)) {
return '待付款'
}
diff --git a/pages/submission/sendOrders.vue b/pages/submission/sendOrders.vue
index 30efa74..022df72 100644
--- a/pages/submission/sendOrders.vue
+++ b/pages/submission/sendOrders.vue
@@ -5,11 +5,11 @@
-
-
+
-
-
+ -->
-
+
+
@@ -198,12 +198,12 @@
确定派单
-
取消
驳回
确认接单
-
+ -->
取消