Skip to content

P
peizhen-vue
Commit af08c508 by 裴梁博
Options

Merge branch 'feature/v1/plb' into 'master' 

Feature/v1/plb

See merge request !10
parents 663ca36a cc831732
Showing with 907 additions and 501 deletions
package.json
......@@ -52,6 +52,7 @@
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"vue": "2.6.12",
"vue-animate-number": "^0.4.2",
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
......
src/assets/styles/variables.scss
// base color
$blue:#324157;
$light-blue:#3A71A8;
// $blue:#324157;
$blue:#107c3d;
// $light-blue:#3A71A8;
$light-blue:#00A546;
$red:#C03639;
$pink: #E65D6E;
$green: #30B08F;
......@@ -11,17 +13,22 @@ $panGreen: #30B08F;
// 自定义暗色菜单风格
$base-menu-color:hsla(0,0%,100%,.65);
$base-menu-color-active:#fff;
$base-menu-background:#010509;
// $base-menu-color:hsla(0,0%,100%,.65);
$base-menu-color:#718096FF;
// $base-menu-color-active:#fff;
$base-menu-color-active:#718096FF;
// $base-menu-background:#010509;
$base-menu-background:#ffffff;
$base-logo-title-color: #ffffff;
$base-menu-light-color:rgba(0,0,0,.70);
$base-menu-light-background:#ffffff;
$base-logo-light-title-color: #010509;
$base-sub-menu-background:#010509;
$base-sub-menu-hover: #010509;
// $base-sub-menu-background:#010509;
$base-sub-menu-background:#ffffff;
// $base-sub-menu-hover: #010509;
$base-sub-menu-hover: #ffffff;
$base-sidebar-width: 200px;
......@@ -39,3 +46,13 @@ $base-sidebar-width: 200px;
logoTitleColor: $base-logo-title-color;
logoLightTitleColor: $base-logo-light-title-color
}
.search-btn {
background-color: #fafafaff !important;
border: none !important;
color: #60687eff !important;
}
.el-divider {
background-color: #00a546ff !important;
}
src/main.js
import Vue from 'vue'
/*
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-07 10:41:27
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-11-10 16:27:57
* @FilePath: \peizhen-vue\src\main.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import Vue from "vue";
import Cookies from 'js-cookie'
import Cookies from "js-cookie";
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
import Element from "element-ui";
import "./assets/styles/element-variables.scss";
import '@/assets/styles/index.scss' // global css
import '@/assets/styles/ruoyi.scss' // ruoyi css
import App from './App'
import store from './store'
import router from './router'
import directive from './directive' // directive
import plugins from './plugins' // plugins
import { download } from '@/utils/request'
import "@/assets/styles/index.scss"; // global css
import "@/assets/styles/ruoyi.scss"; // ruoyi css
import App from "./App";
import store from "./store";
import router from "./router";
import directive from "./directive"; // directive
import plugins from "./plugins"; // plugins
import { download } from "@/utils/request";
import './assets/icons' // icon
import './permission' // permission control
import "./assets/icons"; // icon
import "./permission"; // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey, updateConfigByKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
import {
parseTime,
resetForm,
addDateRange,
selectDictLabel,
selectDictLabels,
handleTree,
} from "@/utils/ruoyi";
// 分页组件
import Pagination from "@/components/Pagination";
// 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar"
import RightToolbar from "@/components/RightToolbar";
// 富文本组件
import Editor from "@/components/Editor"
import Editor from "@/components/Editor";
// 文件上传组件
import FileUpload from "@/components/FileUpload"
import FileUpload from "@/components/FileUpload";
// 图片上传组件
import ImageUpload from "@/components/ImageUpload"
import ImageUpload from "@/components/ImageUpload";
// 图片预览组件
import ImagePreview from "@/components/ImagePreview"
import ImagePreview from "@/components/ImagePreview";
// 字典标签组件
import DictTag from '@/components/DictTag'
import DictTag from "@/components/DictTag";
// 头部标签组件
import VueMeta from 'vue-meta'
import VueMeta from "vue-meta";
// 字典数据组件
import DictData from '@/components/DictData'
import DictData from "@/components/DictData";
// 全局方法挂载
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
Vue.prototype.updateConfigByKey = updateConfigByKey
Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
Vue.prototype.getDicts = getDicts;
Vue.prototype.getConfigKey = getConfigKey;
Vue.prototype.updateConfigByKey = updateConfigByKey;
Vue.prototype.parseTime = parseTime;
Vue.prototype.resetForm = resetForm;
Vue.prototype.addDateRange = addDateRange;
Vue.prototype.selectDictLabel = selectDictLabel;
Vue.prototype.selectDictLabels = selectDictLabels;
Vue.prototype.download = download;
Vue.prototype.handleTree = handleTree;
// 全局组件挂载
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
Vue.component('ImagePreview', ImagePreview)
Vue.component("DictTag", DictTag);
Vue.component("Pagination", Pagination);
Vue.component("RightToolbar", RightToolbar);
Vue.component("Editor", Editor);
Vue.component("FileUpload", FileUpload);
Vue.component("ImageUpload", ImageUpload);
Vue.component("ImagePreview", ImagePreview);
Vue.use(directive);
Vue.use(plugins);
Vue.use(VueMeta);
DictData.install();
import VueAnimateNumber from 'vue-animate-number'
Vue.use(VueAnimateNumber)
Vue.use(directive)
Vue.use(plugins)
Vue.use(VueMeta)
DictData.install()
// 数字增长动画自定义指令
Vue.directive("number", {
// 绑定元素时调用
bind: function (el, binding) {
console.log('el',el,'binding', binding)
// 获取绑定的值
var value = binding.value;
// 设置元素显示的内容为0
el.textContent = "0";
// 动画间隔为10毫秒，设置数字每10毫秒增加的值
var interval = setInterval(function () {
// 循环增加数字
var content = parseInt(el.textContent) + 1;
if (content > value) {
// 如果数字已经增加完成，清除定时器并结束循环
clearInterval(interval);
return;
}
// 更新元素内容
el.textContent = content;
}, 5);
},
});
/**
* If you don't want to use mock-server
......@@ -74,17 +116,17 @@ DictData.install()
*/
// 修改 el-dialog 默认点击遮照为不关闭
Element.Dialog.props.closeOnClickModal.default = false
Element.Dialog.props.closeOnClickModal.default = false;
Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size
})
size: Cookies.get("size") || "large", // set element-ui default size
});
Vue.config.productionTip = false
Vue.config.productionTip = false;
new Vue({
el: '#app',
el: "#app",
router,
store,
render: h => h(App)
})
render: (h) => h(App),
});
src/store/modules/app.js
/*
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-07 10:41:27
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-11-10 15:05:46
* @FilePath: \peizhen-vue\src\store\modules\app.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import Cookies from 'js-cookie'
const state = {
......@@ -7,7 +15,7 @@ const state = {
hide: false
},
device: 'desktop',
size: Cookies.get('size') || 'medium'
size: Cookies.get('size') || 'large'
}
const mutations = {
......
src/views/financialManagement/income/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -41,11 +41,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -57,7 +57,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:income:add']"
>新增</el-button>
......@@ -67,7 +67,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:income:edit']"
......@@ -78,7 +78,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:income:remove']"
......@@ -89,7 +89,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:income:export']"
>导出</el-button>
......@@ -103,6 +103,8 @@
<el-table
v-loading="loading"
:data="incomeList"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
......@@ -112,6 +114,7 @@
prop="id"
key="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="提现人员类型"
......@@ -155,8 +158,8 @@
>
<template slot-scope="{ row }">
<template v-if="row.status == 0">
<el-button type="text" @click="clickBH(row, 1)">通过</el-button>
<el-button type="text" @click="clickBH(row, 2)">拒绝</el-button>
<el-button type="primary" @click="clickBH(row, 1)">通过</el-button>
<el-button type="primary" @click="clickBH(row, 2)">拒绝</el-button>
</template>
<span v-if="row.status == 1">成功提现</span>
<span v-if="row.status == 2">拒绝提现</span>
......@@ -177,16 +180,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:income:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:income:remove']"
......
src/views/financialManagement/paymentRecord/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:paymentRecord:add']"
>新增</el-button>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:paymentRecord:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:paymentRecord:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:paymentRecord:export']"
>导出</el-button>
......@@ -83,9 +83,11 @@
v-loading="loading"
:data="paymentRecordList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" key="id" />
<el-table-column label="ID" align="center" prop="id" key="id" sortable />
<el-table-column
label="订单"
align="center"
......@@ -128,16 +130,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:paymentRecord:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:paymentRecord:remove']"
......
src/views/financialManagement/userRefund/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -41,11 +41,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -57,7 +57,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:userRefund:add']"
>新增</el-button
......@@ -68,7 +68,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:userRefund:edit']"
......@@ -80,7 +80,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:userRefund:remove']"
......@@ -92,7 +92,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:userRefund:export']"
>导出</el-button
......@@ -108,9 +108,11 @@
v-loading="loading"
:data="userRefundList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" key="id" />
<el-table-column label="ID" align="center" prop="id" key="id" sortable />
<el-table-column
label="订单"
align="center"
......@@ -154,8 +156,8 @@
>
<template slot-scope="{ row }">
<template v-if="row.status == 0">
<el-button type="text" @click="clickBH(row, 1)">通过</el-button>
<el-button type="text" @click="clickBH(row, 2)">拒绝</el-button>
<el-button type="primary" @click="clickBH(row, 1)">通过</el-button>
<el-button type="primary" @click="clickBH(row, 2)">拒绝</el-button>
</template>
<span v-if="row.status == 1">退款成功</span>
......@@ -177,16 +179,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:userRefund:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:userRefund:remove']"
......
src/views/hispotalManage/doctor/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -52,11 +52,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -68,7 +68,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -78,7 +78,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:doctor:edit']"
......@@ -89,7 +89,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:doctor:remove']"
......@@ -100,7 +100,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:doctor:export']"
>导出</el-button>
......@@ -115,9 +115,11 @@
v-loading="loading"
:data="doctorList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="ID" align="center" prop="id" sortable />
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="所属医院" align="center" prop="hname" />
<el-table-column label="所属科室" align="center" prop="dname" />
......@@ -130,15 +132,15 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
......
src/views/hispotalManage/hospital/index.vue
......@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-07 16:09:29
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-09-25 09:37:51
* @LastEditTime: 2023-11-10 15:17:06
* @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -11,7 +11,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -92,11 +92,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -108,7 +108,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -118,7 +118,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:hospital:edit']"
......@@ -130,7 +130,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:hospital:remove']"
......@@ -142,7 +142,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:hospital:export']"
>导出</el-button
......@@ -158,6 +158,8 @@
v-loading="loading"
:data="hospitalList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -165,6 +167,7 @@
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="医院名称"
......@@ -229,18 +232,19 @@
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
......
src/views/hispotalManage/office/index.vue
<template>
<div class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- <el-form :model="queryParams" ref="queryForm" size="large" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="上级科室" prop="parentId">
<el-input
v-model="queryParams.parentId"
......@@ -26,8 +26,8 @@
/>
</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-button type="primary" icon="el-icon-search" size="large" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="large" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
......@@ -37,7 +37,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -47,7 +47,7 @@
type="info"
plain
icon="el-icon-sort"
size="mini"
size="large"
@click="toggleExpandAll"
>展开/折叠</el-button
>
......@@ -57,7 +57,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:department:edit']"
......@@ -68,7 +68,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:department:remove']"
......@@ -79,7 +79,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:department:export']"
>导出</el-button>
......@@ -103,7 +103,7 @@
<span style="margin-left: 20px">
<el-button
type="text"
size="mini"
size="large"
icon="el-icon-edit"
@click="() => handleUpdate(node, data)"
>
......@@ -111,7 +111,7 @@
</el-button>
<el-button
type="text"
size="mini"
size="large"
icon="el-icon-delete"
@click="() => handleDelete(node, data)"
>
......@@ -143,7 +143,7 @@
>
<template slot-scope="scope">
<el-button
size="mini"
size="large"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -151,7 +151,7 @@
>修改</el-button
>
<el-button
size="mini"
size="large"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......
src/views/index.vue
<template>
<div class="app-container home">
<div class="index-content">
<div class="index-content-card">
<div
:class="
valueNew === item.value
? 'index-content-card-item index-content-card-itema'
: 'index-content-card-item'
"
v-for="(item, index) in [
{ label: '今天', value: 1 },
{ label: '最近7天', value: 2 },
{ label: '最近30天', value: 3 },
{ label: '总计', value: 0 },
]"
:key="index"
@click="clickValueChange(item)"
>
{{ item.label }}
</div>
</div>
<div class="index-content-nav">
<el-row :gutter="20">
<el-row :gutter="10">
<el-col :span="4" v-if="user.roleId == 3">
<div class="index-content-nav-item">
<div class="index-content-nav-item-top">
<h3>所属城市</h3>
</div>
<h2>{{ cityName ? cityName : "" }}</h2>
<h2>
<img src="@/assets/icons/p6.png" alt="" /><span>{{
cityName ? cityName : ""
}}</span>
</h2>
</div>
</el-col>
<el-col :span="4">
<div class="index-content-nav-item">
<div class="index-content-nav-item-top">
<h3>新增用户</h3>
<el-select
<!-- <el-select
v-model="valueA"
placeholder="请选择"
style="width: 10em"
style="width: 8em"
@change="dataUserAxios"
>
<el-option
......@@ -33,19 +56,28 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</div>
<h2>{{ sumA }}</h2>
<h2>
<img src="@/assets/icons/p1.png" alt="" />
<animate-number
from="1"
:to="sumA"
:key="sumA"
duration="1000"
:formatter="thoudsandW"
></animate-number>
</h2>
</div>
</el-col>
<el-col :span="4" v-if="user.roleId != 3">
<div class="index-content-nav-item">
<div class="index-content-nav-item-top">
<h3>总销售额</h3>
<el-select
<!-- <el-select
v-model="valueB"
placeholder="请选择"
style="width: 10em"
style="width: 8em"
@change="saleroomAxios"
>
<el-option
......@@ -60,19 +92,28 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</div>
<h2>{{ sumB }}</h2>
<h2>
<img src="@/assets/icons/p2.png" alt="" />
<animate-number
from="1"
:to="sumB"
:key="sumB"
duration="1000"
:formatter="thoudsand"
></animate-number>
</h2>
</div>
</el-col>
<el-col :span="4">
<div class="index-content-nav-item">
<div class="index-content-nav-item-top">
<h3>新增陪诊员</h3>
<el-select
<!-- <el-select
v-model="valueC"
placeholder="请选择"
style="width: 10em"
style="width: 8em"
@change="dataEmployeesAxios"
>
<el-option
......@@ -87,9 +128,17 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</div>
<h2>{{ sumC }}</h2>
<h2>
<img src="@/assets/icons/p3.png" alt="" />
<animate-number
from="1"
:to="sumC"
:key="sumC"
duration="1000"
></animate-number>
</h2>
</div>
</el-col>
<el-col :span="4">
......@@ -97,10 +146,10 @@
<div class="index-content-nav-item-top">
<h3 v-if="user.roleId == 3">机构收益</h3>
<h3 v-else>平台收益</h3>
<el-select
<!-- <el-select
v-model="valueD"
placeholder="请选择"
style="width: 10em"
style="width: 8em"
@change="platformRevenueAxios"
>
<el-option
......@@ -115,19 +164,27 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</div>
<h2>{{ sumD }}</h2>
<h2>
<img src="@/assets/icons/p4.png" alt="" />
<animate-number
from="1"
:to="sumD"
:key="sumD"
:formatter="thoudsand"
></animate-number>
</h2>
</div>
</el-col>
<el-col :span="4">
<div class="index-content-nav-item">
<div class="index-content-nav-item-top">
<h3>总订单量</h3>
<el-select
<!-- <el-select
v-model="valueE"
placeholder="请选择"
style="width: 10em"
style="width: 8em"
@change="orderQuantityAxios"
>
<el-option
......@@ -142,9 +199,18 @@
:value="item.value"
>
</el-option>
</el-select>
</el-select> -->
</div>
<h2>{{ sumE }}</h2>
<h2>
<img src="@/assets/icons/p5.png" alt="" />
<animate-number
from="1"
:to="sumE"
:key="sumE"
duration="1000"
:formatter="thoudsandW"
></animate-number>
</h2>
</div>
</el-col>
</el-row>
......@@ -284,6 +350,7 @@ export default {
computed: {
...mapGetters(["user", "cityName"]),
},
filters: {},
data() {
return {
// 版本号
......@@ -292,6 +359,7 @@ export default {
cityVoList: [],
cityId: "",
version: "4.8.0",
valueNew: 1,
valueA: 1,
sumA: 0,
valueB: 1,
......@@ -344,19 +412,67 @@ export default {
this.chart = null;
},
methods: {
clickValueChange(item) {
this.valueNew = item.value;
this.dataUserAxios();
this.dataEmployeesAxios();
this.platformRevenueAxios();
this.orderQuantityAxios();
if (this.user.roleId != 3) {
this.saleroomAxios();
}
},
thoudsand(value) {
if (!value) return "";
value = value.toFixed(2);
const intPart = Math.trunc(value);
// 整数部分处理，增加,
const intPartFormat = intPart
.toString()
.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
// 预定义小数部分
let floatPart = "";
// 将数值截取为小数部分和整数部分
const valueArray = value.toString().split(".");
if (valueArray.length === 2) {
// 有小数部分
floatPart = valueArray[1].toString(); // 取得小数部分
return intPartFormat + "." + floatPart;
}
return intPartFormat + floatPart;
},
thoudsandW(value) {
if (!value) return "";
value = value.toFixed();
const intPart = Math.trunc(value);
// 整数部分处理，增加,
const intPartFormat = intPart
.toString()
.replace(/(\d)(?=(?:\d{3})+$)/g, "$1,");
// 预定义小数部分
let floatPart = "";
// 将数值截取为小数部分和整数部分
const valueArray = value.toString().split(".");
if (valueArray.length === 2) {
// 有小数部分
floatPart = valueArray[1].toString(); // 取得小数部分
return intPartFormat + "." + floatPart;
}
return intPartFormat + floatPart;
},
changeCtypChange() {
this.companyId = ''
this.companyList = []
this.companyListAxios()
this.companyId = "";
this.companyList = [];
this.companyListAxios();
},
async companyListAxios() {
const data_back = await companyListGet({
cityId: this.cityId
cityId: this.cityId,
});
const { code, data } = data_back;
if (code === 200) {
this.companyList = data;
this.orderQuantityEchartsAxios()
this.orderQuantityEchartsAxios();
}
},
async cityVoListAxios() {
......@@ -435,7 +551,8 @@ export default {
},
async orderQuantityAxios() {
const { code, data } = await orderQuantityGet({
condition: this.valueE,
// condition: this.valueE,
condition: this.valueNew,
});
if (code === 200) {
this.sumE = data.dataSum || 0;
......@@ -444,6 +561,7 @@ export default {
async platformRevenueAxios() {
const { code, data } = await platformRevenueGet({
condition: this.valueD,
condition: this.valueNew,
});
if (code === 200) {
this.sumD = data.dataSum || 0;
......@@ -451,7 +569,8 @@ export default {
},
async saleroomAxios() {
const { code, data } = await saleroomGet({
condition: this.valueB,
// condition: this.valueB,
condition: this.valueNew,
});
if (code === 200) {
this.sumB = data.dataSum || 0;
......@@ -459,7 +578,8 @@ export default {
},
async dataEmployeesAxios() {
const { code, data } = await dataEmployeesGet({
condition: this.valueC,
// condition: this.valueC,
condition: this.valueNew,
});
if (code === 200) {
this.sumC = data.dataSum || 0;
......@@ -467,7 +587,8 @@ export default {
},
async dataUserAxios() {
const { code, data } = await dataUserGet({
condition: this.valueA,
// condition: this.valueA,
condition: this.valueNew,
});
if (code === 200) {
this.sumA = data.dataSum || 0;
......@@ -538,6 +659,7 @@ export default {
],
series: [
{
smooth: true,
name: xData,
// type: "bar",
type: "line",
......@@ -554,6 +676,16 @@ export default {
color: "#1506e4",
},
]),
areaStyle: {
normal: {
//LinearGradient线性渐变，可以设置挡位颜色达到渐变的效果
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{ offset: 0, color: "#1506e4" },
{ offset: 0.5, color: "#6d8bec" },
{ offset: 1, color: "#E7F2FD" },
]),
},
},
},
],
};
......@@ -634,6 +766,11 @@ export default {
}
}
.app-container {
background: #f5f6fa;
height: 100vh;
}
.index-content {
width: 100%;
&-nav {
......@@ -641,19 +778,39 @@ export default {
display: flex;
&-item {
min-height: 50px;
border-radius: 4px;
box-shadow: 0 0 10px 2px #e2dfdf;
padding: 10px;
border-radius: 5px;
// box-shadow: 0 0 10px 2px #e2dfdf;
// padding: 10px;
padding: 1em;
background: #ffffff;
&-top {
display: flex;
justify-content: space-between;
// border-bottom: 1px solid rgb(239, 239, 245);
padding-bottom: 5px;
h3 {
font-size: 1em;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #74798c;
}
}
h2 {
width: 100%;
// height: 120px;
font-weight: 500;
font-size: 50px;
font-size: 28px;
color: #000000;
margin: 0px;
padding-bottom: 10px;
display: flex;
align-items: center;
img {
width: 28px;
height: 28px;
margin: 0px 10px 5px 0px;
}
}
}
.el-row {
......@@ -670,15 +827,42 @@ export default {
&-order {
width: 100%;
margin-top: 25px;
box-shadow: 0 0 10px 2px #e2dfdf;
// box-shadow: 0 0 10px 2px #e2dfdf;
padding: 10px;
min-height: 100px;
border-radius: 4px;
background: #ffffff;
&-top {
width: 100%;
display: flex;
justify-content: space-between;
}
}
&-card {
background: #ffffff;
border-radius: 5px;
padding: 21px 26px;
margin-bottom: 20px;
display: flex;
align-items: center;
flex-wrap: wrap;
&-item {
background: #f2f2f2;
border-radius: 3px;
padding: 10px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #74798c;
margin-right: 8px;
text-align: center;
cursor: pointer;
}
&-item:hover,
&-itema {
background: #0054fe;
color: #ffffff;
}
}
}
</style>
src/views/mallManagement/apply/index.vue
......@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:43:21
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-10-25 11:33:19
* @LastEditTime: 2023-11-10 15:31:05
* @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -11,7 +11,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -28,11 +28,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -44,7 +44,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:apply:add']"
>新增</el-button>
......@@ -54,7 +54,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:apply:edit']"
......@@ -65,7 +65,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:apply:remove']"
......@@ -76,7 +76,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:apply:export']"
>导出</el-button>
......@@ -92,9 +92,18 @@
:data="applyList"
@selection-change="handleSelectionChange"
show
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="ID"
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="申请人"
align="center"
key="applyName"
......@@ -248,7 +257,7 @@
row.twoMedicalBusinessLicense &&
row.twoMedicalBusinessLicense.split(',') &&
row.twoMedicalBusinessLicense.split(',').length
? twoMedicalBusinessLicense.split(',').length
? row.twoMedicalBusinessLicense.split(',').length
: 1
"
:isShowTip="false"
......@@ -324,15 +333,15 @@
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:apply:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:apply:remove']"
......
src/views/mallManagement/income/index.vue
......@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:44:37
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-09-11 16:43:12
* @LastEditTime: 2023-11-10 15:32:37
* @FilePath: \peizhen-vue\src\views\mallManagement\income\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -11,7 +11,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -28,11 +28,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -44,7 +44,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:income:add']"
>新增</el-button>
......@@ -54,7 +54,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:income:edit']"
......@@ -65,7 +65,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:income:remove']"
......@@ -76,7 +76,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:income:export']"
>导出</el-button>
......@@ -91,9 +91,11 @@
v-loading="loading"
:data="incomeList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="ID" align="center" prop="id" sortable />
<el-table-column label="商户" align="center" prop="storeName" />
<el-table-column label="金额" align="center" prop="amount" />
<el-table-column label="发票信息" align="center" prop="invoice" />
......@@ -136,16 +138,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:income:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:income:remove']"
......
src/views/mallManagement/order/index.vue
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="商品" prop="title">
<el-input
v-model="queryParams.title"
......@@ -10,8 +17,16 @@
/>
</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-button
type="primary"
icon="el-icon-search"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
......@@ -21,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:order:add']"
>新增</el-button>
......@@ -31,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
......@@ -42,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
......@@ -53,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:order:export']"
>导出</el-button>
......@@ -61,9 +76,15 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="orderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="ID" align="center" prop="id" sortable />
<el-table-column label="城市" align="center" prop="cityName" />
<el-table-column label="商品" align="center" prop="title" />
<el-table-column label="数量" align="center" prop="num" />
......@@ -71,7 +92,7 @@
<el-table-column label="商户" align="center" prop="sname" />
<el-table-column label="用户" align="center" prop="userName" />
<el-table-column label="流程状态" align="center" prop="orderStatus">
<template slot-scope="{row}">
<template slot-scope="{ row }">
<span v-if="row.orderStatus == 0">待发货</span>
<span v-if="row.orderStatus == 1">已发货</span>
<span v-if="row.orderStatus == 2">已完成</span>
......@@ -80,7 +101,7 @@
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="toStatus">
<template slot-scope="{row}">
<template slot-scope="{ row }">
<span v-if="row.toStatus == 0">待支付</span>
<span v-if="row.toStatus == 1">已支付</span>
<span v-if="row.toStatus == 2">已完成</span>
......@@ -92,15 +113,15 @@
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']"
......@@ -110,7 +131,7 @@
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
......@@ -136,31 +157,47 @@
<el-input v-model="form.addressId" placeholder="请输入收获地址id " />
</el-form-item>
<el-form-item label="服务结束时间" prop="overTime">
<el-date-picker clearable
<el-date-picker
clearable
v-model="form.overTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择服务结束时间">
placeholder="请选择服务结束时间"
>
</el-date-picker>
</el-form-item>
<el-form-item label="完成凭证" prop="voucher">
<el-input v-model="form.voucher" type="textarea" placeholder="请输入内容" />
<el-input
v-model="form.voucher"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
<el-form-item label="" prop="logistics">
<el-input v-model="form.logistics" type="textarea" placeholder="请输入内容" />
<el-input
v-model="form.logistics"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
<el-form-item label="" prop="logisticsCode">
<el-input v-model="form.logisticsCode" placeholder="请输入" />
</el-form-item>
<el-form-item label="" prop="refundLogistics">
<el-input v-model="form.refundLogistics" type="textarea" placeholder="请输入内容" />
<el-input
v-model="form.refundLogistics"
type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
<el-form-item label="" prop="refundLogisticsCode">
<el-input v-model="form.refundLogisticsCode" placeholder="请输入" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -168,7 +205,13 @@
</template>
<script>
import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/mallManagement/order";
import {
listOrder,
getOrder,
delOrder,
addOrder,
updateOrder,
} from "@/api/mallManagement/order";
export default {
name: "Order",
......@@ -214,8 +257,7 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {
}
rules: {},
};
},
created() {
......@@ -225,7 +267,7 @@ export default {
/** 查询商城订单列表 */
getList() {
this.loading = true;
listOrder(this.queryParams).then(response => {
listOrder(this.queryParams).then((response) => {
this.orderList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -256,7 +298,7 @@ export default {
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
delFlag: undefined
delFlag: undefined,
};
this.resetForm("form");
},
......@@ -272,9 +314,9 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
......@@ -286,8 +328,8 @@ export default {
handleUpdate(row) {
this.loading = true;
this.reset();
const id = row.id || this.ids
getOrder(id).then(response => {
const id = row.id || this.ids;
getOrder(id).then((response) => {
this.loading = false;
this.form = response.data;
this.open = true;
......@@ -296,25 +338,29 @@ export default {
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
updateOrder(this.form)
.then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
})
.finally(() => {
this.buttonLoading = false;
});
} else {
addOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
addOrder(this.form)
.then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
})
.finally(() => {
this.buttonLoading = false;
});
}
}
});
......@@ -322,24 +368,32 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商城订单编号为"' + ids + '"的数据项？').then(() => {
this.loading = true;
return delOrder(ids);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
this.$modal
.confirm('是否确认删除商城订单编号为"' + ids + '"的数据项？')
.then(() => {
this.loading = true;
return delOrder(ids);
})
.then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {})
.finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/order/export', {
...this.queryParams
}, `order_${new Date().getTime()}.xlsx`)
}
}
this.download(
"system/order/export",
{
...this.queryParams,
},
`order_${new Date().getTime()}.xlsx`
);
},
},
};
</script>
src/views/operation/article/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:article:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:article:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:article:export']"
>导出</el-button>
......@@ -80,6 +80,8 @@
v-loading="loading"
:data="articleList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -87,6 +89,7 @@
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="文章标题"
......@@ -144,15 +147,15 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<!-- <el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']"
......
src/views/operation/banner/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -27,14 +27,14 @@
<el-button
type="primary"
icon="el-icon-refresh"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button
type="primary"
icon="el-icon-refresh"
size="mini"
size="large"
@click="resetQuery"
>重置</el-button
>
......@@ -47,7 +47,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['accompany:carousel:remove']"
......@@ -79,6 +79,8 @@
v-loading="loading"
:data="carouselList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -86,6 +88,7 @@
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="描述"
......@@ -153,15 +156,15 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
......
src/views/operation/business/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -28,11 +28,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -44,7 +44,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:business:add']"
>新增</el-button>
......@@ -54,7 +54,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:business:edit']"
......@@ -65,7 +65,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:business:remove']"
......@@ -76,7 +76,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:business:export']"
>导出</el-button>
......@@ -89,6 +89,8 @@
v-loading="loading"
:data="businessList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -96,6 +98,7 @@
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column label="提供医院" align="center" prop="hospitalsList">
<template slot-scope="scope">
......@@ -114,7 +117,7 @@
<el-button type="primary" round @click="clickServices(props.row)"
>服务</el-button
>
<!-- <el-button size="mini" type="text" icon="el-icon-edit">新增1111</el-button> -->
<!-- <el-button size="large" type="text" icon="el-icon-edit">新增1111</el-button> -->
</template>
</el-table-column>
<el-table-column
......@@ -131,22 +134,22 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handlenew(scope.row)"
>新增</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
......@@ -173,7 +176,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -209,19 +212,20 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuerys"
>搜索</el-button
>
</el-form-item>
</el-form>
<el-table key="inside" :data="servicesList">
<el-table key="inside" :data="servicesList" border="">
<el-table-column
prop="name"
label="服务名称"
:show-overflow-tooltip="true"
align="center"
></el-table-column>
<el-table-column prop="cover" label="封面" width="170">
<el-table-column prop="cover" label="封面" width="170" align="center">
<template slot-scope="{ row }">
<imageUpload
v-model="row.cover"
......@@ -239,39 +243,45 @@
<el-table-column
prop="highPrice"
label="高价"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="price"
label="价格"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="cityName"
label="城市"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="fenmo"
label="平台分成"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="duration"
label="时长(小时)"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="overtime"
label="超时计费/30分钟"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column label="服务时段" :show-overflow-tooltip="true">
<template slot-scope="{ row }">
<span v-if="row.startTime && row.endTime"
<span style="text-align:center" v-if="row.startTime && row.endTime"
>{{ row.startTime }} - {{ row.endTime }}</span
>
<span v-else>未设置</span>
<span style="text-align:center" v-else>未设置</span>
</template>
</el-table-column>
<el-table-column
......@@ -281,8 +291,8 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdateServe(scope.row)"
>修改服务</el-button
......@@ -303,7 +313,7 @@
style="text-align: center !important"
>
<!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> -->
<el-button @click="clcikCancel">关 闭</el-button>
<el-button @click="clcikCancel" type="primary">关 闭</el-button>
</div>
</el-dialog>
<!-- 添加或修改业务对话框 -->
......
src/views/operation/news/index.vue
......@@ -3,7 +3,7 @@
<!-- <el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -12,11 +12,11 @@
<el-button
type="primary"
icon="el-icon-refresh"
size="mini"
size="large"
@click="handleQuery"
>刷新</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-refresh" size="large" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form> -->
......@@ -26,7 +26,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -74,6 +74,8 @@
v-loading="loading"
:data="informationList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -81,6 +83,7 @@
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="标题"
......@@ -117,7 +120,7 @@
</el-table-column>
<el-table-column label="内容" align="center" prop="info">
<template slot-scope="{ row }">
<el-button type="text" @click="handleLook(row)">点击查看</el-button>
<el-button type="primary" @click="handleLook(row)">点击查看</el-button>
</template>
</el-table-column>
<el-table-column
......@@ -141,15 +144,15 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
......
src/views/operation/notice/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -27,11 +27,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -43,7 +43,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -53,7 +53,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:notice:edit']"
......@@ -65,7 +65,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:notice:remove']"
......@@ -77,7 +77,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:notice:export']"
>导出</el-button
......@@ -93,6 +93,8 @@
v-loading="loading"
:data="noticeList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -100,6 +102,7 @@
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column
label="城市"
......@@ -127,15 +130,15 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
......
src/views/orderManagement/dbghOrder/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:dbghOrder:add']"
>新增</el-button>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dbghOrder:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dbghOrder:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:dbghOrder:export']"
>导出</el-button>
......@@ -83,6 +83,8 @@
v-loading="loading"
:data="dbghOrderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -132,19 +134,20 @@
align="center"
prop="userVsitorVo"
key="userVsitorVo"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text"
type="primary"
@click="clickSeeVisitor(row)"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span>
......@@ -154,7 +157,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="text"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button
>
......@@ -227,7 +230,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="text"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
......@@ -245,7 +248,7 @@
<span>
<el-button
v-if="row.voucher"
type="text"
type="primary"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
......@@ -259,19 +262,20 @@
key="createTime"
width="180"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dbghOrder:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dbghOrder:remove']"
......
src/views/orderManagement/dbmyOrder/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:dbmyOrder:add']"
>新增</el-button>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dbmyOrder:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dbmyOrder:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:dbmyOrder:export']"
>导出</el-button>
......@@ -83,6 +83,8 @@
v-loading="loading"
:data="dbmyOrderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -105,11 +107,12 @@
prop="ypName"
key="ypName"
:show-overflow-tooltip="true"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.ypName"
type="text"
type="primary"
@click="clickSeeROWrFK(row.ypName, '药品名称')"
>查看</el-button
>
......@@ -121,11 +124,12 @@
prop="ydAddress"
key="ydAddress"
:show-overflow-tooltip="true"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.ydAddress"
type="text"
type="primary"
@click="clickSeeROWrFK(row.ydAddress, '药店地址')"
>查看</el-button
>
......@@ -169,7 +173,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.prescriptionAttachment"
type="text"
type="primary"
@click="
clickSeeROWrFK(
row.prescriptionAttachment,
......@@ -197,7 +201,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.recipient"
type="text"
type="primary"
@click="clickSeeROWrFK(row.recipient, '收件人')"
>查看</el-button
>
......@@ -209,11 +213,12 @@
prop="adress"
key="adress"
:show-overflow-tooltip="true"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.adress"
type="text"
type="primary"
@click="clickSeeROWrFK(row.adress, '收货地址')"
>查看</el-button
>
......@@ -232,11 +237,12 @@
prop="addressInfo"
key="addressInfo"
:show-overflow-tooltip="true"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.addressInfo"
type="text"
type="primary"
@click="clickSeeROWrFK(row.addressInfo, '详细地址')"
>查看</el-button
>
......@@ -244,7 +250,7 @@
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span>
......@@ -262,11 +268,11 @@
<span v-if="row.isRefrigerate == 1">送货上门</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" key="remark">
<el-table-column label="备注" align="center" prop="remark" key="remark" width="100">
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="text"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
>
......@@ -321,11 +327,12 @@
align="center"
prop="evaluationContent"
key="evaluationContent"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="text"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
......@@ -351,7 +358,7 @@
<span>
<el-button
v-if="row.voucher"
type="text"
type="primary"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
......@@ -365,6 +372,7 @@
key="createTime"
width="180"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column
label="操作"
......@@ -373,16 +381,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dbmyOrder:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dbmyOrder:remove']"
......
src/views/orderManagement/dbwzOrder/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:dbwzOrder:add']"
>新增</el-button>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dbwzOrder:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dbwzOrder:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:dbwzOrder:export']"
>导出</el-button>
......@@ -83,6 +83,8 @@
v-loading="loading"
:data="dbwzOrderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -118,19 +120,20 @@
align="center"
prop="userVsitorVo"
key="userVsitorVo"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text"
type="primary"
@click="clickSeeVisitor(row)"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span>
......@@ -148,7 +151,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="text"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
>
......@@ -159,11 +162,12 @@
align="center"
prop="chiefComplaint"
key="chiefComplaint"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.chiefComplaint"
type="text"
type="primary"
@click="clickSeeROWrEM(row.chiefComplaint, '主诉')"
>查看</el-button
>
......@@ -174,11 +178,12 @@
align="center"
prop="historyOfPresentIllness"
key="historyOfPresentIllness"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.historyOfPresentIllness"
type="text"
type="primary"
@click="clickSeeROWrEM(row.historyOfPresentIllness, '现病史')"
>查看</el-button
>
......@@ -189,11 +194,12 @@
align="center"
prop="pastHistory"
key="pastHistory"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.pastHistory"
type="text"
type="primary"
@click="clickSeeROWrEM(row.pastHistory, '即往史')"
>查看</el-button
>
......@@ -209,7 +215,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.lastMedicalTreatmentSituation"
type="text"
type="primary"
@click="
clickSeeROWrEM(row.lastMedicalTreatmentSituation, '上次就医情况')
"
......@@ -227,7 +233,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.postTreatmentCondition"
type="text"
type="primary"
@click="clickSeeROWrEM(row.postTreatmentCondition, '治疗后情况')"
>查看</el-button
>
......@@ -249,11 +255,12 @@
align="center"
prop="serviceRequirements"
key="serviceRequirements"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.serviceRequirements"
type="text"
type="primary"
@click="clickSeeROWrEM(row.serviceRequirements, '服务要求')"
>查看</el-button
>
......@@ -314,11 +321,12 @@
align="center"
prop="evaluationContent"
key="evaluationContent"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="text"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
......@@ -336,7 +344,7 @@
<span>
<el-button
v-if="row.voucher"
type="text"
type="primary"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
......@@ -350,6 +358,7 @@
key="createTime"
width="180"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column
label="操作"
......@@ -358,16 +367,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dbwzOrder:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dbwzOrder:remove']"
......
src/views/orderManagement/order/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:order:add']"
>新增</el-button>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:order:export']"
>导出</el-button>
......@@ -83,6 +83,8 @@
v-loading="loading"
:data="orderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -133,19 +135,20 @@
align="center"
prop="userVsitorVo"
key="userVsitorVo"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text"
type="primary"
@click="clickSeeVisitor(row)"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span>
......@@ -161,7 +164,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="text"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button
>
......@@ -233,7 +236,7 @@
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="text"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
......@@ -259,7 +262,7 @@
<span>
<el-button
v-if="row.voucher"
type="text"
type="primary"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
......@@ -273,6 +276,7 @@
key="createTime"
width="180"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column
label="操作"
......@@ -281,16 +285,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']"
......
src/views/orderManagement/zqghOrder/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:zqghOrder:add']"
>新增</el-button
......@@ -47,7 +47,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:zqghOrder:edit']"
......@@ -59,7 +59,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:zqghOrder:remove']"
......@@ -71,7 +71,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:zqghOrder:export']"
>导出</el-button
......@@ -87,6 +87,8 @@
v-loading="loading"
:data="zqghOrderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
>
<el-table-column
label="订单号"
......@@ -145,11 +147,11 @@
width="180"
:show-overflow-tooltip="true"
/>
<el-table-column label="备注" align="center" prop="remark" key="remark">
<el-table-column label="备注" align="center" prop="remark" key="remark" width="100">
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="text"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
>
......@@ -176,6 +178,7 @@
key="createTime"
width="180"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column
label="操作"
......@@ -184,16 +187,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:zqghOrder:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:zqghOrder:remove']"
......
src/views/orderManagement/zyphOrder/index.vue
......@@ -3,7 +3,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -20,11 +20,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -36,7 +36,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:zyphOrder:add']"
>新增</el-button>
......@@ -46,7 +46,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:zyphOrder:edit']"
......@@ -57,7 +57,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:zyphOrder:remove']"
......@@ -68,7 +68,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:zyphOrder:export']"
>导出</el-button>
......@@ -83,6 +83,8 @@
v-loading="loading"
:data="zyphOrderList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
......@@ -132,29 +134,30 @@
align="center"
prop="userVsitorVo"
key="userVsitorVo"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text"
type="primary"
@click="clickSeeVisitor(row)"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<el-table-column label="接单人" align="center" prop="ename" key="ename" width="100">
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" key="remark">
<el-table-column label="备注" align="center" prop="remark" key="remark" width="100">
<template slot-scope="{ row }">
<el-button
v-if="row.remark"
type="text"
type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button
>
......@@ -231,11 +234,12 @@
align="center"
prop="evaluationContent"
key="evaluationContent"
width="100"
>
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="text"
type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
......@@ -261,7 +265,7 @@
<span>
<el-button
v-if="row.voucher"
type="text"
type="primary"
@click="clickSeeVisitorImg(row)"
>点击查看</el-button
>
......@@ -275,6 +279,7 @@
key="createTime"
width="180"
:show-overflow-tooltip="true"
sortable
/>
<!-- <el-table-column
label="操作"
......@@ -283,16 +288,16 @@
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:zyphOrder:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:zyphOrder:remove']"
......
src/views/system/user/index.vue
......@@ -8,7 +8,7 @@
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
size="large"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
......@@ -32,7 +32,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -86,11 +86,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -102,7 +102,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -112,7 +112,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
......@@ -123,7 +123,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
......@@ -134,7 +134,7 @@
type="info"
plain
icon="el-icon-upload2"
size="mini"
size="large"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
......@@ -144,7 +144,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
......@@ -160,6 +160,7 @@
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'userId', order: 'ascending' }"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
......@@ -167,6 +168,7 @@
align="center"
key="userId"
prop="userId"
sortable
/>
<el-table-column
label="用户名"
......@@ -220,25 +222,25 @@
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
size="large"
icon="el-icon-edit"
type="primary"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
icon="el-icon-delete"
type="primary"
@click="handleDelete(scope.row)"
>删除</el-button
>
<!-- <el-dropdown
size="mini"
size="large"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
<el-button size="large" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown">
......
src/views/user/companion/index.vue
......@@ -8,7 +8,7 @@
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
size="large"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
......@@ -32,7 +32,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="100px"
......@@ -86,11 +86,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -102,7 +102,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
>新增</el-button
>
......@@ -112,7 +112,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
......@@ -123,7 +123,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
......@@ -134,7 +134,7 @@
type="info"
plain
icon="el-icon-upload2"
size="mini"
size="large"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
......@@ -144,7 +144,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
......@@ -160,9 +160,17 @@
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="ID" align="center" key="id" prop="id" />
<el-table-column
label="ID"
align="center"
key="id"
prop="id"
sortable
/>
<el-table-column
label="陪诊员"
align="center"
......@@ -342,63 +350,63 @@
<el-table-column
label="操作"
align="center"
width="200"
width="450"
fixed="right"
class-name="small-padding fixed-width"
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 1)"
>详情</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 2)"
>修改</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 3)"
v-if="scope.row.status == 1"
>冻结</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 3)"
v-if="scope.row.status == 2"
>解禁</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 4)"
v-if="scope.row.nowType == 1"
>设置为陪护人员</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 4)"
v-if="scope.row.nowType == 2"
>设置为陪诊人员</el-button
>
<el-button
size="mini"
type="text"
size="large"
type="primary"
@click="handleUBTns(scope.row, 5)"
>设置时间</el-button
>
<!-- <el-dropdown
size="mini"
size="large"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
<el-button size="large" type="primary" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown">
......
src/views/user/merchant/index.vue
......@@ -8,7 +8,7 @@
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
size="large"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
......@@ -32,7 +32,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -86,11 +86,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -102,7 +102,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button
......@@ -113,7 +113,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
......@@ -124,7 +124,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
......@@ -135,7 +135,7 @@
type="info"
plain
icon="el-icon-upload2"
size="mini"
size="large"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
......@@ -145,7 +145,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
......@@ -161,9 +161,17 @@
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="ID" align="center" key="id" prop="id" />
<el-table-column
label="ID"
align="center"
key="id"
prop="id"
sortable
/>
<el-table-column
label="商户名称"
align="center"
......@@ -305,7 +313,7 @@
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
size="large"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -313,7 +321,7 @@
>修改</el-button
>
<el-button
size="mini"
size="large"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......@@ -321,11 +329,11 @@
>删除</el-button
>
<el-dropdown
size="mini"
size="large"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
<el-button size="large" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown">
......
src/views/user/whole/index.vue
......@@ -8,7 +8,7 @@
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
size="large"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
......@@ -32,7 +32,7 @@
<el-form
:model="queryParams"
ref="queryForm"
size="small"
size="large"
:inline="true"
v-show="showSearch"
label-width="68px"
......@@ -86,11 +86,11 @@
<el-button
type="primary"
icon="el-icon-search"
size="mini"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
......@@ -102,7 +102,7 @@
type="primary"
plain
icon="el-icon-plus"
size="mini"
size="large"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>新增</el-button
......@@ -113,7 +113,7 @@
type="success"
plain
icon="el-icon-edit"
size="mini"
size="large"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:user:edit']"
......@@ -124,7 +124,7 @@
type="danger"
plain
icon="el-icon-delete"
size="mini"
size="large"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:user:remove']"
......@@ -135,7 +135,7 @@
type="info"
plain
icon="el-icon-upload2"
size="mini"
size="large"
@click="handleImport"
v-hasPermi="['system:user:import']"
>导入</el-button>
......@@ -145,7 +145,7 @@
type="warning"
plain
icon="el-icon-download"
size="mini"
size="large"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
......@@ -161,6 +161,8 @@
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
:default-sort="{ prop: 'userId', order: 'ascending' }"
border=""
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
......@@ -168,6 +170,7 @@
align="center"
key="userId"
prop="userId"
sortable
/>
<el-table-column
label="姓名"
......@@ -245,7 +248,7 @@
>
<template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button
size="mini"
size="large"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
......@@ -253,7 +256,7 @@
>修改</el-button
>
<el-button
size="mini"
size="large"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
......@@ -261,11 +264,11 @@
>删除</el-button
>
<el-dropdown
size="mini"
size="large"
@command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right"
<el-button size="large" type="text" icon="el-icon-d-arrow-right"
>更多</el-button
>
<el-dropdown-menu slot="dropdown">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment