From 14096572f30c4811b953a8cb0611940ca7f1f976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 16 Nov 2022 10:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/goodsOrder/index.vue | 64 +++++++++++---------------
src/views/system/order/index.vue | 36 ++++++---------
src/views/system/station/index.vue | 55 ++++++----------------
src/views/system/stationItem/index.vue | 1 -
4 files changed, 57 insertions(+), 99 deletions(-)
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index a991696..18613a4 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -32,7 +32,6 @@
/>
-
重置
刷新刷新商品订单
@@ -79,7 +78,7 @@
label="订单编号"
align="center"
prop="orderNo"
- width="190"
+ width="190"
/>
录入物流单号
-
+ >
-
@@ -618,27 +616,33 @@ export default {
refundlist: [],
nurseStationlist: [],
orderStatuslist: [
- {
+ {
value: "WAIT_PAY",
label: "待付款",
},
{
value: "PAY",
- label: "已付款",
+ label: "待发货",
+ },
+ {
+ value: "WAIT_RECEIVED_GOODS",
+ label: "待收货",
+ },
+ {
+ value: "RECEIVED_GOODS",
+ 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",
@@ -648,15 +652,6 @@ export default {
value: "REFUNDED",
label: "退款成功",
},
-
- {
- value: "WAIT_RETURNED_GOODS",
- label: "待退货",
- },
- {
- value: "RETURNED_GOODS",
- label: "已退货",
- },
],
// 遮罩层
loading: true,
@@ -695,7 +690,7 @@ export default {
id: "",
expressNo: null,
},
- //权限查询
+ //权限查询
getListByUserquery: {
pageNum: 1,
pageSize: 10,
@@ -808,9 +803,8 @@ export default {
this.$modal.msgSuccess("录入成功");
}
this.queryexpressNo.expressNo = "";
- this.getList();
+ this.getList();
this.innerlogistics = false;
-
});
},
// 取消按钮
@@ -842,7 +836,6 @@ export default {
}
this.getList();
this.innerrefund = false;
-
});
},
// refund(id){
@@ -922,19 +915,17 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- if (this.nurseStationlist[0].isAdmin == '1') {
+ if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
- pageSize: 10
- }
+ pageSize: 10,
+ };
} else {
this.queryParams.pageNum = 1;
- this.queryParams.pageSize = 10
- this.queryParams.orderNo = null
- this.queryParams.orderStatus = null
-
-
+ this.queryParams.pageSize = 10;
+ this.queryParams.orderNo = null;
+ this.queryParams.orderStatus = null;
}
this.handleQuery();
},
@@ -1005,7 +996,7 @@ export default {
`goodsOrder_${new Date().getTime()}.xlsx`
);
},
- //权限列表
+ //权限列表
info() {
// goodsCategory().then((res) => {
// console.log(this.form);
@@ -1039,7 +1030,6 @@ export default {
}
}
},
-
},
};
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 106e030..a1bd976 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -6,7 +6,7 @@
size="small"
:inline="true"
v-show="showSearch"
- label-width="100px"
+ label-width="90px"
>
-
-
-
-
-
+
+
+
刷新刷新预约订单
@@ -85,7 +83,6 @@
align="center"
prop="nurseStationName"
/>
-
+
+
退款中
已退款退款成功
-
+
+
-
-
{
res.data.forEach((e) => {
if (e.serviceDate) {
@@ -691,8 +688,6 @@ export default {
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 = "";
@@ -702,7 +697,6 @@ export default {
getPerson(this.querynursePersonname).then((res) => {
this.dispatchlist = res.rows;
this.total2 = res.total;
- console.log(this.dispatchlist);
this.nursePersonNameinfo = true;
});
},
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index f42cb58..554b991 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -8,7 +8,6 @@
v-show="showSearch"
label-width="100px"
>
-
-
-
+
-
-
取 消
-
{
- console.log(res);
this.streetlist = res.data;
});
},
@@ -768,9 +756,8 @@ export default {
clickcity(item) {
this.form.regionName = "";
this.form.areaCode = "";
- console.log(item);
+ this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
this.arealist = res.data;
});
},
@@ -779,6 +766,7 @@ export default {
this.form.cityName = "";
this.form.regionName = "";
this.form.areaCode = "";
+ this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
this.citylist = res.data;
});
@@ -796,25 +784,18 @@ export default {
},
// 取消按钮
cancel() {
- console.log(this.form);
var obj = { pictureUrlList: [] };
- if(this.imgone!=this.form.stationIntroducePcitureUrl ){
+ if (this.imgone != this.form.stationIntroducePcitureUrl) {
obj.pictureUrlList.push(this.form.stationIntroducePcitureUrl);
}
- if(this.imgtwo!=this.form.stationPictureUrl ){
+ if (this.imgtwo != this.form.stationPictureUrl) {
obj.pictureUrlList.push(this.form.stationPictureUrl);
}
if (obj.pictureUrlList.length > 0) {
- updatePicture(obj).then((res) => {
- console.log(res);
- });
+ updatePicture(obj).then((res) => {});
}
this.open = false;
this.reset();
- this.value3 = "";
- this.value2 = "";
- this.value1 = "";
- this.value = "";
},
// 表单重置
reset() {
@@ -895,10 +876,6 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
- this.value3 = "";
- this.value2 = "";
- this.value1 = "";
- this.value = "";
this.open = true;
this.looknurseStationLabel = [
{
@@ -911,20 +888,18 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
- console.log(row, "看一当前行数据");
this.reset();
this.loading = true;
const id = row.id || this.ids;
getStation(id).then((response) => {
- console.log(response);
this.form = response.data;
+ this.form.streetCode = this.form.streetName;
this.imgone = this.form.stationIntroducePcitureUrl;
this.imgtwo = this.form.stationPictureUrl;
this.looknurseStationLabel = response.data.nurseStationLabel;
- console.log(this.list);
this.open = true;
this.loading = false;
- console.log(this.form);
+ console.log(this.form)
});
},
/** 提交按钮 */
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index d7fa507..21399a9 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -762,7 +762,6 @@ export default {
pageNum: 1,
pageSize: 10,
},
-
// 查询参数
queryParams: {
pageNum: 1,