xinyilu/NurseStationUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2022-11-21 10:01:02 +08:00
parent 39443f82d4
commit e6dfa1e9de
2 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/system/goodsOrder/index.vue
View File

@ -81,11 +81,12 @@
<el-table-column label="订单总金额" align="center" prop="totalPrice" />
<el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope">
<!-- {{ orderStatus(scope.row.orderStatus) }} -->
<el-button v-if="scope.row.orderStatus == 'WAIT_PAY'"
>待付款</el-button
>
<el-button type="primary" v-if="scope.row.orderStatus == 'PAY'"
>已付款</el-button
>待发货</el-button
>
<el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
>已取消</el-button
@ -577,7 +578,7 @@ export default {
},
{
value: "RECEIVED_GOODS",
label: "未评价",
label: "待评价",
},
{
value: "EVALUATED",
@ -679,23 +680,23 @@ export default {
case "WAIT_PAY":
return "待付款";
case "PAY":
return "已付款";
case "CANCEL":
return "已取消";
return "待发货";
case "WAIT_RECEIVED_GOODS":
return "待收货";
case "RECEIVED_GOODS":
return "未评价";
case "WAIT_REFUND":
return "退款中";
case "REFUNDED":
return "退款成功";
return "待评价";
case "EVALUATED":
return "交易完成";
case "WAIT_RETURNED_GOODS":
return "待退货";
case "RETURNED_GOODS":
return "已退货";
case "EVALUATED":
return "交易完成";
case "WAIT_REFUND":
return "退款中";
case "REFUNDED":
return "退款成功";
case "CANCEL":
return "已取消";
default:
break;
}

80
src/views/system/order/index.vue
View File

@ -22,14 +22,6 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员名称" prop="patientName">
<el-input
v-model="queryParams.patientName"
placeholder="请输入会员名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单编号" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
@ -38,7 +30,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<el-select
v-model="queryParams.orderStatus"
@ -53,7 +44,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员名称" prop="patientName">
<el-input
v-model="queryParams.patientName"
placeholder="请输入会员名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
@ -77,7 +75,6 @@
align="center"
prop="nurseStationName"
/>
<el-table-column label="会员名称" align="center" prop="patientName" />
<el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column
label="护理项目名称"
@ -102,7 +99,7 @@
>未完成</el-button
>
<el-button type="primary" v-if="scope.row.orderStatus == 'COMPLETE'"
>未评价</el-button
>待评价</el-button
>
<el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
>服务完成</el-button
@ -121,6 +118,7 @@
</template>
</el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" />
<el-table-column label="会员名称" align="center" prop="patientName" />
<el-table-column
label="操作"
align="center"
@ -236,21 +234,27 @@
<el-form-item
label="服务到岗照片"
prop="onDutyPictureUrl"
v-if="query.orderStatus == 'COMPLETE'||query.orderStatus == 'EVALUATED'"
v-if="
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
"
>
<img class="img" :src="baseurl + query.onDutyPictureUrl" alt="" />
</el-form-item>
<el-form-item
label="服务结束照片"
prop="serviceEndPictureUrl"
v-if="query.orderStatus == 'COMPLETE'||query.orderStatus == 'EVALUATED'"
v-if="
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
"
>
<img class="img" :src="baseurl + query.serviceEndPictureUrl" alt="" />
</el-form-item>
<el-form-item
label="用户确认签名"
prop="userSignaturePictureUrl"
v-if="query.orderStatus == 'COMPLETE'||query.orderStatus == 'EVALUATED'"
v-if="
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
"
>
<img
class="img"
@ -520,35 +524,33 @@ export default {
value: "PAY",
label: "已付款",
},
{
value: "CANCEL",
label: "已取消",
},
{
value: "WAIT_DISPATCH",
label: "待派单",
},
{
value: "REFUNDED",
label: "已退款",
},
{
value: "WAIT_REFUND",
label: "退款中",
value: "NOT_FINISH",
label: "未完成",
},
{
value: "COMPLETE",
label: "未评价",
label: "待评价",
},
{
value: "EVALUATED",
label: "服务完成",
},
{
value: "NOT_FINISH",
label: "未完成",
value: "WAIT_REFUND",
label: "退款中",
},
{
value: "REFUNDED",
label: "退款成功",
},
{
value: "CANCEL",
label: "已取消",
},
],
value: "",
@ -645,22 +647,22 @@ export default {
switch (orderStatus) {
case "WAIT_PAY":
return "待付款";
case "PAY":
return "已付款";
case "WAIT_DISPATCH":
return "待派单";
case "NOT_FINISH":
return "未完成";
case "COMPLETE":
return "未评价";
case "PAY":
return "已付款";
case "WAIT_REFUND":
return "退款中";
case "CANCEL":
return "已取消";
case "REFUNDED":
return "已退款";
return "待评价";
case "EVALUATED":
return "服务完成";
case "WAIT_REFUND":
return "退款中";
case "REFUNDED":
return "退款成功";
case "CANCEL":
return "已取消";
default:
break;
}