chen
/
flying-monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git.scdxtc.com/chen/flying-monkey

master
chen 2022-04-01 18:16:52 +08:00
parent bf35fec7db 6112b9657d
commit d6af98ea95
3 changed files with 98 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pages/peopleManagement/peopleManagement.vue
View File

@ -31,15 +31,15 @@
<view class="con">
<image class="img" src="../../static/del/500478055.png" mode=""></image>
<view class="text">
<view class="text scal09">
<view class="code">
<view class="">
编号: YG20211207-001
</view>
<view class="iconCon">
<view v-for="(item,index) in 5">
<image class="icon" v-if="index<=2" src="../../static/iocn/6.png" mode=""></image>
<image class="icon" v-else src="../../static/iocn/7.png" mode=""></image>
<image class="icon" v-if="index<=2" src="../../static/iocn/6.png" ></image>
<image class="icon" v-else src="../../static/iocn/7.png" ></image>
</view>
</view>
</view>
@ -224,14 +224,14 @@
}
.peopleManagement-content .li .con .img {
width: 186rpx;
height: 124rpx;
width: 129rpx;
height: 114rpx;
margin-right: 16rpx;
}
.peopleManagement-content .li .con .text {
flex: 1;
padding-right: 30rpx;
margin-left: -14rpx;
}
.peopleManagement-content .li .con .text .iconCon {
@ -254,9 +254,9 @@
.peopleManagement-content .li .con .text .p{
color: #7a7979;
display: flex;
font-size: 20rpx;
font-size: 24rpx;
padding: 0rpx 0rpx;
padding: 15rpx 0rpx;
}
.peopleManagement-content .li .con .text .p .one{
@ -273,8 +273,7 @@
color: #333333;
font-size: 24rpx;
display: flex;
padding-right: 22rpx
;
padding-right: 22rpx;
justify-content: space-between;
}
.peopleManagement-content .li .bottom .cor3{

134
pages/workOrder/details.vue
View File

@ -218,57 +218,13 @@
<view class="record-content">
<view class="title">过程追踪</view>
<view class="list">
<view class="li on">
<view class="icon">
<view class="icon-con"></view>
</view>
<view class="con">
<view class="text clips2">【维修中】工号00234工程师将于16:00到达现场为您 服务。</view>
<view class="date">2020-06-15 15：30</view>
</view>
</view>
<view class="li">
<view class="icon"></view>
<view class="con">
<view class="text clips1">【工程师已接单】工号00234工程师已接单</view>
<view class="date">2020-06-15 14:30 </view>
</view>
</view>
<view class="li">
<view class="icon"></view>
<view class="con">
<view class="text"> “黑屏”故障 【某某】已处理。</view>
<view class="date"> 2020-05-15 16:00</view>
</view>
</view>
<view class="li">
<view class="icon"></view>
<view class="con">
<view class="text">“黑屏”故障 【某某】已处理。</view>
<view class="date">2020-05-15 16:00</view>
</view>
</view>
<view class="li">
<view class="icon"></view>
<view class="con">
<view class="text">“黑屏”故障 【某某】已处理。</view>
<view class="date">2020-05-15 16:00</view>
</view>
</view>
<view class="li">
<view class="icon"></view>
<view class="con">
<view class="text">“黑屏”故障 【某某】已处理。</view>
<view class="date">2020-05-15 16:00</view>
</view>
</view>
<view class="li">
<view class="icon"></view>
<view class="con">
<view class="text">“黑屏”故障 【某某】已处理。</view>
<view class="date">2020-05-15 16:00</view>
</view>
</view>
<view class="li pad-z40 fon27 col9" :class="index==0 ? 'activeTrack' : ''" v-for="(item,index) in 10" :key="index">
<view class="disac fw line-h60">
<view class="text">“部分模组不显示”故障【陈志远】已处理。</view>
<view class="date">2020-05-15 16:00</view>
</view>
</view>
</view>
</view>
<view class="button" @tap="goEvaluate(1)">我要评价</view>
@ -442,16 +398,16 @@
.work-order-from .li .title {
font-size: 26rpx;
width: 133rpx;
text-align: right;
white-space: nowrap;
flex: 1;
}
.work-order-from .li .input {
font-size: 24rpx;
color: #8b8b8b;
flex: 1;
padding-left: 15rpx;
width: 80%;
padding-left: 0;
}
.work-order-from .li .input .img {
@ -563,7 +519,6 @@
.record-content .list .li {
display: flex;
align-items: center;
margin-bottom: 40rpx;
}
.record-content .list .li .icon {
@ -695,7 +650,7 @@
font-size: 30rpx;
display: flex;
justify-content: space-between;
margin-bottom: 16rpx;
margin-bottom: 10rpx;
}
.change-accessory .li .text-content .title .text {
@ -752,4 +707,67 @@
.work-order-from .isrideo .on .icon-content {
background-color: #D81E06
}
.record-content {
padding: 0 52rpx;
padding-top: 33rpx;
padding-bottom: 40rpx;
background-color: #FFFFFF;
}
.record-content .title {
color: #333333;
margin-left: 12rpx;
font-size: 30rpx;
margin-bottom: 40rpx;
}
.record-content .list .li {
position: relative;
display: flex;
align-items: center;
padding-top: 20rpx;
border-left: 2rpx solid #999999;
}
.record-content .list .li::before {
content: '';
display: block;
position: absolute;
left: -8rpx;
width: 14rpx;
height: 14rpx;
background-color: #999999;
border-radius: 100%;
}x
.record-content .list .activeTrack {
color: #0084ff;
padding-top: 0rpx;
}
.record-content .list .activeTrack::before {
background-color: rgba(0,132,255,.5);
top: -4rpx;
width: 22rpx;
height: 22rpx;
left: -12rpx;
z-index: 1;
}
.record-content .list .activeTrack::after {
content: '';
display: block;
position: absolute;
top: 0;
left: -8rpx;
width: 14rpx;
height: 14rpx;
background-color: #999999;
border-radius: 100%;
}
.record-content .list .activeTrack .line-h60 {
margin-top: -26rpx;
margin-bottom: 20rpx;
}
.record-content .list .date {
margin-left: 20rpx;
}
</style>

14
pages/workOrder/workOrderThree.vue
View File

@ -90,7 +90,14 @@
</view>
</view>
<view class="customerSignature">
<view class="title">客户签名</view>
<view class="title">
<view class="">
客户签名
</view>
<view class="" @click="clearClick" v-if="!isCanvas">
清除
</view>
</view>
<view class='contents'>
<canvas class='firstCanvas' canvas-id="firstCanvas" @touchmove='move'
@touchstart='start($event)' @touchend='end' @touchcancel='cancel' @longtap='tap'
@ -158,6 +165,7 @@
{title: '验收扫尾',state: false,},
{title: '包年签单',state: false,},
],
signatureState:false,
array: ['微信', '支付宝', '现金', '类型'],
paymentModeIndex:0,
serviceTime:'' ,// 服务时间
@ -272,6 +280,7 @@
// 画布的触摸移动开始手势响应
start: function(e) {
this.isCanvas = false
this.signatureState=true
let point = {
x: e.touches[0].x,
y: e.touches[0].y,
@ -325,6 +334,7 @@
//清除操作
clearClick: function() {
//清除画布
this.isCanvas = true
content.clearRect(0, 0, canvasw, canvash)
content.draw(true)
},
@ -555,6 +565,8 @@
font-size: 30rpx;
font-weight: bold;
margin-bottom: 20rpx;
display: flex;
justify-content: space-between;
}
.customerSignature {