dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-12 17:30:18 +08:00
commit 831c73d498
93 changed files with 107 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/components/Crontab/index.vue
View File

@ -368,7 +368,7 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.pop_btn { .pop_btn {
text-align: center; text-align: center;
margin-top: 20px; margin-top: 20px;

4
fuintAdmin/src/components/DictTag/index.vue
View File

@ -45,8 +45,8 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.el-tag + .el-tag { .el-tag + .el-tag {
margin-left: 10px; margin-left: 10px;
} }
</style> </style>

2
fuintAdmin/src/components/Hamburger/index.vue
View File

@ -37,7 +37,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.hamburger { .hamburger {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;

2
fuintAdmin/src/components/Pagination/index.vue
View File

@ -103,7 +103,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.pagination-container { .pagination-container {
background: transparent; background: transparent;
padding: 32px 16px; padding: 32px 16px;

2
fuintAdmin/src/components/PanThumb/index.vue
View File

@ -34,7 +34,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.pan-item { .pan-item {
width: 200px; width: 200px;
height: 200px; height: 200px;

2
fuintAdmin/src/components/Screenfull/index.vue
View File

@ -45,7 +45,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.screenfull-svg { .screenfull-svg {
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;

2
fuintAdmin/src/components/SvgIcon/index.vue
View File

@ -44,7 +44,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.svg-icon { .svg-icon {
width: 1em; width: 1em;
height: 1em; height: 1em;

10
fuintAdmin/src/components/local/selectStaff.vue
View File

@ -99,10 +99,10 @@ export default {
storeOptions: [], storeOptions: [],
// role:[], // role:[],
posPrem:'', posPrem:'',
props: { multiple: true }, props: { multiple: true },
appletPrem:'', appletPrem:'',
writeOff:[], writeOff:[],
write:[], write:[],
specialPrem:[], specialPrem:[],
@ -132,7 +132,7 @@ export default {
realName: '', realName: '',
mobile: '', mobile: '',
status: '' status: ''
}, },
}; };
}, },
created() { created() {
@ -248,12 +248,12 @@ export default {
} }
this.$emit('send-data', file); this.$emit('send-data', file);
}, },
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/EventMarketing/ManageCard/SaveBlock/index.vue
View File

@ -964,7 +964,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.demo-drawer__footer{ .demo-drawer__footer{
width: 100%; width: 100%;
display: flex; display: flex;

2
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -1001,7 +1001,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.demo-drawer__footer{ .demo-drawer__footer{
width: 100%; width: 100%;
display: flex; display: flex;

2
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -1006,7 +1006,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.box-bt{ .box-bt{
width: 100%; width: 100%;
display: flex; display: flex;

7
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -787,11 +787,8 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
/deep/.el-radio{
//display: flex !important;
//align-items: center !important;
}
.hui-box{ .hui-box{
width: 150px ; width: 150px ;
height: 80px; height: 80px;

2
fuintAdmin/src/views/EventMarketing/coupon/index.vue
View File

@ -25,7 +25,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.top-box{ .top-box{
width: 100%; width: 100%;
height: 55px; height: 55px;

2
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -526,7 +526,7 @@ import {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.tj{ .tj{
width: 100%; width: 100%;
display: flex; display: flex;

2
fuintAdmin/src/views/EventMarketing/grantCoupon/index.vue
View File

@ -10,6 +10,6 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
</style> </style>

2
fuintAdmin/src/views/EventMarketing/online/index.vue
View File

@ -99,7 +99,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.center{ .center{
width: 100%; width: 100%;

2
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -542,7 +542,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.top-sousuo{ .top-sousuo{
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;

2
fuintAdmin/src/views/cashier/components/switchMemberDialog.vue
View File

@ -95,7 +95,7 @@ export default {
} }
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.form { .form {
margin-top: 30px; margin-top: 30px;
} }

2
fuintAdmin/src/views/cashier/index.vue
View File

@ -1227,7 +1227,7 @@ export default {
} }
} }
</style> </style>
<style scoped> <style scoped lang="scss">
.input-item >>> .el-input__inner { .input-item >>> .el-input__inner {
border: #00acac solid 2px; border: #00acac solid 2px;
line-height: 50px; line-height: 50px;

2
fuintAdmin/src/views/commission/cash/index.vue
View File

@ -220,7 +220,7 @@
} }
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.queryInput >>> .el-input__inner { .queryInput >>> .el-input__inner {
border-radius: 0px; border-radius: 0px;
width: 200px; width: 200px;

2
fuintAdmin/src/views/commission/log/index.vue
View File

@ -242,7 +242,7 @@
} }
} }
</script> </script>
<style scoped> <style scoped lang="scss">
select { select {
/*去除select边框*/ /*去除select边框*/

2
fuintAdmin/src/views/commission/relation/index.vue
View File

@ -368,7 +368,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/commission/rule/index.vue
View File

@ -455,7 +455,7 @@
} }
} }
</script> </script>
<style scoped> <style scoped lang="scss">
select { select {
/*去除select边框*/ /*去除select边框*/

2
fuintAdmin/src/views/content/article/index.vue
View File

@ -355,7 +355,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/content/banner/list.vue
View File

@ -373,7 +373,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/convenienceStore/damage/details.vue
View File

@ -698,7 +698,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/damage/index.vue
View File

@ -214,7 +214,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/inventory/details.vue
View File

@ -771,7 +771,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/inventory/index.vue
View File

@ -269,7 +269,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/purchase/details.vue
View File

@ -774,7 +774,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/purchase/index.vue
View File

@ -217,7 +217,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/returns/details.vue
View File

@ -733,7 +733,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/returns/index.vue
View File

@ -214,7 +214,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/convenienceStore/stockStatistic.vue
View File

@ -387,7 +387,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/coupon/confirm/index.vue
View File

@ -179,7 +179,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.main-panel { .main-panel {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;

2
fuintAdmin/src/views/coupon/coupon/index.vue
View File

@ -838,7 +838,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/financialStatement/buy/list.vue
View File

@ -53,7 +53,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-center{ .app-center{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/em.vue
View File

@ -395,7 +395,7 @@ import {getgetInfoByEmApi} from "@/api/order/oilorder";
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
View File

@ -400,7 +400,7 @@ import {getInfoByOilGunApi} from "@/api/order/oilorder";
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
View File

@ -410,7 +410,7 @@ import {getInfoByOilTypeApi} from "@/api/order/oilorder";
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/reconciliation/list.vue
View File

@ -51,7 +51,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-center{ .app-center{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -377,7 +377,7 @@ import {getmyDataApi, getRunningWaterByTissueApi, getTissueByDataApi, getTrading
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/store.vue
View File

@ -254,7 +254,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/time.vue
View File

@ -253,7 +253,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -480,7 +480,7 @@ import {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/runningWater/list.vue
View File

@ -48,7 +48,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-center{ .app-center{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -272,7 +272,7 @@ import {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/runningWater/tab/instituion.vue
View File

@ -256,7 +256,7 @@ import {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/runningWater/tab/none.vue
View File

@ -138,7 +138,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -274,7 +274,7 @@ import {getInstituionListApi, getRunningWaterByDataApi, exportExcelOilDeptApi, g
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/goods/cate/index.vue
View File

@ -374,7 +374,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/handover/HandoverDetails.vue
View File

@ -238,7 +238,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container { .app-container {
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/indexcomponents/bottom_z.vue
View File

@ -126,7 +126,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.center{ .center{
width: 100%; width: 100%;
display: flex; display: flex;

2
fuintAdmin/src/views/indexcomponents/bottomindex.vue
View File

@ -280,7 +280,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.center{ .center{
width: 100%; width: 100%;
display: flex; display: flex;

2
fuintAdmin/src/views/indexcomponents/centenrindex.vue
View File

@ -210,7 +210,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.center{ .center{
width: 100%; width: 100%;
display: flex; display: flex;

2
fuintAdmin/src/views/indexcomponents/indexcomponents.vue
View File

@ -50,7 +50,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
#chart{ #chart{
background: #F8F1E7; background: #F8F1E7;
} }

2
fuintAdmin/src/views/indexcomponents/topindex.vue
View File

@ -208,7 +208,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.cont-bl{ .cont-bl{
width: 100%; width: 100%;
background: #fff; background: #fff;

2
fuintAdmin/src/views/integral/gift/index.vue
View File

@ -1288,7 +1288,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/integral/giftCategory/index.vue
View File

@ -250,6 +250,6 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
</style> </style>

2
fuintAdmin/src/views/integral/order/detail.vue
View File

@ -109,6 +109,6 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
</style> </style>

10
fuintAdmin/src/views/integral/order/outcome.vue
View File

@ -6,7 +6,7 @@
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="7"> <el-col :span="7">
<el-image <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="imagePath+dataForm.coverImage" :src="imagePath+dataForm.coverImage"
fit="cover"></el-image> fit="cover"></el-image>
@ -147,7 +147,7 @@ export default {
}else { }else {
this.flag = false this.flag = false
} }
// 回显 // 回显
if (!this.flagOrderStart) { if (!this.flagOrderStart) {
@ -158,7 +158,7 @@ export default {
if (this.dataFormC.orderStatus == '已拒绝') { if (this.dataFormC.orderStatus == '已拒绝') {
this.editForm.processingResult='1' //处理结果 this.editForm.processingResult='1' //处理结果
} }
}, },
methods: { methods: {
@ -196,12 +196,12 @@ export default {
cancel() { cancel() {
this.$emit('send-data', 'Data from child'); this.$emit('send-data', 'Data from child');
} }
} }
} }
</script> </script>
<style scoped> <style scoped lang="scss">
</style> </style>

2
fuintAdmin/src/views/integral/order/pointsCashier.vue
View File

@ -274,7 +274,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container { .app-container {
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/integral/order/pointsMall.vue
View File

@ -331,7 +331,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container { .app-container {
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/integral/settings/index.vue
View File

@ -429,7 +429,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/member/index.vue
View File

@ -819,7 +819,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/merchant/index.vue
View File

@ -409,7 +409,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -340,7 +340,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
height: 100%; height: 100%;
} }

2
fuintAdmin/src/views/oilConfig/oilInventory/list.vue
View File

@ -208,7 +208,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/oilConfig/oilInventory/order.vue
View File

@ -874,7 +874,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/oilConfig/oilPrice/index.vue
View File

@ -843,7 +843,7 @@ import {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
View File

@ -217,7 +217,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/oilConfig/oilPurchase/purchaseOrder.vue
View File

@ -940,7 +940,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.box { .box {
height: 100%; height: 100%;

2
fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
View File

@ -330,7 +330,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100vh; height: 100vh;

2
fuintAdmin/src/views/order/index.vue
View File

@ -472,7 +472,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/order/order_Added.vue
View File

@ -516,7 +516,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-top{ .app-top{
width: 100%; width: 100%;

2
fuintAdmin/src/views/order/order_Cashier.vue
View File

@ -666,7 +666,7 @@ import {refundApi} from "@/api/order/refund";
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/order/order_Goods.vue
View File

@ -582,7 +582,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/order/order_Integral.vue
View File

@ -341,7 +341,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/order/order_Oil.vue
View File

@ -773,7 +773,7 @@
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/order/order_Ordinary.vue
View File

@ -465,7 +465,7 @@ import {refundApi} from "@/api/order/refund";
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/order/order_Unpaid.vue
View File

@ -410,7 +410,7 @@ import {getOilNumberGun, listOilOrder, orderStatisticsApi} from "@/api/order/oil
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -505,7 +505,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;

2
fuintAdmin/src/views/power/payment/index.vue
View File

@ -551,7 +551,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped lang="scss">
.box-centenr{ .box-centenr{
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;

2
fuintAdmin/src/views/staff/list.vue
View File

@ -900,7 +900,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.el-form--inline .el-form-item { .el-form--inline .el-form-item {
margin-right: 44px; margin-right: 44px;
} }

2
fuintAdmin/src/views/staff/tag/list.vue
View File

@ -368,7 +368,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

2
fuintAdmin/src/views/store/list.vue
View File

@ -503,7 +503,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintAdmin/src/views/system/dict/data.vue
View File

@ -385,7 +385,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100vh; height: 100vh;

2
fuintAdmin/src/views/system/dict/index.vue
View File

@ -335,7 +335,7 @@
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100vh; height: 100vh;

2
fuintAdmin/src/views/userGrade/index.vue
View File

@ -1325,7 +1325,7 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.app-container{ .app-container{
width: 100%; width: 100%;
height: 100%; height: 100%;

5
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -160,6 +160,11 @@ export default {
}else { }else {
this.isCashier = false this.isCashier = false
} }
if (this.checkedKeys.length==this.ruleForm.checkedKeys.length && this.isCashier){
this.checked = true
}else {
this.checked = false
}
this.getMenuTreeselect() this.getMenuTreeselect()
// this.tableData = response.data.treeselect; // this.tableData = response.data.treeselect;
}); });

2
fuintAdmin_zt/src/views/store/list.vue
View File

@ -503,7 +503,7 @@ export default {
} }
}; };
</script> </script>
<style scoped> <style scoped lang="scss">
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

2
fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
View File

@ -9,7 +9,7 @@
</if> </if>
AND source_id IN(SELECT source_id FROM `t_duty_source` AND source_id IN(SELECT source_id FROM `t_duty_source`
WHERE duty_id IN(SELECT duty_id FROM `t_account_duty` WHERE duty_id IN(SELECT duty_id FROM `t_account_duty`
WHERE acct_id = #{accountId})) WHERE acct_id = #{accountId} and if_delete = '0'))
ORDER BY s.source_style ASC ORDER BY s.source_style ASC
</select> </select>

2
fuintCashier/src/renderer/views/cashier/index.vue
View File

@ -1179,7 +1179,7 @@ export default {
} }
} }
</style> </style>
<style scoped> <style scoped lang="scss">
.input-item >>> .el-input__inner { .input-item >>> .el-input__inner {
border: #00acac solid 2px; border: #00acac solid 2px;
line-height: 50px; line-height: 50px;