chuangte/share-space-vue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

111

Browse Source
This commit is contained in:
邱贞招 2025-03-03 15:29:30 +08:00
parent 5ee4e95409
commit b422aca224
17 changed files with 147 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/system/clean.js
View File

@ -42,3 +42,15 @@ export function delClean(cleanId) {
method: 'delete' method: 'delete'
}) })
} }
// 完成保洁
export function completeCleaning(data) {
return request({
url: '/app/clean/completeCleaning',
method: 'get',
params: {
cleanId: data.cleanId
}
})
}

4
src/utils/ruoyi.js
View File

@ -236,9 +236,9 @@ export function generateCode(type) {
console.log('generateCode', type) console.log('generateCode', type)
// 定义type与前缀的映射关系 // 定义type与前缀的映射关系
const prefixMap = { const prefixMap = {
'1': 'DP', '1': 'D',
'2': 'F', '2': 'F',
'3': 'D', '3': 'T',
'4': 'W' '4': 'W'
}; };

94
src/views/system/clean/index.vue
View File

@ -42,38 +42,38 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['system:clean:add']" <!-- v-hasPermi="['system:clean:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['system:clean:edit']" <!-- v-hasPermi="['system:clean:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:clean:remove']" <!-- v-hasPermi="['system:clean:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -136,17 +136,11 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-check"
@click="handleUpdate(scope.row)" v-if="scope.row.status === '1'"
@click="completeClean(scope.row)"
v-hasPermi="['system:clean:edit']" v-hasPermi="['system:clean:edit']"
>修改</el-button> >完成保洁</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:clean:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -219,7 +213,7 @@
</template> </template>
<script> <script>
import { listClean, getClean, delClean, addClean, updateClean } from "@/api/system/clean"; import {listClean, getClean, delClean, addClean, updateClean, completeCleaning} from "@/api/system/clean";
import { $showColumns } from '@/utils/mixins'; import { $showColumns } from '@/utils/mixins';
// 默认排序字段 // 默认排序字段
@ -243,7 +237,8 @@ export default {
{key: 'roomName', visible: true, label: '房间名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'roomName', visible: true, label: '房间名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'startTime', visible: true, label: '开始时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, {key: 'startTime', visible: true, label: '开始时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
{key: 'endTime', visible: true, label: '结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, // {key: 'endTime', visible: true, label: '结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
{key: 'actualEndTime', visible: true, label: '实际结束时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
{key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
], ],
// 排序方式 // 排序方式
@ -294,6 +289,17 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
completeClean(row){
const cleanId = row.cleanId || this.ids
this.$modal.confirm('确认完成保洁吗？').then(() => {
return completeCleaning({
cleanId: cleanId
});
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => {});
},
/** 查看商户详情 */ /** 查看商户详情 */
merchantDetail(row) { merchantDetail(row) {
if (!row.merchantId) { if (!row.merchantId) {

31
src/views/system/commandLog/index.vue
View File

@ -33,8 +33,8 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="IOT状态" prop="callStatus"> <el-form-item label="IOT状态" prop="code">
<el-select v-model="queryParams.callStatus" placeholder="请选择IOT状态" clearable> <el-select v-model="queryParams.code" placeholder="请选择IOT状态" clearable>
<el-option <el-option
v-for="dict in dict.type.onenet_call_status" v-for="dict in dict.type.onenet_call_status"
:key="dict.value" :key="dict.value"
@ -69,11 +69,14 @@
<template v-if="column.key === 'sn'"> <template v-if="column.key === 'sn'">
{{ d.row.sn || '--' }} {{ d.row.sn || '--' }}
</template> </template>
<template v-else-if="column.key === 'callStatus'"> <template v-else-if="column.key === 'code'">
<dict-tag :options="dict.type.onenet_call_status" :value="d.row.callStatus"/> <dict-tag :options="dict.type.onenet_call_status" :value="d.row.code"/>
</template> </template>
<template v-else-if="column.key === 'createTime'"> <template v-else-if="column.key === 'type'">
<span>{{ parseTime(d.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <dict-tag :options="dict.type.command_log_type" :value="d.row.type"/>
</template>
<template v-else-if="column.key === 'operaTime'">
<span>{{ parseTime(d.row.operaTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
<template v-else> <template v-else>
{{d.row[column.key]}} {{d.row[column.key]}}
@ -109,7 +112,9 @@
<el-form-item label="命令">{{ form.command }}</el-form-item> <el-form-item label="命令">{{ form.command }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item style="color: #12d2ac;font-weight: 700" label="类型">{{ form.type }}</el-form-item> <el-form-item label="类型">
<dict-tag :options="dict.type.command_log_type" :value="form.type"/>
</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="MAC">{{ form.mac }}</el-form-item> <el-form-item label="MAC">{{ form.mac }}</el-form-item>
@ -122,14 +127,14 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="IOT状态"> <el-form-item label="IOT状态">
<dict-tag :options="dict.type.onenet_call_status" :value="form.callStatus"/> <dict-tag :options="dict.type.onenet_call_status" :value="form.code"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="操作人">{{ form.userName }}</el-form-item> <el-form-item label="操作人">{{ form.userName }}</el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="创建时间">{{ parseTime(form.createTime) }}</el-form-item> <el-form-item label="操作时间">{{ parseTime(form.operaTime) }}</el-form-item>
</el-col> </el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -145,7 +150,7 @@ import { $showColumns } from '@/utils/mixins';
export default { export default {
name: "CommandLog", name: "CommandLog",
dicts: ['onenet_call_status'], dicts: ['onenet_call_status','command_log_type'],
mixins: [$showColumns], mixins: [$showColumns],
props:{ props:{
query: { query: {
@ -198,12 +203,12 @@ export default {
{key: 'mac', visible: true, label: 'MAC', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'mac', visible: true, label: 'MAC', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'sn', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'sn', visible: true, label: 'SN', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'result', visible: true, label: '响应', minWidth: null, sortable: true, overflow: true, align: 'center'}, {key: 'result', visible: true, label: '响应', minWidth: null, sortable: true, overflow: true, align: 'center'},
{key: 'callStatus', visible: true, label: 'IOT状态', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'code', visible: true, label: 'IOT状态', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'userName', visible: true, label: '操作人', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'userName', visible: true, label: '操作人', minWidth: null, sortable: true, overflow: false, align: 'center'},
{key: 'createTime', visible: true, label: '创建时间', minWidth: null, sortable: true, overflow: false, align: 'center'}, {key: 'operaTime', visible: true, label: '操作时间', minWidth: null, sortable: true, overflow: false, align: 'center'},
], ],
// 默认排序字段 // 默认排序字段
defaultSort: {prop: 'createTime', order: 'descending'}, defaultSort: {prop: 'operaTime', order: 'descending'},
// 排序方式 // 排序方式
orderSorts: ['ascending', 'descending'], orderSorts: ['ascending', 'descending'],
}; };

6
src/views/system/detail/index.vue
View File

@ -68,8 +68,9 @@
{{d.row.partnerName}} {{d.row.partnerName}}
</router-link> </router-link>
</template> </template>
<template v-else-if="['totalAmount', 'dividendAmount', 'refundAmount'].includes(column.key)"> <template v-else-if="['totalAmount', 'dividendAmount', 'refundAmount','settlementAmount'].includes(column.key)">
<span v-if="column.key === 'refundAmount'" style="color: red">{{d.row[column.key] | dv}} 元</span> <span v-if="column.key === 'refundAmount'" style="color: red;font-weight: bold;">{{d.row[column.key] | dv}} 元</span>
<span v-else-if="column.key === 'settlementAmount'" style="color: #13ce66;font-weight: bold;">{{d.row[column.key] | dv}} 元</span>
<span v-else>{{d.row[column.key] | dv}}元 </span> <span v-else>{{d.row[column.key] | dv}}元 </span>
</template> </template>
<template v-else-if="column.key === 'dividendProportion'"> <template v-else-if="column.key === 'dividendProportion'">
@ -195,6 +196,7 @@ export default {
{key: 'totalAmount', visible: true, label: '总金额', sortable: true, align: 'center'}, {key: 'totalAmount', visible: true, label: '总金额', sortable: true, align: 'center'},
{key: 'dividendAmount', visible: true, label: '分账金额', sortable: true, align: 'center'}, {key: 'dividendAmount', visible: true, label: '分账金额', sortable: true, align: 'center'},
{key: 'refundAmount', visible: true, label: '退款金额', sortable: true, align: 'center'}, {key: 'refundAmount', visible: true, label: '退款金额', sortable: true, align: 'center'},
{key: 'settlementAmount', visible: true, label: '结算金额', sortable: true, align: 'center'},
{key: 'createTime', visible: true, label: '创建时间', minWidth: '120', sortable: true, align: 'center'} {key: 'createTime', visible: true, label: '创建时间', minWidth: '120', sortable: true, align: 'center'}
], ],
// 排序方式 // 排序方式

3
src/views/system/hallEqu/index.vue
View File

@ -368,6 +368,7 @@ export default {
picture: undefined, picture: undefined,
pictures: [], pictures: [],
tags: [], tags: [],
code: '',
ruleIds: [], ruleIds: [],
specification: undefined, specification: undefined,
// billingMode: 'basePrice', // 默认计费方式 // billingMode: 'basePrice', // 默认计费方式
@ -473,6 +474,7 @@ export default {
this.form = { this.form = {
roomId: undefined, roomId: undefined,
roomName: undefined, roomName: undefined,
code: '',
storeId: this.query.storeId, storeId: this.query.storeId,
merchantId: this.query.merchantId, merchantId: this.query.merchantId,
type: undefined, type: undefined,
@ -506,6 +508,7 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.handleMerchantChange(this.query.merchantId);
this.open = true; this.open = true;
this.title = "添加设施"; this.title = "添加设施";
}, },

6
src/views/system/order/order_detail.vue
View File

@ -143,7 +143,9 @@
<el-descriptions-item label="实付金额">{{ order.payFee | dv }} 元</el-descriptions-item> <el-descriptions-item label="实付金额">{{ order.payFee | dv }} 元</el-descriptions-item>
<el-descriptions-item label="手续费">{{ order.handlingCharge | dv }} 元</el-descriptions-item> <el-descriptions-item label="手续费">{{ order.handlingCharge | dv }} 元</el-descriptions-item>
<el-descriptions-item label="平台服务费">{{ order.platformServiceFee | dv }} 元</el-descriptions-item> <el-descriptions-item label="平台服务费">{{ order.platformServiceFee | dv }} 元</el-descriptions-item>
<el-descriptions-item label="退款金额">{{ order.refund | dv }} 元</el-descriptions-item> <el-descriptions-item label="退款金额">
<span style="color: red; font-weight: bold;">{{ order.refund | dv }} 元</span>
</el-descriptions-item>
<!-- <el-descriptions-item label="扣除金额">{{ order.deductionAmount | dv }} 元</el-descriptions-item>--> <!-- <el-descriptions-item label="扣除金额">{{ order.deductionAmount | dv }} 元</el-descriptions-item>-->
</el-descriptions> </el-descriptions>
</div> </div>
@ -154,7 +156,7 @@
<!-- 右侧操作履历 --> <!-- 右侧操作履历 -->
<div class="detail-right"> <div class="detail-right">
<div class="info-sections history-section"> <div class="info-sections history-section">
<h3> <h3 style="font-size: 16px">
<i class="el-icon-time" style="color: #E6A23C;"></i> <i class="el-icon-time" style="color: #E6A23C;"></i>
操作履历 操作履历
</h3> </h3>

24
src/views/system/refund/index.vue
View File

@ -43,22 +43,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="退款金额" prop="amount">
<el-input
v-model="queryParams.amount"
placeholder="请输入退款金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="退款结果" prop="refundResult">
<el-input
v-model="queryParams.refundResult"
placeholder="请输入退款结果"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商户" prop="merchantId"> <el-form-item label="商户" prop="merchantId">
<el-input <el-input
v-model="queryParams.merchantId" v-model="queryParams.merchantId"
@ -171,9 +155,9 @@
<el-form-item label="退款原因" prop="reason"> <el-form-item label="退款原因" prop="reason">
<el-input v-model="form.reason" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.reason" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="退款结果" prop="refundResult"> <!-- <el-form-item label="退款结果" prop="refundResult">-->
<el-input v-model="form.refundResult" placeholder="请输入退款结果" /> <!-- <el-input v-model="form.refundResult" placeholder="请输入退款结果" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="商户" prop="merchantId"> <el-form-item label="商户" prop="merchantId">
<el-input v-model="form.merchantId" placeholder="请输入商户" /> <el-input v-model="form.merchantId" placeholder="请输入商户" />
</el-form-item> </el-form-item>
@ -219,7 +203,7 @@ export default {
{key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'amount', visible: true, label: '退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'amount', visible: true, label: '退款金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'reason', visible: true, label: '退款原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'reason', visible: true, label: '退款原因', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'refundResult', visible: true, label: '退款结果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, // {key: 'refundResult', visible: true, label: '退款结果', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
// {key: 'merchant', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, // {key: 'merchant', visible: true, label: '商户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
{key: 'operTime', visible: true, label: '操作时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, {key: 'operTime', visible: true, label: '操作时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null},
], ],

3
src/views/system/room/index.vue
View File

@ -345,6 +345,7 @@ export default {
type: null, type: null,
type2: "1", type2: "1",
hour: null, hour: null,
code: '',
picture: '', picture: '',
pictures: [], pictures: [],
tags: [], tags: [],
@ -450,6 +451,7 @@ export default {
merchantId: this.query.merchantId, merchantId: this.query.merchantId,
type: null, type: null,
type2: "1", type2: "1",
code: '',
hour: null, hour: null,
picture: '', picture: '',
pictures: [], pictures: [],
@ -491,6 +493,7 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.handleMerchantChange(this.query.merchantId);
this.open = true; this.open = true;
this.title = "添加房间"; this.title = "添加房间";
}, },

10
src/views/system/room/room_detail.vue
View File

@ -250,7 +250,7 @@
merchantId: room.merchantId merchantId: room.merchantId
}" /> }" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="设施列表" name="equipments" :lazy="true"> <el-tab-pane v-if="!isEquipment" label="设施列表" name="equipments" :lazy="true">
<equipment :query="{ <equipment :query="{
roomId: room.roomId, roomId: room.roomId,
storeId: Number(room.storeId), storeId: Number(room.storeId),
@ -413,17 +413,19 @@ export default {
explain: undefined, explain: undefined,
mode: undefined mode: undefined
}, },
isEquipment: false, // 是否为设施详情
} }
}, },
computed: {
isEquipment() {
return this.$route.query.type === 'equipment';
}
},
created() { created() {
this.handleRuleQuery() this.handleRuleQuery()
this.getDetail() this.getDetail()
this.getDictData() this.getDictData()
this.getStoreOptions() this.getStoreOptions()
this.getDomain2() this.getDomain2()
this.isEquipment = this.$route.query.type === 'equipment';
}, },
methods: { methods: {

29
src/views/system/store/components/StoreForm.vue
View File

@ -2,8 +2,8 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="isAdmin" label="商户" prop="merchantId"> <el-form-item v-if="query.isAdmin" label="商户" prop="merchantId">
<el-select v-model="form.merchantId" filterable placeholder="请选择商户"> <el-select v-model="form.merchantId" filterable placeholder="请选择商户" :disabled="query.merchantId">
<el-option <el-option
v-for="merchant in merchantOptions" v-for="merchant in merchantOptions"
:key="merchant.userId" :key="merchant.userId"
@ -143,13 +143,11 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
storeId: { query: {
type: [String, Number], type: Object,
default: null default: () => {
}, return {}
isAdmin: { }
type: Boolean,
default: false
} }
}, },
data() { data() {
@ -157,7 +155,7 @@ export default {
open: this.visible, open: this.visible,
title: "", title: "",
form: { form: {
storeId: null, storeId: this.query.storeId,
name: null, name: null,
contactName: null, contactName: null,
contactMobile: null, contactMobile: null,
@ -168,7 +166,7 @@ export default {
lat: null, lat: null,
businessTimeStart: null, businessTimeStart: null,
businessTimeEnd: null, businessTimeEnd: null,
merchantId: null merchantId: this.query.merchantId
}, },
merchantOptions: [], merchantOptions: [],
rules: { rules: {
@ -195,7 +193,7 @@ export default {
this.open = val; this.open = val;
if (val) { if (val) {
this.reset(); this.reset();
if (this.storeId) { if (this.query.storeId) {
this.title = "修改店铺"; this.title = "修改店铺";
this.getStoreInfo(); this.getStoreInfo();
} else { } else {
@ -220,7 +218,7 @@ export default {
}); });
}, },
getStoreInfo() { getStoreInfo() {
getStore(this.storeId).then(response => { getStore(this.query.storeId).then(response => {
this.form = response.data; this.form = response.data;
// 处理图片 // 处理图片
if (!this.form.picture && Array.isArray(this.form.pictures) && this.form.pictures.length > 0) { if (!this.form.picture && Array.isArray(this.form.pictures) && this.form.pictures.length > 0) {
@ -261,8 +259,9 @@ export default {
}, },
reset() { reset() {
this.form = { this.form = {
storeId: null, storeId: this.query.storeId,
name: null, name: null,
code: '',
contactName: null, contactName: null,
contactMobile: null, contactMobile: null,
idcard: null, idcard: null,
@ -272,7 +271,7 @@ export default {
lat: null, lat: null,
businessTimeStart: null, businessTimeStart: null,
businessTimeEnd: null, businessTimeEnd: null,
merchantId: null merchantId: this.query.merchantId
}; };
this.resetForm("form"); this.resetForm("form");
} }

8
src/views/system/store/index.vue
View File

@ -232,8 +232,11 @@
<!-- 添加或修改店铺对话框 --> <!-- 添加或修改店铺对话框 -->
<store-form <store-form
:visible.sync="showStoreForm" :visible.sync="showStoreForm"
:store-id="currentStoreId" :query="{
:is-admin="isAdmin" merchantId: query.merchantId,
isAdmin: isAdmin,
storeId: currentStoreId
}"
@success="handleFormSuccess" @success="handleFormSuccess"
@cancel="handleFormCancel" @cancel="handleFormCancel"
/> />
@ -658,6 +661,7 @@ export default {
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset();
this.currentStoreId= null this.currentStoreId= null
this.showStoreForm = true; this.showStoreForm = true;
}, },

10
src/views/system/store/store_detail.vue
View File

@ -251,7 +251,7 @@
merchantId: storeData.merchantId merchantId: storeData.merchantId
}"/> }"/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="设施列表" name="equipments" :lazy="true"> <el-tab-pane label="大厅设施" name="equipments" :lazy="true">
<equipment :query="{ <equipment :query="{
storeId: Number(storeId), storeId: Number(storeId),
merchantId: storeData.merchantId merchantId: storeData.merchantId
@ -287,8 +287,11 @@
<!-- 添加或修改店铺对话框 --> <!-- 添加或修改店铺对话框 -->
<store-form <store-form
:visible.sync="showStoreForm" :visible.sync="showStoreForm"
:store-id="currentStoreId" :query="{
:is-admin="isAdmin" merchantId: storeData.merchantId,
isAdmin: isAdmin,
storeId: currentStoreId
}"
@success="handleFormSuccess" @success="handleFormSuccess"
@cancel="handleFormCancel" @cancel="handleFormCancel"
/> />
@ -881,6 +884,7 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate() { handleUpdate() {
this.currentStoreId = this.storeId; this.currentStoreId = this.storeId;
console.log("this.currentStoreId----------"+this.currentStoreId)
this.showStoreForm = true; this.showStoreForm = true;
}, },
} }

11
src/views/system/withdraw/index.vue
View File

@ -69,9 +69,9 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="withdrawList" :data="withdrawList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="defaultSort" :default-sort="defaultSort"
@sort-change="onSortChange" @sort-change="onSortChange"
@ -98,6 +98,11 @@
{{d.row[column.key]}} {{d.row[column.key]}}
</router-link> </router-link>
</template> </template>
<template v-else-if="column.key === 'amount'">
<span>
{{d.row[column.key] || dv}}元
</span>
</template>
<template v-else-if="column.key === 'createTime'"> <template v-else-if="column.key === 'createTime'">
<span>{{ parseTime(d.row[column.key], '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(d.row[column.key], '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>

1
src/views/user/user/components/UserConfigDialog.vue
View File

@ -26,6 +26,7 @@
<el-input <el-input
v-model.number="form.dividendProportion" v-model.number="form.dividendProportion"
type="number" type="number"
disabled
:min="0" :min="0"
:max="100" :max="100"
:step="0.01" :step="0.01"

7
src/views/user/user/detail.vue
View File

@ -34,9 +34,9 @@
<el-row type="flex" justify="end" > <el-row type="flex" justify="end" >
<el-button v-if="detail.userType === '01'" type="text" icon="el-icon-plus" size="mini" @click="handleAddAccount" <el-button v-if="detail.userType === '01'" type="text" icon="el-icon-plus" size="mini" @click="handleAddAccount"
v-hasPermi="['system:smUser:edit']">加账</el-button> v-hasPermi="['system:smUser:edit']">加账</el-button>
<el-button v-if="detail.userType === '01'" type="text" icon="el-icon-minus" size="mini" @click="handleReduceAccount" <el-button v-if="detail.userType === '01' || detail.userType === '05'" type="text" icon="el-icon-minus" size="mini" @click="handleReduceAccount"
v-hasPermi="['system:smUser:edit']">减账</el-button> v-hasPermi="['system:smUser:edit']">减账</el-button>
<el-button type="text" icon="el-icon-setting" size="mini" @click="handleUpdateRisk" <el-button v-if="detail.userType !== '00'" type="text" icon="el-icon-setting" size="mini" @click="handleUpdateRisk"
v-hasPermi="['system:smUser:edit']">配置</el-button> v-hasPermi="['system:smUser:edit']">配置</el-button>
</el-row> </el-row>
</div> </div>
@ -250,7 +250,7 @@
merchantId: detail.userId merchantId: detail.userId
}" /> }" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="设施列表" name="equipments" :lazy="true"> <el-tab-pane label="大厅设施" name="equipments" :lazy="true">
<equipment :query="{ <equipment :query="{
merchantId: detail.userId merchantId: detail.userId
}" /> }" />
@ -549,6 +549,7 @@ export default {
this.loading = true; this.loading = true;
getUser(this.$route.params.userId, params).then(response => { getUser(this.$route.params.userId, params).then(response => {
this.detail = response.data; this.detail = response.data;
this.detail.serviceFeeProportion = this.detail.serviceFeeProportion * 100;
// 初始化收入趋势图表 // 初始化收入趋势图表
this.$nextTick(() => { this.$nextTick(() => {
this.initDailyChart(); this.initDailyChart();

15
src/views/user/user/index.vue
View File

@ -148,24 +148,11 @@
@click="handleView(scope.row)" @click="handleView(scope.row)"
v-hasPermi="['system:smUser:detail']" v-hasPermi="['system:smUser:detail']"
>详情</el-button> >详情</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['system:smUser:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['system:smUser:remove']"-->
<!-- >删除</el-button>-->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-setting" icon="el-icon-setting"
v-if="scope.row.userType !== '00'"
@click="handleUpdateRisk(scope.row)" @click="handleUpdateRisk(scope.row)"
v-hasPermi="['system:smUser:edit']" v-hasPermi="['system:smUser:edit']"
>配置</el-button> >配置</el-button>