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

Merge remote-tracking branch 'origin/dev'

Browse Source
This commit is contained in:
纪寒 2022-11-21 10:18:15 +08:00
commit bb726ea473
3 changed files with 194 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/system/goodsOrder.js
View File

@ -1,5 +1,12 @@
import request from '@/utils/request'
//查看评价图片
export function selectOrderEvaluate(id) {
return request({
url: `/nurseApp/orderEvaluate/selectOrderEvaluate?orderNo=${id}`,
method: 'get',
})
}
// 查询商品订单列表
export function listGoodsOrder(query) {
return request({

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

@ -86,7 +86,7 @@
>待付款</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
@ -99,7 +99,10 @@
<el-button
type="primary"
v-if="scope.row.orderStatus == 'RECEIVED_GOODS'"
>已收货</el-button
>待评价</el-button
>
<el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
>交易完成</el-button
>
<el-button
type="warning"
@ -284,43 +287,7 @@
style="width: 240px"
/>
</el-form-item>
<!-- <el-form-item label="商品属性" prop="goodsAttributeName">
<el-input
v-model="orderList.goodsAttributeName"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item> -->
<!-- <el-form-item label="商品价格" prop="goodsPrice">
<el-input
v-model="orderList.goodsPrice"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item> -->
<!-- <el-form-item label="地址" prop="receiveAddress">
<el-input
v-model="orderList.receiveAddress"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item> -->
<el-form-item label="订单状态" prop="orderStatus">
<!-- <el-form-item label="退款类型" prop="refundType">
<el-input
:value="refundTypeStatus(refundlist.refundType)"
disabled
style="width: 205px"
/>
</el-form-item> -->
<el-input
:value="orderStatusinfo(orderList.orderStatus)"
clearable
@ -347,57 +314,47 @@
style="width: 240px"
/>
</el-form-item>
<!-- <el-table
:data="orderList"
align="center"
style="margin: 10px 0 20px 0; padding-bottom: 20px"
>
<el-table-column
prop="orderNo"
label="订单编号"
width="120"
align="center"
<el-form-item label="综合评分" v-if="ratelist.compositeScore">
<div style="width: 240px">
<el-rate
v-model="ratelist.compositeScore"
style="padding-top: 7px"
disabled
show-score
text-color="#ff9900"
score-template="{value}"
>
</el-rate>
</div>
</el-form-item>
<el-form-item label="评价内容" v-if="ratelist.evaluateContent">
<el-input
type="textarea"
disabled
style="width: 240px"
v-model="ratelist.evaluateContent"
/>
</el-form-item>
<el-form-item
label="评价图片"
v-if="ratelist.orderEvaluatePictureInfoList"
>
</el-table-column>
<el-table-column
prop="receiveAddress"
label="地址"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="receiver"
label="收货人"
width="120"
align="center"
>
</el-table-column>
<el-table-column prop="phone" label="手机号" width="120" align="center">
</el-table-column>
<el-table-column
prop="goodsName"
label="商品名称"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="goodsAttributeName"
label="商品属性"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="goodsPrice"
label="商品价格"
width="120"
align="center"
>
</el-table-column>
</el-table> -->
<div
style="
display: flex;
flex-wrap: wrap;
justify-content: space-around;
"
>
<img
style="width: 240px"
v-for="(item, index) in ratelist.orderEvaluatePictureInfoList"
:src="baseurl + item.evaluatePictureUrl"
alt=""
:key="index"
/>
</div>
</el-form-item>
</el-form>
</el-dialog>
<!-- 查看物流信息弹框 -->
@ -589,13 +546,16 @@ import {
editExpressNo,
goodsOrderrefund,
weChatRefundOrderApply,
selectOrderEvaluate,
} from "@/api/system/goodsOrder";
import { getListByUser } from "@/api/system/userlist.js";
import baseurl from "@/api/baseurl.js";
export default {
name: "GoodsOrder",
data() {
return {
baseurl: null,
// 查看商品信息
innerorder: false,
// 查看物流信息
@ -605,6 +565,7 @@ export default {
orderList: [],
refundlist: [],
nurseStationlist: [],
ratelist: [], //评分list
orderStatuslist: [
{
value: "WAIT_PAY",
@ -612,21 +573,31 @@ export default {
},
{
value: "PAY",
label: "已付款",
label: "待发货",
},
{
value: "WAIT_RECEIVED_GOODS",
label: "待收货",
},
{
value: "RECEIVED_GOODS",
label: "待评价",
},
{
value: "EVALUATED",
label: "交易完成",
},
{
value: "CANCEL",
label: "已取消",
},
{
value: "WAIT_RECEIVED_GOODS",
label: "待收货",
value: "WAIT_RETURNED_GOODS",
label: "待退货",
},
{
value: "RECEIVED_GOODS",
label: "已收货",
value: "RETURNED_GOODS",
label: "已退货",
},
{
value: "WAIT_REFUND",
@ -636,15 +607,6 @@ export default {
value: "REFUNDED",
label: "退款成功",
},
{
value: "WAIT_RETURNED_GOODS",
label: "待退货",
},
{
value: "RETURNED_GOODS",
label: "已退货",
},
],
// 遮罩层
loading: true,
@ -699,6 +661,7 @@ export default {
};
},
created() {
this.baseurl = baseurl;
this.getList();
this.info();
this.infos();
@ -721,21 +684,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 "WAIT_REFUND":
return "退款中";
case "REFUNDED":
return "退款成功";
case "CANCEL":
return "已取消";
default:
break;
}
@ -781,6 +746,14 @@ export default {
getGoodsOrderlist(id).then((res) => {
this.orderList = res.data;
this.innerorder = true;
if (row.orderStatus == "EVALUATED") {
this.ratelist = {};
selectOrderEvaluate(id).then((res) => {
if (res.data) {
this.ratelist = res.data;
}
});
}
});
},
// 查看录入物流单号弹框
@ -800,7 +773,6 @@ export default {
this.queryexpressNo.expressNo = "";
this.getList();
this.innerlogistics = false;
});
},
// 取消按钮
@ -832,7 +804,6 @@ export default {
}
this.getList();
this.innerrefund = false;
});
},
// refund(id){
@ -914,13 +885,13 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
console.log(this.nurseStationlist)
console.log(this.nurseStationlist)
if (this.nurseStationlist[0]){
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
this.queryParams.orderNo = null;
this.queryParams.orderStatus = null;
console.log(this.nurseStationlist);
console.log(this.nurseStationlist);
if (this.nurseStationlist[0]) {
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
this.queryParams.orderNo = null;
this.queryParams.orderStatus = null;
}
// this.queryParams = {
@ -988,7 +959,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => { });
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
@ -1006,7 +977,7 @@ export default {
this.total2 = res.total;
this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.getList()
this.getList();
// this.handleQuery();
});
},
@ -1016,12 +987,10 @@ export default {
pageSize: 9999,
};
getListByUser(queryFor).then((res) => {
console.log(res)
console.log(res);
this.handstationlist = res.rows;
});
},
},
};
</script>

