chuangte/smart-switch-ui
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
墨大叔 2024-10-09 16:03:00 +08:00
parent e916467e18
commit 8be60ed4e1
13 changed files with 563 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/agent/device.js Normal file
View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
/**
* 代理商获取设备列表
*/
export function agentListDevice(params) {
return request({
url: "/agent/device/list",
method: 'get',
params
})
}
/**
* 代理商解绑设备商户
* @param deviceId 设备ID
*/
export function agentUnbindDeviceMch(deviceId) {
return request({
url: "/agent/device/unbindMch",
method: 'put',
params: {
deviceId
}
})
}

2
src/router/agentRouter.js
View File

@ -69,7 +69,7 @@ export const agentRoutes = [
},
{
path: 'agent',
component: () => import('@/views/mch/device'),
component: () => import('@/views/agent/device'),
hidden: false,
name: "AgentDevice",
meta: {

15
src/utils/constants.js
View File

@ -1,6 +1,4 @@
// 视图
import { exp } from 'qrcode/lib/core/galois-field'
// 管理员视图
export const views = {
user: 'user', // 用户
mch: 'mch', // 商户
@ -9,6 +7,17 @@ export const views = {
transfer: 'transfer', // 转账
withdraw: 'withdraw', // 提现
recharge: 'recharge', // 充值订单
agent: 'agent', // 代理商
}
// 代理商视图
export const agentViews = {
agent: "a_agent", // 代理商
}
// 商户视图
export const mchViews = {
mch: "m_mch",
}
// 收款账户类型

31
src/utils/mixins.js
View File

@ -1,4 +1,14 @@
import { ApiPriceType, RechargeStatus, SuitFeeType, views } from '@/utils/constants'
import {
agentViews,
ApiPriceType,
mchViews,
RechargeStatus,
SmUserType,
SuitFeeType,
UserType,
views
} from '@/utils/constants'
import { mapGetters } from 'vuex'
export const $view = {
props: {
@ -9,7 +19,9 @@ export const $view = {
},
data() {
return {
views
views,
agentViews,
mchViews
}
},
computed: {
@ -157,3 +169,18 @@ export const $recharge = {
}
},
}
export const $smRoles = {
computed: {
...mapGetters(['smUserType', 'userType']),
isAdmin() {
return this.userType === UserType.ADMIN;
},
isAgent() {
return this.userType === UserType.APP && this.smUserType === SmUserType.AGENT;
},
isMch() {
return this.userType === UserType.APP && this.smUserType === SmUserType.MCH;
},
},
}

410
src/views/agent/device/index.vue Normal file
View File

@ -0,0 +1,410 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="SN" prop="deviceNo">
<el-input
v-model="queryParams.deviceNo"
placeholder="请输入设备SN"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="MAC" prop="mac">
<el-input
v-model="queryParams.mac"
placeholder="请输入设备Mac"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="型号" prop="model">
<el-input
v-model="queryParams.model"
placeholder="请输入型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input
v-model="queryParams.deviceName"
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="店铺名称" prop="storeName">
<el-input
v-model="queryParams.storeName"
placeholder="请输入店铺名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="在线状态" prop="onlineStatus">
<el-select v-model="queryParams.onlineStatus" placeholder="请选择在线状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.sm_device_online_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.sm_device_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<device-table :loading="loading" :data="deviceList" @selection-change="handleSelectionChange" :view="agentViews.agent">
<template v-slot:operate="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleSee(scope.row)"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="scope.row.userId != null"
@click="handleUnbind(scope.row)"
>解绑商户</el-button>
</template>
</device-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<sn-input :show.sync="showBindSn" @submit="onSubmitSn"></sn-input>
<!-- 添加或修改设备对话框 -->
<el-dialog :title="title" :visible.sync="open" width="400px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="5em">
<el-row :gutter="gutter">
<form-col :span="span" label="服务费" prop="agentServiceRate">
<el-input v-model="form.agentServiceRate" placeholder="请输入服务费" >
<template #append>%</template>
</el-input>
</form-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!--型号选择弹窗-->
<model-dialog
:show.sync="showCheckModel"
@select="onSubmitBatchModel"
/>
</div>
</template>
<script>
import {
updateDeviceSn,
batchUpdateModel, updateDeviceServiceRate
} from '@/api/system/device'
import ModelSelect from "@/components/Business/Model/modelSelect.vue";
import SmUserSelect from "@/components/Business/SmUser/smUserSelect.vue";
import QrCode from "@/components/QrCode/index.vue";
import {getWxIndexUrl} from "@/utils/wx";
import SnInput from '@/components/SnInput/index.vue'
import StoreInput from '@/components/Business/Store/StoreInput.vue'
import UserInput from '@/components/Business/SmUser/UserInput.vue'
import { isEmpty } from '@/utils'
import ModelDialog from '@/components/Business/Model/modelDialog.vue'
import UserLink from '@/components/Business/SmUser/UserLink.vue'
import StoreLink from '@/components/Business/Store/StoreLink.vue'
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import { $serviceType } from '@/utils/mixins'
import { mchGetDevice, mchUpdateDevice } from '@/api/mch/device'
import DeviceTable from '@/views/system/device/components/DeviceTable.vue'
import { agentListDevice, agentUnbindDeviceMch } from '@/api/agent/device'
import { agentViews, views } from '@/utils/constants'
export default {
name: "MyDevice",
mixins: [$serviceType],
components: { DeviceTable, DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit'],
data() {
return {
// 是否展示选择型号弹窗
showCheckModel: false,
span: 24,
gutter: 8,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 设备表格数据
deviceList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
storeName: null,
deviceName: null,
model: null,
mac: null,
deviceNo: null,
onlineStatus: null,
status: null,
userName: null,
tenantName: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
modelId: [
{ required: true, message: "型号不能为空", trigger: "change" }
],
mac: [
{ required: true, message: "设备MAC不能为空", trigger: "change" }
],
},
// 房租提醒日期选项配置
expireDatePickerOptions: {
disabledDate(date) {
return date.getTime() <= Date.now();
}
},
showBindSn: false,
snLoading: false,
};
},
computed: {
agentViews() {
return agentViews
},
views() {
return views
},
isEdit() {
return this.title === "修改设备";
},
// 二维码文本
qrCodeText() {
return (device) => {
return getWxIndexUrl({ s: device.deviceNo});
}
},
},
created() {
this.getList();
},
methods: {
// 选中型号后
onSubmitBatchModel(model) {
if (model == null) {
return;
}
batchUpdateModel(this.ids, model.modelId).then(res => {
if (res.code === 200) {
this.$message.success("操作成功");
this.showCheckModel = false;
this.getList();
}
})
},
isEmpty,
handleBindSn(row) {
this.form.deviceId = row.deviceId;
this.showBindSn = true;
},
// 绑定SN
onSubmitSn(data) {
this.snLoading = true;
updateDeviceSn(this.form.deviceId, data.sn).then(res => {
if (res.code !== 200) {
return this.$message.error(res.msg);
}
this.$message.success("操作成功");
this.showBindSn = false;
this.getList();
}).finally(()=> {
this.snLoading = false;
})
},
// 选中店铺后
onSubmitGroup(group) {
this.form.groupId = group?.groupId;
this.form.groupName = group?.groupName;
},
// 选中型号后
onSubmitModel(model) {
this.form.model = model?.modelName;
// 若是新增，则填入默认的服务费
if (this.form.deviceId == null) {
this.form.serviceType = model?.serviceType;
this.form.serviceRate = model?.serviceRate;
}
},
/** 查询设备列表 */
getList() {
this.loading = true;
agentListDevice(this.queryParams).then(response => {
this.deviceList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
deviceId: null,
picture: null,
modelId: null,
mac: null,
deviceNo: null,
deviceName: null,
serviceType: '1',
serviceRate: null,
remark: null,
startTime: null,
startUnit: "3",
startPrice: null,
overTime: null,
overUnit: "3",
overPrice: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.deviceId)
this.single = selection.length!==1
this.multiple = !selection.length
},
// 查看按钮操作
handleSee(row) {
this.$router.push({path: `/device/${row.deviceId}`})
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加设备";
},
// 重置服务费
handleResetService(row) {
this.$confirm(`确定重置设备${row.deviceNo}的服务费吗？`, '重置服务费', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading = true;
updateDeviceServiceRate(row.deviceId, null).then(res => {
if (res.code === 200) {
this.$message.success("重置成功")
}
}).finally(() => {
this.getList();
})
})
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const deviceId = row.deviceId || this.ids
mchGetDevice(deviceId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改设备";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.deviceId != null) {
mchUpdateDevice(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
}
}
});
},
handleBatchModel() {
this.showCheckModel = true;
},
/** 解绑按钮操作 */
handleUnbind(row) {
this.$modal.confirm(`是否确认解绑设备【${row.deviceName}(${row.deviceNo})】的商户？`).then(function() {
return agentUnbindDeviceMch(row.deviceId);
}).then(() => {
this.getList();
this.$modal.msgSuccess("解绑成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/device/export', {
...this.queryParams
}, `device_${new Date().getTime()}.xlsx`)
}
}
};
</script>

107
src/views/mch/device/index.vue
View File

@ -71,88 +71,28 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
<el-table-column type="index" width="55" align="center" label="#" />
<el-table-column label="设备名称" align="center" prop="deviceName" >
<device-link slot-scope="d" :text="d.row.deviceName" :id="d.row.deviceId"/>
</el-table-column>
<el-table-column label="设备SN" align="center" prop="deviceNo" min-width="60">
<template slot-scope="d">
<device-link :text="d.row.deviceNo" :id="d.row.deviceId"/>
</template>
</el-table-column>
<el-table-column label="设备Mac" align="center" prop="mac" min-width="100">
<device-link slot-scope="d" :text="d.row.mac" :id="d.row.deviceId"/>
</el-table-column>
<el-table-column label="所属店铺" align="center" prop="storeName" >
<store-link slot-scope="d" :id="d.row.storeId" :name="d.row.storeName"/>
</el-table-column>
<el-table-column label="图片" align="center" prop="picture" width="100">
<template slot-scope="scope">
<image-preview v-if="isEmpty(scope.row.customPicture)" :src="scope.row.picture" :width="50" :height="50"/>
<image-preview v-else :src="scope.row.customPicture" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="二维码" align="center" width="80">
<template slot-scope="d">
<el-popover
placement="top"
width="180"
trigger="hover">
<div class="qr-code-box">
<qr-code :text="qrCodeText(d.row)" :width="150" :height="150" />
<p>扫描二维码进行设备绑定</p>
</div>
<el-button slot="reference" type="text" icon="el-icon-picture">查看</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="在线状态" align="center" prop="onlineStatus" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sm_device_online_status" :value="scope.row.onlineStatus"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" width="80">
<template slot-scope="scope">
<dict-tag :options="dict.type.sm_device_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="服务费" align="center" prop="serviceRate" >
<template slot-scope="d">
<template v-if="d.row.serviceRate == null || d.row.serviceType == null">跟随用户</template>
<template v-else>
<dict-tag :options="dict.type.service_type" :value="d.row.serviceType"/>
{{d.row.serviceRate}} {{serviceUnit(d.row.serviceType)}}
</template>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
<el-table-column label="设备租期" align="center" prop="rentTime" width="180"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleSee(scope.row)"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleUnbind(scope.row)"
>解绑</el-button>
</template>
</el-table-column>
</el-table>
<device-table :loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
<template v-slot:operate="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleSee(scope.row)"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleUnbind(scope.row)"
>解绑</el-button>
</template>
</device-table>
<pagination
v-show="total>0"
@ -250,11 +190,12 @@ import StoreLink from '@/components/Business/Store/StoreLink.vue'
import DeviceLink from '@/components/Business/Device/DeviceLink.vue'
import { $serviceType } from '@/utils/mixins'
import { mchGetDevice, mchListDevice, mchUnbindDevice, mchUpdateDevice } from '@/api/mch/device'
import DeviceTable from '@/views/system/device/components/DeviceTable.vue'
export default {
name: "MyDevice",
mixins: [$serviceType],
components: { DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
components: { DeviceTable, DeviceLink, StoreLink, UserLink, ModelDialog, UserInput, StoreInput, SnInput, QrCode, SmUserSelect, ModelSelect},
dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit'],
data() {
return {

15
src/views/mch/storeApply/detail.vue
View File

@ -36,24 +36,9 @@
<dict-tag :value="value" :options="dict.type.ss_store_type" size="small"/>
</template>
</change-field>
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（起始）" prop="businessTimeStart" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（结束）" prop="businessTimeEnd" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="经度" prop="lng" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="纬度" prop="lat" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="省" prop="province" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="市" prop="city" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="区" prop="county" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="地址" prop="address" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="联系人" prop="contactName" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="联系电话" prop="contactMobile" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="是否展示" prop="show">
<template #old="{value}">
{{value ? '是' : '否'}}
</template>
<template #new="{value}">
{{value ? '是' : '否'}}
</template>
</change-field>
</ul>
</el-card>
</el-col>

6
src/views/ss/store/detail.vue
View File

@ -19,6 +19,9 @@
<el-descriptions-item label="营业时间">
{{store.businessTimeStart | defaultValue}} 至 {{store.businessTimeEnd | defaultValue}}
</el-descriptions-item>
<el-descriptions-item label="非营业时间使用">
<boolean-tag :value="store.useOutTime" true-text="允许" false-text="不允许" size="small"/>
</el-descriptions-item>
<el-descriptions-item label="所属商户">
<user-link :id="store.userId" :name="store.userName"/>
</el-descriptions-item>
@ -129,6 +132,7 @@ import Device from '@/views/system/device/index.vue'
import Recharge from '@/views/system/recharge/index.vue'
import { isEmpty } from '@/utils'
import deviceData from 'svg-sprite-loader/examples/custom-runtime-generator/build/main'
import BooleanTag from '@/components/BooleanTag/index.vue'
export default {
name: 'storeDetail',
@ -140,7 +144,7 @@ export default {
return views
}
},
components: { Recharge, Device, StoreApply, UserLink, StoreRechargeReport, RechargeList, DeviceList, PlaceSearchMap },
components: { BooleanTag, Recharge, Device, StoreApply, UserLink, StoreRechargeReport, RechargeList, DeviceList, PlaceSearchMap },
dicts: ['ss_store_type', 'store_status'],
data() {
return {

33
src/views/ss/store/index.vue
View File

@ -201,18 +201,25 @@
</el-select>
</form-col>
<form-col label="营业时间" prop="businessTimeStart" :span="span">
<el-time-picker
is-range
v-model="formatBusinessTime"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="HH:mm"
value-format="HH:mm"
:clearable="false"
style="width: 100%"
placeholder="请选择营业时间范围">
</el-time-picker>
<el-row type="flex">
<el-time-picker
style="flex:1"
v-model="form.businessTimeStart"
format="HH:mm"
value-format="HH:mm"
:clearable="false"
placeholder="请选择营业时间（起始）">
</el-time-picker>
<div style="margin: 0 0.5em;">至</div>
<el-time-picker
style="flex:1"
v-model="form.businessTimeEnd"
format="HH:mm"
value-format="HH:mm"
:clearable="false"
placeholder="请选择营业时间（结束）">
</el-time-picker>
</el-row>
</form-col>
<form-col label="非营业时间内使用" prop="useOutTime" :span="span" label-width="10em">
<el-switch v-model="form.useOutTime" active-text="允许" inactive-text="不允许"/>
@ -302,6 +309,8 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 20,
orderByColumn: "createTime",
isAsc: "desc",
storeId: null,
userId: null,
name: null,

31
src/views/ss/storeApply/detail.vue
View File

@ -39,25 +39,21 @@
<dict-tag :value="value" :options="dict.type.ss_store_type" size="small"/>
</template>
</change-field>
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（起始）" prop="businessTimeStart" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="营业时间（结束）" prop="businessTimeEnd" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="经度" prop="lng" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="纬度" prop="lat" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="省" prop="province" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="市" prop="city" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="区" prop="county" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="地址" prop="address" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="联系人" prop="contactName" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="联系电话" prop="contactMobile" />
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="是否展示" prop="show">
<template #old="{value}">
{{value ? '是' : '否'}}
</template>
<template #new="{value}">
{{value ? '是' : '否'}}
</template>
</change-field>
<change-field :new-data="detail.newData" :old-data="detail.oldData" label="地址" prop="address" />
</ul>
<place-search-map
v-if="detail.newData"
:key="detail.id"
width="100%"
height="300px"
:init-lat="detail.newData.lat"
:init-lng="detail.newData.lng"
enable-geo
marker-type="store"
/>
</el-card>
</el-col>
<el-col :span="24 - span">
@ -90,10 +86,11 @@ import { StoreApplyStatus } from '@/utils/constants'
import ChangeField from '@/views/ss/storeApply/component/ChangeField.vue'
import StoreLink from '@/components/Business/Store/StoreLink.vue'
import UserLink from '@/components/Business/SmUser/UserLink.vue'
import PlaceSearchMap from '@/components/Map/PlaceSearch/PlaceSearchMap.vue'
export default {
name: "StoreApplyDetail",
components: { UserLink, StoreLink, ChangeField },
components: { PlaceSearchMap, UserLink, StoreLink, ChangeField },
dicts: ['store_apply_type', 'store_apply_status', 'ss_store_type'],
props: {
id: {

33
src/views/system/device/components/DeviceTable.vue
View File

@ -22,15 +22,15 @@
</el-popover>
</template>
</el-table-column>
<el-table-column label="MAC-1" align="center" prop="mac" min-width="100">
<el-table-column label="MAC-1" align="center" prop="mac" min-width="100" v-if="isAdmin">
<device-link slot-scope="d" :text="d.row.mac" :id="d.row.deviceId"/>
</el-table-column>
<el-table-column label="MAC-2" align="center" prop="mac2" min-width="100">
<el-table-column label="MAC-2" align="center" prop="mac2" min-width="100" v-if="isAdmin">
<device-link slot-scope="d" :text="d.row.mac2" :id="d.row.deviceId"/>
</el-table-column>
<el-table-column label="设备SN" align="center" prop="deviceNo" min-width="100">
<template slot-scope="d">
<el-link type="danger" v-if="d.row.deviceNo == null" @click="handleBindSn(d.row)">点击绑定</el-link>
<el-link type="danger" v-if="d.row.deviceNo == null && isAdmin" @click="handleBindSn(d.row)">点击绑定</el-link>
<device-link v-else :text="d.row.deviceNo" :id="d.row.deviceId"/>
</template>
</el-table-column>
@ -48,20 +48,20 @@
<dict-tag :options="dict.type.sm_device_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="服务模式" align="center" prop="serviceMode">
<el-table-column label="服务模式" align="center" prop="serviceMode" v-if="isAdmin">
<template slot-scope="d">
<dict-tag :options="dict.type.device_service_mode" :value="d.row.serviceMode"/>
</template>
</el-table-column>
<el-table-column label="归属信息" align="center" width="180">
<el-table-column label="归属信息" align="center" width="180" >
<template slot-scope="d">
<template v-if="d.row.userId != null">
<template v-if="d.row.userId != null" >
商户:<user-link :id="d.row.userId" :name="d.row.userName"/><br/>
</template>
<template v-if="d.row.storeId != null">
店铺:<store-link :id="d.row.storeId" :name="d.row.storeName"/><br/>
</template>
<template v-if="d.row.agentId != null">
<template v-if="d.row.agentId != null && isAdmin">
代理:<user-link :id="d.row.agentId" :name="d.row.agentName"/>
</template>
</template>
@ -72,20 +72,21 @@
月费：{{d.row.monthFee | money | defaultValue}} 元 / 月 <br/>
</template>
<template v-if="d.row.serviceMode === DeviceServiceMode.DIRECT">
平台：{{d.row.realServiceRate | money | defaultValue}} % <br/>
{{isAdmin ? '平台' : '服务费'}}：{{d.row.realServiceRate | money | defaultValue}} % <br/>
</template>
<template v-if="d.row.serviceMode === DeviceServiceMode.AGENT">
代理：{{d.row.agentServiceRate | money | defaultValue}} % <br/>
{{isAdmin ? '代理' : '服务费'}}：{{d.row.agentServiceRate | money | defaultValue}} % <br/>
</template>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="创建时间" align="center" prop="createTime" width="100"/>
<el-table-column label="到期时间" align="center" prop="rentTime" width="100"/>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip v-if="isAdmin"/>
<el-table-column label="最后在线" align="center" prop="lastOnlineTime" width="100"/>
<el-table-column label="绑定时间" align="center" prop="activationTime" width="100"/>
<el-table-column label="到期时间" align="center" prop="rentTime" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="100" v-if="isAdmin"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
<template slot-scope="scope">
<slot :row="scope.row"/>
<slot :row="scope.row" name="operate"/>
</template>
</el-table-column>
</el-table>
@ -98,9 +99,11 @@ import UserLink from '@/components/Business/SmUser/UserLink.vue'
import { isEmpty } from '@/utils'
import { getWxIndexUrl } from '@/utils/wx'
import { DeviceServiceMode } from '@/utils/constants'
import { $smRoles, $view } from '@/utils/mixins'
export default {
name: "DeviceTable",
mixins: [$view, $smRoles],
components: { UserLink, DeviceLink, StoreLink, QrCode },
dicts: ['sm_device_online_status', 'sm_device_status', 'sm_device_outage_way','sm_device_notice_way', 'service_type', 'time_unit', 'device_service_mode'],
props: {
@ -128,6 +131,10 @@ export default {
},
methods: {
isEmpty,
handleBindSn(row) {
this.form.deviceId = row.deviceId;
this.showBindSn = true;
},
}
}
</script>

1
src/views/system/device/detail.vue
View File

@ -111,7 +111,6 @@
</el-descriptions>
<el-button size="small" style="width: 100%" plain icon="el-icon-link" type="danger" @click="handleUnbind" :disabled="deviceData.userId == null">解绑商户</el-button>
</el-card>
</el-col>
</el-row>

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

@ -130,7 +130,7 @@
</el-row>
<device-table :data="deviceList" :loading="loading" @selection-change="handleSelectionChange">
<template slot-scope="scope">
<template v-slot:operate="scope">
<el-button
size="mini"
type="text"
@ -402,10 +402,6 @@ export default {
})
},
isEmpty,
handleBindSn(row) {
this.form.deviceId = row.deviceId;
this.showBindSn = true;
},
// 绑定SN
onSubmitSn(data) {
this.snLoading = true;