Skip to content

P
peizhen-vue
Commit c1e60fce by 裴梁博
Options

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

Feature/v1/plb

See merge request !8
parents f8b4e46d f4e43380
Showing with 576 additions and 139 deletions
src/api/index.js
...@@ -122,4 +122,13 @@ export function employeesSetWorkHourPut(data) { ...@@ -122,4 +122,13 @@ export function employeesSetWorkHourPut(data) {
method: "put", method: "put",
data: data, data: data,
}); });
} }
\ No newline at end of file
// 机构
export function companyListGet(query) {
return request({
url: `/system/data/companyList`,
method: "get",
params: query,
});
}
src/views/goods/index.vue
...@@ -313,7 +313,13 @@ ...@@ -313,7 +313,13 @@
<imageUpload <imageUpload
v-if="VisitorData.cover" v-if="VisitorData.cover"
v-model="VisitorData.cover" v-model="VisitorData.cover"
:limit="VisitorData.cover.split(',').length" :limit="
VisitorData.cover &&
VisitorData.cover.split(',') &&
VisitorData.cover.split(',').length
? VisitorData.cover.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
......
src/views/index.vue
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="index-content-nav-item-top"> <div class="index-content-nav-item-top">
<h3>所属城市</h3> <h3>所属城市</h3>
</div> </div>
<h2>{{cityName ? cityName : ''}}</h2> <h2>{{ cityName ? cityName : "" }}</h2>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -188,6 +188,40 @@ ...@@ -188,6 +188,40 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<template v-if="user.roleId != 3">
<el-select
v-model="cityId"
placeholder="请选择城市"
style="margin-left: 15px; width: 10em"
filterable
clearable=""
@change="changeCtypChange"
>
<el-option
v-for="item in cityVoList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
<el-select
v-model="companyId"
placeholder="请选择机构"
style="margin-left: 15px; width: 10em"
filterable
clearable=""
@change="orderQuantityEchartsAxios"
>
<el-option
v-for="item in companyList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</template>
</div> </div>
</div> </div>
<!-- <h2>总量：{{ sumF }}</h2> --> <!-- <h2>总量：{{ sumF }}</h2> -->
...@@ -232,6 +266,7 @@ ...@@ -232,6 +266,7 @@
import * as echarts from "echarts"; import * as echarts from "echarts";
require("echarts/theme/macarons"); // echarts theme require("echarts/theme/macarons"); // echarts theme
import resize from "./dashboard/mixins/resize"; import resize from "./dashboard/mixins/resize";
import { cityVoListGET } from "@/api/hispotalManage/hospital";
const animationDuration = 3000; const animationDuration = 3000;
import { import {
dataUserGet, dataUserGet,
...@@ -240,17 +275,22 @@ import { ...@@ -240,17 +275,22 @@ import {
platformRevenueGet, platformRevenueGet,
orderQuantityGet, orderQuantityGet,
orderQuantityEchartsGet, orderQuantityEchartsGet,
companyListGet,
} from "@/api/index.js"; } from "@/api/index.js";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
name: "Index", name: "Index",
mixins: [resize], mixins: [resize],
computed: { computed: {
...mapGetters(["user","cityName"]), ...mapGetters(["user", "cityName"]),
}, },
data() { data() {
return { return {
// 版本号 // 版本号
companyId: "",
companyList: [],
cityVoList: [],
cityId: "",
version: "4.8.0", version: "4.8.0",
valueA: 1, valueA: 1,
sumA: 0, sumA: 0,
...@@ -290,6 +330,7 @@ export default { ...@@ -290,6 +330,7 @@ export default {
this.dataEmployeesAxios(); this.dataEmployeesAxios();
if (this.user.roleId != 3) { if (this.user.roleId != 3) {
this.saleroomAxios(); this.saleroomAxios();
this.cityVoListAxios();
} }
this.platformRevenueAxios(); this.platformRevenueAxios();
this.orderQuantityAxios(); this.orderQuantityAxios();
...@@ -303,6 +344,28 @@ export default { ...@@ -303,6 +344,28 @@ export default {
this.chart = null; this.chart = null;
}, },
methods: { methods: {
changeCtypChange() {
this.companyId = ''
this.companyList = []
this.companyListAxios()
},
async companyListAxios() {
const data_back = await companyListGet({
cityId: this.cityId
});
const { code, data } = data_back;
if (code === 200) {
this.companyList = data;
this.orderQuantityEchartsAxios()
}
},
async cityVoListAxios() {
const data_back = await cityVoListGET();
const { code, data } = data_back;
if (code === 200) {
this.cityVoList = data;
}
},
changeDataer(e) { changeDataer(e) {
console.log("changeDataer", e); console.log("changeDataer", e);
if (!e) { if (!e) {
...@@ -319,6 +382,8 @@ export default { ...@@ -319,6 +382,8 @@ export default {
async orderQuantityEchartsAxios() { async orderQuantityEchartsAxios() {
let params = { let params = {
type: this.valueF, type: this.valueF,
cityId: this.cityId,
companyId: this.companyId,
}; };
if ([0, 1].includes(this.valueF)) { if ([0, 1].includes(this.valueF)) {
} else if (this.valueF == 2) { } else if (this.valueF == 2) {
......
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-09-15 18:30:08 * @LastEditTime: 2023-10-25 11:33:19
* @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
--> -->
...@@ -148,7 +148,13 @@ ...@@ -148,7 +148,13 @@
<imageUpload <imageUpload
v-if="row.businessLicense" v-if="row.businessLicense"
v-model="row.businessLicense" v-model="row.businessLicense"
:limit="row.businessLicense.split(',').length" :limit="
row.businessLicense &&
row.businessLicense.split(',') &&
row.businessLicense.split(',').length
? row.businessLicense.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
...@@ -166,7 +172,13 @@ ...@@ -166,7 +172,13 @@
<imageUpload <imageUpload
v-if="row.foodBusinessLicense" v-if="row.foodBusinessLicense"
v-model="row.foodBusinessLicense" v-model="row.foodBusinessLicense"
:limit="row.foodBusinessLicense.split(',').length" :limit="
row.foodBusinessLicense &&
row.foodBusinessLicense.split(',') &&
row.foodBusinessLicense.split(',').length
? row.foodBusinessLicense.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
...@@ -184,7 +196,13 @@ ...@@ -184,7 +196,13 @@
<imageUpload <imageUpload
v-if="row.drugBusinessLicense" v-if="row.drugBusinessLicense"
v-model="row.drugBusinessLicense" v-model="row.drugBusinessLicense"
:limit="row.drugBusinessLicense.split(',').length" :limit="
row.drugBusinessLicense &&
row.drugBusinessLicense.split(',') &&
row.drugBusinessLicense.split(',').length
? row.drugBusinessLicense.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
...@@ -202,7 +220,13 @@ ...@@ -202,7 +220,13 @@
<imageUpload <imageUpload
v-if="row.medicalBusinessLicense" v-if="row.medicalBusinessLicense"
v-model="row.medicalBusinessLicense" v-model="row.medicalBusinessLicense"
:limit="row.medicalBusinessLicense.split(',').length" :limit="
row.medicalBusinessLicense &&
row.medicalBusinessLicense.split(',') &&
row.medicalBusinessLicense.split(',').length
? row.medicalBusinessLicense.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
...@@ -220,7 +244,13 @@ ...@@ -220,7 +244,13 @@
<imageUpload <imageUpload
v-if="row.twoMedicalBusinessLicense" v-if="row.twoMedicalBusinessLicense"
v-model="row.twoMedicalBusinessLicense" v-model="row.twoMedicalBusinessLicense"
:limit="row.twoMedicalBusinessLicense.split(',').length" :limit="
row.twoMedicalBusinessLicense &&
row.twoMedicalBusinessLicense.split(',') &&
row.twoMedicalBusinessLicense.split(',').length
? twoMedicalBusinessLicense.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
......
src/views/operation/business/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="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="提供医院" prop="hospitals"> <!-- <el-form-item label="提供医院" prop="hospitals">
<el-input <el-input
v-model="queryParams.hospitals" v-model="queryParams.hospitals"
...@@ -10,11 +17,24 @@ ...@@ -10,11 +17,24 @@
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item label="业务名称" prop="name"> <el-form-item label="业务名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入业务名称" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="queryParams.name"
placeholder="请输入业务名称"
clearable
@keyup.enter.native="handleQuery"
/>
</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
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -64,38 +84,100 @@ ...@@ -64,38 +84,100 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> --> </el-row> -->
<el-table key="outer" v-loading="loading" :data="businessList" @selection-change="handleSelectionChange"> <el-table
key="outer"
v-loading="loading"
:data="businessList"
@selection-change="handleSelectionChange"
>
<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" :show-overflow-tooltip="true" /> <el-table-column
label="ID"
align="center"
prop="id"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="提供医院" align="center" prop="hospitalsList"> <!-- <el-table-column label="提供医院" align="center" prop="hospitalsList">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-for="(item, index) in scope.row.hospitalsList" :key="index" style="margin-right: 8px">{{ item <el-tag v-for="(item, index) in scope.row.hospitalsList" :key="index" style="margin-right: 8px">{{ item
}}</el-tag> }}</el-tag>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="业务名称" align="center" prop="name" :show-overflow-tooltip="true" /> <el-table-column
label="业务名称"
align="center"
prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column label="服务" align="center" prop="name"> <el-table-column label="服务" align="center" prop="name">
<template slot-scope="props"> <template slot-scope="props">
<el-button type="primary" round @click="clickServices(props.row)">服务</el-button> <el-button type="primary" round @click="clickServices(props.row)"
>服务</el-button
>
<!-- <el-button size="mini" type="text" icon="el-icon-edit">新增1111</el-button> --> <!-- <el-button size="mini" type="text" icon="el-icon-edit">新增1111</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> label="更新时间"
align="center"
prop="updateTime"
width="180"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handlenew(scope.row)">新增</el-button> <el-button
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> type="text"
icon="el-icon-edit"
@click="handlenew(scope.row)"
>新增</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination
@pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<el-dialog :title="title" :visible.sync="servicesOpen" width="80%" append-to-body max-height="100px"> <el-dialog
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> :title="title"
:visible.sync="servicesOpen"
width="80%"
append-to-body
max-height="100px"
>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="提供医院" prop="hospitals"> <!-- <el-form-item label="提供医院" prop="hospitals">
<el-input <el-input
v-model="queryParams.hospitals" v-model="queryParams.hospitals"
...@@ -105,47 +187,121 @@ ...@@ -105,47 +187,121 @@
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item label="服务名称" prop="name"> <el-form-item label="服务名称" prop="name">
<el-input v-model="name" placeholder="请输入服务名称" clearable @keyup.enter.native="handleQuery" /> <el-input
v-model="name"
placeholder="请输入服务名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <el-form-item label="城市" prop="cityId">
<el-select filterable clearable v-model="cityId" placeholder="请选择"> <el-select filterable clearable v-model="cityId" placeholder="请选择">
<el-option v-for="item in cityVoList" :key="item.id" :label="item.name" :value="item.id"> <el-option
v-for="item in cityVoList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">搜索</el-button> <el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuerys"
>搜索</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table key="inside" :data="servicesList"> <el-table key="inside" :data="servicesList">
<el-table-column prop="name" label="服务名称" :show-overflow-tooltip="true"></el-table-column> <el-table-column
prop="name"
label="服务名称"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column prop="cover" label="封面" width="170"> <el-table-column prop="cover" label="封面" width="170">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<imageUpload v-model="row.cover" :limit="row.cover.split(',').length" :disabled="true" :isShowTip="false"> <imageUpload
v-model="row.cover"
:limit="
row.cover && row.cover.split(',') && row.cover.split(',').length
? row.cover.split(',').length
: 1
"
:disabled="true"
:isShowTip="false"
>
</imageUpload> </imageUpload>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="highPrice" label="高价" :show-overflow-tooltip="true" /> <el-table-column
<el-table-column prop="price" label="价格" :show-overflow-tooltip="true" /> prop="highPrice"
<el-table-column prop="cityName" label="城市" :show-overflow-tooltip="true"></el-table-column> label="高价"
<el-table-column prop="fenmo" label="平台分成" :show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="duration" label="时长(小时)" :show-overflow-tooltip="true" /> />
<el-table-column prop="overtime" label="超时计费/30分钟" :show-overflow-tooltip="true" /> <el-table-column
prop="price"
label="价格"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="cityName"
label="城市"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="fenmo"
label="平台分成"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="duration"
label="时长(小时)"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="overtime"
label="超时计费/30分钟"
:show-overflow-tooltip="true"
/>
<el-table-column label="服务时段" :show-overflow-tooltip="true"> <el-table-column label="服务时段" :show-overflow-tooltip="true">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.startTime && row.endTime">{{ row.startTime }} - {{ row.endTime }}</span> <span v-if="row.startTime && row.endTime"
>{{ row.startTime }} - {{ row.endTime }}</span
>
<span v-else>未设置</span> <span v-else>未设置</span>
</template> </template>
</el-table-column> </el-table-column>
<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 size="mini" type="text" icon="el-icon-edit" @click="handleUpdateServe(scope.row)">修改服务</el-button> <el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdateServe(scope.row)"
>修改服务</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="totals > 0" :total="totals" :page.sync="pageNum" :limit.sync="pageSize" <pagination
@pagination="clickServices" /> v-show="totals > 0"
<div slot="footer" class="dialog-footer" style="text-align: center!important;"> :total="totals"
:page.sync="pageNum"
:limit.sync="pageSize"
@pagination="clickServices"
/>
<div
slot="footer"
class="dialog-footer"
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">关 闭</el-button>
</div> </div>
...@@ -164,14 +320,26 @@ ...@@ -164,14 +320,26 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button> <el-button :loading="buttonLoading" type="primary" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="service == true ? '修改服务' : '新增服务'" :visible.sync="openServe" width="50%" append-to-body> <el-dialog
:title="service == true ? '修改服务' : '新增服务'"
:visible.sync="openServe"
width="50%"
append-to-body
>
<div class="hidden-dialog"> <div class="hidden-dialog">
<el-form ref="serveForm" :model="serveForm" :rules="serveRules" label-width="80px"> <el-form
ref="serveForm"
:model="serveForm"
:rules="serveRules"
label-width="80px"
>
<el-form-item label="服务名称" prop="name"> <el-form-item label="服务名称" prop="name">
<el-input v-model="serveForm.name" placeholder="请输入服务名称"> <el-input v-model="serveForm.name" placeholder="请输入服务名称">
<template slot="prepend"> <template slot="prepend">
...@@ -180,8 +348,18 @@ ...@@ -180,8 +348,18 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <el-form-item label="城市" prop="cityId">
<el-select filterable clearable v-model="serveForm.cityId" placeholder="请选择"> <el-select
<el-option v-for="item in cityVoList" :key="item.id" :label="item.name" :value="item.id"> filterable
clearable
v-model="serveForm.cityId"
placeholder="请选择"
>
<el-option
v-for="item in cityVoList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -190,31 +368,58 @@ ...@@ -190,31 +368,58 @@
</el-form-item> </el-form-item>
<el-form-item label="高价" prop="highPrice"> <el-form-item label="高价" prop="highPrice">
<strong>￥</strong> <strong>￥</strong>
<el-input-number v-model="serveForm.highPrice" controls-position="right" :min="0"></el-input-number> <el-input-number
v-model="serveForm.highPrice"
controls-position="right"
:min="0"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="价格" prop="price"> <el-form-item label="价格" prop="price">
<strong>￥</strong> <strong>￥</strong>
<el-input-number v-model="serveForm.price" controls-position="right" :min="0"></el-input-number> <el-input-number
v-model="serveForm.price"
controls-position="right"
:min="0"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="平台分成" prop="fenmo"> <el-form-item label="平台分成" prop="fenmo">
<strong>%</strong> <strong>%</strong>
<el-input-number v-model="serveForm.fenmo" controls-position="right" :min="0"></el-input-number> <el-input-number
v-model="serveForm.fenmo"
controls-position="right"
:min="0"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="服务时长" prop="duration"> <el-form-item label="服务时长" prop="duration">
<el-input-number v-model="serveForm.duration" :min="0"></el-input-number> <el-input-number
v-model="serveForm.duration"
:min="0"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="超时付费" prop="overtime"> <el-form-item label="超时付费" prop="overtime">
<!-- <el-input v-model="serveForm.overtime" placeholder="请输入"> <!-- <el-input v-model="serveForm.overtime" placeholder="请输入">
<template slot="prepend"> ￥ </template> <template slot="prepend"> ￥ </template>
</el-input> --> </el-input> -->
<strong>￥</strong> <strong>￥</strong>
<el-input-number v-model="serveForm.overtime" controls-position="right" :min="0"></el-input-number> <el-input-number
v-model="serveForm.overtime"
controls-position="right"
:min="0"
></el-input-number>
<div>每30分钟。未满30分钟按30分钟算</div> <div>每30分钟。未满30分钟按30分钟算</div>
</el-form-item> </el-form-item>
<el-form-item label="服务时段" prop="date"> <el-form-item label="服务时段" prop="date">
<el-time-picker is-range arrow-control v-model="serveForm.date" range-separator="至" start-placeholder="开始时间" <el-time-picker
end-placeholder="结束时间" value-format="HH:mm:ss" placeholder="选择时间范围"> is-range
arrow-control
v-model="serveForm.date"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
value-format="HH:mm:ss"
placeholder="选择时间范围"
>
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="介绍" prop="info"> <el-form-item label="介绍" prop="info">
...@@ -224,7 +429,12 @@ ...@@ -224,7 +429,12 @@
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitServeForm">确 定</el-button> <el-button
:loading="buttonLoading"
type="primary"
@click="submitServeForm"
>确 定</el-button
>
<el-button @click="cancelServeForm">取 消</el-button> <el-button @click="cancelServeForm">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -241,7 +451,7 @@ import { ...@@ -241,7 +451,7 @@ import {
getServe, getServe,
addServe, addServe,
updateServe, updateServe,
servicesGET servicesGET,
} from "@/api/operation/business"; } from "@/api/operation/business";
import { listHospital, cityVoListGET } from "@/api/hispotalManage/hospital"; import { listHospital, cityVoListGET } from "@/api/hispotalManage/hospital";
...@@ -264,12 +474,12 @@ export default { ...@@ -264,12 +474,12 @@ export default {
showSearch: true, showSearch: true,
service: true, service: true,
cityVoList: [], cityVoList: [],
name: '', name: "",
cityId: '', cityId: "",
// 总条数 // 总条数
total: 0, total: 0,
totals: 0, totals: 0,
bid: '', bid: "",
// 业务表格数据 // 业务表格数据
businessList: [], businessList: [],
// 弹出层标题 // 弹出层标题
...@@ -415,45 +625,44 @@ export default { ...@@ -415,45 +625,44 @@ export default {
}); });
}, },
handlenew(row) { handlenew(row) {
this.service = false this.service = false;
this.openServe = true; this.openServe = true;
this.bid = row.id this.bid = row.id;
this.resetServe(); this.resetServe();
}, },
handleQuerys() { handleQuerys() {
this.pageNum = 1 this.pageNum = 1;
this.pageSize = 10 this.pageSize = 10;
let par = {} let par = {};
this.clickServices(par) this.clickServices(par);
}, },
clickServices(val) { clickServices(val) {
// console.log(val, '==============') // console.log(val, '==============')
if (val.id != undefined) { if (val.id != undefined) {
this.servicesID = val.id this.servicesID = val.id;
} }
let params = { let params = {
pageNum: this.pageNum, pageNum: this.pageNum,
pageSize: this.pageSize, pageSize: this.pageSize,
bid: this.servicesID, bid: this.servicesID,
name:this.name, name: this.name,
cityId:this.cityId cityId: this.cityId,
} };
servicesGET(params).then((res) => { servicesGET(params).then((res) => {
this.totals = res.total this.totals = res.total;
this.servicesList = res.rows this.servicesList = res.rows;
this.servicesOpen = true this.servicesOpen = true;
}) });
// return // return
}, },
clcikCancel() { clcikCancel() {
this.pageNum = 1 this.pageNum = 1;
this.pageSize = 10 this.pageSize = 10;
this.servicesOpen = false this.servicesOpen = false;
}, },
// 修改服务 // 修改服务
handleUpdateServe(row) { handleUpdateServe(row) {
this.service = true this.service = true;
this.openServe = true; this.openServe = true;
this.resetServe(); this.resetServe();
const id = row.id; const id = row.id;
...@@ -534,7 +743,7 @@ export default { ...@@ -534,7 +743,7 @@ export default {
this.serveForm.date && this.serveForm.date.length this.serveForm.date && this.serveForm.date.length
? this.serveForm.date[1] ? this.serveForm.date[1]
: "", : "",
bid: this.bid bid: this.bid,
}) })
.then((response) => { .then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
...@@ -562,7 +771,7 @@ export default { ...@@ -562,7 +771,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => { }) .catch(() => {})
.finally(() => { .finally(() => {
this.loading = false; this.loading = false;
}); });
......
src/views/operation/news/index.vue
...@@ -105,7 +105,11 @@ ...@@ -105,7 +105,11 @@
<imageUpload <imageUpload
v-if="row.cover" v-if="row.cover"
v-model="row.cover" v-model="row.cover"
:limit="row.cover.split(',').length" :limit="
row.cover && row.cover.split(',') && row.cover.split(',').length
? row.cover.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
......
src/views/orderManagement/dbghOrder/index.vue
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
</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 }">
<span v-if="row.ename">{{ row.ename }}</span> <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -240,13 +242,6 @@ ...@@ -240,13 +242,6 @@
width="170" width="170"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
...@@ -398,12 +393,34 @@ ...@@ -398,12 +393,34 @@
<imageUpload <imageUpload
v-if="VisitorData.voucher" v-if="VisitorData.voucher"
v-model="VisitorData.voucher" v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length" :limit="
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
</el-dialog> </el-dialog>
</template> </template>
<template v-if="openEMInfo">
<el-dialog
title="接单人信息"
:visible.sync="openEMInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">姓名：</p>
<p class="contl-item-rig">{{ VisitorData.ename }}</p>
</div>
</div>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -420,6 +437,7 @@ export default { ...@@ -420,6 +437,7 @@ export default {
name: "DbghOrder", name: "DbghOrder",
data() { data() {
return { return {
openEMInfo: false,
openArticleInfoImg: false, openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
...@@ -476,6 +494,10 @@ export default { ...@@ -476,6 +494,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) { clickSeeVisitorImg(row) {
this.openArticleInfoImg = true; this.openArticleInfoImg = true;
this.VisitorData = row; this.VisitorData = row;
......
src/views/orderManagement/dbmyOrder/index.vue
...@@ -139,7 +139,13 @@ ...@@ -139,7 +139,13 @@
v-model="row.prescriptionAttachment" v-model="row.prescriptionAttachment"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
:limit="row.prescriptionAttachment.split(',').length" :limit="
row.prescriptionAttachment &&
row.prescriptionAttachment.split(',') &&
row.prescriptionAttachment.split(',').length
? row.prescriptionAttachment.split(',').length
: 1
"
/> />
</template> </template>
</el-table-column> </el-table-column>
...@@ -179,7 +185,9 @@ ...@@ -179,7 +185,9 @@
/> />
<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 }">
<span v-if="row.ename">{{ row.ename }}</span> <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -281,13 +289,6 @@ ...@@ -281,13 +289,6 @@
width="170" width="170"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
...@@ -506,12 +507,34 @@ ...@@ -506,12 +507,34 @@
<imageUpload <imageUpload
v-if="VisitorData.voucher" v-if="VisitorData.voucher"
v-model="VisitorData.voucher" v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length" :limit="
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
</el-dialog> </el-dialog>
</template> </template>
<template v-if="openEMInfo">
<el-dialog
title="接单人信息"
:visible.sync="openEMInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">姓名：</p>
<p class="contl-item-rig">{{ VisitorData.ename }}</p>
</div>
</div>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -528,6 +551,7 @@ export default { ...@@ -528,6 +551,7 @@ export default {
name: "DbmyOrder", name: "DbmyOrder",
data() { data() {
return { return {
openEMInfo: false,
openArticleInfoImg: false, openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
...@@ -594,6 +618,10 @@ export default { ...@@ -594,6 +618,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) { clickSeeVisitorImg(row) {
this.openArticleInfoImg = true; this.openArticleInfoImg = true;
this.VisitorData = row; this.VisitorData = row;
......
src/views/orderManagement/dbwzOrder/index.vue
...@@ -107,13 +107,6 @@ ...@@ -107,13 +107,6 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="科室"
align="center"
prop="title"
key="title"
:show-overflow-tooltip="true"
/>
<el-table-column
label="订单价" label="订单价"
align="center" align="center"
prop="payMoney" prop="payMoney"
...@@ -137,7 +130,9 @@ ...@@ -137,7 +130,9 @@
</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 }">
<span v-if="row.ename">{{ row.ename }}</span> <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -338,13 +333,6 @@ ...@@ -338,13 +333,6 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
...@@ -551,12 +539,34 @@ ...@@ -551,12 +539,34 @@
<imageUpload <imageUpload
v-if="VisitorData.voucher" v-if="VisitorData.voucher"
v-model="VisitorData.voucher" v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length" :limit="
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
</el-dialog> </el-dialog>
</template> </template>
<template v-if="openEMInfo">
<el-dialog
title="接单人信息"
:visible.sync="openEMInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">姓名：</p>
<p class="contl-item-rig">{{ VisitorData.ename }}</p>
</div>
</div>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -573,6 +583,7 @@ export default { ...@@ -573,6 +583,7 @@ export default {
name: "DbwzOrder", name: "DbwzOrder",
data() { data() {
return { return {
openEMInfo: false,
openArticleInfoImg: false, openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
...@@ -636,6 +647,10 @@ export default { ...@@ -636,6 +647,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitor(row) { clickSeeVisitor(row) {
this.openArticleInfo = true; this.openArticleInfo = true;
this.VisitorData = row.userVsitorVo; this.VisitorData = row.userVsitorVo;
......
src/views/orderManagement/order/index.vue
...@@ -145,11 +145,19 @@ ...@@ -145,11 +145,19 @@
</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 }">
<span v-if="row.ename">{{ row.ename }}</span> <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
>查看</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" width="120"> <el-table-column
label="备注"
align="center"
prop="remark"
key="remark"
width="120"
>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
v-if="row.remark" v-if="row.remark"
...@@ -248,13 +256,6 @@ ...@@ -248,13 +256,6 @@
width="170" width="170"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
...@@ -415,12 +416,34 @@ ...@@ -415,12 +416,34 @@
<imageUpload <imageUpload
v-if="VisitorData.voucher" v-if="VisitorData.voucher"
v-model="VisitorData.voucher" v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length" :limit="
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
</el-dialog> </el-dialog>
</template> </template>
<template v-if="openEMInfo">
<el-dialog
title="接单人信息"
:visible.sync="openEMInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">姓名：</p>
<p class="contl-item-rig">{{ VisitorData.ename }}</p>
</div>
</div>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -437,6 +460,7 @@ export default { ...@@ -437,6 +460,7 @@ export default {
name: "Order", name: "Order",
data() { data() {
return { return {
openEMInfo: false,
openArticleInfoImg: false, openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
...@@ -496,6 +520,10 @@ export default { ...@@ -496,6 +520,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) { clickSeeVisitorImg(row) {
this.openArticleInfoImg = true; this.openArticleInfoImg = true;
this.VisitorData = row; this.VisitorData = row;
......
src/views/orderManagement/zyphOrder/index.vue
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
</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 }">
<span v-if="row.ename">{{ row.ename }}</span> <el-button v-if="row.ename" type="text" @click="clickSeeEM(row)"
>查看</el-button
>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -256,13 +258,6 @@ ...@@ -256,13 +258,6 @@
width="170" width="170"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <imageUpload
v-if="row.voucher"
v-model="row.voucher"
:limit="row.voucher.split(',').length"
:isShowTip="false"
:disabled="true"
></imageUpload> -->
<span> <span>
<el-button <el-button
v-if="row.voucher" v-if="row.voucher"
...@@ -429,12 +424,34 @@ ...@@ -429,12 +424,34 @@
<imageUpload <imageUpload
v-if="VisitorData.voucher" v-if="VisitorData.voucher"
v-model="VisitorData.voucher" v-model="VisitorData.voucher"
:limit="VisitorData.voucher.split(',').length" :limit="
VisitorData.voucher &&
VisitorData.voucher.split(',') &&
VisitorData.voucher.split(',').length
? VisitorData.voucher.split(',').length
: 1
"
:isShowTip="false" :isShowTip="false"
:disabled="true" :disabled="true"
></imageUpload> ></imageUpload>
</el-dialog> </el-dialog>
</template> </template>
<template v-if="openEMInfo">
<el-dialog
title="接单人信息"
:visible.sync="openEMInfo"
width="600px"
append-to-body
>
<div class="contl">
<div class="contl-item">
<p class="contl-item-label">姓名：</p>
<p class="contl-item-rig">{{ VisitorData.ename }}</p>
</div>
</div>
</el-dialog>
</template>
</div> </div>
</template> </template>
...@@ -451,6 +468,7 @@ export default { ...@@ -451,6 +468,7 @@ export default {
name: "ZyphOrder", name: "ZyphOrder",
data() { data() {
return { return {
openEMInfo: false,
openArticleInfoImg: false, openArticleInfoImg: false,
openArticleInfo: false, openArticleInfo: false,
openArticle: false, openArticle: false,
...@@ -512,6 +530,10 @@ export default { ...@@ -512,6 +530,10 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
clickSeeEM(row) {
this.openEMInfo = true;
this.VisitorData = row;
},
clickSeeVisitorImg(row) { clickSeeVisitorImg(row) {
this.openArticleInfoImg = true; this.openArticleInfoImg = true;
this.VisitorData = row; this.VisitorData = row;
......
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