134
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="护理项目名称"
@ -101,7 +98,10 @@
<el-button type="primary" v-if="scope.row.orderStatus == 'NOT_FINISH'"
>未完成</el-button
>
<el-button type="success" v-if="scope.row.orderStatus == 'COMPLETE'"
<el-button type="primary" v-if="scope.row.orderStatus == 'COMPLETE'"
>待评价</el-button
>
<el-button type="success" v-if="scope.row.orderStatus == 'EVALUATED'"
>服务完成</el-button
>
<el-button
@ -110,15 +110,15 @@
>退款中</el-button
>
<el-button type="warning" v-if="scope.row.orderStatus == 'REFUNDED'"
>已退款</el-button
>退款成功</el-button
>
<el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
>已取消</el-button
>
</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"
@ -231,19 +231,48 @@
style="width: 250px"
/>
</el-form-item>
<el-form-item label="服务到岗照片" prop="onDutyPictureUrl" v-if="query.orderStatus == 'COMPLETE'">
<el-form-item
label="服务到岗照片"
prop="onDutyPictureUrl"
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'">
<el-form-item
label="服务结束照片"
prop="serviceEndPictureUrl"
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'">
<el-form-item
label="用户确认签名"
prop="userSignaturePictureUrl"
v-if="
query.orderStatus == 'COMPLETE' || query.orderStatus == 'EVALUATED'
"
>
<img
class="img"
:src="baseurl + query.userSignaturePictureUrl"
alt=""
/>
</el-form-item>
<el-form-item
label="评价满意度"
prop="evaluateSatisfaction"
v-if="query.orderStatus == 'EVALUATED'"
>
<el-input
v-model="query.evaluateSatisfaction"
disabled
style="width: 250px"
/>
</el-form-item>
<el-table
:data="query.appointmentOrderConsumableList"
align="center"
@ -479,12 +508,13 @@ import {
appointmentOrderDetails,
} from "@/api/system/order";
import { getListByUser } from "@/api/system/userlist.js";
import baseurl from '@/api/baseurl.js'
import baseurl from "@/api/baseurl.js";
import { selectOrderEvaluate } from "@/api/system/goodsOrder";
export default {
name: "order",
data() {
return {
baseurl:null,
baseurl: null,
orderStatuslist: [
{
value: "WAIT_PAY",
@ -494,31 +524,33 @@ export default {
value: "PAY",
label: "已付款",
},
{
value: "CANCEL",
label: "已取消",
},
{
value: "WAIT_DISPATCH",
label: "待派单",
},
{
value: "REFUNDED",
label: "已退款",
value: "NOT_FINISH",
label: "未完成",
},
{
value: "COMPLETE",
label: "待评价",
},
{
value: "EVALUATED",
label: "服务完成",
},
{
value: "WAIT_REFUND",
label: "退款中",
},
{
value: "COMPLETE",
label: "服务完成",
value: "REFUNDED",
label: "退款成功",
},
{
value: "NOT_FINISH",
label: "未完成",
value: "CANCEL",
label: "已取消",
},
],
value: "",
@ -585,7 +617,7 @@ export default {
};
},
created() {
this.baseurl = baseurl
this.baseurl = baseurl;
this.getList();
this.info();
this.infos();
@ -615,28 +647,30 @@ export default {
switch (orderStatus) {
case "WAIT_PAY":
return "待付款";
case "PAY":
return "已付款";
case "WAIT_DISPATCH":
return "待派单";
case "NOT_FINISH":
return "未完成";
case "COMPLETE":
return "待评价";
case "EVALUATED":
return "服务完成";
case "PAY":
return "已付款";
case "WAIT_REFUND":
return "退款中";
case "REFUNDED":
return "退款成功";
case "CANCEL":
return "已取消";
case "REFUNDED":
return "已退款";
default:
break;
}
},
// 查看
seeLook(row) {
this.loading = true;
const id = row.orderNo;
// console.log(row);
appointmentOrderDetails(id).then((res) => {
res.data.forEach((e) => {
if (e.serviceDate) {
@ -646,15 +680,32 @@ export default {
});
this.query = res.data[0];
this.innerVisible4 = true;
console.log(this.query);
if (row.orderStatus == "EVALUATED") {
selectOrderEvaluate(id).then((res) => {
if (res.data) {
if (res.data.evaluateSatisfaction == "COMMONLY") {
this.query.evaluateSatisfaction = "一般";
} else if (res.data.evaluateSatisfaction == "SATISFIED") {
this.query.evaluateSatisfaction = "满意";
} else if (res.data.evaluateSatisfaction == "DISSATISFIED") {
this.query.evaluateSatisfaction = "不满意";
}
this.loading = false;
this.innerVisible4 = true;
} else {
this.loading = false;
this.innerVisible4 = true;
}
});
} else {
this.loading = false;
this.innerVisible4 = true;
}
});
},
// 派单
dispatch(row) {
console.log(row);
this.querynursePersonname.orderNo = row.orderNo;
console.log(this.querynursePersonname.orderNo);
// console.log(row)
this.nurseName = "请选择护理员";
this.innerdispatch = true;
this.nursePersonid = "";
@ -813,7 +864,6 @@ export default {
</script>
<style scoped>
.img {
width: 250px;
height: 250px;