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

10.31

Browse Source
This commit is contained in:
ds 2024-11-01 08:26:04 +08:00
parent a58892a2da
commit 112fe28dd9
10 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="价格">
<el-input :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
<el-input type="number" :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
<template slot="append">万元</template>
</el-input>
</el-form-item>
@ -653,20 +653,20 @@
<el-row>
<el-col :span="24">
<el-form-item label="联系方式" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入用户的联系方式" maxlength="50" autocomplete="off" />
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.mobile" placeholder="请输入用户的联系方式" maxlength="50" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="登录账号" prop="accountName">
<el-input v-model="form.accountName" placeholder="请输入" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
<el-input v-model="form.accountName" placeholder="登录账号（5-12位大小写字母、数字）" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" maxlength="50" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<template v-if="title == '新增用户'">
<template v-if="title == '新增用户信息'">
<el-row>
<el-col :span="24">
@ -680,7 +680,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="用户角色" prop="roleIds">
<el-select v-model="form.roleIds" @change="$forceUpdate(),getCodeByRole($event)" placeholder="请选择角色">
<el-select v-model="form.roleIds" @change="$forceUpdate(),getCodeByRole($event)" placeholder="请选择角色" style="width: 100%;">
<el-option
v-for="item in rolelist"
:key="item.dutyId"
@ -2038,7 +2038,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.open = true
this.title = "新增用户"
this.title = "新增用户信息"
this.resetForm()
let permissionType
if (this.deptType === "3") {

37
fuintAdmin_zt/src/views/components/Service/index.vue
View File

@ -71,15 +71,15 @@
</div>
</div>
<el-dialog title="编辑油站" class="d-dialog" :visible.sync="editDialog" width="700px" style="padding-right: 10px;">
<el-dialog title="修改油站信息" class="d-dialog" :visible.sync="editDialog" width="35%" style="padding-right: 10px;">
<el-form :model="from" ref="form" :rules="rules">
<el-row>
<el-col :span="10">
<el-form-item label="油站名称" prop="name" :label-width="formLabelWidth">
<el-input v-model="from.name" autocomplete="off" style="width:500px"></el-input>
<el-col>
<el-form-item label="油站名称" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-input v-model="from.name" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="上传头像" prop="name" :label-width="formLabelWidth">
<el-form-item label="上传头像" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-upload
:action="uploadAction"
list-type="picture-card"
@ -98,26 +98,25 @@
</el-upload>
</el-form-item>
<el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth" placeholder="请输入油站负责人">
<el-input v-model="from.contact" autocomplete="off" style="width:500px"></el-input>
<el-form-item label="油站联系人" prop="contact" :label-width="formLabelWidth" style="margin-left: -25px;" >
<el-input v-model="from.contact" autocomplete="off" placeholder="请输入油站负责人" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth" placeholder="请输入联系方式">
<el-input v-model="from.phone" autocomplete="off" style="width:500px"></el-input>
<el-col>
<el-form-item label="联系电话" prop="phone" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-input v-model="from.phone" autocomplete="off" placeholder="请输入联系方式"/>
</el-form-item>
</el-col>
<el-col :span="10">
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="店铺地址" prop="address" :label-width="formLabelWidth">
<el-col>
<el-form-item label="店铺地址" prop="address" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-input
style="width:500px"
type="textarea"
:rows="2"
placeholder="请输入店铺地址"
@ -125,7 +124,7 @@
</el-input>
</el-form-item>
<el-form-item label="油站状态" prop="status" :label-width="formLabelWidth">
<el-form-item label="油站状态" prop="status" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-tooltip class="item" effect="dark" content="油站状态在组织架构中设置" placement="top-start">
<el-switch
@ -141,8 +140,8 @@
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="营业执照" prop="name" :label-width="formLabelWidth">
<el-col>
<el-form-item label="营业执照" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-upload
:action="uploadAction"
list-type="picture-card"
@ -161,7 +160,7 @@
</el-upload>
</el-form-item>
<el-form-item label="经营照" prop="name" :label-width="formLabelWidth">
<el-form-item label="经营照" prop="name" :label-width="formLabelWidth" style="margin-left: -25px;">
<el-upload
:action="uploadAction"
list-type="picture-card"
@ -185,9 +184,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="editDialog = false">取 消</el-button>
<el-button type="primary" @click=" edit">确 定</el-button>
<el-button type="primary" @click=" edit">保 存</el-button>
</div>
</el-dialog>
<el-dialog title="收货地址" :visible.sync="dialogFormVisible">

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

@ -202,10 +202,10 @@
</el-table-column>
</el-table>
</div>
<el-dialog :title="addMerchantTitile" :visible.sync="addMerchants" width="550px">
<el-dialog :title="addMerchantTitile" :visible.sync="addMerchants" width="30%">
<el-form :model="form" ref="formAdd" :rules="rules">
<el-form-item label="所属机构" :label-width="formLabelWidth" prop="deptId">
<el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 350px">
<el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 100%">
<el-option
v-for="item in deptListSelect"
:key="item.deptId"
@ -219,7 +219,7 @@
v-model="form.merchantName"
placeholder="全部"
clearable
style="width: 350px"
style="width: 100%"
>
<!-- <el-option-->
<!-- v-for="dict in dict.type.payment_channel"-->
@ -237,16 +237,16 @@
</el-form-item>
<el-form-item label="商户号编号" :label-width="formLabelWidth" prop="mchntCd">
<el-input v-model="form.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
style="width: 350px"></el-input>
style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="备注" :label-width="formLabelWidth">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" autocomplete="off"
style="width: 350px"></el-input>
style="width: 100%"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="addMerchants = false">取 消</el-button>
<el-button type="primary" @click="submitMerchant">确 定</el-button>
<el-button type="primary" @click="submitMerchant">保 存</el-button>
</div>
</el-dialog>
<el-dialog :title="Ruletitle" :visible.sync="addRule" width="60%">
@ -297,7 +297,7 @@
</el-form-item>
<el-form-item label="交易占比" :label-width="formLabelWidth" style="margin-left: -20px;">
<el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 350px">
<el-input v-model="item.proportion" onkeyup="this.value=this.value.replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"> placeholder="请输入交易占比" autocomplete="off" style="width: 350px">
<template slot="append">%</template>
</el-input>
</el-form-item>

36
fuintAdmin_zt/src/views/components/Service/staff.vue
View File

@ -116,8 +116,8 @@
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="所属机构" prop="storeId">
<el-select v-model="form.storeId+''" placeholder="请选择角色" style="width: 270px">
<el-form-item label="所属机构" prop="storeId" style="margin-left: -30px;">
<el-select v-model="form.storeId+''" placeholder="请选择角色" style="width: 100%">
<el-option
v-for="item in options"
:key="item.id+''"
@ -127,25 +127,25 @@
</el-select>
</el-form-item>
<el-form-item label="员工姓名" prop="realName">
<el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" style="width: 270px"/>
<el-form-item label="员工姓名" prop="realName" style="margin-left: -30px;">
<el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" style="width: 100%"/>
</el-form-item>
<el-form-item label="联系方式" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30" style="width: 270px"/>
<el-form-item label="联系方式" prop="mobile" style="margin-left: -30px;">
<el-input onkeyup="this.value=this.value.replace(/\D/g,'')" v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30" style="width: 100%"/>
</el-form-item>
<el-form-item label="登录账号" prop="accountName">
<el-input v-model="form.accountName" placeholder="请输入登录账号" maxlength="30" style="width: 270px"/>
<el-form-item label="登录账号" prop="accountName" style="margin-left: -30px;">
<el-input v-model="form.accountName" placeholder="请输入登录账号" maxlength="30" style="width: 100%"/>
</el-form-item>
<el-form-item label="登录密码" prop="password" v-if="!form.id">
<el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="30" style="width: 270px"/>
<el-form-item label="登录密码" prop="password" v-if="!form.id" style="margin-left: -30px;">
<el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="30" style="width: 100%"/>
</el-form-item>
<el-form-item label="用户角色" prop="roleId">
<el-select v-model="form.roleId" placeholder="请选择角色" style="width: 270px">
<el-form-item label="用户角色" prop="roleId" style="margin-left: -30px;">
<el-select v-model="form.roleId" placeholder="请选择角色" style="width: 100%">
<el-option
v-for="item in roleList"
:key="item.dutyId+''"
@ -155,7 +155,7 @@
</el-select>
</el-form-item>
<el-form-item label="账号状态" prop="status">
<el-form-item label="账号状态" prop="status" style="margin-left: -30px;">
<el-switch
v-model="form.status"
active-value="qy"
@ -166,7 +166,7 @@
</el-form-item>
<el-form-item label="一键加油" prop="isRefuel">
<el-form-item label="一键加油" prop="isRefuel" style="margin-left: -30px;">
<!-- <el-select v-model="form.isRefuel" style="width: 270px">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.display"-->
@ -201,9 +201,9 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">保 存</el-button>
</div>
</el-dialog>
</div>
@ -498,7 +498,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "新增员工";
this.title = "新增用户信息";
this.getRoleList1()
},
// 获取角色信息
@ -589,7 +589,7 @@ export default {
this.form = response.data;
// this.form.category = response.data.staffInfo.category + '';
this.open = true;
this.title = "编辑员工信息";
this.title = "修改用户信息";
this.writeOff = this.form.writeOff.split(",");
this.specialPrem = this.form.specialPrem.split(",");
this.posPrem = JSON.parse(this.form.posPrem);

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

@ -109,7 +109,7 @@
<!-- <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
<!-- </el-form-item>-->
<!-- -->
<el-form-item label="机构名称" prop="orgId">
<el-form-item label="机构名称" prop="orgId" style="margin-left: -20px;">
<el-select
v-model="deviceInfo.orgId"
clearable
@ -121,25 +121,25 @@
</el-select>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode" style="margin-left: -20px;">
<el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 100%;" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
<el-form-item label="小程序appID" prop="appId">
<el-form-item label="小程序appID" prop="appId" style="margin-left: -20px;">
<el-input v-model="deviceInfo.appId" style="width: 100%;" placeholder="请输入小程序appID"></el-input>
</el-form-item>
<el-form-item label="密钥" prop="appKey">
<el-form-item label="密钥" prop="appKey" style="margin-left: -20px;">
<el-input v-model="deviceInfo.appKey" style="width: 100%;" placeholder="请输入密钥"></el-input>
</el-form-item>
<el-form-item label="法人姓名" prop="legalRepresentativeName">
<el-form-item label="法人姓名" prop="legalRepresentativeName" style="margin-left: -20px;">
<el-input v-model="deviceInfo.legalRepresentativeName" style="width: 100%;" placeholder="请输入法人姓名"></el-input>
</el-form-item>
<el-form-item label="法人微信号" prop="legalRepresentativeWechat">
<el-form-item label="法人微信号" prop="legalRepresentativeWechat" style="margin-left: -20px;">
<el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 100%;" placeholder="请输入法人微信号"></el-input>
</el-form-item>
<el-form-item label="法人联系方式" prop="legalRepresentativeContact">
<el-form-item label="法人联系方式" prop="legalRepresentativeContact" style="margin-left: -20px;">
<el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 100%;" placeholder="请输入法人联系方式"></el-input>
</el-form-item>
<el-form-item label="小程序状态" prop="appStatus">
<el-form-item label="小程序状态" prop="appStatus" style="margin-left: -20px;">
<el-switch
v-model="deviceInfo.appStatus"
active-color="#13ce66"
@ -305,7 +305,7 @@ export default {
edit(e) {
this.clean()
this.open = true;
this.title = "编辑小程序配置"
this.title = "修改小程序配置"
this.deviceInfo = e
console.log('提交设备信息数据:', this.deviceInfo);

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

@ -203,7 +203,7 @@
</el-select>
</el-form-item>
<el-form-item label="排序号" prop="sortOrder">
<el-input v-model="deviceInfo.sortOrder" placeholder="请选择排序号" style="width: 100%"></el-input>
<el-input v-model="deviceInfo.sortOrder" placeholder="请输入排序号1/2/3..." style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="banner图链接" prop="bannerLink">
<el-input v-model="deviceInfo.bannerLink" placeholder="请输入banner图链接地址" style="width: 100%"></el-input>

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

@ -97,13 +97,13 @@
<el-form ref="form" :rules="rules" :model="form" label-width="120px">
<el-form-item label="短信模板ID" prop="messageId" style="margin-left: -25px;">
<el-input v-model="form.messageId" style="width: 100%"></el-input>
<el-input v-model="form.messageId" placeholder="请输入短信模板ID" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="短信名称" prop="name" style="margin-left: -25px;">
<el-input v-model="form.name" style="width: 100%"></el-input>
<el-input v-model="form.name" placeholder="请输入短信名称" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="适用范围" prop="deptIdList" style="margin-left: -25px;">
<el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 100%">
<el-select v-model="form.deptIdList" multiple placeholder="请选择适用组织机构（多选）" style="width: 100%">
<el-option
v-for="item in deptListSelect"
:key="item.deptId"
@ -313,12 +313,12 @@ export default {
handleAdd(e) {
this.clean()
this.open = true;
this.title = "新增短信"
this.title = "新增短信模板"
},
edit(e) {
this.clean()
this.open = true;
this.title = "修改短信"
this.title = "修改短信模板"
this.form = e
},
del(e) {

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

@ -137,7 +137,7 @@
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form-item label="机构名称" prop="deptId" style="margin-left: -30px;" >
<el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 100%">
<el-select v-model="deviceInfo.deptId" placeholder="请选择机构名称" @change="chooseDept(deviceInfo.deptId)" style="width: 100%">
<el-option
v-for="item in deptListSelect"
:key="item.deptId"
@ -155,7 +155,7 @@
</el-select>
</el-form-item>
<el-form-item label="支付通道" prop="paymentChannel" style="margin-left: -30px;">
<el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 100%">
<el-select v-model="deviceInfo.paymentChannel" placeholder="请选择机构支付通道" clearable style="width: 100%">
<el-option
v-for="dict in dict.type.payment_channel"
:key="dict.value"
@ -164,23 +164,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'" style="margin-left: -30px;">
<!-- <el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'" style="margin-left: -30px;">
<el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="机构号" prop="insCd" v-else style="margin-left: -30px;">
<el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
</el-form-item>
</el-form-item> -->
<el-form-item label="公钥" prop="publicKey" style="margin-left: -30px;">
<el-input v-model="deviceInfo.publicKey" style="width: 100%"></el-input>
<el-input v-model="deviceInfo.publicKey" placeholder="请输入支付通道的公钥" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="私钥" prop="privateKey" style="margin-left: -30px;">
<el-input v-model="deviceInfo.privateKey" style="width: 100%"></el-input>
<el-input v-model="deviceInfo.privateKey" placeholder="请输入支付通道的私钥" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="联系人" prop="contact" style="margin-left: -30px;">
<el-input v-model="deviceInfo.contact" style="width: 100%"></el-input>
<el-input v-model="deviceInfo.contact" placeholder="请输入负责人姓名" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="information" style="margin-left: -30px;">
<el-input v-model="deviceInfo.information" style="width: 100%"></el-input>
<el-input v-model="deviceInfo.information" placeholder="请输入负责人联系方式" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="支付通道状态" prop="appStatus" style="margin-left: -25px;" >
<el-switch
@ -341,17 +341,17 @@ export default {
handleAdd(e) {
this.clean()
this.open = true;
this.title = "增加支付参数"
this.title = "新增支付参数"
// this.selectChildByDeptIdApi();
},
edit(e) {
this.clean()
// this.open = true;
// this.title = "编辑支付参数"
// this.title = "支付参数"
// this.deviceInfo = e
getPaymentParameter(e.id).then(res => {
this.open = true;
this.title = "编辑支付参数"
this.title = "修改支付参数"
this.deviceInfo = res.data
})
},

6
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -125,7 +125,7 @@
<!-- 接收角色 -->
<el-form-item label="接收角色" prop="recipientRoles" style="margin-left: -30px;">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 100%">
<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>
@ -351,12 +351,12 @@ export default {
this.open = true;
this.getDutyList()
this.title = "增加通知模板"
this.title = "新增通知模板"
},
edit(e) {
this.clean()
this.open = true;
this.title = "编辑通知模板"
this.title = "修改通知模板"
this.getDutyList()
this.form = e

2
fuintAdmin_zt/src/views/system/notify/page/record.vue
View File

@ -429,7 +429,7 @@ export default {
edit(e) {
this.cleanForm()
this.open = true;
this.title = "编辑通知"
this.title = "修改通知"
this.getDutyList()
this.form = JSON.parse(JSON.stringify(e));