diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue index 8ae9464b4..e928b5b97 100644 --- a/fuintAdmin_zt/src/views/Service/index.vue +++ b/fuintAdmin_zt/src/views/Service/index.vue @@ -159,8 +159,6 @@ - - + diff --git a/fuintAdmin_zt/src/views/Site/components/afterff.vue b/fuintAdmin_zt/src/views/Site/components/afterff.vue index 388628d20..44fd92e36 100644 --- a/fuintAdmin_zt/src/views/Site/components/afterff.vue +++ b/fuintAdmin_zt/src/views/Site/components/afterff.vue @@ -160,11 +160,11 @@ export default { align="center" label="创建人"> - + > --> @@ -172,14 +172,14 @@ export default { - - - + @@ -358,6 +358,7 @@ export default { width: 100%; height: 46vh; overflow: auto; + min-height: 100vh; } .wrap-boxs { diff --git a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue index a036e541c..051b69d5b 100644 --- a/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue +++ b/fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue @@ -91,14 +91,14 @@ - - + @@ -308,6 +308,7 @@ export default { width: 100%; height: 46vh; overflow: auto; + min-height: 100vh; } .wrap-boxs { diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue index 3cb2863e6..b6e31a1c0 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue @@ -269,9 +269,13 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan .table-box{ width: 100%; - height: 65vh; + height: 66vh; overflow: auto; } +.card-change { + min-height: 100vh; +} + diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue index f596f3b3d..a26cf8e04 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue @@ -265,6 +265,11 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder"; .table-box{ width: 100%; + height: 66vh; + overflow: auto; } +.card-change { + min-height: 100vh; +} diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue index c84b07045..ca15e04da 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue @@ -272,8 +272,12 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang"; .table-box{ width: 100%; - height: 65vh; + height: 66vh; overflow: auto; } +.card-change { + min-height: 100vh; +} + diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue index 9800e5511..d74de7747 100644 --- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue +++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue @@ -267,8 +267,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder"; diff --git a/fuintAdmin_zt/src/views/setting/app/index.vue b/fuintAdmin_zt/src/views/setting/app/index.vue index e529824be..fd9b45b2e 100644 --- a/fuintAdmin_zt/src/views/setting/app/index.vue +++ b/fuintAdmin_zt/src/views/setting/app/index.vue @@ -98,7 +98,7 @@ - + @@ -113,8 +113,8 @@ @@ -122,22 +122,22 @@ - + - + - + - + - + - + - + + +
+ 取 消 + 保 存 +
diff --git a/fuintAdmin_zt/src/views/setting/banner/index.vue b/fuintAdmin_zt/src/views/setting/banner/index.vue index 88b7122b8..ecc049770 100644 --- a/fuintAdmin_zt/src/views/setting/banner/index.vue +++ b/fuintAdmin_zt/src/views/setting/banner/index.vue @@ -120,11 +120,11 @@ - - + + - + @@ -192,7 +192,7 @@ - + - + - - + + - + - - - - 取消 - 提交 + +
+ 取 消 + 保 存 +
@@ -276,6 +276,9 @@ export default { bannerName: [ { required: true, message: '请填写banner名称', trigger: 'blur' } ], + uploadAction: [ + { required: true, message: '请上传banner图', trigger: 'blur' } + ], systemPosition: [ { required: true, message: '请填写系统位置', trigger: 'blur' } ], @@ -285,8 +288,8 @@ export default { bannerLink: [ { required: true, message: '请填写链接', trigger: 'blur' } ], - note: [ - { required: true, message: '请选择备注', trigger: 'blur' } + bannerStatus: [ + { required: true, message: '请选择banner图状态', trigger: 'blur' } ] }, diff --git a/fuintAdmin_zt/src/views/setting/hardware.vue b/fuintAdmin_zt/src/views/setting/hardware.vue index 52208e88a..0f8f4a6f8 100644 --- a/fuintAdmin_zt/src/views/setting/hardware.vue +++ b/fuintAdmin_zt/src/views/setting/hardware.vue @@ -116,14 +116,14 @@ - + - + - + - + - - - - 提交 + - +
+ 取消 + 保 存 +
@@ -344,6 +344,9 @@ export default { createByName: '', // } }, + handleReset() { + this.open = false + }, } }; diff --git a/fuintAdmin_zt/src/views/setting/message.vue b/fuintAdmin_zt/src/views/setting/message.vue index 50361520c..2c054b6b8 100644 --- a/fuintAdmin_zt/src/views/setting/message.vue +++ b/fuintAdmin_zt/src/views/setting/message.vue @@ -94,16 +94,16 @@ - + - + - + - + --> - - - - 取消 - 提交 + - +
+ 取 消 + 保 存 +
diff --git a/fuintAdmin_zt/src/views/setting/pay/index.vue b/fuintAdmin_zt/src/views/setting/pay/index.vue index fd33ceeb9..42271dfd8 100644 --- a/fuintAdmin_zt/src/views/setting/pay/index.vue +++ b/fuintAdmin_zt/src/views/setting/pay/index.vue @@ -134,10 +134,10 @@ - + - + - + @@ -155,7 +155,7 @@ - + - + - + - + - + - + - + - - 取消 - 保存 - - +
+ 取消 + 保存 +