From 134dfce80f28084bb46c3033b47e34a4bd734746 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 15 Nov 2022 15:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/goodsInfo/index.vue  | 27 ++++++++++++++++-----------
 src/views/system/goodsOrder/index.vue |  1 -
 src/views/system/order/index.vue      |  3 +++
 src/views/system/station/index.vue    |  2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 78a1637..e500668 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -42,7 +42,10 @@
       </el-form-item>
 
       <el-form-item label="商品用途" prop="goodsPurpose">
-        <el-select v-model="queryParams.goodsPurpose" placeholder="请选择商品用途">
+        <el-select
+          v-model="queryParams.goodsPurpose"
+          placeholder="请选择商品用途"
+        >
           <el-option
             v-for="item in goods"
             :key="item.value"
@@ -572,8 +575,8 @@ export default {
       },
       // 表单参数
       form: {
-        nurseStationName:"",
-        nurseStationId:"",
+        nurseStationName: "",
+        nurseStationId: "",
       },
       // 表单校验
       rules: {
@@ -687,7 +690,7 @@ export default {
     cancel() {
       console.log(this.form);
       var obj = { pictureUrlList: [] };
-      if (this.imgone!= this.form.goodsPictureUrl) {
+      if (this.imgone != this.form.goodsPictureUrl) {
         obj.pictureUrlList.push(this.form.goodsPictureUrl);
       }
       if (obj.pictureUrlList.length > 0) {
@@ -726,8 +729,8 @@ export default {
       // this.getListByUserquery.pageNum = 1;
       this.getList2();
     },
-    getList2(){
-       getListByUser(this.getListByUserquery).then((res) => {
+    getList2() {
+      getListByUser(this.getListByUserquery).then((res) => {
         this.total2 = res.total;
         this.nurseStationlist = res.rows;
       });
@@ -797,6 +800,8 @@ export default {
         this.queryParams.goodsName = null
         this.queryParams.goodsCategoryName = null
         this.queryParams.goodsPurpose = null
+        this.queryParams.whetherShelf = null
+
       }
       this.handleQuery();
     },
@@ -810,8 +815,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
-      this.form.nurseStationName=this.nurseStationlist[0].nurseStationName
-      this.form.nurseStationId =this.nurseStationlist[0].id;
+      this.form.nurseStationName = this.nurseStationlist[0].nurseStationName
+      this.form.nurseStationId = this.nurseStationlist[0].id;
       this.title = "商品基本信息";
       this.StationName = "请选择所属护理站";
       this.goodDetailsLists = [
@@ -833,7 +838,7 @@ export default {
       getGoodsInfo(id).then((response) => {
         console.log(response)
         this.form = response.data[0];
-         this.form.nurseStationName = row.nurseStationName
+        this.form.nurseStationName = row.nurseStationName
         this.imgone = this.form.goodsPictureUrl;
         if (response.data[0].goodAttributeDetailsLists) {
           this.goodDetailsLists = response.data[0].goodAttributeDetailsLists;
@@ -845,7 +850,7 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-        console.log(this.form);
+      console.log(this.form);
       console.log(this.goodDetailsLists);
       this.form.goodAttributeDetailsLists = [];
       this.form.goodDetailsLists = this.goodDetailsLists;
@@ -866,7 +871,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
 
               // this.StationName = "请选择所属护理站";
-                this.open = false;
+              this.open = false;
               this.getList();
             });
           }
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index a991696..e676a19 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -934,7 +934,6 @@ export default {
         this.queryParams.orderNo = null
         this.queryParams.orderStatus = null
 
-
       }
       this.handleQuery();
     },
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index e0e9949..4523ba0 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -782,6 +782,9 @@ export default {
       } else {
         this.queryParams.pageNum = 1;
         this.queryParams.pageSize = 10;
+           this.queryParams.orderNo = null
+        this.queryParams.orderStatus = null
+         this.queryParams.patientName=null
       }
       this.handleQuery();
     },
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index d62d635..609cf8f 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -883,7 +883,7 @@ export default {
         // this.queryParams.nurseStationCode = null;
         this.queryParams.pageSize = 10;
         this.queryParams.pageNum = 1;
-        this.queryParams.nurseStationType = null;
+        this.queryParams.nurseStationCode = null;
         this.handleQuery();
       }
     },