From 3bb77129795a3841ac37c0979bf8595ba7e3deca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 14 Nov 2022 15:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/OperateGoodsInfo/index.vue | 48 +++------------------
 src/views/system/goodsOrder/index.vue       | 10 ++---
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue
index a1acde2..482af24 100644
--- a/src/views/system/OperateGoodsInfo/index.vue
+++ b/src/views/system/OperateGoodsInfo/index.vue
@@ -10,7 +10,7 @@
     >
       <el-form-item label="所属护理站" prop="nurseStationName">
         <el-select
-          v-model="queryParams.nurseStationId"
+          v-model="queryParams.nurseStationName"
           placeholder="请选择护理站"
           v-loadmore="loadMore"
         >
@@ -55,7 +55,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item label="是否上架" prop="whetherShelf">
         <el-select v-model="queryParams.whetherShelf" placeholder="请选择">
           <el-option
@@ -475,7 +474,7 @@
         :total="total2"
         :page.sync="getListByUserquery.pageNum"
         :limit.sync="getListByUserquery.pageSize"
-        @pagination="handleQuery2"
+        @pagination="info"
       />
     </el-dialog>
   </div>
@@ -564,10 +563,7 @@ export default {
         id: null,
         whetherShelf: null,
       },
-      getListByUserquery: {
-        pageNum: 1,
-        pageSize: 10,
-      },
+
       queryParams: {
         id: null,
         pageNum: 1,
@@ -589,6 +585,8 @@ export default {
       getListByUserquery: {
         pageNum: 1,
         pageSize: 10,
+        // nurseStationCode:"",
+        // nurseStationId:"",
       },
       // 表单参数
       form: {
@@ -759,7 +757,6 @@ export default {
     },
     addcancel() {
       this.innerVisible = false;
-      // this.innerVisiblexg = false;
       this.resetQuery2();
     },
 
@@ -878,7 +875,6 @@ export default {
             addGoodsInfo(this.form).then((response) => {
               console.log(this.form);
               this.$modal.msgSuccess("新增成功");
-
               this.StationName = "请选择所属护理站";
               this.open = false;
               this.getList();
@@ -899,34 +895,10 @@ export default {
           delGoodsInfo(row.goodsInfoId).then((res) => {
             this.$message.success("删除成功");
             this.getList();
-            // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
           });
         })
         .catch(() => { });
     },
-    // handleDelete(row) {
-    //   const ids = row.id || this.ids;
-    //   this.$modal
-    //     .confirm("是否确认删除？")
-    //     .then(function () {
-    //       return delGoodsInfo(ids);
-    //     })
-    //     .then(() => {
-    //       this.getList();
-    //       this.$modal.msgSuccess("删除成功");
-    //     })
-    //     .catch(() => {});
-    // },
-    // /** 导出按钮操作 */
-    // handleExport() {
-    //   this.download(
-    //     "system/goodsInfo/export",
-    //     {
-    //       ...this.queryParams,
-    //     },
-    //     `goodsInfo_${new Date().getTime()}.xlsx`
-    //   );
-    // },
     imgUrl(imgUrl) {
       console.log(imgUrl);
       this.form.goodsPictureUrl = imgUrl;
@@ -961,16 +933,6 @@ export default {
         this.nurseStationlist = res.rows;
         this.total2 = res.total;
         console.log(res)
-        // if (res.rows[0].isAdmin == "1") {
-        //   this.nurseStationlist = res.rows;
-        //   this.total2 = res.total;
-        // } else {
-        //   this.total2 = res.total;
-        //   this.nurseStationlist = res.rows;
-        //   this.queryParams.nurseStationId = res.rows[0].id;
-        //   this.form.nurseStationId = res.rows[0].id;
-        //   this.handleQuery();
-        // }
       });
     },
     //滑动下拉框
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 0832727..f0c8bf1 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -167,7 +167,7 @@
             v-hasPermi="['system:goodsOrder:editExpressNo']"
             >录入物流单号</el-button
           >
-           <el-button
+           <!-- <el-button
             v-if="scope.row.orderStatus != 'WAIT_RECEIVED_GOODS'"
             size="mini"
             type="text"
@@ -175,7 +175,7 @@
             disabled
             v-hasPermi="['system:goodsOrder:editExpressNo']"
             >不可录入物流单号</el-button
-          >
+          > -->
         </template>
       </el-table-column>
       <el-table-column
@@ -202,7 +202,7 @@
             v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
             >确认退款</el-button
           >
-          <el-button
+          <!-- <el-button
             v-else
             size="mini"
             type="text"
@@ -210,7 +210,7 @@
             disabled
             v-hasPermi="['system:goodsOrder:goodsOrderRefund']"
             >确认退款</el-button
-          >
+          > -->
         </template>
       </el-table-column>
     </el-table>
@@ -1023,7 +1023,7 @@ export default {
         }
       }
     },
- 
+
   },
 };
 </script>