Skip to content

P
peizhen-vue
Commit d98064b9 by honghong
Options

Merge branch 'feature/v1/plb' of http://git.nyinhong.com/PeiZhen-Java/peizhen-vue into feature_lyj

parents 44b91c6a 7198ffd7
Showing with 195 additions and 91 deletions
src/api/merchant/divide.js 0 → 100644
import request from "@/utils/request";
// 查询订单分成记录列表
export function listDivide(query) {
return request({
url: "/merchant/divide/list",
method: "get",
params: query,
});
}
// 数据
export function platformRevenueDivGET(query) {
return request({
url: "/system/data/platformRevenueDiv",
method: "get",
params: query,
});
}
// 查询订单分成记录详细
export function getDivide(id) {
return request({
url: "/merchant/divide/" + id,
method: "get",
});
}
// 新增订单分成记录
export function addDivide(data) {
return request({
url: "/merchant/divide",
method: "post",
data: data,
});
}
// 修改订单分成记录
export function updateDivide(data) {
return request({
url: "/merchant/divide",
method: "put",
data: data,
});
}
// 删除订单分成记录
export function delDivide(id) {
return request({
url: "/merchant/divide/" + id,
method: "delete",
});
}
src/views/financialManagement/income/index.vue
......@@ -161,10 +161,6 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<template v-if="row.status == 0">
<el-button type="primary" @click="clickBH(row, 1)">通过</el-button>
<el-button type="primary" @click="clickBH(row, 2)">拒绝</el-button>
</template>
<span v-if="row.status == 1">成功提现</span>
<span v-if="row.status == 2">拒绝提现</span>
</template>
......@@ -177,30 +173,38 @@
width="180"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
<!-- <el-button
size="large"
type="primary"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:income:edit']"
>修改</el-button
>
<el-button
> -->
<!-- <el-button
size="large"
type="primary"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:income:remove']"
>删除</el-button
>
> -->
<template v-if="scope.row.status == 0">
<el-button type="primary" @click="clickBH(scope.row, 1)"
>通过</el-button
>
<el-button type="primary" @click="clickBH(scope.row, 2)"
>拒绝</el-button
>
</template>
</template>
</el-table-column> -->
</el-table-column>
</el-table>
<pagination
......
src/views/orderManagement/dbghOrder/index.vue
......@@ -211,11 +211,12 @@
width="100"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
> -->
{{ row.title }}
</template>
</el-table-column>
<el-table-column
......@@ -242,9 +243,10 @@
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
<!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
> -->
<span v-if="row.ename"> {{ row.ename }}</span>
<span v-else>未接单</span>
</template>
</el-table-column>
......@@ -272,11 +274,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.visitTime, '期望就诊时间')"
>查看</el-button
>
> -->
{{ row.visitTime }}
</template>
</el-table-column>
<el-table-column
......@@ -385,11 +388,12 @@
sortable
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
> -->
{{ row.createTime }}
</template>
</el-table-column>
<el-table-column
......
src/views/orderManagement/dbmyOrder/index.vue
......@@ -182,11 +182,12 @@
width="100"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrFK(row.ypName, '药品名称')"
>查看</el-button
>
> -->
{{ row.ypName }}
</template>
</el-table-column>
<el-table-column
......@@ -198,12 +199,12 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.ydAddress" -->
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrFK(row.ydAddress, '药店地址')"
>查看</el-button
>
> -->
{{ row.ydAddress }}
</template>
</el-table-column>
<el-table-column
......@@ -214,13 +215,13 @@
width="100"
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeJudge(row)">查看</el-button>
</template>
<!-- <template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeJudge(row)">查看</el-button>
</template> -->
<template slot-scope="{ row }">
<span v-if="row.isCf == 0">否</span>
<span v-if="row.isCf == 1">是</span>
</template> -->
</template>
</el-table-column>
<el-table-column
label="处方附件"
......@@ -230,7 +231,7 @@
:show-overflow-tooltip="true"
width="120"
>
<!-- <template slot-scope="{ row }">
<template slot-scope="{ row }">
<fileUpload
v-model="row.prescriptionAttachment"
:isShowTip="false"
......@@ -242,10 +243,9 @@
? row.prescriptionAttachment.split(',').length
: 1
"
/>
</template> -->
<template slot-scope="{ row }">
<!-- v-if="row.prescriptionAttachment" -->
></fileUpload>
</template>
<template slot-scope="{ row }" v-if="false">
<el-button
type="primary"
@click="
......@@ -264,12 +264,13 @@
align="center"
prop="way"
key="way"
width="100"
width="120"
>
<template slot-scope="{ row }">
<!-- <span v-if="row.way == 0">邮寄到家</span>
<span v-if="row.way == 1">送货上门</span> -->
<el-button type="primary" @click="clickSeeWay(row)">查看</el-button>
<span v-if="row.way == 0">邮寄到家</span>
<span v-else-if="row.way == 1">送货上门</span>
<span v-else>暂无取药方式</span>
<!-- <el-button type="primary" @click="clickSeeWay(row)">查看</el-button> -->
</template>
</el-table-column>
<el-table-column
......@@ -281,12 +282,13 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.recipient" -->
<el-button
type="primary"
@click="clickSeeROWrFK(row.recipient, '收件人')"
v-if="false"
>查看</el-button
>
{{ row.recipient }}
</template>
</el-table-column>
<el-table-column
......@@ -301,8 +303,10 @@
<el-button
type="primary"
@click="clickSeeROWrFK(row.adress, '收货地址')"
v-if="false"
>查看</el-button
>
{{ row.adress }}
</template>
</el-table-column>
<el-table-column
......@@ -320,13 +324,14 @@
:show-overflow-tooltip="true"
width="100"
>
<!-- v-if="row.addressInfo" -->
<template slot-scope="{ row }">
<el-button
type="primary"
@click="clickSeeROWrFK(row.addressInfo, '详细地址')"
v-if="false"
>查看</el-button
>
{{ row.addressInfo }}
</template>
</el-table-column>
<el-table-column
......@@ -337,9 +342,9 @@
width="100"
>
<template slot-scope="{ row }">
<!-- v-if="row.ename" -->
<el-button type="primary" @click="clickSeeEM(row)">查看</el-button>
<!-- <span v-else>未接单</span> -->
<!-- <el-button type="primary" @click="clickSeeEM(row)">查看</el-button>-->
<span v-if="row.ename">{{ row.ename }}</span>
<span v-else>未接单</span>
</template>
</el-table-column>
<el-table-column
......@@ -480,8 +485,10 @@
<el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
v-if="false"
>查看</el-button
>
{{ row.createTime }}
</template>
</el-table-column>
<el-table-column
......@@ -1647,6 +1654,7 @@ export default {
height: 500px;
overflow-x: hidden;
}
.content {
width: 100%;
}
......@@ -1656,11 +1664,14 @@ export default {
width: calc(100 - 40px);
color: #333333;
font-size: 16px;
&-item {
display: flex;
&-label {
width: 20%;
}
&-rig {
width: 80%;
}
......@@ -1672,6 +1683,7 @@ export default {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
&-item {
width: 48%;
margin-bottom: 20px;
......@@ -1686,6 +1698,7 @@ export default {
display: flex;
align-items: center;
margin-bottom: 10px;
> img {
width: 60px;
height: 60px;
......
src/views/orderManagement/dbwzOrder/index.vue
......@@ -190,14 +190,14 @@
width="100"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
> -->
{{}}
</template>
</el-table-column>
<el-table-column
label="订单价"
align="center"
......@@ -229,9 +229,10 @@
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
<!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
> -->
<span v-if="row.ename">{{ row.ename }}</span>
<span v-else>未接单</span>
</template>
</el-table-column>
......@@ -244,12 +245,13 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.chiefComplaint"
type="primary"
@click="clickSeeROWrEM(row.visitTime, '期望就诊时间')"
>查看</el-button
>
> -->
{{ row.visitTime }}
</template>
</el-table-column>
<el-table-column
......@@ -274,14 +276,16 @@
prop="chiefComplaint"
key="chiefComplaint"
width="100"
v-if="false"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.chiefComplaint"
type="primary"
@click="clickSeeROWrEM(row.chiefComplaint, '主诉')"
>查看</el-button
>
> -->
{{ row.chiefComplaint }}
</template>
</el-table-column>
<el-table-column
......@@ -290,14 +294,16 @@
prop="historyOfPresentIllness"
key="historyOfPresentIllness"
width="100"
v-if="false"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.historyOfPresentIllness"
type="primary"
@click="clickSeeROWrEM(row.historyOfPresentIllness, '现病史')"
>查看</el-button
>
> -->
{{ row.historyOfPresentIllness }}
</template>
</el-table-column>
<el-table-column
......@@ -306,14 +312,16 @@
prop="pastHistory"
key="pastHistory"
width="100"
v-if="false"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.pastHistory"
type="primary"
@click="clickSeeROWrEM(row.pastHistory, '即往史')"
>查看</el-button
>
> -->
{{ row.pastHistory }}
</template>
</el-table-column>
<el-table-column
......@@ -322,16 +330,18 @@
prop="lastMedicalTreatmentSituation"
key="lastMedicalTreatmentSituation"
width="100"
v-if="false"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.lastMedicalTreatmentSituation"
type="primary"
@click="
clickSeeROWrEM(row.lastMedicalTreatmentSituation, '上次就医情况')
"
>查看</el-button
>
> -->
{{ row.lastMedicalTreatmentSituation }}
</template>
</el-table-column>
<el-table-column
......@@ -340,14 +350,16 @@
prop="postTreatmentCondition"
key="postTreatmentCondition"
width="100"
v-if="false"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.postTreatmentCondition"
type="primary"
@click="clickSeeROWrEM(row.postTreatmentCondition, '治疗后情况')"
>查看</el-button
>
> -->
{{ row.postTreatmentCondition }}
</template>
</el-table-column>
<el-table-column
......@@ -355,6 +367,7 @@
align="center"
prop="relatedReports"
key="relatedReports"
v-if="false"
>
<template slot-scope="{ row }">
<span v-if="row.relatedReports">已上传</span>
......@@ -367,14 +380,16 @@
prop="serviceRequirements"
key="serviceRequirements"
width="100"
v-if="false"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
v-if="row.serviceRequirements"
type="primary"
@click="clickSeeROWrEM(row.serviceRequirements, '服务要求')"
>查看</el-button
>
> -->
{{ row.serviceRequirements }}
</template>
</el-table-column>
<el-table-column
......@@ -483,11 +498,12 @@
sortable
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
> -->
{{ row.createTime }}
</template>
</el-table-column>
<el-table-column
......
src/views/orderManagement/order/index.vue
......@@ -212,11 +212,12 @@
width="100"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
> -->
{{ row.title }}
</template>
</el-table-column>
<el-table-column
......@@ -243,9 +244,10 @@
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
<!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
> -->
<span v-if="row.ename"> {{ row.ename }}</span>
<span v-else>未接单</span>
</template>
</el-table-column>
......@@ -274,11 +276,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.visitTime, '订单就诊时间')"
>查看</el-button
>
> -->
{{ row.visitTime }}
</template>
</el-table-column>
<el-table-column
......@@ -289,11 +292,12 @@
width="120"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.phone, '预约电话')"
>查看</el-button
>
> -->
{{ row.phone }}
</template>
</el-table-column>
<el-table-column
......@@ -402,11 +406,12 @@
sortable
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
> -->
{{ row.createTime }}
</template>
</el-table-column>
<el-table-column
......
src/views/orderManagement/zqghOrder/index.vue
......@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-12-04 15:56:04
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-12-06 09:49:26
* @LastEditTime: 2023-12-07 11:07:54
* @FilePath: \peizhen-vue\src\views\orderManagement\zqghOrder\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -197,9 +197,10 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeROWrEM(row.title, '科室')"
<!-- <el-button type="primary" @click="clickSeeROWrEM(row.title, '科室')"
>查看</el-button
>
> -->
{{ row.title }}
</template>
</el-table-column>
<el-table-column
......@@ -217,11 +218,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.userName, '用户')"
>查看</el-button
>
> -->
{{ row.userName }}
</template>
</el-table-column>
<el-table-column
......@@ -233,11 +235,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.timeOfAppointment, '预约时间')"
>查看</el-button
>
> -->
{{ row.timeOfAppointment }}
</template>
</el-table-column>
<el-table-column
......@@ -291,11 +294,12 @@
sortable
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
> -->
{{ row.createTime }}
</template>
</el-table-column>
<el-table-column
......@@ -824,7 +828,7 @@ export default {
}
},
changeHId(e) {
console.log('changeHId',e);
console.log("changeHId", e);
this.$set(this.form, "doctorId", undefined);
this.doctorListAxios(e);
},
......
src/views/orderManagement/zyphOrder/index.vue
......@@ -210,11 +210,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button
>
> -->
{{ row.title }}
</template>
</el-table-column>
<el-table-column
......@@ -241,9 +242,10 @@
width="100"
>
<template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
<!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button
>
> -->
<span v-if="row.ename">{{ row.ename }}</span>
<span v-else>未接单</span>
</template>
</el-table-column>
......@@ -268,17 +270,19 @@
align="center"
prop="startDay"
key="startDay"
width="180"
width="270"
:show-overflow-tooltip="true"
>
<template slot-scope="{ row }">
<!-- {{ row.startDay }} - {{ row.endDay }} -->
<el-button
<!-- <el-button
type="primary"
@click="
clickSeeROWrEM(`${row.startDay}至${row.endDay}`, '期待陪护日期')
"
>查看</el-button
> -->
<span v-if="row.startDay && row.endDay"
>{{ row.startDay }}至{{ row.endDay }}</span
>
</template>
</el-table-column>
......@@ -400,11 +404,12 @@
sortable
>
<template slot-scope="{ row }">
<el-button
<!-- <el-button
type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button
>
> -->
{{ row.createTime }}
</template>
</el-table-column>
<el-table-column
......
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