diff --git a/src/assets/images/eval-bad-dis.png b/src/assets/images/eval-bad-dis.png new file mode 100644 index 0000000..47f5fdc Binary files /dev/null and b/src/assets/images/eval-bad-dis.png differ diff --git a/src/assets/images/eval-good-dis.png b/src/assets/images/eval-good-dis.png new file mode 100644 index 0000000..4ee5bb6 Binary files /dev/null and b/src/assets/images/eval-good-dis.png differ diff --git a/src/assets/images/eval-verygood-dis.png b/src/assets/images/eval-verygood-dis.png new file mode 100644 index 0000000..5f10022 Binary files /dev/null and b/src/assets/images/eval-verygood-dis.png differ diff --git a/src/views/administrative/appointmentDetail.vue b/src/views/administrative/appointmentDetail.vue index 5d34a4f..23d842b 100644 --- a/src/views/administrative/appointmentDetail.vue +++ b/src/views/administrative/appointmentDetail.vue @@ -106,9 +106,9 @@

--> - + @@ -148,7 +148,7 @@ 取消确认 - + @@ -791,6 +791,10 @@ padding-bottom: 0.27rem; } + .van-overlay { + z-index: 999; + } + .popcont { position: absolute; z-index: 100; diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue index 552fb14..86f0882 100644 --- a/src/views/administrative/appointmentList.vue +++ b/src/views/administrative/appointmentList.vue @@ -86,8 +86,9 @@

已登记

- 编辑 - 再次发起 + 变更 + 取消 + 再次发起
@@ -101,6 +102,14 @@ +
+
+
确认取消该行政检查通知?
+ +
+
@@ -172,6 +181,7 @@ { text: '季度', value: 'quarter' }, { text: '月度', value: 'month' }, ], + showIsCancel: ref(false) }); // 设置初始值为当前时间 @@ -420,6 +430,17 @@ }); } + const cancel = (val) => { + if(val == 0){ + data.showIsCancel = false; + return; + }else{ + cancelEnterpriseLawEnforcement(route?.query?.id,success =>{ + router.go(-1); + }); + } + }; + diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue index 738a894..f216582 100644 --- a/src/views/enforce/enforcementPlanAdd.vue +++ b/src/views/enforce/enforcementPlanAdd.vue @@ -706,6 +706,10 @@ line-height: 3.25; }*/ + .van-overlay { + z-index: 999; + } + .popcont { position: absolute; z-index: 100; diff --git a/src/views/enforce/enterpriseBaseInfo.vue b/src/views/enforce/enterpriseBaseInfo.vue index 1b1d123..ae3137c 100644 --- a/src/views/enforce/enterpriseBaseInfo.vue +++ b/src/views/enforce/enterpriseBaseInfo.vue @@ -651,7 +651,10 @@ export default { border-radius: 0.27rem; .swipe_cell { + margin: 0 0 1% 0; width: 100%; + box-shadow: 0 0 0.1rem #e7e7e7; + border-radius: 0.15rem; } .card_box { @@ -670,7 +673,7 @@ export default { .card_box_span { display: flex; align-items: center; - margin: 2% 0; + margin: 1% 0; padding: 0 3%; color: #666; font-size: 0.35rem; @@ -738,7 +741,7 @@ export default { } .goods_box .swipe_cell .card_box .card_box_span p { - margin: 0.1rem 0; + margin: 0; color: #999; } diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue index cc09c7c..4d3d2fa 100644 --- a/src/views/enforceHome.vue +++ b/src/views/enforceHome.vue @@ -1,7 +1,7 @@ diff --git a/src/views/enterprise/enterpriseInspectionNotice.vue b/src/views/enterprise/enterpriseInspectionNotice.vue index ab92ad7..3cc3b05 100644 --- a/src/views/enterprise/enterpriseInspectionNotice.vue +++ b/src/views/enterprise/enterpriseInspectionNotice.vue @@ -103,6 +103,11 @@ background-color: #fff; border-radius: 0.27rem; } + + .shop_footer_body { + //height: 101px; + position: relative; + } } .tohome {