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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
闫晓茹 2022-11-08 14:37:15 +08:00
commit a3f1da13ac
2 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="seeOrder(scope.row)" @click="seeOrder(scope.row)"
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:goodsOrder:goodsOrderByOrder']"
>查看商品信息</el-button >查看商品信息</el-button
> >
<el-button <el-button
@ -108,7 +108,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="seelogistics(scope.row.id)" @click="seelogistics(scope.row.id)"
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:goodsOrder:editExpressNo']"
>录入物流单号</el-button >录入物流单号</el-button
> >
<!-- <el-button <!-- <el-button
@ -126,7 +126,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="refund(scope.row.id)" @click="refund(scope.row.id)"
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
>确认退款</el-button >确认退款</el-button
> >
<!-- <el-button <!-- <el-button

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

@ -65,7 +65,7 @@
<el-table-column label="订单总金额" align="center" prop="totalPrice" /> <el-table-column label="订单总金额" align="center" prop="totalPrice" />
<el-table-column label="订单状态" align="center" prop="orderStatus"> <el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.orderStatus=='WAIT_PAY'">待付款</el-button> <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 type="primary" v-if="scope.row.orderStatus=='PAY'">已付款</el-button>
<el-button type="primary" v-if="scope.row.orderStatus=='WAIT_DISPATCH'">待派单</el-button> <el-button type="primary" v-if="scope.row.orderStatus=='WAIT_DISPATCH'">待派单</el-button>
<el-button type="primary" v-if="scope.row.orderStatus=='NOT_FINISH'">待完成</el-button> <el-button type="primary" v-if="scope.row.orderStatus=='NOT_FINISH'">待完成</el-button>
@ -88,7 +88,8 @@
type="text" type="text"
icon="el-icon-zoom-in" icon="el-icon-zoom-in"
@click="seeLook(scope.row)" @click="seeLook(scope.row)"
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:appointmentOrder:query']"
>查看</el-button >查看</el-button
> >
<el-button <el-button
@ -96,7 +97,7 @@
type="text" type="text"
icon="el-icon-s-promotion" icon="el-icon-s-promotion"
@click="dispatch(scope.row)" @click="dispatch(scope.row)"
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:appointmentOrder:dispatch']"
v-if="scope.row.orderStatus=='WAIT_DISPATCH'" v-if="scope.row.orderStatus=='WAIT_DISPATCH'"
>派单</el-button >派单</el-button
> >
@ -104,8 +105,8 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-error" icon="el-icon-error"
@click="cencel(scope.row.appointmentOrderId)" @click="cencel(scope.row.appointmentOrderId)"
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:appointmentOrder:confirmCancel']"
>取消预约</el-button >取消预约</el-button
> >
<el-button <el-button
@ -568,10 +569,6 @@ export default {
}, },
// 姓名弹框确定按钮 // 姓名弹框确定按钮
submitForm() { submitForm() {
// console.log(this.querynursePersonname)
// var obj = {}
// obj.nurseStationPersonId = nurseStationPersonId
// obj.orderNo = this.querynursePersonname.orderNo
let params={ let params={
nurseStationPersonId:this.nursePersonid, nurseStationPersonId:this.nursePersonid,
orderNo:this.querynursePersonname.orderNo orderNo:this.querynursePersonname.orderNo
@ -595,19 +592,6 @@ export default {
}, },
// cencel(appointmentOrderId) {
// confirmCancel(appointmentOrderId).then((res) => {
// // this.nurseName="请选择护理员";
// // this.innerdispatch = false;
// })
// console.log(appointmentOrderId)
// },
// console.log(row.appointmentOrderId)
// this.appointmentOrderId = row.appointmentOrderId
// console.log('row :>> ', this.querynursecencel.appointmentOrderId);
// obj.appointmentOrderId=row.appointmentOrderId
// 确认取消预约 // 确认取消预约
cencel(appointmentOrderId) { cencel(appointmentOrderId) {
@ -627,8 +611,7 @@ export default {
} }
confirmCancel(params).then((res) => { confirmCancel(params).then((res) => {
this.$message.success("取消成功"); this.$message.success("取消成功");
// this.getList();
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
}); });
}) })