|
@@ -253,6 +253,10 @@
|
253
|
253
|
<text class="text1">预约时间</text>
|
254
|
254
|
<text class="text2">{{ item.yyTime || "-" }}</text>
|
255
|
255
|
</view>
|
|
256
|
+ <view class="page_item_foot_text"
|
|
257
|
+ v-show="item.inspectState.value==1||item.inspectState.value==2||item.inspectState.value==3||item.inspectState.value==4">
|
|
258
|
+ <view class="btn" @click.stop="remove(item)">移除</view>
|
|
259
|
+ </view>
|
256
|
260
|
</view>
|
257
|
261
|
</view>
|
258
|
262
|
</view>
|
|
@@ -315,6 +319,9 @@
|
315
|
319
|
<showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
|
316
|
320
|
@know="know" :operate="models.operate" @ok="ok" @cancel="cancel" :textareaFlag="textareaFlag"
|
317
|
321
|
@textareaInput="textareaInput"></showModel>
|
|
322
|
+ <!-- 弹窗 -->
|
|
323
|
+ <showModel :title="models1.title" :icon="models1.icon" :disjunctor="models1.disjunctor" :content="models1.content"
|
|
324
|
+ @know="know1" :operate="models1.operate" @ok="ok1" @cancel="cancel1"></showModel>
|
318
|
325
|
</view>
|
319
|
326
|
</template>
|
320
|
327
|
<script>
|
|
@@ -336,7 +343,12 @@
|
336
|
343
|
models: {
|
337
|
344
|
disjunctor: false,
|
338
|
345
|
},
|
339
|
|
- showType: "hiddle",
|
|
346
|
+ // 弹窗model1
|
|
347
|
+ models1: {
|
|
348
|
+ disjunctor: false,
|
|
349
|
+ },
|
|
350
|
+ currentInspect: null,
|
|
351
|
+ showType: "show",
|
340
|
352
|
infoDATA: {},
|
341
|
353
|
dataId: "",
|
342
|
354
|
animationData: {},
|
|
@@ -346,6 +358,54 @@
|
346
|
358
|
};
|
347
|
359
|
},
|
348
|
360
|
methods: {
|
|
361
|
+ // 移除检查->知道了
|
|
362
|
+ know1() {
|
|
363
|
+ this.models1.disjunctor = false;
|
|
364
|
+ this.getInfo(this.dataId);
|
|
365
|
+ },
|
|
366
|
+ // 移除检查->确定
|
|
367
|
+ ok1() {
|
|
368
|
+ this.models1.disjunctor = false;
|
|
369
|
+ let postData = {
|
|
370
|
+ gdId: this.infoDATA.id,
|
|
371
|
+ inspectId: this.currentInspect.id,
|
|
372
|
+ };
|
|
373
|
+ uni.showLoading({
|
|
374
|
+ title: '移除中',
|
|
375
|
+ mask: true,
|
|
376
|
+ })
|
|
377
|
+ post('/workerOrder/removeInspectByOderId', postData).then(res => {
|
|
378
|
+ uni.hideLoading();
|
|
379
|
+ if (res.state == 200) {
|
|
380
|
+ this.models1 = {
|
|
381
|
+ disjunctor: true,
|
|
382
|
+ content: "移除成功",
|
|
383
|
+ };
|
|
384
|
+ } else {
|
|
385
|
+ uni.showToast({
|
|
386
|
+ icon: "none",
|
|
387
|
+ title: "移除失败",
|
|
388
|
+ });
|
|
389
|
+ }
|
|
390
|
+ })
|
|
391
|
+ },
|
|
392
|
+ // 移除检查->取消
|
|
393
|
+ cancel1() {
|
|
394
|
+ this.models1.disjunctor = false;
|
|
395
|
+ },
|
|
396
|
+ // 移除
|
|
397
|
+ remove(item) {
|
|
398
|
+ this.currentInspect = item;
|
|
399
|
+ this.models1 = {
|
|
400
|
+ disjunctor: true,
|
|
401
|
+ content: "是否移除该检查信息",
|
|
402
|
+ icon: "warn",
|
|
403
|
+ operate: {
|
|
404
|
+ ok: "确定",
|
|
405
|
+ cancel: "取消",
|
|
406
|
+ },
|
|
407
|
+ };
|
|
408
|
+ },
|
349
|
409
|
// 拍照
|
350
|
410
|
photograph(data) {
|
351
|
411
|
photographTool(data);
|
|
@@ -672,6 +732,20 @@
|
672
|
732
|
uni.hideLoading();
|
673
|
733
|
if (res.status == 200) {
|
674
|
734
|
this.infoDATA = res.data;
|
|
735
|
+ // 计算高度
|
|
736
|
+ setTimeout(() => {
|
|
737
|
+ const query = uni.createSelectorQuery().in(this);
|
|
738
|
+ query
|
|
739
|
+ .selectAll(".page_item_infos")
|
|
740
|
+ .boundingClientRect((data) => {
|
|
741
|
+ let len = data.reduce((prev, current) => {
|
|
742
|
+ return prev + current.height;
|
|
743
|
+ }, 0);
|
|
744
|
+ this.animation.height(len).step();
|
|
745
|
+ this.animationData = this.animation.export();
|
|
746
|
+ })
|
|
747
|
+ .exec();
|
|
748
|
+ }, 500)
|
675
|
749
|
} else {
|
676
|
750
|
uni.showToast({
|
677
|
751
|
icon: "none",
|
|
@@ -783,7 +857,7 @@
|
783
|
857
|
|
784
|
858
|
.page_item_top {
|
785
|
859
|
height: 86rpx;
|
786
|
|
- border-bottom: 2rpx dashed #e5e9ed;
|
|
860
|
+ border-bottom: 2rpx dashed #666;
|
787
|
861
|
padding: 0 16rpx;
|
788
|
862
|
|
789
|
863
|
.page_item_top_L {
|
|
@@ -877,7 +951,7 @@
|
877
|
951
|
.line {
|
878
|
952
|
height: 20rpx;
|
879
|
953
|
width: 2rpx;
|
880
|
|
- border-left: 2rpx solid #e5e9ed;
|
|
954
|
+ border-left: 2rpx solid #666;
|
881
|
955
|
position: absolute;
|
882
|
956
|
top: 82rpx;
|
883
|
957
|
left: 40rpx;
|
|
@@ -886,7 +960,7 @@
|
886
|
960
|
.lines {
|
887
|
961
|
height: 40%;
|
888
|
962
|
width: 2rpx;
|
889
|
|
- border-left: 2rpx solid #e5e9ed;
|
|
963
|
+ border-left: 2rpx solid #666;
|
890
|
964
|
position: absolute;
|
891
|
965
|
top: 23%;
|
892
|
966
|
left: 36rpx;
|
|
@@ -921,8 +995,8 @@
|
921
|
995
|
}
|
922
|
996
|
|
923
|
997
|
.page_item_foot {
|
924
|
|
- border-top: 2rpx dashed #e5e9ed;
|
925
|
|
- border-bottom: 2rpx dashed #e5e9ed;
|
|
998
|
+ border-top: 2rpx dashed #666;
|
|
999
|
+ border-bottom: 2rpx dashed #666;
|
926
|
1000
|
padding: 28rpx 16rpx;
|
927
|
1001
|
text-align: left;
|
928
|
1002
|
|
|
@@ -949,7 +1023,7 @@
|
949
|
1023
|
|
950
|
1024
|
.spe_list {
|
951
|
1025
|
padding: 32rpx 0;
|
952
|
|
- border-top: 2rpx solid #e5e9ed;
|
|
1026
|
+ border-top: 2rpx solid #666;
|
953
|
1027
|
|
954
|
1028
|
.page_item_info_title {
|
955
|
1029
|
color: #666;
|
|
@@ -977,8 +1051,9 @@
|
977
|
1051
|
}
|
978
|
1052
|
|
979
|
1053
|
.page_item_infos {
|
|
1054
|
+ padding-top: 20rpx;
|
980
|
1055
|
padding-bottom: 20rpx;
|
981
|
|
- border-bottom: 2rpx dashed #e5e9ed;
|
|
1056
|
+ border-bottom: 2rpx dashed #666;
|
982
|
1057
|
|
983
|
1058
|
.page_item_info2 {
|
984
|
1059
|
text-align: left;
|
|
@@ -990,6 +1065,10 @@
|
990
|
1065
|
font-size: 32rpx;
|
991
|
1066
|
margin-bottom: 20rpx;
|
992
|
1067
|
|
|
1068
|
+ &:last-of-type {
|
|
1069
|
+ margin-bottom: 0;
|
|
1070
|
+ }
|
|
1071
|
+
|
993
|
1072
|
.text1 {
|
994
|
1073
|
color: rgb(102, 102, 102);
|
995
|
1074
|
}
|
|
@@ -998,6 +1077,18 @@
|
998
|
1077
|
float: right;
|
999
|
1078
|
font-weight: 700;
|
1000
|
1079
|
}
|
|
1080
|
+
|
|
1081
|
+ .btn {
|
|
1082
|
+ height: 66rpx;
|
|
1083
|
+ width: 132rpx;
|
|
1084
|
+ margin: 0 auto;
|
|
1085
|
+ background-color: #49b856;
|
|
1086
|
+ color: #fff;
|
|
1087
|
+ border-radius: 8rpx;
|
|
1088
|
+ font-size: 32rpx;
|
|
1089
|
+ margin-top: 20rpx;
|
|
1090
|
+ text-align: center;
|
|
1091
|
+ }
|
1001
|
1092
|
}
|
1002
|
1093
|
}
|
1003
|
1094
|
}
|