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

no message

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-29 08:40:08 +08:00
parent 93161691a6
commit 8b75b67a83
6 changed files with 98 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,13 +157,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="margin-top: 20px"> <pagination
<el-pagination v-show="total>0"
background :total="total"
layout="prev, pager, next" :page.sync="queryParams.page"
:total="total"> :limit.sync="queryParams.pageSize"
</el-pagination> @pagination="getStoreList"
</div> />
</el-card> </el-card>
@ -326,6 +326,8 @@ export default {
await Storelist(this.queryParams).then(res=>{ await Storelist(this.queryParams).then(res=>{
console.log(res) console.log(res)
this.arrlist = res.data.records this.arrlist = res.data.records
// this.total = res.data.total
}) })
}, },

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

@ -1319,6 +1319,17 @@ export default {
this.queryParams1.page = 1; this.queryParams1.page = 1;
this.getDutyList(); this.getDutyList();
}, },
reset2() {
this.queryParams1={
page:1,
pageSize:10,
// 当做机构id使用
storeId:"",
deptId:''
}
this.getDutyList();
},
getDutyList(){ getDutyList(){
this.loading = true; this.loading = true;
dutyList(this.queryParams1).then(res => { dutyList(this.queryParams1).then(res => {

31
fuintAdmin_zt/src/views/components/Service/allOrder.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="bai-box" style="margin-top: 20px" > <div class="bai-box" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="orderNo"> <el-form-item label="" prop="orderNo">
@ -66,17 +66,18 @@
<el-form-item label=""> <el-form-item label="">
<el-date-picker <el-date-picker
v-model="dateRange" v-model="dateRange"
style="width: 240px" style="width: 240px;height: 32px"
size="medium" size="medium"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" type="daterange"
range-separator="-" range-separator="-"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -90,7 +91,7 @@
{{ getType(scope.row.type) }} {{ getType(scope.row.type) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="sumPayMoney" align="center" prop="payMoney"> <el-table-column :label="sumPayMoney" align="center" prop="payMoney" >
</el-table-column> </el-table-column>
@ -119,17 +120,19 @@
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="支付通道" align="center" prop="userMobile" width="150">--> <el-table-column label="支付通道" align="center" prop="paymentChannel" width="150">
<!-- <template slot-scope="scope">--> <template slot-scope="scope">
<!-- <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>--> <span>{{ scope.row.paymentChannel?scope.row.paymentChannel: '--'}}</span>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column label="商户号编号" align="center" prop="mchntCd" width="150">
<template slot-scope="scope">
<span>{{ scope.row.mchntCd?scope.row.mchntCd: '--'}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="商户号编号" align="center" prop="userMobile" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="订单创建时间" align="center" prop="createTime"> <el-table-column label="订单创建时间" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">

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

@ -8,8 +8,8 @@
</div> </div>
<div class="dis-box"> <div class="dis-box">
<div class="block"> <div class="block">
<el-avatar v-if="fullImagePath" shape="square" :size="96" :key="fullImagePath" :src="fullImagePath"></el-avatar> <el-avatar v-if="fullImagePath" shape="square" :size="96" :key="fullImagePath" :src="fullImagePath" style="border-radius: 3%;"></el-avatar>
<el-avatar v-else shape="square" :size="96" src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png"></el-avatar> <el-avatar v-else shape="square" :size="96" src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" style="border-radius: 3%;"></el-avatar>
</div> </div>
<div style="width: 100%"> <div style="width: 100%">
<div class="dis-box" style="align-items: center;cursor: pointer;margin-bottom: 20px"> <div class="dis-box" style="align-items: center;cursor: pointer;margin-bottom: 20px">
@ -60,20 +60,22 @@
<span class="demonstration" >营业执照</span> <span class="demonstration" >营业执照</span>
<br/> <br/>
<el-image v-if="from.license" :src="imagePath+from.license" style="margin-top: 10px;"></el-image> <el-image v-if="from.license" :src="imagePath+from.license" style="margin-top: 10px;width: 220px;height: 135px;border-radius: 3%;" ></el-image>
<el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image> <el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image>
</div> </div>
<div style="height: 200px; width: 300px; margin-left: 100px;"> <div style="height: 1000px; width: 1000px; margin-left: 30px;">
<span class="demonstration">门头照</span> <span class="demonstration">门头照</span>
<br/> <br/>
<div style="width: 1220px;display: flex">
<el-image v-for="(item, index) in from.doorstepPhoto" v-if="from.doorstepPhoto[0]" :src="imagePath+item" style="margin-top: 10px;margin-right:10px;width: 220px;height: 135px;display: flex;border-radius: 3%; "></el-image>
<el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" style="border-radius: 3%;"></el-image>
<el-image v-if="from.doorstepPhoto[0]" :src="imagePath+from.doorstepPhoto[0]" style="margin-top: 10px;"></el-image> </div>
<el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image>
</div> </div>
</div> </div>
<el-dialog title="编辑油站" class="d-dialog" :visible.sync="editDialog" width="900px" style="padding-right: 10px;"> <el-dialog title="编辑油站" class="d-dialog" :visible.sync="editDialog" width="1000px" style="padding-right: 10px;">
<el-form :model="from" ref="form" :rules="rules"> <el-form :model="from" ref="form" :rules="rules">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
@ -471,8 +473,8 @@
this.hideUpload = true this.hideUpload = true
// Check if the number of files exceeds 3 // Check if the number of files exceeds 3
if (this.uploadImages.length >= 3) { if (this.uploadImages.length >= 5) {
this.$message.warning('最多只可以上传三张'); this.$message.warning('最多只可以上传五张');
return false; // Cancel upload return false; // Cancel upload
} }
return true; // Continue with the upload return true; // Continue with the upload
@ -539,7 +541,7 @@
.box-h{ .box-h{
background: rgb(255, 255, 255); background: rgb(255, 255, 255);
width: 98%; width: 98%;
margin: 10px auto; margin: 20px auto;
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
} }

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

@ -96,12 +96,12 @@
<el-form :model="form" label-width="120px"> <el-form :model="form" label-width="120px">
<!-- 通知名称 --> <!-- 通知名称 -->
<el-form-item label="通知名称" :required="true"> <el-form-item label="通知名称" :required="true">
<el-input v-model="form.notificationName" placeholder="请输入通知名称"></el-input> <el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px" ></el-input>
</el-form-item> </el-form-item>
<!-- 通知类型 --> <!-- 通知类型 -->
<el-form-item label="通知类型" :required="true"> <el-form-item label="通知类型" :required="true">
<el-select v-model="form.notificationType" placeholder="请选择通知类型"> <el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px">
<el-option label="到期提醒" value="到期提醒"></el-option> <el-option label="到期提醒" value="到期提醒"></el-option>
<!-- 添加其他选项 --> <!-- 添加其他选项 -->
</el-select> </el-select>
@ -109,13 +109,13 @@
<!-- 通知模板 --> <!-- 通知模板 -->
<el-form-item label="通知模板" :required="true"> <el-form-item label="通知模板" :required="true">
<el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200" show-word-limit></el-input> <el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit style="width: 300px"></el-input>
</el-form-item> </el-form-item>
<!-- 接收角色 --> <!-- 接收角色 -->
<el-form-item label="接收角色" :required="true"> <el-form-item label="接收角色" :required="true">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色"> <el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 300px">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId"></el-option> <el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -125,7 +125,7 @@
</el-form-item> </el-form-item>
<!-- 发送条件 --> <!-- 发送条件 -->
<el-form-item label="发送条件" style="margin-bottom: 10px"> <el-form-item label="发送条件" style="margin-bottom: 10px" :required="true">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group"> <div v-for="(condition, index) in form.conditions" :key="index" class="condition-group">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px"> <el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px">
<el-option label="系统到期日期" value="系统到期日期"></el-option> <el-option label="系统到期日期" value="系统到期日期"></el-option>
@ -148,11 +148,15 @@
</el-form-item> </el-form-item>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<el-form-item> <!-- <el-form-item>-->
<el-button type="primary" @click="handleSubmit">保存</el-button>
<el-button @click="handleReset">取消</el-button> <!-- </el-form-item>-->
</el-form-item>
</el-form> </el-form>
<div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<el-button type="primary" @click="handleSubmit">保存</el-button>
<el-button @click="handleReset">取消</el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
@ -183,10 +187,11 @@ export default {
templateStatus: true, templateStatus: true,
type: 0, type: 0,
conditions: [ conditions: [
{ field: '', operator: '', value: '' }
] ]
}, },
deviceInfo: { // { field: '', operator: '', value: '' }
deviceInfo: {
id: null, // 自增id id: null, // 自增id
notificationName: '',//通知名称，字符长度最多100，不能为空 notificationName: '',//通知名称，字符长度最多100，不能为空
notificationType: '',//通知类型 notificationType: '',//通知类型
@ -239,8 +244,18 @@ export default {
// 在这里调用接口提交设备信息数据 // 在这里调用接口提交设备信息数据
console.log('提交设备信息数据:', this.form); console.log('提交设备信息数据:', this.form);
this.form.conditions = JSON.stringify(this.form.conditions) if ( this.form.conditions.length === 0 || this.form.conditions[0].field == '') {
this.form.conditions = ''
this.$message({
type: 'info',
message: '请选择发送条件!'
});
return
} else {
this.form.conditions = JSON.stringify(this.form.conditions)
}
this.form.recipientRoles = JSON.stringify(this.form.recipientRoles) this.form.recipientRoles = JSON.stringify(this.form.recipientRoles)
if (this.form.id) { if (this.form.id) {
updateSysNotifyApi(this.form).then(res=>{ updateSysNotifyApi(this.form).then(res=>{
if(res.code === 200) { if(res.code === 200) {
@ -277,12 +292,12 @@ export default {
this.open = true; this.open = true;
this.getDutyList() this.getDutyList()
this.title = "增加设备" this.title = "增加通知模板"
}, },
edit(e) { edit(e) {
this.clean() this.clean()
this.open = true; this.open = true;
this.title = "编辑设备" this.title = "编辑通知模板"
this.getDutyList() this.getDutyList()
this.form = e this.form = e
@ -372,6 +387,19 @@ export default {
conditions: [ conditions: [
{ field: '', operator: '', value: '' } { field: '', operator: '', value: '' }
] ]
},
this.form= {
id: null,
notificationName: '',
notificationType: '',
templateContent: '',
recipientRoles: [],
dutyList: [],
templateStatus: true,
type: 0,
conditions: [
{ field: '', operator: '', value: '' }
]
} }
}, },
} }

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

@ -164,8 +164,10 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button type="primary" @click="userEnter">确定</el-button> <div style="display: flex; justify-content: center; align-items: center;margin-top: 30px">
<el-button @click="userCe">取消</el-button> <el-button type="primary" @click="userEnter">确定</el-button>
<el-button @click="userCe">取消</el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
@ -296,7 +298,7 @@ export default {
this.open = true; this.open = true;
this.getDutyList() this.getDutyList()
this.title = "增加设备" this.title = "新增通知"
}, },
userEnter1(){ userEnter1(){
// 在这里调用接口提交设备信息数据 // 在这里调用接口提交设备信息数据
@ -325,7 +327,7 @@ export default {
edit(e) { edit(e) {
this.clean() this.clean()
this.open = true; this.open = true;
this.title = "编辑设备" this.title = "编辑通知"
this.form = e this.form = e
this.form.recipientUser = JSON.parse(this.form.recipientUser) this.form.recipientUser = JSON.parse(this.form.recipientUser)
this.form.recipientRoles = JSON.parse(this.form.recipientRoles) this.form.recipientRoles = JSON.parse(this.form.recipientRoles)