Skip to content

郑艺斌 / emaint-servicer-wechat-app

Go to a project
Commit f3c4019d by 郑艺斌
Options

Merge refs/remotes/origin/master into refs/heads/master

parents 39d7abbe fbc75a48
Inline Side-by-side
Showing with 80 additions and 12 deletions
app.json
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
"pages/weishou/weishou", "pages/weishou/weishou",
"pages/addcan/addcan", "pages/addcan/addcan",
"pages/baobiaojin/baobiaojin", "pages/baobiaojin/baobiaojin",
"pages/custSearch/search" "pages/custSearch/search",
"pages/changeProblemType/problemType"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
......
pages/baobiao/baobiao.wxml
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<view class="container" style="padding: 0px"> <view class="container" style="padding: 0px">
<view class="page__bd"> <view class="page__bd">
<view class="weui-cells weui-cells_after-title" style="background-color:rgb(21,141,233);color: white;font-size: 20px;"> <view class="weui-cells weui-cells_after-title" style="margin-top:0px;background-color:rgb(21,141,233);color: white;font-size: 20px;">
<view class="weui-cell"> <view class="weui-cell">
<view class="weui-cell__bd">今日工单</view> <view class="weui-cell__bd" style="color: white;">今日工单</view>
<view class="weui-cell__ft" style="color: white;font-size: 14px;">{{day}}</view> <view class="weui-cell__ft" style="color: white;font-size: 14px;">{{day}}</view>
</view> </view>
</view> </view>
......
pages/baobiaojin/baobiaojin.wxml
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 无数据 --> <!-- 无数据 -->
<nodata wx:else></nodata> <nodata wx:else></nodata>
......
pages/baobiaojin/baobiaojin.wxss
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
} }
.textactive{ .textactive{
border-bottom: 4rpx solid rgba(16, 142, 233, 1); border-bottom: 4rpx solid rgba(16, 142, 233, 1);
font-weight: bold;
} }
.container-title-right{ .container-title-right{
......
pages/information/information.js
...@@ -30,6 +30,15 @@ Page({ ...@@ -30,6 +30,15 @@ Page({
buttonClickeds:false, buttonClickeds:false,
id:'', id:'',
buttonConfig: null,
dialogShow: false,
dialogTitle: "转蓝鲸",
dialogContent: "",
dialogButtons: [
{text: '确认'}
],
isComplete:'',
}, },
// 图片放大预览 // 图片放大预览
...@@ -133,7 +142,50 @@ Page({ ...@@ -133,7 +142,50 @@ Page({
url: '../changeProblemType/problemType?problem=' + JSON.stringify(e.currentTarget.dataset.gonglist), url: '../changeProblemType/problemType?problem=' + JSON.stringify(e.currentTarget.dataset.gonglist),
}) })
}, },
//转蓝鲸
transferLanjing(){
var that = this;
console.log(this.data.baolist.workOrderNo);
wx.request({
url:baseUrl+'/api/lanjing/repairProblem/toLanJing',
data: {
workOrderNo: that.data.baolist.workOrderNo
},
method: 'POST', // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
header: {
"Content-Type": "application/json",
"accessToken": wx.getStorageSync('accessToken'),
}, // 设置请求的 header
success: function (res) {
console.log(res);
var dialogContent
if(res.data.resMessage=='成功'){
dialogContent = '已转入蓝鲸系统'
that.setData({
isComplete:true
})
}
else if(res.data.resMessage=='失败'){
dialogContent = res.data.responseResult
}
that.setData({
dialogShow:true,
dialogTitle:res.data.resMessage,
dialogContent:dialogContent
})
}
})
},
//关闭提示
tapDialogButton(){
this.setData({
dialogShow:false
})
},
// 点击备注 // 点击备注
beizhu(e) { beizhu(e) {
...@@ -242,12 +294,14 @@ Page({ ...@@ -242,12 +294,14 @@ Page({
that.setData({ that.setData({
zhixingren: res.data.responseResult.userName, zhixingren: res.data.responseResult.userName,
}) })
// } // }
console.log(res.data.responseResult.lanjingSn);
that.setData({ that.setData({
baolist: res.data.responseResult, baolist: res.data.responseResult,
baolistlist: res.data.responseResult.recordEntityList.reverse(), baolistlist: res.data.responseResult.recordEntityList.reverse(),
imglist: arr2, imglist: arr2,
}) isComplete:res.data.responseResult.lanjingSn?true:false
})
}else if(res.data.statusCode == '101'){ }else if(res.data.statusCode == '101'){
wx.redirectTo({ wx.redirectTo({
......
pages/information/information.json
{ {
"navigationBarTitleText": "工单详情", "navigationBarTitleText": "工单详情",
"usingComponents":{ "usingComponents":{
"my_btn": "/components/btn/btn" "my_btn": "/components/btn/btn",
"mp-dialog": "weui-miniprogram/dialog/dialog"
} }
} }
\ No newline at end of file
pages/information/information.wxml
...@@ -129,12 +129,17 @@ ...@@ -129,12 +129,17 @@
</view> </view>
</view> </view>
</view> </view>
<view class="information-btn clearfix"> <view class="clearfix" style="text-align: right;margin-top: 20rpx;height: 104rpx;margin-right: 32rpx;">
<text class='btn two' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='changeProblemType'>问题类型</text> <text class='btn two' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='changeProblemType'>变更问题</text>
<text class='btn two' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='biangengdan'>变更执行</text>
</view>
<view class=" clearfix" style="text-align: right;margin-top: 20rpx;height: 104rpx;margin-right: 32rpx;">
<text class='btn two' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='beizhu'>备注</text> <text class='btn two' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='beizhu'>备注</text>
<text class='btn two' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='biangengdan'>变更</text>
<text class='btn one' wx-if="{{baorespid == baolist.userId && (baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" bindtap='wanchengdan' data-id="{{baolist.id}}">完成</text> <text class='btn one' wx-if="{{baorespid == baolist.userId && (baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" bindtap='wanchengdan' data-id="{{baolist.id}}">完成</text>
</view> </view>
<view wx:if="{{!isComplete}}" class=" clearfix" style="text-align: right;margin-top: 20rpx;height: 104rpx;margin-right: 32rpx;">
<text class='btn one' wx-if="{{(baolist.state =='待派单'&&beitype == '0')||(beitype == '0'&&baolist.state !='待评价'&&baolist.state !='已评价')|| ((baorespid == baolist.userId) &&baolist.state !='待评价'&&baolist.state !='已评价'&&baolist.state !='待派单')}}" data-gonglist="{{baolist}}" bindtap='transferLanjing'>转蓝鲸</text>
</view>
<!--完成维修弹窗 --> <!--完成维修弹窗 -->
<!-- <view class="wantan" wx-if="{{wantan}}" catchtouchmove="return"></view> <!-- <view class="wantan" wx-if="{{wantan}}" catchtouchmove="return"></view>
<view class="wantannei" wx-if="{{wantan}}" catchtouchmove="return"> <view class="wantannei" wx-if="{{wantan}}" catchtouchmove="return">
...@@ -145,3 +150,7 @@ ...@@ -145,3 +150,7 @@
</view> </view>
</view> --> </view> -->
</view> </view>
<mp-dialog title="{{dialogTitle}}" show="{{dialogShow}}" bindbuttontap="tapDialogButton" buttons="{{dialogButtons}}">
<view>{{dialogContent}}</view>
</mp-dialog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment