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

src/views/system/goodsCategory/index.vue

@@ -168,13 +168,13 @@
             maxlength="10"
           />
         </el-form-item>
-        <el-form-item label="商品分类编码" prop="goodsCategoryCode">
+        <!-- <el-form-item label="商品分类编码" prop="goodsCategoryCode">
           <el-input
             v-model="form.goodsCategoryCode"
             placeholder="请输入商品分类编码"
             maxlength="20"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="商品分类图片" prop="goodsCategoryPicture">
           <stationAcatar
             @imgUrl="imgUrl"

src/views/system/goodsInfo/index.vue

@@ -236,10 +236,27 @@
             v-model="form.goodsName"
             placeholder="请输入商品名称"
             max="40"
-            style="width: 210px; margin-left: 10px"
+            style="width: 210px"
           />
         </el-form-item>
-        <el-form-item label="护理站名称" prop="nurseStationId">
+        <el-form-item label="护理站名称" prop="nurseStationName">
+          <el-select
+          style="width:210px"
+            v-model="queryParams.id"
+            clearable
+            placeholder="请选择护理站"
+            v-loadmore="loadMore"
+          >
+            <el-option
+              v-for="item in nurseStationlist"
+              :key="item.id"
+              :label="item.nurseStationName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="护理站名称">
           <el-select
             style="width: 210px"
             v-model="form.nurseStationId"
@@ -550,6 +567,7 @@ import {
   editGoodsWhetherShelf,
 } from "@/api/system/goodsInfo";
 import editor from "@/components/Editor";
+import { getListByUser } from "@/api/system/userlist.js";
 import stationAcatar from "../stationAvatar/index.vue";
 import baseurl from "@/api/baseurl.js";
 export default {
@@ -628,6 +646,11 @@ export default {
         goodsPurpose: null,
         sort: null,
       },
+      //权限查询
+      getListByUserquery: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -655,7 +678,7 @@ export default {
   },
   created() {
     this.getList();
-    this.list();
+    this.info();
   },
   methods: {
     upwhetherShelf(row) {
@@ -698,16 +721,12 @@ export default {
         this.loading = false;
       });
     },
-    list() {
+    // list() {
-      listStation().then((res) => {
+    //   listStation().then((res) => {
-        console.log(res);
+    //     console.log(res);
-        this.nurseStationlist = res.data;
+    //     this.nurseStationlist = res.data;
-      });
+    //   });
-      goodsCategory().then((res) => {
+    // },
-        console.log(this.form);
-        this.goodsCategorylist = res.rows;
-      });
-    },
     // 添加
     addgoodAttributeDetail() {
       console.log(this.goodDetailsLists);
@@ -953,6 +972,40 @@ export default {
         });
       }
     },
+    //权限列表
+    info() {
+      goodsCategory().then((res) => {
+        console.log(this.form);
+        this.goodsCategorylist = res.rows;
+      });
+      getListByUser(this.getListByUserquery).then((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.id = res.rows[0].id;
+          this.handleQuery();
+        }
+      });
+    },
+    //滑动下拉框
+    loadMore() {
+      var a = Math.ceil(this.total2 / 10);
+      if (this.nurseStationlist.length + 1 >= this.total2) {
+      } else {
+        if (this.getListByUserquery.pageNum >= a) {
+        } else {
+          this.getListByUserquery.pageNum++;
+          getListByUser(this.getListByUserquery).then((res) => {
+            res.rows.forEach((e) => {
+              this.nurseStationlist.push(e);
+            });
+          });
+        }
+      }
+    },
   },
 };
 </script>

src/views/system/stationConsumable/index.vue

@@ -230,7 +230,7 @@
       :before-close="cancel"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="所属护理站" prop="nurseStationId">
+        <el-form-item label="所属护理站" >
           <el-button
           disabled
             style="width: 360px; text-align: left; height: 36px; color: #c0c4cc"