Skip to content

P
peizhen-vue
Commit 3320ae5b by ‘巴博尔’
Options

优化修改

parent ec67aa4b
Showing with 646 additions and 407 deletions
package.json
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
"screenfull": "5.0.2", "screenfull": "5.0.2",
"sortablejs": "1.10.2", "sortablejs": "1.10.2",
"vue": "2.6.12", "vue": "2.6.12",
"vue-animate-number": "^0.4.2",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "0.5.5", "vue-cropper": "0.5.5",
"vue-meta": "2.4.0", "vue-meta": "2.4.0",
......
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 Element from "element-ui";
import './assets/styles/element-variables.scss' import "./assets/styles/element-variables.scss";
import '@/assets/styles/index.scss' // global css import "@/assets/styles/index.scss"; // global css
import '@/assets/styles/ruoyi.scss' // ruoyi css import "@/assets/styles/ruoyi.scss"; // ruoyi css
import App from './App' import App from "./App";
import store from './store' import store from "./store";
import router from './router' import router from "./router";
import directive from './directive' // directive import directive from "./directive"; // directive
import plugins from './plugins' // plugins import plugins from "./plugins"; // plugins
import { download } from '@/utils/request' import { download } from "@/utils/request";
import './assets/icons' // icon import "./assets/icons"; // icon
import './permission' // permission control import "./permission"; // permission control
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { getConfigKey, updateConfigByKey } from "@/api/system/config"; 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 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.getDicts = getDicts;
Vue.prototype.getConfigKey = getConfigKey Vue.prototype.getConfigKey = getConfigKey;
Vue.prototype.updateConfigByKey = updateConfigByKey Vue.prototype.updateConfigByKey = updateConfigByKey;
Vue.prototype.parseTime = parseTime Vue.prototype.parseTime = parseTime;
Vue.prototype.resetForm = resetForm Vue.prototype.resetForm = resetForm;
Vue.prototype.addDateRange = addDateRange Vue.prototype.addDateRange = addDateRange;
Vue.prototype.selectDictLabel = selectDictLabel Vue.prototype.selectDictLabel = selectDictLabel;
Vue.prototype.selectDictLabels = selectDictLabels Vue.prototype.selectDictLabels = selectDictLabels;
Vue.prototype.download = download Vue.prototype.download = download;
Vue.prototype.handleTree = handleTree Vue.prototype.handleTree = handleTree;
// 全局组件挂载 // 全局组件挂载
Vue.component('DictTag', DictTag) Vue.component("DictTag", DictTag);
Vue.component('Pagination', Pagination) Vue.component("Pagination", Pagination);
Vue.component('RightToolbar', RightToolbar) Vue.component("RightToolbar", RightToolbar);
Vue.component('Editor', Editor) Vue.component("Editor", Editor);
Vue.component('FileUpload', FileUpload) Vue.component("FileUpload", FileUpload);
Vue.component('ImageUpload', ImageUpload) Vue.component("ImageUpload", ImageUpload);
Vue.component('ImagePreview', ImagePreview) 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.directive("number", {
Vue.use(VueMeta) // 绑定元素时调用
DictData.install() 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 * If you don't want to use mock-server
...@@ -74,17 +116,17 @@ DictData.install() ...@@ -74,17 +116,17 @@ DictData.install()
*/ */
// 修改 el-dialog 默认点击遮照为不关闭 // 修改 el-dialog 默认点击遮照为不关闭
Element.Dialog.props.closeOnClickModal.default = false Element.Dialog.props.closeOnClickModal.default = false;
Vue.use(Element, { 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({ new Vue({
el: '#app', el: "#app",
router, router,
store, 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' import Cookies from 'js-cookie'
const state = { const state = {
...@@ -7,7 +15,7 @@ const state = { ...@@ -7,7 +15,7 @@ const state = {
hide: false hide: false
}, },
device: 'desktop', device: 'desktop',
size: Cookies.get('size') || 'medium' size: Cookies.get('size') || 'large'
} }
const mutations = { const mutations = {
......
src/views/financialManagement/income/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:income:add']" v-hasPermi="['system:income:add']"
>新增</el-button> >新增</el-button>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:income:edit']" v-hasPermi="['system:income:edit']"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:income:remove']" v-hasPermi="['system:income:remove']"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:income:export']" v-hasPermi="['system:income:export']"
>导出</el-button> >导出</el-button>
...@@ -103,6 +103,8 @@ ...@@ -103,6 +103,8 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="incomeList" :data="incomeList"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
...@@ -112,6 +114,7 @@ ...@@ -112,6 +114,7 @@
prop="id" prop="id"
key="id" key="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<el-table-column <el-table-column
label="提现人员类型" label="提现人员类型"
...@@ -155,8 +158,8 @@ ...@@ -155,8 +158,8 @@
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<template v-if="row.status == 0"> <template v-if="row.status == 0">
<el-button type="text" @click="clickBH(row, 1)">通过</el-button> <el-button type="primary" @click="clickBH(row, 1)">通过</el-button>
<el-button type="text" @click="clickBH(row, 2)">拒绝</el-button> <el-button type="primary" @click="clickBH(row, 2)">拒绝</el-button>
</template> </template>
<span v-if="row.status == 1">成功提现</span> <span v-if="row.status == 1">成功提现</span>
<span v-if="row.status == 2">拒绝提现</span> <span v-if="row.status == 2">拒绝提现</span>
...@@ -177,16 +180,16 @@ ...@@ -177,16 +180,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:income:edit']" v-hasPermi="['system:income:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:income:remove']" v-hasPermi="['system:income:remove']"
......
src/views/financialManagement/paymentRecord/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:paymentRecord:add']" v-hasPermi="['system:paymentRecord:add']"
>新增</el-button> >新增</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:paymentRecord:edit']" v-hasPermi="['system:paymentRecord:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:paymentRecord:remove']" v-hasPermi="['system:paymentRecord:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:paymentRecord:export']" v-hasPermi="['system:paymentRecord:export']"
>导出</el-button> >导出</el-button>
...@@ -83,9 +83,11 @@ ...@@ -83,9 +83,11 @@
v-loading="loading" v-loading="loading"
:data="paymentRecordList" :data="paymentRecordList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <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 <el-table-column
label="订单" label="订单"
align="center" align="center"
...@@ -128,16 +130,16 @@ ...@@ -128,16 +130,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:paymentRecord:edit']" v-hasPermi="['system:paymentRecord:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:paymentRecord:remove']" v-hasPermi="['system:paymentRecord:remove']"
......
src/views/financialManagement/userRefund/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:userRefund:add']" v-hasPermi="['system:userRefund:add']"
>新增</el-button >新增</el-button
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:userRefund:edit']" v-hasPermi="['system:userRefund:edit']"
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:userRefund:remove']" v-hasPermi="['system:userRefund:remove']"
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:userRefund:export']" v-hasPermi="['system:userRefund:export']"
>导出</el-button >导出</el-button
...@@ -108,9 +108,11 @@ ...@@ -108,9 +108,11 @@
v-loading="loading" v-loading="loading"
:data="userRefundList" :data="userRefundList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <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 <el-table-column
label="订单" label="订单"
align="center" align="center"
...@@ -154,8 +156,8 @@ ...@@ -154,8 +156,8 @@
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<template v-if="row.status == 0"> <template v-if="row.status == 0">
<el-button type="text" @click="clickBH(row, 1)">通过</el-button> <el-button type="primary" @click="clickBH(row, 1)">通过</el-button>
<el-button type="text" @click="clickBH(row, 2)">拒绝</el-button> <el-button type="primary" @click="clickBH(row, 2)">拒绝</el-button>
</template> </template>
<span v-if="row.status == 1">退款成功</span> <span v-if="row.status == 1">退款成功</span>
...@@ -177,16 +179,16 @@ ...@@ -177,16 +179,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:userRefund:edit']" v-hasPermi="['system:userRefund:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:userRefund:remove']" v-hasPermi="['system:userRefund:remove']"
......
src/views/hispotalManage/doctor/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -52,11 +52,11 @@ ...@@ -52,11 +52,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:doctor:edit']" v-hasPermi="['system:doctor:edit']"
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:doctor:remove']" v-hasPermi="['system:doctor:remove']"
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:doctor:export']" v-hasPermi="['system:doctor:export']"
>导出</el-button> >导出</el-button>
...@@ -115,9 +115,11 @@ ...@@ -115,9 +115,11 @@
v-loading="loading" v-loading="loading"
:data="doctorList" :data="doctorList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <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="name" />
<el-table-column label="所属医院" align="center" prop="hname" /> <el-table-column label="所属医院" align="center" prop="hname" />
<el-table-column label="所属科室" align="center" prop="dname" /> <el-table-column label="所属科室" align="center" prop="dname" />
...@@ -130,15 +132,15 @@ ...@@ -130,15 +132,15 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
......
src/views/hispotalManage/hospital/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com * @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-07 16:09:29 * @Date: 2023-09-07 16:09:29
* @LastEditors: ‘巴博尔’ 2164119982@qq.com * @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 * @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -92,11 +92,11 @@ ...@@ -92,11 +92,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:hospital:edit']" v-hasPermi="['system:hospital:edit']"
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:hospital:remove']" v-hasPermi="['system:hospital:remove']"
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:hospital:export']" v-hasPermi="['system:hospital:export']"
>导出</el-button >导出</el-button
...@@ -158,6 +158,8 @@ ...@@ -158,6 +158,8 @@
v-loading="loading" v-loading="loading"
:data="hospitalList" :data="hospitalList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -165,6 +167,7 @@ ...@@ -165,6 +167,7 @@
align="center" align="center"
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<el-table-column <el-table-column
label="医院名称" label="医院名称"
...@@ -229,18 +232,19 @@ ...@@ -229,18 +232,19 @@
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
width="200"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
......
src/views/hispotalManage/office/index.vue
<template> <template>
<div class="app-container"> <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-form-item label="上级科室" prop="parentId">
<el-input <el-input
v-model="queryParams.parentId" v-model="queryParams.parentId"
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" 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-item>
</el-form> --> </el-form> -->
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
type="info" type="info"
plain plain
icon="el-icon-sort" icon="el-icon-sort"
size="mini" size="large"
@click="toggleExpandAll" @click="toggleExpandAll"
>展开/折叠</el-button >展开/折叠</el-button
> >
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:department:edit']" v-hasPermi="['system:department:edit']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:department:remove']" v-hasPermi="['system:department:remove']"
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:department:export']" v-hasPermi="['system:department:export']"
>导出</el-button> >导出</el-button>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<span style="margin-left: 20px"> <span style="margin-left: 20px">
<el-button <el-button
type="text" type="text"
size="mini" size="large"
icon="el-icon-edit" icon="el-icon-edit"
@click="() => handleUpdate(node, data)" @click="() => handleUpdate(node, data)"
> >
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
size="mini" size="large"
icon="el-icon-delete" icon="el-icon-delete"
@click="() => handleDelete(node, data)" @click="() => handleDelete(node, data)"
> >
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
......
src/views/index.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-select <el-select
v-model="valueA" v-model="valueA"
placeholder="请选择" placeholder="请选择"
style="width: 10em" style="width: 8em"
@change="dataUserAxios" @change="dataUserAxios"
> >
<el-option <el-option
...@@ -35,7 +35,15 @@ ...@@ -35,7 +35,15 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<h2>{{ sumA }}</h2> <h2>
<animate-number
from="1"
:to="sumA"
:key="sumA"
duration="1000"
:formatter="thoudsandW"
></animate-number>
</h2>
</div> </div>
</el-col> </el-col>
<el-col :span="4" v-if="user.roleId != 3"> <el-col :span="4" v-if="user.roleId != 3">
...@@ -45,7 +53,7 @@ ...@@ -45,7 +53,7 @@
<el-select <el-select
v-model="valueB" v-model="valueB"
placeholder="请选择" placeholder="请选择"
style="width: 10em" style="width: 8em"
@change="saleroomAxios" @change="saleroomAxios"
> >
<el-option <el-option
...@@ -62,7 +70,15 @@ ...@@ -62,7 +70,15 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<h2>{{ sumB }}</h2> <h2>
<animate-number
from="1"
:to="sumB"
:key="sumB"
duration="1000"
:formatter="thoudsand"
></animate-number>
</h2>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -72,7 +88,7 @@ ...@@ -72,7 +88,7 @@
<el-select <el-select
v-model="valueC" v-model="valueC"
placeholder="请选择" placeholder="请选择"
style="width: 10em" style="width: 8em"
@change="dataEmployeesAxios" @change="dataEmployeesAxios"
> >
<el-option <el-option
...@@ -89,7 +105,15 @@ ...@@ -89,7 +105,15 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<h2>{{ sumC }}</h2> <h2>
<animate-number
from="1"
:to="sumC"
:key="sumC"
duration="1000"
:formatter="thoudsandW"
></animate-number>
</h2>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -100,7 +124,7 @@ ...@@ -100,7 +124,7 @@
<el-select <el-select
v-model="valueD" v-model="valueD"
placeholder="请选择" placeholder="请选择"
style="width: 10em" style="width: 8em"
@change="platformRevenueAxios" @change="platformRevenueAxios"
> >
<el-option <el-option
...@@ -117,7 +141,13 @@ ...@@ -117,7 +141,13 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<h2>{{ sumD }}</h2> <h2>
<animate-number
from="1"
:to="sumD"
:key="sumD"
></animate-number>
</h2>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -127,7 +157,7 @@ ...@@ -127,7 +157,7 @@
<el-select <el-select
v-model="valueE" v-model="valueE"
placeholder="请选择" placeholder="请选择"
style="width: 10em" style="width: 8em"
@change="orderQuantityAxios" @change="orderQuantityAxios"
> >
<el-option <el-option
...@@ -144,7 +174,15 @@ ...@@ -144,7 +174,15 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<h2>{{ sumE }}</h2> <h2>
<animate-number
from="1"
:to="sumE"
:key="sumE"
duration="1000"
:formatter="thoudsandW"
></animate-number>
</h2>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -284,6 +322,7 @@ export default { ...@@ -284,6 +322,7 @@ export default {
computed: { computed: {
...mapGetters(["user", "cityName"]), ...mapGetters(["user", "cityName"]),
}, },
filters: {},
data() { data() {
return { return {
// 版本号 // 版本号
...@@ -344,19 +383,57 @@ export default { ...@@ -344,19 +383,57 @@ export default {
this.chart = null; this.chart = null;
}, },
methods: { methods: {
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() { changeCtypChange() {
this.companyId = '' this.companyId = "";
this.companyList = [] this.companyList = [];
this.companyListAxios() this.companyListAxios();
}, },
async companyListAxios() { async companyListAxios() {
const data_back = await companyListGet({ const data_back = await companyListGet({
cityId: this.cityId cityId: this.cityId,
}); });
const { code, data } = data_back; const { code, data } = data_back;
if (code === 200) { if (code === 200) {
this.companyList = data; this.companyList = data;
this.orderQuantityEchartsAxios() this.orderQuantityEchartsAxios();
} }
}, },
async cityVoListAxios() { async cityVoListAxios() {
...@@ -538,6 +615,7 @@ export default { ...@@ -538,6 +615,7 @@ export default {
], ],
series: [ series: [
{ {
smooth: true,
name: xData, name: xData,
// type: "bar", // type: "bar",
type: "line", type: "line",
...@@ -554,6 +632,16 @@ export default { ...@@ -554,6 +632,16 @@ export default {
color: "#1506e4", 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" },
]),
},
},
}, },
], ],
}; };
...@@ -643,10 +731,17 @@ export default { ...@@ -643,10 +731,17 @@ export default {
min-height: 50px; min-height: 50px;
border-radius: 4px; border-radius: 4px;
box-shadow: 0 0 10px 2px #e2dfdf; box-shadow: 0 0 10px 2px #e2dfdf;
padding: 10px; // padding: 10px;
padding: 1em;
&-top { &-top {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid rgb(239, 239, 245);
padding-bottom: 5px;
h3 {
font-size: 1em;
}
} }
h2 { h2 {
width: 100%; width: 100%;
......
src/views/mallManagement/apply/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com * @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:43:21 * @Date: 2023-09-11 15:43:21
* @LastEditors: ‘巴博尔’ 2164119982@qq.com * @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 * @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:apply:add']" v-hasPermi="['system:apply:add']"
>新增</el-button> >新增</el-button>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:apply:edit']" v-hasPermi="['system:apply:edit']"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:apply:remove']" v-hasPermi="['system:apply:remove']"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:apply:export']" v-hasPermi="['system:apply:export']"
>导出</el-button> >导出</el-button>
...@@ -92,9 +92,18 @@ ...@@ -92,9 +92,18 @@
:data="applyList" :data="applyList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
show show
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
label="ID"
align="center"
prop="id"
:show-overflow-tooltip="true"
sortable
/>
<el-table-column
label="申请人" label="申请人"
align="center" align="center"
key="applyName" key="applyName"
...@@ -248,7 +257,7 @@ ...@@ -248,7 +257,7 @@
row.twoMedicalBusinessLicense && row.twoMedicalBusinessLicense &&
row.twoMedicalBusinessLicense.split(',') && row.twoMedicalBusinessLicense.split(',') &&
row.twoMedicalBusinessLicense.split(',').length row.twoMedicalBusinessLicense.split(',').length
? twoMedicalBusinessLicense.split(',').length ? row.twoMedicalBusinessLicense.split(',').length
: 1 : 1
" "
:isShowTip="false" :isShowTip="false"
...@@ -324,15 +333,15 @@ ...@@ -324,15 +333,15 @@
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:apply:edit']" v-hasPermi="['system:apply:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:apply:remove']" v-hasPermi="['system:apply:remove']"
......
src/views/mallManagement/income/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com * @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:44:37 * @Date: 2023-09-11 15:44:37
* @LastEditors: ‘巴博尔’ 2164119982@qq.com * @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 * @FilePath: \peizhen-vue\src\views\mallManagement\income\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:income:add']" v-hasPermi="['system:income:add']"
>新增</el-button> >新增</el-button>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:income:edit']" v-hasPermi="['system:income:edit']"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:income:remove']" v-hasPermi="['system:income:remove']"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:income:export']" v-hasPermi="['system:income:export']"
>导出</el-button> >导出</el-button>
...@@ -91,9 +91,11 @@ ...@@ -91,9 +91,11 @@
v-loading="loading" v-loading="loading"
:data="incomeList" :data="incomeList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <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="storeName" />
<el-table-column label="金额" align="center" prop="amount" /> <el-table-column label="金额" align="center" prop="amount" />
<el-table-column label="发票信息" align="center" prop="invoice" /> <el-table-column label="发票信息" align="center" prop="invoice" />
...@@ -136,16 +138,16 @@ ...@@ -136,16 +138,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:income:edit']" v-hasPermi="['system:income:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:income:remove']" v-hasPermi="['system:income:remove']"
......
src/views/operation/article/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:article:edit']" v-hasPermi="['system:article:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:article:remove']" v-hasPermi="['system:article:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:article:export']" v-hasPermi="['system:article:export']"
>导出</el-button> >导出</el-button>
...@@ -80,6 +80,8 @@ ...@@ -80,6 +80,8 @@
v-loading="loading" v-loading="loading"
:data="articleList" :data="articleList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -87,6 +89,7 @@ ...@@ -87,6 +89,7 @@
align="center" align="center"
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<el-table-column <el-table-column
label="文章标题" label="文章标题"
...@@ -144,15 +147,15 @@ ...@@ -144,15 +147,15 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑</el-button >编辑</el-button
> >
<!-- <el-button <!-- <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:article:remove']" v-hasPermi="['system:article:remove']"
......
src/views/operation/banner/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="large"
@click="resetQuery" @click="resetQuery"
>重置</el-button >重置</el-button
> >
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['accompany:carousel:remove']" v-hasPermi="['accompany:carousel:remove']"
...@@ -79,6 +79,8 @@ ...@@ -79,6 +79,8 @@
v-loading="loading" v-loading="loading"
:data="carouselList" :data="carouselList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -86,6 +88,7 @@ ...@@ -86,6 +88,7 @@
align="center" align="center"
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<el-table-column <el-table-column
label="描述" label="描述"
...@@ -153,15 +156,15 @@ ...@@ -153,15 +156,15 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
......
src/views/operation/business/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:business:add']" v-hasPermi="['system:business:add']"
>新增</el-button> >新增</el-button>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:business:edit']" v-hasPermi="['system:business:edit']"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:business:remove']" v-hasPermi="['system:business:remove']"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:business:export']" v-hasPermi="['system:business:export']"
>导出</el-button> >导出</el-button>
...@@ -89,6 +89,8 @@ ...@@ -89,6 +89,8 @@
v-loading="loading" v-loading="loading"
:data="businessList" :data="businessList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -96,6 +98,7 @@ ...@@ -96,6 +98,7 @@
align="center" align="center"
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column label="提供医院" align="center" prop="hospitalsList"> <!-- <el-table-column label="提供医院" align="center" prop="hospitalsList">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -114,7 +117,7 @@ ...@@ -114,7 +117,7 @@
<el-button type="primary" round @click="clickServices(props.row)" <el-button type="primary" round @click="clickServices(props.row)"
>服务</el-button >服务</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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -131,22 +134,22 @@ ...@@ -131,22 +134,22 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handlenew(scope.row)" @click="handlenew(scope.row)"
>新增</el-button >新增</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
...@@ -173,7 +176,7 @@ ...@@ -173,7 +176,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -209,7 +212,7 @@ ...@@ -209,7 +212,7 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuerys" @click="handleQuerys"
>搜索</el-button >搜索</el-button
> >
...@@ -281,8 +284,8 @@ ...@@ -281,8 +284,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdateServe(scope.row)" @click="handleUpdateServe(scope.row)"
>修改服务</el-button >修改服务</el-button
...@@ -303,7 +306,7 @@ ...@@ -303,7 +306,7 @@
style="text-align: center !important" style="text-align: center !important"
> >
<!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> --> <!-- <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> </div>
</el-dialog> </el-dialog>
<!-- 添加或修改业务对话框 --> <!-- 添加或修改业务对话框 -->
......
src/views/operation/news/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- <el-form <!-- <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>刷新</el-button >刷新</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-item>
</el-form> --> </el-form> -->
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -74,6 +74,8 @@ ...@@ -74,6 +74,8 @@
v-loading="loading" v-loading="loading"
:data="informationList" :data="informationList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -81,6 +83,7 @@ ...@@ -81,6 +83,7 @@
align="center" align="center"
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<el-table-column <el-table-column
label="标题" label="标题"
...@@ -117,7 +120,7 @@ ...@@ -117,7 +120,7 @@
</el-table-column> </el-table-column>
<el-table-column label="内容" align="center" prop="info"> <el-table-column label="内容" align="center" prop="info">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" @click="handleLook(row)">点击查看</el-button> <el-button type="primary" @click="handleLook(row)">点击查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -141,15 +144,15 @@ ...@@ -141,15 +144,15 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
......
src/views/operation/notice/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:notice:edit']" v-hasPermi="['system:notice:edit']"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:notice:remove']" v-hasPermi="['system:notice:remove']"
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:notice:export']" v-hasPermi="['system:notice:export']"
>导出</el-button >导出</el-button
...@@ -93,6 +93,8 @@ ...@@ -93,6 +93,8 @@
v-loading="loading" v-loading="loading"
:data="noticeList" :data="noticeList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -100,6 +102,7 @@ ...@@ -100,6 +102,7 @@
align="center" align="center"
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column <!-- <el-table-column
label="城市" label="城市"
...@@ -127,15 +130,15 @@ ...@@ -127,15 +130,15 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
......
src/views/orderManagement/dbghOrder/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dbghOrder:add']" v-hasPermi="['system:dbghOrder:add']"
>新增</el-button> >新增</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dbghOrder:edit']" v-hasPermi="['system:dbghOrder:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dbghOrder:remove']" v-hasPermi="['system:dbghOrder:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dbghOrder:export']" v-hasPermi="['system:dbghOrder:export']"
>导出</el-button> >导出</el-button>
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
v-loading="loading" v-loading="loading"
:data="dbghOrderList" :data="dbghOrderList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -132,19 +134,20 @@ ...@@ -132,19 +134,20 @@
align="center" align="center"
prop="userVsitorVo" prop="userVsitorVo"
key="userVsitorVo" key="userVsitorVo"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length" v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text" type="primary"
@click="clickSeeVisitor(row)" @click="clickSeeVisitor(row)"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </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 }"> <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 >查看</el-button
> >
<span v-else>未接单</span> <span v-else>未接单</span>
...@@ -154,7 +157,7 @@ ...@@ -154,7 +157,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
type="text" type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')" @click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button >点击查看</el-button
> >
...@@ -227,7 +230,7 @@ ...@@ -227,7 +230,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.evaluationContent" v-if="row.evaluationContent"
type="text" type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')" @click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button >查看</el-button
> >
...@@ -245,7 +248,7 @@ ...@@ -245,7 +248,7 @@
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
type="text" type="primary"
@click="clickSeeVisitorImg(row)" @click="clickSeeVisitorImg(row)"
>点击查看</el-button >点击查看</el-button
> >
...@@ -259,19 +262,20 @@ ...@@ -259,19 +262,20 @@
key="createTime" key="createTime"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dbghOrder:edit']" v-hasPermi="['system:dbghOrder:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:dbghOrder:remove']" v-hasPermi="['system:dbghOrder:remove']"
......
src/views/orderManagement/dbmyOrder/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dbmyOrder:add']" v-hasPermi="['system:dbmyOrder:add']"
>新增</el-button> >新增</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dbmyOrder:edit']" v-hasPermi="['system:dbmyOrder:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dbmyOrder:remove']" v-hasPermi="['system:dbmyOrder:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dbmyOrder:export']" v-hasPermi="['system:dbmyOrder:export']"
>导出</el-button> >导出</el-button>
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
v-loading="loading" v-loading="loading"
:data="dbmyOrderList" :data="dbmyOrderList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -105,11 +107,12 @@ ...@@ -105,11 +107,12 @@
prop="ypName" prop="ypName"
key="ypName" key="ypName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.ypName" v-if="row.ypName"
type="text" type="primary"
@click="clickSeeROWrFK(row.ypName, '药品名称')" @click="clickSeeROWrFK(row.ypName, '药品名称')"
>查看</el-button >查看</el-button
> >
...@@ -121,11 +124,12 @@ ...@@ -121,11 +124,12 @@
prop="ydAddress" prop="ydAddress"
key="ydAddress" key="ydAddress"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.ydAddress" v-if="row.ydAddress"
type="text" type="primary"
@click="clickSeeROWrFK(row.ydAddress, '药店地址')" @click="clickSeeROWrFK(row.ydAddress, '药店地址')"
>查看</el-button >查看</el-button
> >
...@@ -169,7 +173,7 @@ ...@@ -169,7 +173,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.prescriptionAttachment" v-if="row.prescriptionAttachment"
type="text" type="primary"
@click=" @click="
clickSeeROWrFK( clickSeeROWrFK(
row.prescriptionAttachment, row.prescriptionAttachment,
...@@ -197,7 +201,7 @@ ...@@ -197,7 +201,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.recipient" v-if="row.recipient"
type="text" type="primary"
@click="clickSeeROWrFK(row.recipient, '收件人')" @click="clickSeeROWrFK(row.recipient, '收件人')"
>查看</el-button >查看</el-button
> >
...@@ -209,11 +213,12 @@ ...@@ -209,11 +213,12 @@
prop="adress" prop="adress"
key="adress" key="adress"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.adress" v-if="row.adress"
type="text" type="primary"
@click="clickSeeROWrFK(row.adress, '收货地址')" @click="clickSeeROWrFK(row.adress, '收货地址')"
>查看</el-button >查看</el-button
> >
...@@ -232,11 +237,12 @@ ...@@ -232,11 +237,12 @@
prop="addressInfo" prop="addressInfo"
key="addressInfo" key="addressInfo"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.addressInfo" v-if="row.addressInfo"
type="text" type="primary"
@click="clickSeeROWrFK(row.addressInfo, '详细地址')" @click="clickSeeROWrFK(row.addressInfo, '详细地址')"
>查看</el-button >查看</el-button
> >
...@@ -244,7 +250,7 @@ ...@@ -244,7 +250,7 @@
</el-table-column> </el-table-column>
<el-table-column label="接单人" align="center" prop="ename" key="ename"> <el-table-column label="接单人" align="center" prop="ename" key="ename">
<template slot-scope="{ row }"> <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 >查看</el-button
> >
<span v-else>未接单</span> <span v-else>未接单</span>
...@@ -262,11 +268,11 @@ ...@@ -262,11 +268,11 @@
<span v-if="row.isRefrigerate == 1">送货上门</span> <span v-if="row.isRefrigerate == 1">送货上门</span>
</template> </template>
</el-table-column> </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 }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
type="text" type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')" @click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button >查看</el-button
> >
...@@ -321,11 +327,12 @@ ...@@ -321,11 +327,12 @@
align="center" align="center"
prop="evaluationContent" prop="evaluationContent"
key="evaluationContent" key="evaluationContent"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.evaluationContent" v-if="row.evaluationContent"
type="text" type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')" @click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button >查看</el-button
> >
...@@ -351,7 +358,7 @@ ...@@ -351,7 +358,7 @@
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
type="text" type="primary"
@click="clickSeeVisitorImg(row)" @click="clickSeeVisitorImg(row)"
>点击查看</el-button >点击查看</el-button
> >
...@@ -365,6 +372,7 @@ ...@@ -365,6 +372,7 @@
key="createTime" key="createTime"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column <!-- <el-table-column
label="操作" label="操作"
...@@ -373,16 +381,16 @@ ...@@ -373,16 +381,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dbmyOrder:edit']" v-hasPermi="['system:dbmyOrder:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:dbmyOrder:remove']" v-hasPermi="['system:dbmyOrder:remove']"
......
src/views/orderManagement/dbwzOrder/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dbwzOrder:add']" v-hasPermi="['system:dbwzOrder:add']"
>新增</el-button> >新增</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dbwzOrder:edit']" v-hasPermi="['system:dbwzOrder:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dbwzOrder:remove']" v-hasPermi="['system:dbwzOrder:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dbwzOrder:export']" v-hasPermi="['system:dbwzOrder:export']"
>导出</el-button> >导出</el-button>
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
v-loading="loading" v-loading="loading"
:data="dbwzOrderList" :data="dbwzOrderList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -118,19 +120,20 @@ ...@@ -118,19 +120,20 @@
align="center" align="center"
prop="userVsitorVo" prop="userVsitorVo"
key="userVsitorVo" key="userVsitorVo"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length" v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text" type="primary"
@click="clickSeeVisitor(row)" @click="clickSeeVisitor(row)"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </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 }"> <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 >查看</el-button
> >
<span v-else>未接单</span> <span v-else>未接单</span>
...@@ -148,7 +151,7 @@ ...@@ -148,7 +151,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
type="text" type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')" @click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button >查看</el-button
> >
...@@ -159,11 +162,12 @@ ...@@ -159,11 +162,12 @@
align="center" align="center"
prop="chiefComplaint" prop="chiefComplaint"
key="chiefComplaint" key="chiefComplaint"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.chiefComplaint" v-if="row.chiefComplaint"
type="text" type="primary"
@click="clickSeeROWrEM(row.chiefComplaint, '主诉')" @click="clickSeeROWrEM(row.chiefComplaint, '主诉')"
>查看</el-button >查看</el-button
> >
...@@ -174,11 +178,12 @@ ...@@ -174,11 +178,12 @@
align="center" align="center"
prop="historyOfPresentIllness" prop="historyOfPresentIllness"
key="historyOfPresentIllness" key="historyOfPresentIllness"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.historyOfPresentIllness" v-if="row.historyOfPresentIllness"
type="text" type="primary"
@click="clickSeeROWrEM(row.historyOfPresentIllness, '现病史')" @click="clickSeeROWrEM(row.historyOfPresentIllness, '现病史')"
>查看</el-button >查看</el-button
> >
...@@ -189,11 +194,12 @@ ...@@ -189,11 +194,12 @@
align="center" align="center"
prop="pastHistory" prop="pastHistory"
key="pastHistory" key="pastHistory"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.pastHistory" v-if="row.pastHistory"
type="text" type="primary"
@click="clickSeeROWrEM(row.pastHistory, '即往史')" @click="clickSeeROWrEM(row.pastHistory, '即往史')"
>查看</el-button >查看</el-button
> >
...@@ -209,7 +215,7 @@ ...@@ -209,7 +215,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.lastMedicalTreatmentSituation" v-if="row.lastMedicalTreatmentSituation"
type="text" type="primary"
@click=" @click="
clickSeeROWrEM(row.lastMedicalTreatmentSituation, '上次就医情况') clickSeeROWrEM(row.lastMedicalTreatmentSituation, '上次就医情况')
" "
...@@ -227,7 +233,7 @@ ...@@ -227,7 +233,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.postTreatmentCondition" v-if="row.postTreatmentCondition"
type="text" type="primary"
@click="clickSeeROWrEM(row.postTreatmentCondition, '治疗后情况')" @click="clickSeeROWrEM(row.postTreatmentCondition, '治疗后情况')"
>查看</el-button >查看</el-button
> >
...@@ -249,11 +255,12 @@ ...@@ -249,11 +255,12 @@
align="center" align="center"
prop="serviceRequirements" prop="serviceRequirements"
key="serviceRequirements" key="serviceRequirements"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.serviceRequirements" v-if="row.serviceRequirements"
type="text" type="primary"
@click="clickSeeROWrEM(row.serviceRequirements, '服务要求')" @click="clickSeeROWrEM(row.serviceRequirements, '服务要求')"
>查看</el-button >查看</el-button
> >
...@@ -314,11 +321,12 @@ ...@@ -314,11 +321,12 @@
align="center" align="center"
prop="evaluationContent" prop="evaluationContent"
key="evaluationContent" key="evaluationContent"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.evaluationContent" v-if="row.evaluationContent"
type="text" type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')" @click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button >查看</el-button
> >
...@@ -336,7 +344,7 @@ ...@@ -336,7 +344,7 @@
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
type="text" type="primary"
@click="clickSeeVisitorImg(row)" @click="clickSeeVisitorImg(row)"
>点击查看</el-button >点击查看</el-button
> >
...@@ -350,6 +358,7 @@ ...@@ -350,6 +358,7 @@
key="createTime" key="createTime"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column <!-- <el-table-column
label="操作" label="操作"
...@@ -358,16 +367,16 @@ ...@@ -358,16 +367,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dbwzOrder:edit']" v-hasPermi="['system:dbwzOrder:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:dbwzOrder:remove']" v-hasPermi="['system:dbwzOrder:remove']"
......
src/views/orderManagement/order/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:order:add']" v-hasPermi="['system:order:add']"
>新增</el-button> >新增</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:order:edit']" v-hasPermi="['system:order:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:order:remove']" v-hasPermi="['system:order:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:order:export']" v-hasPermi="['system:order:export']"
>导出</el-button> >导出</el-button>
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
v-loading="loading" v-loading="loading"
:data="orderList" :data="orderList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -133,19 +135,20 @@ ...@@ -133,19 +135,20 @@
align="center" align="center"
prop="userVsitorVo" prop="userVsitorVo"
key="userVsitorVo" key="userVsitorVo"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length" v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text" type="primary"
@click="clickSeeVisitor(row)" @click="clickSeeVisitor(row)"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </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 }"> <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 >查看</el-button
> >
<span v-else>未接单</span> <span v-else>未接单</span>
...@@ -161,7 +164,7 @@ ...@@ -161,7 +164,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
type="text" type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')" @click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button >点击查看</el-button
> >
...@@ -233,7 +236,7 @@ ...@@ -233,7 +236,7 @@
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.evaluationContent" v-if="row.evaluationContent"
type="text" type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')" @click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button >查看</el-button
> >
...@@ -259,7 +262,7 @@ ...@@ -259,7 +262,7 @@
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
type="text" type="primary"
@click="clickSeeVisitorImg(row)" @click="clickSeeVisitorImg(row)"
>点击查看</el-button >点击查看</el-button
> >
...@@ -273,6 +276,7 @@ ...@@ -273,6 +276,7 @@
key="createTime" key="createTime"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column <!-- <el-table-column
label="操作" label="操作"
...@@ -281,16 +285,16 @@ ...@@ -281,16 +285,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:order:edit']" v-hasPermi="['system:order:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:order:remove']" v-hasPermi="['system:order:remove']"
......
src/views/orderManagement/zqghOrder/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:zqghOrder:add']" v-hasPermi="['system:zqghOrder:add']"
>新增</el-button >新增</el-button
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:zqghOrder:edit']" v-hasPermi="['system:zqghOrder:edit']"
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:zqghOrder:remove']" v-hasPermi="['system:zqghOrder:remove']"
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:zqghOrder:export']" v-hasPermi="['system:zqghOrder:export']"
>导出</el-button >导出</el-button
...@@ -87,6 +87,8 @@ ...@@ -87,6 +87,8 @@
v-loading="loading" v-loading="loading"
:data="zqghOrderList" :data="zqghOrderList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
> >
<el-table-column <el-table-column
label="订单号" label="订单号"
...@@ -145,11 +147,11 @@ ...@@ -145,11 +147,11 @@
width="180" width="180"
:show-overflow-tooltip="true" :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 }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
type="text" type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')" @click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button >查看</el-button
> >
...@@ -176,6 +178,7 @@ ...@@ -176,6 +178,7 @@
key="createTime" key="createTime"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column <!-- <el-table-column
label="操作" label="操作"
...@@ -184,16 +187,16 @@ ...@@ -184,16 +187,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:zqghOrder:edit']" v-hasPermi="['system:zqghOrder:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:zqghOrder:remove']" v-hasPermi="['system:zqghOrder:remove']"
......
src/views/orderManagement/zyphOrder/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:zyphOrder:add']" v-hasPermi="['system:zyphOrder:add']"
>新增</el-button> >新增</el-button>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:zyphOrder:edit']" v-hasPermi="['system:zyphOrder:edit']"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:zyphOrder:remove']" v-hasPermi="['system:zyphOrder:remove']"
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:zyphOrder:export']" v-hasPermi="['system:zyphOrder:export']"
>导出</el-button> >导出</el-button>
...@@ -83,6 +83,8 @@ ...@@ -83,6 +83,8 @@
v-loading="loading" v-loading="loading"
:data="zyphOrderList" :data="zyphOrderList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'createTime', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column
...@@ -132,29 +134,30 @@ ...@@ -132,29 +134,30 @@
align="center" align="center"
prop="userVsitorVo" prop="userVsitorVo"
key="userVsitorVo" key="userVsitorVo"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length" v-if="row.userVsitorVo && Object.keys(row.userVsitorVo).length"
type="text" type="primary"
@click="clickSeeVisitor(row)" @click="clickSeeVisitor(row)"
>查看</el-button >查看</el-button
> >
</template> </template>
</el-table-column> </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 }"> <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 >查看</el-button
> >
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </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 }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
type="text" type="primary"
@click="clickSeeROWrEM(row.remark, '订单备注')" @click="clickSeeROWrEM(row.remark, '订单备注')"
>查看</el-button >查看</el-button
> >
...@@ -231,11 +234,12 @@ ...@@ -231,11 +234,12 @@
align="center" align="center"
prop="evaluationContent" prop="evaluationContent"
key="evaluationContent" key="evaluationContent"
width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.evaluationContent" v-if="row.evaluationContent"
type="text" type="primary"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')" @click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button >查看</el-button
> >
...@@ -261,7 +265,7 @@ ...@@ -261,7 +265,7 @@
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
type="text" type="primary"
@click="clickSeeVisitorImg(row)" @click="clickSeeVisitorImg(row)"
>点击查看</el-button >点击查看</el-button
> >
...@@ -275,6 +279,7 @@ ...@@ -275,6 +279,7 @@
key="createTime" key="createTime"
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
sortable
/> />
<!-- <el-table-column <!-- <el-table-column
label="操作" label="操作"
...@@ -283,16 +288,16 @@ ...@@ -283,16 +288,16 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:zyphOrder:edit']" v-hasPermi="['system:zyphOrder:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:zyphOrder:remove']" v-hasPermi="['system:zyphOrder:remove']"
......
src/views/system/user/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
v-model="deptName" v-model="deptName"
placeholder="请输入部门名称" placeholder="请输入部门名称"
clearable clearable
size="small" size="large"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
type="info" type="info"
plain plain
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="large"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
>导入</el-button> >导入</el-button>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:user:export']" v-hasPermi="['system:user:export']"
>导出</el-button> >导出</el-button>
...@@ -160,6 +160,7 @@ ...@@ -160,6 +160,7 @@
v-loading="loading" v-loading="loading"
:data="userList" :data="userList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'userId', order: 'ascending' }"
> >
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column <el-table-column
...@@ -167,6 +168,7 @@ ...@@ -167,6 +168,7 @@
align="center" align="center"
key="userId" key="userId"
prop="userId" prop="userId"
sortable
/> />
<el-table-column <el-table-column
label="用户名" label="用户名"
...@@ -220,25 +222,25 @@ ...@@ -220,25 +222,25 @@
> >
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button <el-button
size="mini" size="large"
type="text"
icon="el-icon-edit" icon="el-icon-edit"
type="primary"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text"
icon="el-icon-delete" icon="el-icon-delete"
type="primary"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button >删除</el-button
> >
<!-- <el-dropdown <!-- <el-dropdown
size="mini" size="large"
@command="(command) => handleCommand(command, scope.row)" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']" 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-button
> >
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
......
src/views/user/companion/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
v-model="deptName" v-model="deptName"
placeholder="请输入部门名称" placeholder="请输入部门名称"
clearable clearable
size="small" size="large"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
>新增</el-button >新增</el-button
> >
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
type="info" type="info"
plain plain
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="large"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
>导入</el-button> >导入</el-button>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:user:export']" v-hasPermi="['system:user:export']"
>导出</el-button> >导出</el-button>
...@@ -160,9 +160,17 @@ ...@@ -160,9 +160,17 @@
v-loading="loading" v-loading="loading"
:data="userList" :data="userList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="50" align="center" /> <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 <el-table-column
label="陪诊员" label="陪诊员"
align="center" align="center"
...@@ -342,63 +350,63 @@ ...@@ -342,63 +350,63 @@
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="200" width="450"
fixed="right" fixed="right"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 1)" @click="handleUBTns(scope.row, 1)"
>详情</el-button >详情</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 2)" @click="handleUBTns(scope.row, 2)"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 3)" @click="handleUBTns(scope.row, 3)"
v-if="scope.row.status == 1" v-if="scope.row.status == 1"
>冻结</el-button >冻结</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 3)" @click="handleUBTns(scope.row, 3)"
v-if="scope.row.status == 2" v-if="scope.row.status == 2"
>解禁</el-button >解禁</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 4)" @click="handleUBTns(scope.row, 4)"
v-if="scope.row.nowType == 1" v-if="scope.row.nowType == 1"
>设置为陪护人员</el-button >设置为陪护人员</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 4)" @click="handleUBTns(scope.row, 4)"
v-if="scope.row.nowType == 2" v-if="scope.row.nowType == 2"
>设置为陪诊人员</el-button >设置为陪诊人员</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="primary"
@click="handleUBTns(scope.row, 5)" @click="handleUBTns(scope.row, 5)"
>设置时间</el-button >设置时间</el-button
> >
<!-- <el-dropdown <!-- <el-dropdown
size="mini" size="large"
@command="(command) => handleCommand(command, scope.row)" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']" 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-button
> >
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
......
src/views/user/merchant/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
v-model="deptName" v-model="deptName"
placeholder="请输入部门名称" placeholder="请输入部门名称"
clearable clearable
size="small" size="large"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:user:add']" v-hasPermi="['system:user:add']"
>新增</el-button >新增</el-button
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
type="info" type="info"
plain plain
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="large"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
>导入</el-button> >导入</el-button>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:user:export']" v-hasPermi="['system:user:export']"
>导出</el-button> >导出</el-button>
...@@ -161,9 +161,17 @@ ...@@ -161,9 +161,17 @@
v-loading="loading" v-loading="loading"
:data="userList" :data="userList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'id', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="50" align="center" /> <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 <el-table-column
label="商户名称" label="商户名称"
align="center" align="center"
...@@ -305,7 +313,7 @@ ...@@ -305,7 +313,7 @@
> >
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button <el-button
size="mini" size="large"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
...@@ -313,7 +321,7 @@ ...@@ -313,7 +321,7 @@
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
...@@ -321,11 +329,11 @@ ...@@ -321,11 +329,11 @@
>删除</el-button >删除</el-button
> >
<el-dropdown <el-dropdown
size="mini" size="large"
@command="(command) => handleCommand(command, scope.row)" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']" 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-button
> >
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
......
src/views/user/whole/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
v-model="deptName" v-model="deptName"
placeholder="请输入部门名称" placeholder="请输入部门名称"
clearable clearable
size="small" size="large"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
style="margin-bottom: 20px" style="margin-bottom: 20px"
/> />
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<el-form <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="large"
:inline="true" :inline="true"
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
...@@ -86,11 +86,11 @@ ...@@ -86,11 +86,11 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
size="mini" size="large"
@click="handleQuery" @click="handleQuery"
>搜索</el-button >搜索</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-button
> >
</el-form-item> </el-form-item>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="large"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:user:add']" v-hasPermi="['system:user:add']"
>新增</el-button >新增</el-button
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
type="success" type="success"
plain plain
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="large"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:user:edit']" v-hasPermi="['system:user:edit']"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="large"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
type="info" type="info"
plain plain
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="large"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:user:import']" v-hasPermi="['system:user:import']"
>导入</el-button> >导入</el-button>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="large"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:user:export']" v-hasPermi="['system:user:export']"
>导出</el-button> >导出</el-button>
...@@ -161,6 +161,8 @@ ...@@ -161,6 +161,8 @@
v-loading="loading" v-loading="loading"
:data="userList" :data="userList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'userId', order: 'ascending' }"
border=""
> >
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column <el-table-column
...@@ -168,6 +170,7 @@ ...@@ -168,6 +170,7 @@
align="center" align="center"
key="userId" key="userId"
prop="userId" prop="userId"
sortable
/> />
<el-table-column <el-table-column
label="姓名" label="姓名"
...@@ -245,7 +248,7 @@ ...@@ -245,7 +248,7 @@
> >
<template slot-scope="scope" v-if="scope.row.userId !== 1"> <template slot-scope="scope" v-if="scope.row.userId !== 1">
<el-button <el-button
size="mini" size="large"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
...@@ -253,7 +256,7 @@ ...@@ -253,7 +256,7 @@
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini" size="large"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
...@@ -261,11 +264,11 @@ ...@@ -261,11 +264,11 @@
>删除</el-button >删除</el-button
> >
<el-dropdown <el-dropdown
size="mini" size="large"
@command="(command) => handleCommand(command, scope.row)" @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="['system:user:resetPwd', 'system:user:edit']" 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-button
> >
<el-dropdown-menu slot="dropdown"> <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