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

src/views/system/goodsOrder/index.vue

@@ -806,6 +806,20 @@ refundcancel() {
 },
 // 表单重置
 reset() {
+   this.queryParams={
+        pageNum: 1,
+        pageSize: 10,
+        nurseStationId: null,
+        patientId: null,
+        orderNo: null,
+        orderStatus: null,
+        totalPrice: null,
+        receiver: null,
+        receiveAddress: null,
+        phone: null,
+        orderTime: null,
+        orderChannel: null,
+      }
   this.form = {
     id: null,
     nurseStationId: null,
@@ -825,7 +839,7 @@ reset() {
     updateTime: null,
     orderStatus: "",
   };
-  this.resetForm("form");
+  this.resetForm("queryParams");
 },
 /** 搜索按钮操作 */
 handleQuery() {
@@ -834,11 +848,11 @@ handleQuery() {
 },
 /** 重置按钮操作 */
 resetQuery() {
+  this.reset();
   this.resetForm("queryForm");
   this.handleQuery();
- 
-
 },
+
 // 多选框选中数据
 handleSelectionChange(selection) {
   this.ids = selection.map(item => item.id)