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

11.4

Browse Source
This commit is contained in:
xvv 2024-11-04 18:09:27 +08:00
parent 8f285b0166
commit c405d2745f
4 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fuintAdmin/src/views/power/page/mode.vue
View File

@ -40,7 +40,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div class="table_box" >
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
@ -86,7 +86,6 @@
/>
</div>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open" width="42%" append-to-body>
<el-form :model="form" label-width="80px" >
<!-- 通知名称 -->
@ -114,21 +113,17 @@
<span @click="insertText('{挂账单位}')">{挂账单位}</span>
<span @click="insertText('{会员手机号}')">{会员手机号}</span>
</div>
</el-form-item>
<!-- 接收角色 -->
<el-form-item label="接收角色" :required="true">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 100%">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option>
</el-select>
</el-form-item>
<!-- 模板状态 -->
<el-form-item label="模板状态" :required="true">
<el-switch v-model="form.templateStatus" active-color="#13ce66" inactive-color="#ff4949"></el-switch>
</el-form-item>
<!-- 发送条件 -->
<el-form-item label="发送条件" style="margin-bottom: 10px" :required="true">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group"
@ -153,20 +148,12 @@
</div>
<el-button @click="addCondition(index)" type="primary" icon="el-icon-plus">添加条件</el-button>
</el-form-item>
<!-- 操作按钮 -->
<!-- <el-form-item>-->
<!-- </el-form-item>-->
</el-form>
<div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<el-button @click="handleReset">取消</el-button>
<el-button type="primary" @click="handleSubmit">保存</el-button>
</div>
</el-dialog>
</div>
</template>
@ -332,12 +319,12 @@ export default {
this.getDutyList()
this.form.conditions = [{}]
this.title = "新增通知模板"
this.title = "增加通知模板"
},
edit(e) {
this.clean()
this.open = true;
this.title = "修改通知模板"
this.title = "编辑通知模板"
this.getDutyList()
this.form = e
@ -465,7 +452,7 @@ export default {
};
</script>
<style lang="scss" scoped>
.common-dialog > > > .el-upload--picture-card {
.common-dialog.el-upload--picture-card {
width: 60px;
height: 50px;
line-height: 60px;
@ -473,13 +460,19 @@ export default {
.container_hui{
background: #fff;
margin: 10px;
margin-bottom: 0px;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
}
.cards-change{
height: 83vh;
//height: 81vh;
}
.table_box{
height: 72vh;
overflow: auto;
scrollbar-width: none;
}
</style>

17
fuintAdmin/src/views/power/page/record.vue
View File

@ -43,7 +43,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 69vh;overflow: auto">
<div class="table_box" >
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
@ -150,8 +150,8 @@
</el-form>
<div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<el-button type="primary" @click="userEnter1">确定</el-button>
<el-button @click="userCe2">取消</el-button>
<el-button type="primary" @click="userEnter1">保 存</el-button>
</div>
</el-dialog>
<el-dialog center :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>
@ -399,7 +399,7 @@ export default {
this.onlyGetUser()
getSysNotifyInfo(e.id).then(res => {
this.open = true;
this.title = "修改通知"
this.title = "编辑通知"
this.form = res.data
if (this.form.recipientUser) {
this.form.recipientUser = JSON.parse(this.form.recipientUser)
@ -543,7 +543,7 @@ export default {
};
</script>
<style lang="scss" scoped>
.common-dialog > > > .el-upload--picture-card {
.common-dialog.el-upload--picture-card {
width: 60px;
height: 50px;
line-height: 60px;
@ -551,14 +551,19 @@ export default {
.container_hui{
background: #fff;
margin: 10px;
margin-bottom: 0px;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
}
.cards-change{
height: 83vh;
//height: 81vh;
}
.table_box{
height: 72vh;
overflow: auto;
scrollbar-width: none;
}
</style>

1
fuintAdmin/src/views/shopowner.vue
View File

@ -632,6 +632,7 @@ export default {
},
//油站首页数据展示
getDataShow() {
const data = {
"startTime": this.showValue[0].split(' ')[0],
"endTime": this.showValue[1].split(' ')[0]

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

@ -1,5 +1,5 @@
<template>
<div class="app-container" style="padding: 10px">
<div class="app-container" >
<div class="tab-box">
<div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
</div>
@ -623,9 +623,7 @@
<!-- 添加或修改用户配置对话框 class="common-dialog" -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">
<el-form-item label="所属机构" prop="deptId">
@ -640,7 +638,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="用户姓名" prop="realName">