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

10.29

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-29 17:21:46 +08:00
parent 1c908a1d1d
commit e76741bb13
6 changed files with 128 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/views/integral/gift/add.vue
View File

@ -497,7 +497,7 @@ export default {
<template>
<div class="container1">
<div class="card-change" style="margin-top: 10px;">
<div class="card-change" >
<div style="display: flex; justify-content: space-between">
@ -840,7 +840,7 @@ export default {
.container1 {
background: #F4F5F9;
box-sizing: border-box;
padding: 20px;
padding: 10px;
}
.app-container {
@ -848,7 +848,9 @@ export default {
height: 100%;
background: #f6f8f9;
}
.card-change{
height: 91vh;
}
.d-dialog > > > .el-upload--picture-card {
width: 100px;
height: 100px;

46
fuintAdmin/src/views/integral/gift/gift.vue
View File

@ -34,12 +34,8 @@
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
</el-row>
<div class="table_box">
<el-table ref="tables"
v-loading="loading"
:data="dataList"
@ -142,6 +138,8 @@
</template>
</el-table-column>
</el-table>
</div>
<!-- 分页 -->
<pagination
v-show="total>0"
@ -151,7 +149,6 @@
@pagination="getList"
/>
</div>
<el-dialog :title="title" class="d-dialog" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
<el-row :gutter="24">
@ -213,22 +210,6 @@
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<!-- <el-upload
:action="uploadAction"
list-type="picture-card"
:class="{hide:hideUpload}"
:file-list="uploadFiles"
:auto-upload="true"
:show-file-list="false"
:headers="uploadHeader"
:on-success="handleUploadSuccessGift">
<img
v-if="this.dataForm.giftImages"
:src="imagePath + this.dataForm.giftImages"
class="list-img"
/>
<i v-if="!this.dataForm.giftImages" class="el-icon-plus"></i>
</el-upload> -->
</el-form-item>
</el-col>
</el-row>
@ -429,7 +410,6 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 打开商品界面 -->
<el-dialog title="选择商品" :visible.sync="openCommodity" width="1000px" append-to-body :close-on-click-modal="false">
<el-container>
@ -506,18 +486,9 @@
<el-button @click="cancel">取 消</el-button>
</div> -->
</el-dialog>
<el-dialog title="库存变更" :visible.sync="openInventory" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="inventoryForm" :rules="rulesInventory" label-width="100px">
<!-- <el-form-item label="当前总库存" prop="totalInventory" >-->
<!-- <el-input disabled v-model="inventoryForm.totalInventory" placeholder="" maxlength="30" style="width: 270px;">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="已用库存" prop="usedInventory" >-->
<!-- <el-input disabled v-model="inventoryForm.usedInventory" placeholder="" maxlength="30" style="width: 270px;">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="可用库存" prop="remainingInventory" >
<el-input disabled v-model="inventoryForm.remainingInventory" placeholder="" maxlength="30" style="width: 270px;">
@ -546,7 +517,6 @@
<el-button @click="cancelInventory">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
@ -1283,4 +1253,12 @@ export default {
width: 98px;
height: 98px;
}
.card-change{
height: 87vh;
}
.table_box{
height: 70vh;
overflow: auto;
scrollbar-width: none;
}
</style>

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

@ -89,7 +89,7 @@ export default {
margin-right: 50px;
display: flex;
align-items: center;
cursor: pointer;
}
.active {

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

@ -86,27 +86,15 @@
/>
</div>
-
<!-- 新增/修改-->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="dataForm" :rules="rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="20">
<el-dialog :title="title" :visible.sync="open" width="25%" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
<el-form-item label="分类名称" prop="categoryName">
<el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="30"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="10">
<el-form-item label="排序" prop="contactPerson">
<el-input-number v-model="dataForm.sort" :min="1" :max="10" label=""></el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-col :span="20">
<el-form-item label="状态" prop="status">
<el-radio-group v-model="dataForm.status">
<el-radio
@ -117,9 +105,9 @@
:value="dict.value"/>
</el-radio-group>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-form-item label="备注" prop="categoryName">
<el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="分类名称" maxlength="30"/>
</el-form-item>
</el-form>
@ -251,5 +239,7 @@ export default {
</script>
<style scoped lang="scss">
.card-change{
height: 84vh;
}
</style>

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

@ -68,8 +68,8 @@
</div>
<div class="bai-box" v-else>
<el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true" label-width="100px">
<el-form-item label="积分说明" prop="desc">
<el-input type="textarea" v-model="dataForm.pointsRules" style="width: 1600px"></el-input>
<el-form-item label="积分说明" prop="desc" style="width: 100%;margin-right: 0px ">
<el-input type="textarea" :rows="8" v-model="dataForm.pointsRules" style="width: 1550px"></el-input>
</el-form-item>
</el-form>
@ -477,6 +477,7 @@ valiNumberPass(rule, value, callback, fieldName)
margin-right: 50px;
display: flex;
align-items: center;
cursor: pointer;
}

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

@ -774,8 +774,9 @@
}
.table-box{
width: 100%;
height: 70vh;
height: 69vh;
overflow: auto;
scrollbar-width: none;
}
.pagination-box{
width: 100%;