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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
齐天大圣 2024-10-28 09:26:15 +08:00
commit 980261477e
16 changed files with 110 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin_zt/src/views/Service/index.vue
View File

@ -159,8 +159,6 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"
@ -168,6 +166,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getStoreList"
/>
</div>
</div>

8
fuintAdmin_zt/src/views/Site/components/afterff.vue
View File

@ -160,11 +160,11 @@ export default {
align="center"
label="创建人">
</el-table-column>
<el-table-column
<!-- <el-table-column
width="200"
align="center"
label="操作"
>
> -->
<!-- <template slot="header" slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
@ -172,14 +172,14 @@ export default {
<!-- >新增</el-button>-->
<!-- 操作-->
<!-- </template>-->
<template slot-scope="scope">
<!-- <template slot-scope="scope">
<el-button
size="mini"
@click="handleEdit(scope.row)">修改</el-button>
<el-button
size="mini"
@click="handleEditshoukuan(scope.row)">收款</el-button>
</template>
</template> -->
</el-table-column>
</el-table>

4
fuintAdmin_zt/src/views/Site/components/before.vue
View File

@ -170,7 +170,7 @@ export default {
align="center"
label="创建人">
</el-table-column>
<el-table-column
<!-- <el-table-column
align="center">
<template slot="header" slot-scope="scope">
<el-button
@ -183,7 +183,7 @@ export default {
size="mini"
@click="handleEdit( scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<el-dialog
title="新增"

4
fuintAdmin_zt/src/views/Site/components/yearff.vue
View File

@ -131,7 +131,7 @@ export default {
align="center"
label="创建人">
</el-table-column>
<el-table-column
<!-- <el-table-column
align="center">
<template slot="header" slot-scope="scope">
<el-button
@ -146,7 +146,7 @@ export default {
@click="handleEdit(scope.row)">修改</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<el-dialog

10
fuintAdmin_zt/src/views/components/Service/payment.vue
View File

@ -252,15 +252,15 @@
<el-dialog :title="Ruletitle" :visible.sync="addRule" width="60%">
<el-form :model="formRule" ref="formRule" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-col :span="10">
<el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
<el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
<el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 100%"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="规则描述" :label-width="formLabelWidth">
<el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
style="width: 350px"></el-input>
style="width: 100%"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -343,9 +343,9 @@
<i class="el-icon-delete" style="font-size: 28px;margin-left: 15px" @click="deleteDoxlist(index)"></i>
</div>
</el-form>
<div slot="footer" class="dialog-footer" v-if="Ruletitle != '查看商户信息'">
<div slot="footer" class="dialog-footer" v-if="Ruletitle != '查看商户信息'" style="text-align: center;">
<el-button @click="addRule = false">取 消</el-button>
<el-button type="primary" @click="submitAddRule">确 定</el-button>
<el-button type="primary" @click="submitAddRule">保 存</el-button>
</div>
</el-dialog>
<el-dialog title="启用" :visible.sync="Enable" width="650px">

5
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -107,14 +107,14 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
@ -358,6 +358,7 @@ export default {
width: 100%;
height: 46vh;
overflow: auto;
min-height: 100vh;
}
.wrap-boxs {

5
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
View File

@ -91,14 +91,14 @@
</template>
</el-table-column>
</el-table>
</div>
<pagination
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</div>
</div>
@ -308,6 +308,7 @@ export default {
width: 100%;
height: 46vh;
overflow: auto;
min-height: 100vh;
}
.wrap-boxs {

6
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
View File

@ -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;
}
</style>

5
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -265,6 +265,11 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{
width: 100%;
height: 66vh;
overflow: auto;
}
.card-change {
min-height: 100vh;
}
</style>

6
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
View File

@ -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;
}
</style>

8
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -267,8 +267,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
<style scoped>
.box-card{
//width: 100%;
//margin: 0px 20px 20px 20px;
width: 100%;
margin: 0px 20px 20px 20px;
}
.el-form--inline .el-form-item {
@ -281,4 +281,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
overflow: auto;
}
.card-change {
min-height: 100vh;
}
</style>

27
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -98,7 +98,7 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<!-- <el-form ref="form" :model="deviceInfo" label-width="80px">-->
<el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
<!-- <el-form-item label="机构名称" prop="orgName">-->
@ -113,8 +113,8 @@
<el-select
v-model="deviceInfo.orgId"
clearable
placeholder="机构名称"
style="width: 300px;"
placeholder="请输入机构名称"
style="width: 100%"
>
<el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option>
@ -122,22 +122,22 @@
</el-form-item>
<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
<el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 100%;" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
<el-form-item label="小程序appID" prop="appId">
<el-input v-model="deviceInfo.appId" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.appId" style="width: 100%;" placeholder="请输入小程序appID"></el-input>
</el-form-item>
<el-form-item label="密钥" prop="appKey">
<el-input v-model="deviceInfo.appKey" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.appKey" style="width: 100%;" placeholder="请输入密钥"></el-input>
</el-form-item>
<el-form-item label="法人姓名" prop="legalRepresentativeName">
<el-input v-model="deviceInfo.legalRepresentativeName" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeName" style="width: 100%;" placeholder="请输入法人姓名"></el-input>
</el-form-item>
<el-form-item label="法人微信号" prop="legalRepresentativeWechat">
<el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 100%;" placeholder="请输入法人微信号"></el-input>
</el-form-item>
<el-form-item label="法人联系方式" prop="legalRepresentativeContact">
<el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 100%;" placeholder="请输入法人联系方式"></el-input>
</el-form-item>
<el-form-item label="小程序状态" prop="appStatus">
<el-switch
@ -146,12 +146,17 @@
inactive-color="#ff4949">
</el-switch>
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button @click="resetForm('deviceForm')">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
<!-- </el-form>-->
<div style="text-align: center; margin-top: 50px;">
<el-button @click="resetForm('deviceForm')">取 消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">保 存</el-button>
</div>
</el-dialog>
</div>

33
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -120,11 +120,11 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules" style="margin-left: 30px">
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form-item label="banner名称" prop="bannerName">
<el-input v-model="deviceInfo.bannerName" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.bannerName" style="width: 100%" placeholder="请输入banner名称"></el-input>
</el-form-item>
<el-form-item label="图片" prop="uploadAction">
@ -192,7 +192,7 @@
</el-form-item>
<el-form-item label="系统位置" prop="systemPosition">
<el-select v-model="deviceInfo.systemPosition" placeholder="系统位置" style="width: 300px">
<el-select v-model="deviceInfo.systemPosition" placeholder="请选择系统位置" style="width: 100%">
<el-option
v-for="item in systemPositionList"
:key="item.value"
@ -203,12 +203,12 @@
</el-select>
</el-form-item>
<el-form-item label="排序号" prop="sortOrder">
<el-input v-model="deviceInfo.sortOrder" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.sortOrder" placeholder="请选择排序号" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="Banner链接" prop="bannerLink">
<el-input v-model="deviceInfo.bannerLink" style="width: 300px"></el-input>
<el-form-item label="banner图链接" prop="bannerLink">
<el-input v-model="deviceInfo.bannerLink" placeholder="请输入banner图链接地址" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="Banner状态" prop="bannerStatus">
<el-form-item label="banner图状态" prop="bannerStatus">
<el-switch
v-model="deviceInfo.bannerStatus"
active-color="#13ce66"
@ -217,14 +217,14 @@
</el-switch>
</el-form-item>
<el-form-item label="备注" prop="note">
<el-input v-model="deviceInfo.note" style="width: 300px"></el-input>
</el-form-item>
<el-form-item style="margin-left: 30px;">
<el-button style="margin-right: 20px;" @click="handleReset">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
<el-input type="textarea" v-model="deviceInfo.note" style="width: 100%" placeholder="请输入banner图的备注信息" :rows="5" ></el-input>
</el-form-item>
</el-form>
</el-form>
<div style="text-align: center; margin-top: 50px;">
<el-button style="margin-right: 20px;" @click="handleReset">取 消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">保 存</el-button>
</div>
</el-dialog>
</div>
@ -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' }
]
},

21
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -116,14 +116,14 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="40%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
<el-form-item label="商品名称" prop="name">
<el-input v-model="form.name" style="width: 300px"></el-input>
<el-input v-model="form.name" style="width: 100%" placeholder="请输入商品名称"></el-input>
</el-form-item>
<el-form-item label="商品分类" prop="categoryName">
<el-select v-model="form.categoryName" style="width: 150px" placeholder="全部">
<el-select v-model="form.categoryName" style="width: 100%" placeholder="请选择商品分类">
<el-option
v-for="dict in dict.type.hardware_type"
:key="dict.label"
@ -133,20 +133,20 @@
</el-select>
</el-form-item>
<el-form-item label="采购商家" prop="formStore">
<el-input v-model="form.formStore" style="width: 300px"></el-input>
<el-input v-model="form.formStore" style="width: 100%" placeholder="请输入采购商家名称"></el-input>
</el-form-item>
<el-form-item label="图片" prop="image">
<ImageUpload v-model="form.image"></ImageUpload>
</el-form-item>
<el-form-item label="商品介绍" prop="content">
<el-input type="textarea" v-model="form.content"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('form')">提交</el-button>
<el-input type="textarea" v-model="form.content" style="width: 100%;" placeholder="请输入商品介绍" :rows="5"></el-input>
</el-form-item>
</el-form>
<div style="text-align: center; margin-top: 50px;">
<el-button style="margin-right: 20px;" @click="handleReset">取消</el-button>
<el-button type="primary" @click="submitForm('form')">保 存</el-button>
</div>
</el-dialog>
</div>
@ -344,6 +344,9 @@ export default {
createByName: '', //
}
},
handleReset() {
this.open = false
},
}
};
</script>

19
fuintAdmin_zt/src/views/setting/message.vue
View File

@ -94,16 +94,16 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="120px" style="margin-left: 25px;">
<el-form ref="form" :rules="rules" :model="form" label-width="120px">
<el-form-item label="短信模板ID" prop="messageId">
<el-input v-model="form.messageId" style="width: 300px"></el-input>
<el-input v-model="form.messageId" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="短信名称" prop="name">
<el-input v-model="form.name" style="width: 300px"></el-input>
<el-input v-model="form.name" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="适用范围" prop="deptIdList">
<el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 300px" >
<el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 100%">
<el-option
v-for="item in deptListSelect"
:key="item.deptId"
@ -133,14 +133,13 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="短信内容" prop="content" >
<el-input type="textarea" v-model="form.content" style="width: 300px"></el-input>
</el-form-item>
<el-form-item style="margin-left: 40px; margin-top: 40px">
<el-button style="margin-right: 20px;" @click="handleReset">取消</el-button>
<el-button type="primary" @click="submitForm('form')">提交</el-button>
<el-input type="textarea" v-model="form.content" style="width: 100%"></el-input>
</el-form-item>
</el-form>
<div style="text-align: center; margin-top: 50px;">
<el-button style="margin-right: 20px;" @click="handleReset">取 消</el-button>
<el-button type="primary" @click="submitForm('form')">保 存</el-button>
</div>
</el-dialog>
</div>

29
fuintAdmin_zt/src/views/setting/pay/index.vue
View File

@ -134,10 +134,10 @@
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules" style="margin-left: 20px;">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form-item label="机构名称" prop="deptId" >
<el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 300px">
<el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 100%">
<el-option
v-for="item in deptListSelect"
:key="item.deptId"
@ -147,7 +147,7 @@
</el-select>
</el-form-item>
<el-form-item label="机构类型" prop="deptType">
<el-select v-model="deviceInfo.deptType" placeholder="请选择机构类型" clearable disabled style="width: 300px">
<el-select v-model="deviceInfo.deptType" placeholder="请选择机构类型" clearable disabled style="width: 100%">
<el-option label="代理商" value="1"></el-option>
<el-option label="连锁店" value="2"></el-option>
<el-option label="基本门店" value="3"></el-option>
@ -155,7 +155,7 @@
</el-select>
</el-form-item>
<el-form-item label="支付通道" prop="paymentChannel">
<el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 300px">
<el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 100%">
<el-option
v-for="dict in dict.type.payment_channel"
:key="dict.value"
@ -165,22 +165,22 @@
</el-select>
</el-form-item>
<el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'">
<el-input v-model="deviceInfo.insCd" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="机构号" prop="insCd" v-else>
<el-input v-model="deviceInfo.insCd" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="公钥" prop="publicKey">
<el-input v-model="deviceInfo.publicKey" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.publicKey" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="私钥" prop="privateKey">
<el-input v-model="deviceInfo.privateKey" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.privateKey" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="联系人" prop="contact">
<el-input v-model="deviceInfo.contact" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.contact" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="information">
<el-input v-model="deviceInfo.information" style="width: 300px"></el-input>
<el-input v-model="deviceInfo.information" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="支付状态" prop="appStatus" >
<el-switch
@ -191,12 +191,11 @@
inactive-color="#ff4949">
</el-switch>
</el-form-item>
<el-form-item style="margin-left: 55px">
<el-button @click="handleReset" style="margin-right: 20px;">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">保存</el-button>
</el-form-item>
</el-form>
<div style="text-align: center; margin-top: 50px;">
<el-button @click="handleReset" style="margin-right: 20px;">取消</el-button>
<el-button type="primary" @click="submitForm('deviceForm')">保存</el-button>
</div>
</el-dialog>
</div>