From 09954788b2aa4a38dee59336102a0010ce02f168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 22 Sep 2022 08:32:14 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/baseurl.js                           |   2 +-
 src/api/system/station.js                    |  37 ++
 src/api/system/userlist.js                   |   8 +
 src/views/system/nurseItem/index.vue         | 189 +++++---
 src/views/system/station/index.vue           | 473 +++++++++++++++++--
 src/views/system/stationAvatar/index.vue     |  18 +-
 src/views/system/stationConsumable/index.vue |   2 +-
 src/views/system/user/index.vue              |   3 +-
 src/views/system/userlist/index.vue          |  21 +
 9 files changed, 618 insertions(+), 135 deletions(-)
 create mode 100644 src/api/system/userlist.js
 create mode 100644 src/views/system/userlist/index.vue

diff --git a/src/api/baseurl.js b/src/api/baseurl.js
index 6ca908c..a56555f 100644
--- a/src/api/baseurl.js
+++ b/src/api/baseurl.js
@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.81:8081";
+var baseurl = "http://192.168.16.81:8080";
 
 export default baseurl
\ No newline at end of file
diff --git a/src/api/system/station.js b/src/api/system/station.js
index 0809d49..8988a96 100644
--- a/src/api/system/station.js
+++ b/src/api/system/station.js
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+
+
 // 查询护理站信息列表
 export function listStation(query) {
     return request({
@@ -58,4 +60,39 @@ export function getSecondaryLevelInfo(id) {
         url: `/system/communityInfo/getSecondaryLevelInfo?parentId=${id}`,
         method: 'get'
     })
+}
+
+
+//省市区
+export function getSubordinateRegions(Code) {
+    return request({
+        url: `/system/area/getSubordinateRegions?areaCode=${Code}`,
+        method: 'get'
+    })
+}
+
+//查看所属护理类型
+
+export function getInfoLists(Code) {
+    return request({
+        url: `/system/nurseType/getInfoList?nurseTypeCode=${Code}`,
+        method: 'get'
+    })
+}
+//查看所属标签信息
+
+export function nurseStationlabel(id) {
+    return request({
+        url: `/system/nurseStationlabel/list?nurseStationId=${id}`,
+        method: 'get'
+    })
+}
+
+
+
+export function getLabelList(id) {
+    return request({
+        url: `/system/nurseStationlabel/getLabelList?nurseStationId=${id}`,
+        method: 'get'
+    })
 }
\ No newline at end of file
diff --git a/src/api/system/userlist.js b/src/api/system/userlist.js
new file mode 100644
index 0000000..00bee4b
--- /dev/null
+++ b/src/api/system/userlist.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function getListByUser(data) {
+    return request({
+        url: '/system/user/getListByUser',
+        method: 'GET'
+    })
+}
\ No newline at end of file
diff --git a/src/views/system/nurseItem/index.vue b/src/views/system/nurseItem/index.vue
index 1f35aad..3520713 100644
--- a/src/views/system/nurseItem/index.vue
+++ b/src/views/system/nurseItem/index.vue
@@ -133,6 +133,30 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <el-form label-position="left" inline class="demo-table-expand">
+            <el-form-item label="护理时长" style="margin-left: 120px">
+              <div
+                v-for="(item, index) in props.row.nurseStationItemPrices"
+                :key="index"
+                style="display: block"
+              >
+                {{ item.serveDurationUnit }}
+              </div>
+            </el-form-item>
+            <el-form-item label="价格" style="margin-left: 30px">
+              <div
+                v-for="(item, index) in props.row.nurseStationItemPrices"
+                :key="index"
+                style="display: block"
+              >
+                {{ item.price }}
+              </div>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
       <el-table-column
         label="所属护理站"
         align="center"
@@ -185,7 +209,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -198,7 +221,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1100px"
+      width="1120px"
       append-to-body
       :before-close="cancel"
     >
@@ -206,7 +229,7 @@
         ref="form"
         :model="form"
         :rules="rules"
-        label-width="110px"
+        label-width="130px"
         :inline="true"
       >
         <el-form-item label="所属护理站" prop="nurseStationItem.nurseStationId">
@@ -243,6 +266,13 @@
             >
           </template>
         </el-form-item>
+        <el-form-item label="护理项目名称" prop="nurseItemName">
+          <el-input
+            v-model="form.nurseStationItem.nurseItemName"
+            placeholder="请输入护理项目名称"
+            maxlength="50"
+          />
+        </el-form-item>
         <el-form-item label="护理类型" prop="nurseStationItem.nurseTypeId">
           <el-select
             v-model="form.nurseStationItem.nurseTypeId"
@@ -259,14 +289,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="护理项目名称" prop="nurseItemName">
-          <el-input
-            v-model="form.nurseStationItem.nurseItemName"
-            placeholder="请输入护理项目名称"
-            maxlength="50"
-          />
-        </el-form-item>
-
         <el-form-item label="提前预约时长" prop="advanceAppointDuration">
           <el-input
             v-model="form.nurseStationItem.advanceAppointDuration"
@@ -274,16 +296,19 @@
             type="number"
           />
         </el-form-item>
-
         <el-form-item label="排序" prop="sort">
           <el-input
             v-model="form.nurseStationItem.sort"
+            placeholder="不可输入小数点"
             type="number"
-            oninput=" if(value.length>10){value=value.slice(0,10)}"
-            placeholder="请输入排序"
+            min="0"
+            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
           />
         </el-form-item>
-        <el-form-item label="项目内容简介">
+        <el-form-item
+          label="项目内容简介"
+          prop="nurseStationItem.nurseItemContent"
+        >
           <el-input
             maxlength="300"
             type="textarea"
@@ -294,16 +319,16 @@
           >
           </el-input>
         </el-form-item>
-        <el-form-item label="项目时长和价格">
+        <el-form-item label="项目时长和价格" required>
           <el-table
-            ref="singleTable"
+            ref="nurseStationItemPrices"
             :data="form.nurseStationItemPrices"
             style="margin-top: 20px; width: 100%"
           >
             <el-table-column
               property="serveDurationUnit"
               label="服务时长和单位"
-              width="140"
+              width="145"
               align="center"
             >
               <template slot-scope="scope">
@@ -317,7 +342,7 @@
             <el-table-column
               property="price"
               label="价格"
-              width="161"
+              width="166"
               align="center"
             >
               <template slot-scope="scope">
@@ -332,7 +357,7 @@
             <el-table-column
               property="description"
               label="描述"
-              width="135"
+              width="140"
               align="center"
             >
               <template slot-scope="scope">
@@ -342,7 +367,7 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="100">
+            <el-table-column label="操作" align="center" width="105">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -360,27 +385,14 @@
             </el-table-column>
           </el-table>
         </el-form-item>
-        <el-form-item label="项目头像">
-          <el-upload
-            class="avatar-uploader"
-            action="https://jsonplaceholder.typicode.com/posts/"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-          >
-            <img
-              v-if="imageUrl"
-              :src="imageUrl"
-              class="avatar"
-              style="width: 208px; margin-top: 20px"
-            />
-            <i
-              v-else
-              class="el-icon-plus avatar-uploader-icon"
-              style="width: 208px; margin-top: 20px; border: 2px solid #fafafa"
-            ></i>
-          </el-upload>
+        <el-form-item label="项目头像" required>
+          <stationAcatar
+            @imgUrl="imgUrl"
+            :img="form.nurseStationItem.itemPictureUrl"
+            :type="'itemPictureUrl'"
+          />
         </el-form-item>
-        <el-form-item label="护理项目耗材">
+        <el-form-item label="护理项目耗材" required>
           <el-button
             type="primary"
             size="small"
@@ -391,12 +403,11 @@
           <el-table
             ref="singleTable"
             :data="form.nurseStationItemConsumables"
-            style="margin-top: 20px; width: 100%"
+            style="margin-top: 20px; width: 850px"
           >
             <el-table-column
               property="nurseStationConsumableId"
               label="耗材包名称"
-              width="150"
               align="center"
             >
               <template slot-scope="scope">
@@ -407,7 +418,6 @@
             <el-table-column
               property="consumableCount"
               label="耗材包数量"
-              width="180"
               align="center"
             >
               <template slot-scope="scope">
@@ -422,7 +432,6 @@
             <el-table-column
               property="consumablePrice"
               label="耗材包单位"
-              width="150"
               align="center"
             >
               <template slot-scope="scope">
@@ -432,14 +441,13 @@
             <el-table-column
               property="consumablePrice"
               label="耗材包单价"
-              width="150"
               align="center"
             >
               <template slot-scope="scope">
                 {{ scope.row.consumablePrice }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -452,7 +460,6 @@
           </el-table>
         </el-form-item>
       </el-form>
-
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -461,7 +468,7 @@
 
     <!-- 护理站 -->
     <el-dialog
-      :title="title"
+      title="选择护理站"
       :visible.sync="nurseStationshow"
       width="1100px"
       append-to-body
@@ -479,6 +486,12 @@
             placeholder="请输入护理站名称"
           />
         </el-form-item>
+        <el-form-item label="护理站编号" prop="nurseStationCode">
+          <el-input
+            v-model="nurseStationqueryParams.nurseStationCode"
+            placeholder="请输入护理站编号"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -700,6 +713,8 @@
 
 <script>
 import { listStationConsumable } from "@/api/system/stationConsumable";
+import stationAcatar from "../stationAvatar/index.vue";
+
 import {
   list,
   getNurseItem,
@@ -712,6 +727,7 @@ import {
 import { getToken } from "@/utils/auth";
 
 export default {
+  components: { stationAcatar },
   name: "NurseItem",
   data() {
     return {
@@ -796,6 +812,16 @@ export default {
       ids: 1,
       // 表单校验
       rules: {
+        nurseItemName: [
+          { required: true, message: "护理项目名称不能为空", trigger: "blur" },
+        ],
+        "nurseStationItem.nurseItemContent": [
+          { required: true, message: "项目内容简介不能为空", trigger: "blur" },
+        ],
+        sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+        advanceAppointDuration: [
+          { required: true, message: "提前预约时长不能为空", trigger: "blur" },
+        ],
         "nurseStationItem.nurseStationId": [
           { required: true, message: "请选择所属护理站", trigger: "blur" },
         ],
@@ -812,6 +838,10 @@ export default {
     // this.listStationConsumableinfo();
   },
   methods: {
+    imgUrl(imgUrl) {
+      console.log(imgUrl);
+      this.form.nurseStationItem.itemPictureUrl = imgUrl;
+    },
     handleAvatarSuccess(res, file) {
       this.imageUrl = URL.createObjectURL(file.raw);
     },
@@ -820,7 +850,7 @@ export default {
       this.download(
         "/system/stationItem/downloadTemplate?fileType=1",
         {},
-        `护理站项目模板.xlsx`
+        `护理站项目信息导入模板.xlsx`
       );
     },
     // 提交上传文件
@@ -916,7 +946,6 @@ export default {
       liststation(this.nurseStationqueryParams).then((res) => {
         this.nurseStationlist = res.rows;
         this.total2 = res.total;
-        // console.log(this.nurseStationlist);
       });
     },
     loadMore() {
@@ -968,10 +997,7 @@ export default {
       this.loading = true;
       list(this.queryParams).then((response) => {
         response.rows.forEach((e) => {
-          // console.log(e)
-          // e.nurseTypeId
           this.typelist.forEach((el) => {
-            // console.log(el);
             if (e.nurseTypeId == el.id) {
               e.nurseTypeName = el.nurseTypeName;
             }
@@ -992,19 +1018,21 @@ export default {
     },
     //时长价格
     addnurseStationItemPrices(item, index) {
-      this.ids++;
-      var obj = {
-        serveDurationUnit: "",
-        price: "",
-        description: "",
-        ids: this.ids,
-      };
-      this.form.nurseStationItemPrices.push(obj);
+      if (this.form.nurseStationItemPrices.length == 5) {
+        this.$message.error("最多只能5条");
+      } else {
+        this.ids++;
+        var obj = {
+          serveDurationUnit: "",
+          price: "",
+          description: "",
+          ids: this.ids,
+        };
+        this.form.nurseStationItemPrices.push(obj);
+      }
     },
     delnurseStationItemPrices(item) {
-      console.log(item);
       if (item.ids && !item.id) {
-        console.log(1);
         if (this.form.nurseStationItemPrices.length == 1) {
           this.$message.error("最后一条不可删除");
         } else {
@@ -1012,7 +1040,6 @@ export default {
             this.form.nurseStationItemPrices.filter((e) => e.ids != item.ids);
         }
       } else if (!item.ids && item.id) {
-        console.log(2);
         if (this.form.nurseStationItemPrices.length == 1) {
           this.$message.error("最后一条不可删除");
         } else {
@@ -1079,7 +1106,33 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getNurseItem(id).then((response) => {
+        console.log(response);
         this.form = response.data;
+        if (this.form.nurseStationItemPrices == []) {
+          var obj = {
+            serveDurationUnit: "",
+            price: "",
+            description: "",
+            ids: this.ids,
+          };
+          this.form.nurseStationItemPrices.push(obj);
+        } else if (this.form.nurseStationItemPrices.length == 0) {
+          var obj = {
+            serveDurationUnit: "",
+            price: "",
+            description: "",
+            ids: this.ids,
+          };
+          this.form.nurseStationItemPrices.push(obj);
+        } else if (this.form.nurseStationItemPrices == null) {
+          var obj = {
+            serveDurationUnit: "",
+            price: "",
+            description: "",
+            ids: this.ids,
+          };
+          this.form.nurseStationItemPrices.push(obj);
+        }
         this.open = true;
         this.title = "修改护理站护理项目";
       });
@@ -1132,6 +1185,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .el-table__cell .el-form-item--medium .el-form-item__content {
+  display: block;
+}
+// ::v-deep .el-form-item__label {
+//   font-weight: 550;
+// }
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index 429f848..45107cb 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -164,7 +164,6 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="所属区域编码" align="center" prop="areaCode" />
       <el-table-column
         label="护理站编号"
         align="center"
@@ -175,17 +174,16 @@
         align="center"
         prop="nurseStationName"
       />
-      <el-table-column label="护理类型" align="center" prop="nurseTypeName">
+      <el-table-column label="护理站类型" align="center" prop="nurseTypeName">
         <template slot-scope="scope">
-          <div v-for="(item, index) in scope.row.nurseTypeList" :key="index">
-            <span>
-              {{ item.nurseTypeName }}
-            </span>
-            <span v-if="scope.row.nurseTypeList.length > 1">.</span>
-          </div>
+          <el-button size="mini" type="text" @click="looktype(scope.row)"
+            >查看</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="所属区域" align="center" prop="areaCode" />
+      <el-table-column label="护理站地址" align="center" prop="address" />
+      <!-- <el-table-column
         label="护理站简介"
         align="center"
         prop="agencyIntroduce"
@@ -196,11 +194,10 @@
         align="center"
         prop="nurseStationDescription"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column label="护理站经度" align="center" prop="longitude" />
       <el-table-column label="护理站纬度" align="center" prop="latitude" />
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="护理站地址" align="center" prop="address" />
       <el-table-column label="负责人" align="center" prop="dutyPerson" />
       <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
       <el-table-column label="排序" align="center" prop="sort" />
@@ -210,6 +207,13 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-search"
+            @click="looknurseStationLabelList(scope.row)"
+            >查看标签信息</el-button
+          >
           <el-button
             size="mini"
             type="text"
@@ -237,6 +241,58 @@
       :limit.sync="queryParams.pageSize"
       @pagination="liststationinfo"
     />
+    <!-- 查看护理类型 -->
+    <el-dialog
+      title="护理类型"
+      :visible.sync="typeopen"
+      width="700px"
+      append-to-body
+    >
+      <el-table v-loading="loading" :data="typelooks">
+        <el-table-column
+          label="护理类型名称"
+          align="center"
+          prop="nurseTypeName"
+        />
+        <el-table-column
+          label="护理类型编号"
+          align="center"
+          prop="nurseTypeCode"
+        />
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" plain @click="typeopen = false" size="small"
+          >关闭窗口</el-button
+        >
+      </div>
+    </el-dialog>
+
+    <!-- 查看标签信息 -->
+    <el-dialog
+      title="标签信息"
+      :visible.sync="nurseStationLabelopen"
+      width="700px"
+      append-to-body
+    >
+      <el-table v-loading="loading" :data="looknurseStationLabel">
+        <el-table-column
+          label="标签名称"
+          align="center"
+          prop="labelDescription"
+        />
+        <el-table-column label="标签编号" align="center" prop="labelCode" />
+        <el-table-column label="排序" align="center" prop="sort" />
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          @click="nurseStationLabelopen = false"
+          size="small"
+          >关闭窗口</el-button
+        >
+      </div>
+    </el-dialog>
 
     <!-- 新增护理站信息对话框 -->
     <el-dialog
@@ -258,7 +314,7 @@
             v-model="value"
             clearable
             placeholder="请选择省"
-            style="width: 127px"
+            style="width: 129px"
           >
             <el-option
               v-for="item in provincelist"
@@ -273,7 +329,7 @@
             v-model="value1"
             clearable
             placeholder="请选择市"
-            style="width: 127px; margin-left: 10px"
+            style="width: 129px; margin-left: 10px"
           >
             <el-option
               v-for="item in citylist"
@@ -288,7 +344,7 @@
             v-model="value2"
             clearable
             placeholder="请选择区"
-            style="width: 127px; margin-left: 10px"
+            style="width: 129px; margin-left: 10px"
           >
             <el-option
               v-for="item in arealist"
@@ -300,10 +356,10 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="form.areaCode"
+            v-model="value3"
             clearable
             placeholder="请选择街道"
-            style="width: 127px; margin-left: 10px"
+            style="width: 129px; margin-left: 10px"
           >
             <el-option
               v-for="item in streetlist"
@@ -319,20 +375,12 @@
           <el-input
             v-model="form.nurseStationName"
             placeholder="请输入护理站名称"
+            maxlength="40"
           />
         </el-form-item>
-        <el-form-item label="护理站地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入护理站地址" />
-        </el-form-item>
-        <el-form-item label="护理站经度" prop="longitude">
-          <el-input v-model="form.longitude" placeholder="请输入护理站经度" />
-        </el-form-item>
-        <el-form-item label="护理站纬度" prop="latitude">
-          <el-input v-model="form.latitude" placeholder="请输入护理站纬度" />
-        </el-form-item>
         <el-form-item label="护理类型" prop="nurseStationType">
           <el-select
-            v-model="form.nurseStationType"
+            v-model="form.nurseStationType2"
             multiple
             placeholder="请选择护理类型"
             style="width: 208px"
@@ -346,20 +394,58 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="护理站经度" prop="longitude">
+          <el-input
+            v-model="form.longitude"
+            placeholder="请输入护理站经度"
+            type="number"
+            oninput=" if(value.length>10){value=value.slice(0,20)}"
+          />
+        </el-form-item>
+        <el-form-item label="护理站纬度" prop="latitude">
+          <el-input
+            v-model="form.latitude"
+            placeholder="请输入护理站纬度"
+            type="number"
+            oninput=" if(value.length>10){value=value.slice(0,20)}"
+          />
+        </el-form-item>
+        <el-form-item label="护理站地址" prop="address">
+          <el-input
+            v-model="form.address"
+            placeholder="请输入护理站地址"
+            maxlength="80"
+          />
+        </el-form-item>
         <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+          <el-input
+            v-model="form.phone"
+            placeholder="请输入联系电话"
+            maxlength="11"
+          />
         </el-form-item>
         <el-form-item label="负责人" prop="dutyPerson">
-          <el-input v-model="form.dutyPerson" placeholder="请输入负责人" />
+          <el-input
+            v-model="form.dutyPerson"
+            placeholder="请输入负责人"
+            maxlength="20"
+          />
         </el-form-item>
         <el-form-item label="负责人电话" prop="dutyPhone">
           <el-input
             v-model="form.dutyPhone"
             placeholder="请输入负责人联系电话"
+            maxlength="11"
           />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
+          <el-input
+            v-model="form.sort"
+            placeholder="排序不可输入小数点"
+            type="number"
+            min="0"
+            oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
+          />
         </el-form-item>
         <el-form-item label="护理站总概述" prop="nurseStationDescription">
           <el-input
@@ -367,6 +453,7 @@
             v-model="form.nurseStationDescription"
             placeholder="请输入护理站信息总概述"
             type="textarea"
+            maxlength="150"
           />
         </el-form-item>
         <el-form-item label="护理站简介" prop="agencyIntroduce">
@@ -375,18 +462,63 @@
             v-model="form.agencyIntroduce"
           ></editor>
         </el-form-item>
-        <el-form-item label="护理站头像" prop="stationPictureUrl">
+        <el-form-item label="护理站头像" prop="stationPictureUrl" required>
           <stationAcatar
+            @imgUrl="imgUrl"
             :img="form.stationPictureUrl"
             :type="'stationPictureUrl'"
           />
         </el-form-item>
-        <el-form-item label="护理站简介头像" prop="stationPictureUrl">
+        <el-form-item label="护理站简介头像" prop="stationIntroducePcitureUrl">
           <stationAcatar
-            :img="form.stationPictureUrl"
+            @imgUrl="imgUrl2"
+            :img="form.stationIntroducePcitureUrl"
             :type="'stationIntroducePcitureUrl'"
           />
         </el-form-item>
+        <el-form-item label="护理站标签信息" required label-width="130px">
+          <el-table
+            ref="looknurseStationLabel"
+            :data="looknurseStationLabel"
+            style="margin-top: 20px"
+          >
+            <el-table-column label="标签名称" width="190" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.labelDescription"
+                  maxlength="40"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="排序" width="200" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.sort"
+                  placeholder="排序不可输入小数点"
+                  type="number"
+                  min="0"
+                  oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="120">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="addnurseStationLabelList"
+                  >新增</el-button
+                >
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="delnurseStationLabelList(scope.row)"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -582,12 +714,11 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- <userlist /> -->
   </div>
 </template>
 
 <script>
-import editor from "@/components/Editor";
-
 import {
   listStation,
   getStation,
@@ -596,15 +727,42 @@ import {
   updateStation,
   getFirstLevelInfo,
   getSecondaryLevelInfo,
+  getSubordinateRegions,
+  getInfoLists,
+  nurseStationlabel,
+  getLabelList,
 } from "@/api/system/station";
 import { getInfoList } from "@/api/system/nurseItem";
 import stationAcatar from "../stationAvatar/index.vue";
 import { getToken } from "@/utils/auth";
-
+import editor from "@/components/Editor";
+import userlist from "../userlist/index.vue";
 export default {
-  components: { stationAcatar, editor },
+  components: { stationAcatar, editor, userlist },
   name: "Station",
   data() {
+    // 验证手机号的规则
+    var checkMobile = (rule, value, cb) => {
+      var str = String(value);
+      // 验证手机号的正则表达式
+      const regMobile =
+        /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/;
+      //  /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+      // /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/;
+      const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
+      const isTel = reg.test(value);
+
+      if (str.length == 11) {
+        if (regMobile.test(str)) {
+          return cb();
+        }
+      } else if (11 < str.length <= 13) {
+        if (isTel) {
+          return cb();
+        }
+      }
+      cb(new Error("请输入正确的联系电话"));
+    };
     return {
       imageUrl: "",
       imageUrl2: "",
@@ -643,13 +801,24 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      //所属护理类型
+      typelooks: [],
+      //所属标签
+      looknurseStationLabel: [
+        {
+          labelDescription: "",
+          sort: "",
+          ids: 1,
+        },
+      ],
       // 护理站信息表格数据
       stationList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      openadd: false,
+      typeopen: false,
+      nurseStationLabelopen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -672,15 +841,64 @@ export default {
       },
       // 表单参数
       form: {},
+      ids: 1,
       provincelist: [],
       arealist: [],
       citylist: [],
       streetlist: [],
+      resid: null,
       // 表单校验
       rules: {
+        agencyIntroduce: [
+          { required: true, message: "请输入护理站简介", trigger: "blur" },
+        ],
+        stationIntroducePcitureUrl: [
+          { required: true, message: "请上传护理站简介头像", trigger: "blur" },
+        ],
+        stationPictureUrl: [
+          { required: true, message: "请上传护理站头像", trigger: "blur" },
+        ],
+        nurseStationDescription: [
+          { required: true, message: "护理站总概述不能为空", trigger: "blur" },
+        ],
+        phone: [
+          {
+            required: true,
+            validator: checkMobile,
+            trigger: "blur",
+            message: "",
+          },
+          // { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        dutyPerson: [
+          { required: true, message: "负责人不能为空", trigger: "blur" },
+        ],
+        dutyPhone: [
+          {
+            required: true,
+            validator: checkMobile,
+            trigger: "blur",
+            message: "",
+          },
+          // { required: true, message: "负责人电话不能为空", trigger: "blur" },
+        ],
+        sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+        longitude: [
+          { required: true, message: "经度不能为空", trigger: "blur" },
+        ],
+        latitude: [
+          { required: true, message: "纬度不能为空", trigger: "blur" },
+        ],
         areaCode: [
           { required: true, message: "所属区域不能为空", trigger: "blur" },
         ],
+        nurseStationName: [
+          { required: true, message: "护理站名称不能为空", trigger: "blur" },
+        ],
+        nurseStationType: [
+          { required: true, message: "请选择护理站类型", trigger: "blur" },
+        ],
       },
     };
   },
@@ -688,15 +906,71 @@ export default {
     this.getList();
   },
   methods: {
-    handleAvatarSuccess2(res, file) {
-      this.imageUrl2 = URL.createObjectURL(file.raw);
+    imgUrl(imgUrl) {
+      console.log(imgUrl);
+      this.form.stationPictureUrl = imgUrl;
     },
-    handleAvatarSuccess(res, file) {
-      this.imageUrl = URL.createObjectURL(file.raw);
+    imgUrl2(imgUrl) {
+      console.log(imgUrl);
+      this.form.stationIntroducePcitureUrl = imgUrl;
+    },
+    delnurseStationLabelList(item) {
+      console.log(item);
+      if (item.ids && !item.id) {
+        if (this.looknurseStationLabel.length == 1) {
+          this.$message.error("最后一条不可删除");
+        } else {
+          this.looknurseStationLabel = this.looknurseStationLabel.filter(
+            (e) => e.ids != item.ids
+          );
+        }
+      } else if (!item.ids && item.id) {
+        if (this.looknurseStationLabel.length == 1) {
+          this.$message.error("最后一条不可删除");
+        } else {
+          this.looknurseStationLabel = this.looknurseStationLabel.filter(
+            (e) => e.id != item.id
+          );
+        }
+      }
+      console.log(this.form.nurseStationLabelList);
+    },
+    addnurseStationLabelList() {
+      if (this.looknurseStationLabel.length == 5) {
+        this.$message.error("最多只能5条");
+      } else {
+        this.ids++;
+        var obj = {
+          labelDescription: "",
+          sort: "",
+          ids: this.ids,
+        };
+        this.looknurseStationLabel.push(obj);
+      }
+      console.log(this.looknurseStationLabel);
+    },
+    //查看标签
+    looknurseStationLabelList(item) {
+      console.log(item);
+      nurseStationlabel(item.id).then((res) => {
+        this.looknurseStationLabel = res.rows;
+        this.nurseStationLabelopen = true;
+        console.log(this.looknurseStationLabel);
+      });
+    },
+    //查看类型
+    looktype(item) {
+      console.log(item);
+      getInfoLists(item.nurseTypeCode).then((res) => {
+        console.log(res);
+        this.typelooks = res.data;
+        this.typeopen = true;
+      });
     },
     //点击街道
     clickstreet(item) {
       this.form.areaCode = item.areaCode;
+      this.value3 = item.areaCode;
       console.log(this.form);
     },
     //点击区县城
@@ -744,7 +1018,6 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
-      // this.openadd = false;
       this.reset();
       this.value3 = "";
       this.value2 = "";
@@ -759,6 +1032,7 @@ export default {
         nurseStationCode: null,
         nurseStationName: null,
         nurseStationType: null,
+        nurseStationType2: [],
         agencyIntroduce: null,
         nurseStationDescription: null,
         longitude: null,
@@ -768,7 +1042,9 @@ export default {
         dutyPerson: null,
         dutyPhone: null,
         stationPictureUrl: null,
+        stationIntroducePcitureUrl: null,
         sort: null,
+        nurseStationLabelList: [],
       };
       this.resetForm("form");
     },
@@ -786,6 +1062,25 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        areaCode: null,
+        userId: null,
+        nurseStationCode: null,
+        nurseStationName: null,
+        nurseStationType: null,
+        agencyIntroduce: null,
+        nurseStationDescription: null,
+        longitude: null,
+        latitude: null,
+        phone: null,
+        address: null,
+        dutyPerson: null,
+        dutyPhone: null,
+        stationPictureUrl: null,
+        sort: null,
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -798,24 +1093,94 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.value3 = "";
+      this.value2 = "";
+      this.value1 = "";
+      this.value = "";
       this.open = true;
+      this.looknurseStationLabel = [
+        {
+          labelDescription: "",
+          sort: "",
+          ids: 1,
+        },
+      ];
       this.title = "添加护理站信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getStation(id).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改护理站信息";
-      });
+      getStation(id)
+        .then((response) => {
+          this.resid = response.data.id;
+          this.form = response.data;
+          if (
+            !this.form.nurseStationType ||
+            this.form.nurseStationType == null ||
+            this.form.nurseStationType.length == 0
+          ) {
+          } else {
+            this.form.nurseStationType2 = this.form.nurseStationType.split(",");
+            this.form.nurseStationType = this.form.nurseStationType2;
+          }
+          // this.form.nurseStationLabelList = [];
+          this.title = "修改护理站信息";
+          getSubordinateRegions(response.data.areaCode).then((res) => {
+            this.value = res.data.provinceCode;
+            this.value1 = res.data.cityName;
+            this.value2 = res.data.regionName;
+            this.value3 = res.data.streetName;
+          });
+        })
+        .then(() => {
+          getLabelList(this.resid).then((res) => {
+            this.looknurseStationLabel = res;
+
+            if (this.looknurseStationLabel.length == 0) {
+              var obj = {
+                labelDescription: "",
+                sort: "",
+                ids: 1,
+              };
+              this.looknurseStationLabel.push(obj);
+            } else if (this.looknurseStationLabel == []) {
+              var obj = {
+                labelDescription: "",
+                sort: "",
+                ids: 1,
+              };
+              this.looknurseStationLabel.push(obj);
+            } else if (this.looknurseStationLabel == null) {
+              var obj = {
+                labelDescription: "",
+                sort: "",
+                ids: 1,
+              };
+              this.looknurseStationLabel.push(obj);
+            }
+            console.log(this.looknurseStationLabel);
+
+            // console.log(this.form);
+            // console.log(this.form.nurseStationLabelList);
+            // this.form.nurseStationLabelList = obj;
+
+            // res.rows.forEach((e) => {
+            //   this.form.nurseStationLabelList.push(e);
+            // });
+          });
+          console.log(this.form);
+          this.open = true;
+        });
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.nurseStationLabelList = this.looknurseStationLabel;
+      this.form.nurseStationType = this.form.nurseStationType2;
       console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.nurseStationType = this.form.nurseStationType2.join(",");
           if (this.form.id != null) {
             updateStation(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -824,9 +1189,13 @@ export default {
             });
           } else {
             addStation(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              if (response.code) {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              } else {
+                this.form.nurseStationType = obj;
+              }
             });
           }
         }
@@ -836,7 +1205,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除护理站信息编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除此护理站信息？")
         .then(function () {
           return delStation(ids);
         })
@@ -866,7 +1235,7 @@ export default {
       this.download(
         "/system/station/downloadTemplate?fileType=nurseStation",
         {},
-        `护理站模板.xlsx`
+        `护理站信息导入模板.xlsx`
       );
     },
     // 提交上传文件
diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue
index 7fe2432..e99888d 100644
--- a/src/views/system/stationAvatar/index.vue
+++ b/src/views/system/stationAvatar/index.vue
@@ -143,32 +143,23 @@ export default {
     };
   },
   created() {
-    console.log(this.img);
-    console.log(this.type);
     this.types = this.type;
     if (this.img == null) {
-      console.log(1);
       this.options.img = null;
     } else if (this.img == "") {
-      console.log(2);
       this.options.img = null;
     } else {
-      console.log(3);
       this.options.img = baseurl + this.img;
     }
   },
   watch: {
     img: {
       handler(newimg, oldimg) {
-        console.log(this.img);
         if (this.img == null) {
-          console.log(1);
           this.options.img = null;
         } else if (this.img == "") {
-          console.log(2);
           this.options.img = null;
         } else {
-          console.log(3);
           this.options.img = baseurl + this.img;
         }
       },
@@ -176,7 +167,6 @@ export default {
     type: {
       handler(newimg, oldimg) {
         this.types = this.type;
-        console.log(this.types);
       },
     },
   },
@@ -208,7 +198,7 @@ export default {
     beforeUpload(file) {
       if (file.type.indexOf("image/") == -1) {
         this.$modal.msgError(
-          "文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。"
+          "文件格式错误，请上传图片类型,如:JPG,PNG后缀的文件。"
         );
       } else {
         const reader = new FileReader();
@@ -222,15 +212,12 @@ export default {
     uploadImg() {
       // console.log(this.types);
       this.$refs.cropper.getCropBlob((data) => {
-        console.log(data);
         let formData = new FormData();
-        console.log(formData);
         formData.append("file", data);
         formData.append("type", this.types);
-        console.log(formData);
         updateNurseStationHeads(formData).then((response) => {
-          console.log(response);
           this.options.img = baseurl + response.imgUrl;
+          this.$emit("imgUrl", response.imgUrl);
           this.openimg = false;
         });
       });
@@ -252,6 +239,7 @@ export default {
   position: relative;
   display: inline-block;
   height: 120px;
+  background: #fafafa;
 }
 
 .user-info-head:hover:after {
diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue
index 7fd66f9..3467cad 100644
--- a/src/views/system/stationConsumable/index.vue
+++ b/src/views/system/stationConsumable/index.vue
@@ -716,7 +716,7 @@ export default {
       this.download(
         "/system/stationItem/downloadTemplate?fileType=2",
         {},
-        `护理站耗材模板.xlsx`
+        `护理站耗材信息导入模板.xlsx`
       );
     },
     // 提交上传文件
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 44a0d4f..6fc4d03 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -840,9 +840,10 @@ export default {
     /** 提交按钮 */
     submitForm: function () {
       console.log(this.form);
-      this.form.nurseStationIds = this.form.nurseStationIds.join(",");
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.nurseStationIds = this.form.nurseStationIds.join(",");
+
           if (this.form.userId != undefined) {
             updateUser(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/system/userlist/index.vue b/src/views/system/userlist/index.vue
new file mode 100644
index 0000000..13e2e28
--- /dev/null
+++ b/src/views/system/userlist/index.vue
@@ -0,0 +1,21 @@
+<template></template>
+
+<script>
+import { getListByUser } from "@/api/system/userlist.js";
+export default {
+  name: "userlist",
+  data() {
+    return {};
+  },
+  created() {
+    this.info()
+  },
+  methods: {
+    info() {
+      getListByUser().then((res) => {
+        console.log(res);
+      });
+    },
+  },
+};
+</script>

From cfb98f77b77a926ff47cb0b1cb5cf3fca384372c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 22 Sep 2022 11:34:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8A=A4=E7=90=86?=
 =?UTF-8?q?=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/station/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index 45107cb..f68412f 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -181,7 +181,7 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="所属区域" align="center" prop="areaCode" />
+      <el-table-column label="所属区域" align="center" prop="sysAreaVOList[0].streetName" />
       <el-table-column label="护理站地址" align="center" prop="address" />
       <!-- <el-table-column
         label="护理站简介"
@@ -1052,6 +1052,7 @@ export default {
     liststationinfo() {
       listStation(this.queryParams).then((response) => {
         this.stationList = response.rows;
+        console.log('this.stationList :>> ', this.stationList);
         this.total = response.total;
         this.loading = false;
       });

From 4a03eae743b8e78f6c056d265c9ba7e06f126788 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 22 Sep 2022 14:51:21 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=20=E9=87=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/person/index.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 14a88d9..d11b68c 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -1485,12 +1485,12 @@ export default {
       this.getList();
     },
     handleQuery() {
-      stationList(this.nurseStationqueryParams).then((res) => {
-        console.log(res);
-        this.nurseStationlist = res.rows;
-        this.total4 = res.total;
-        console.log(this.nurseStationlist);
-      });
+      // stationList(this.nurseStationqueryParams).then((res) => {
+      //   console.log(res);
+      //   this.nurseStationlist = res.rows;
+      //   this.total4 = res.total;
+      //   console.log(this.nurseStationlist);
+      // });
       this.queryParams.pageNum = 1;
       this.getList();
       //  this.nurselist()
@@ -1544,10 +1544,6 @@ export default {
         phone: null,
         address: null,
       };
-      stationList(this.queryParams2).then((res) => {
-        this.stationLists = res.rows;
-        this.total2 = res.total;
-      });
       this.handleQuery();
     },
     // 多选框选中数据

From f59fd466b6e8a93f9d725c32d705a75fe5cf038c Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 22 Sep 2022 15:03:50 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/communityInfo/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/system/communityInfo/index.vue b/src/views/system/communityInfo/index.vue
index b9b33f5..3a600ec 100644
--- a/src/views/system/communityInfo/index.vue
+++ b/src/views/system/communityInfo/index.vue
@@ -237,7 +237,8 @@
         <div
           v-for="(item, index) in form.communityInfoList"
           :key="index"
-          style="margin-top: 20px"
+          style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
+         
         >
           <el-form-item
             label="所属区域"

From be49874bc6eee5196512a29d9715f4f143d68587 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 23 Sep 2022 09:02:16 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=20=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/person/index.vue | 152 +++++++++++++++++++++++-------
 1 file changed, 120 insertions(+), 32 deletions(-)

diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index d11b68c..5b2d447 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -8,10 +8,10 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="护理站" prop="nurseStationId">
+      <el-form-item label="护理站" prop="nurseStationId"  v-if="nurseStationlist.find((e) => e.isAdmin == '1')">
         <el-select
           v-model="queryParams.nurseStationId"
-          clearable
+          
           placeholder="请选择护理站"
           v-loadmore="loadMore"
           @keyup.enter.native="handleQuery"
@@ -25,6 +25,22 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+       <el-form-item label="护理站" prop="nurseStationId" v-else>
+        <el-select
+          v-model="queryParams.nurseStationId"
+          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="所属科室" prop="departmentName">
         <el-input
           v-model="queryParams.departmentName"
@@ -1030,6 +1046,7 @@ import {
   StationDepartmentList,
 } from "@/api/system/person";
 import { getToken } from "@/utils/auth";
+import { getListByUser } from "@/api/system/userlist.js";
 
 export default {
   name: "Person",
@@ -1133,6 +1150,7 @@ export default {
       // 是否显示弹出层
       open: false,
       open2: false,
+      //权限查询
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1252,16 +1270,14 @@ export default {
   },
   created() {
     this.getList();
+    this.getList2();
     this.nurselist();
+    this.info();
   },
   methods: {
     // // 新增所属科室按钮
     departclick(item, index) {
-      StationDepartmentList(this.queryParams3).then((res) => {
-        this.StationDepartmentLists = res.rows;
-        this.total3 = res.total;
-        this.loading = false;
-      });
+      
       console.log(item);
       this.departid = item.departmentCode;
       this.innerVisible2 = true;
@@ -1281,11 +1297,7 @@ export default {
     },
     // 新增护理站按钮
     clickinnerVisible(item, index) {
-      stationList(this.queryParams2).then((res) => {
-        this.stationLists = res.rows;
-        this.total2 = res.total;
-        this.loading = false;
-      });
+     
       // console.log(item);
       this.stationid = item.nurseStationId;
       this.innerVisible = true;
@@ -1304,24 +1316,24 @@ export default {
       // this.index = index;
     },
     //xialakuang
-    loadMore() {
-      console.log("1");
-      var a = Math.ceil(this.total4 / 10);
-      console.log(this.nurseStationlist.length);
-      if (this.nurseStationlist.length + 1 >= this.total4) {
-      } else {
-        if (this.nurseStationqueryParams.pageNum >= a) {
-        } else {
-          this.nurseStationqueryParams.pageNum++;
-          stationList(this.nurseStationqueryParams).then((res) => {
-            console.log(res);
-            res.rows.forEach((e) => {
-              this.nurseStationlist.push(e);
-            });
-          });
-        }
-      }
-    },
+    // loadMore() {
+    //   console.log("1");
+    //   var a = Math.ceil(this.total4 / 10);
+    //   console.log(this.nurseStationlist.length);
+    //   if (this.nurseStationlist.length + 1 >= this.total4) {
+    //   } else {
+    //     if (this.nurseStationqueryParams.pageNum >= a) {
+    //     } else {
+    //       this.nurseStationqueryParams.pageNum++;
+    //       stationList(this.nurseStationqueryParams).then((res) => {
+    //         console.log(res);
+    //         res.rows.forEach((e) => {
+    //           this.nurseStationlist.push(e);
+    //         });
+    //       });
+    //     }
+    //   }
+    // },
     nurselist() {
       stationList(this.nurseStationqueryParams).then((res) => {
         console.log(res);
@@ -1417,6 +1429,21 @@ export default {
         this.loading = false;
       });
     },
+    getList2() {
+      // 护理站名称
+       this.loading = true;
+       stationList(this.queryParams2).then((res) => {
+        this.stationLists = res.rows;
+        this.total2 = res.total;
+        this.loading = false;
+      });
+      StationDepartmentList(this.queryParams3).then((res) => {
+        this.StationDepartmentLists = res.rows;
+        this.total3 = res.total;
+        this.loading = false;
+      });
+     
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -1428,6 +1455,7 @@ export default {
     },
     // 表单重置
     reset() {
+       
       this.form = {
         id: null,
         nurseStationId: null,
@@ -1461,6 +1489,7 @@ export default {
         ],
       };
       this.resetForm("form");
+      
     },
 
     /** 搜索按钮操作 */
@@ -1506,7 +1535,6 @@ export default {
         id: null,
         nurseStationId: null,
       };
-
       stationList(this.queryParams2).then((res) => {
         this.stationLists = res.rows;
         this.total2 = res.total;
@@ -1522,7 +1550,6 @@ export default {
         departmentName: null,
         nurseStationId: null,
       };
-
       StationDepartmentList(this.queryParams3).then((response) => {
         this.StationDepartmentLists = response.rows;
         this.total3 = response.total;
@@ -1531,6 +1558,7 @@ export default {
     },
 
     resetQuery() {
+      if (this.nurseStationlist[0].isAdmin == "1") {
       this.resetForm("queryForm");
       this.queryParams = {
         pageNum: 1,
@@ -1545,6 +1573,14 @@ export default {
         address: null,
       };
       this.handleQuery();
+     } else {
+        console.log(1);
+        this.queryParams.departmentName = null;
+        this.queryParams.pageSize = 10;
+        this.queryParams.pageNum = 1;
+        this.queryParams.nursePersonName = null;
+        this.handleQuery();
+      }
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1668,6 +1704,58 @@ export default {
         `person_${new Date().getTime()}.xlsx`
       );
     },
+     //权限列表
+    info() {
+      getListByUser(this.nurseStationqueryParams).then((res) => {
+        console.log(res);
+        if (res.rows[0].isAdmin == "1") {
+          console.log(true);
+          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.handleQuery();
+        }
+      });
+    },
+    //滑动下拉框
+    loadMore() {
+      var a = Math.ceil(this.total4 / 10);
+      if (this.nurseStationlist.length + 1 >= this.total4) {
+      } else {
+        if (this.nurseStationqueryParams.pageNum >= a) {
+        } else {
+          this.nurseStationqueryParams.pageNum++;
+          console.log(this.nurseStationqueryParams.pageNum);
+          getListByUser(this.nurseStationqueryParams).then((res) => {
+            console.log(res);
+            res.rows.forEach((e) => {
+              this.nurseStationlist.push(e);
+            });
+          });
+        }
+      }
+    },
+    // loadMore() {
+    //   console.log("1");
+    //   var a = Math.ceil(this.total4 / 10);
+    //   console.log(this.nurseStationlist.length);
+    //   if (this.nurseStationlist.length + 1 >= this.total4) {
+    //   } else {
+    //     if (this.nurseStationqueryParams.pageNum >= a) {
+    //     } else {
+    //       this.nurseStationqueryParams.pageNum++;
+    //       stationList(this.nurseStationqueryParams).then((res) => {
+    //         console.log(res);
+    //         res.rows.forEach((e) => {
+    //           this.nurseStationlist.push(e);
+    //         });
+    //       });
+    //     }
+    //   }
+    // },
   },
 };
 </script>

From ddb3514ac7a7df261a73cee69673023f2cfc7dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 23 Sep 2022 14:45:51 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/baseurl.js                            |   2 +-
 src/api/system/userlist.js                    |   5 +-
 src/views/system/station/index.vue            | 143 ++++++++++++++----
 src/views/system/stationConsumable/index.vue  | 133 +++++++++++-----
 .../{nurseItem => stationItem}/index.vue      | 105 +++++++++----
 src/views/system/userlist/index.vue           |   7 +-
 7 files changed, 295 insertions(+), 102 deletions(-)
 rename src/views/system/{nurseItem => stationItem}/index.vue (94%)

diff --git a/.env.development b/.env.development
index de7243a..46aa8e5 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 全医通护理站管理平台/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.64:8080'
+VUE_APP_BASE_API = 'http://192.168.16.87:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/baseurl.js b/src/api/baseurl.js
index a56555f..abb555c 100644
--- a/src/api/baseurl.js
+++ b/src/api/baseurl.js
@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.81:8080";
+var baseurl = "http://192.168.16.81:8082";
 
 export default baseurl
\ No newline at end of file
diff --git a/src/api/system/userlist.js b/src/api/system/userlist.js
index 00bee4b..8c0cf17 100644
--- a/src/api/system/userlist.js
+++ b/src/api/system/userlist.js
@@ -1,8 +1,9 @@
 import request from '@/utils/request'
 
-export function getListByUser(data) {
+export function getListByUser(query) {
     return request({
         url: '/system/user/getListByUser',
-        method: 'GET'
+        method: 'GET',
+        params: query
     })
 }
\ No newline at end of file
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index 45107cb..7d4ff8e 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -16,15 +16,42 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-
-      <el-form-item label="护理站名称" prop="nurseStationName">
-        <el-input
-          v-model="queryParams.nurseStationName"
-          placeholder="请输入护理站名称"
+      <el-form-item
+        label="护理站名称"
+        prop="nurseStationName"
+        v-if="nurseStationlist.find((e) => e.isAdmin == '1')"
+      >
+        <el-select
+          v-model="queryParams.nurseStationCode"
           clearable
-          @keyup.enter.native="handleQuery"
-        /> </el-form-item
-      ><el-form-item label="护理站编号" prop="nurseStationCode">
+          placeholder="请选择护理站"
+          v-loadmore="loadMore"
+        >
+          <el-option
+            v-for="item in nurseStationlist"
+            :key="item.id"
+            :label="item.nurseStationName"
+            :value="item.nurseStationCode"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属护理站" prop="nurseStationName" v-else>
+        <el-select
+          v-model="queryParams.nurseStationCode"
+          placeholder="请选择护理站"
+          v-loadmore="loadMore"
+        >
+          <el-option
+            v-for="item in nurseStationlist"
+            :key="item.id"
+            :label="item.nurseStationName"
+            :value="item.nurseStationCode"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="护理站编号" prop="nurseStationCode">
         <el-input
           v-model="queryParams.nurseStationCode"
           placeholder="请输入护理站编号"
@@ -137,7 +164,6 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handledata"
-          v-hasPermi="['system:station:importData']"
           >导入</el-button
         >
       </el-col>
@@ -714,7 +740,6 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- <userlist /> -->
   </div>
 </template>
 
@@ -734,11 +759,11 @@ import {
 } from "@/api/system/station";
 import { getInfoList } from "@/api/system/nurseItem";
 import stationAcatar from "../stationAvatar/index.vue";
+import { getListByUser } from "@/api/system/userlist.js";
 import { getToken } from "@/utils/auth";
 import editor from "@/components/Editor";
-import userlist from "../userlist/index.vue";
 export default {
-  components: { stationAcatar, editor, userlist },
+  components: { stationAcatar, editor },
   name: "Station",
   data() {
     // 验证手机号的规则
@@ -801,6 +826,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      total2: 0,
       //所属护理类型
       typelooks: [],
       //所属标签
@@ -813,12 +839,18 @@ export default {
       ],
       // 护理站信息表格数据
       stationList: [],
+      nurseStationlist: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
       typeopen: false,
       nurseStationLabelopen: false,
+      //权限查询
+      getListByUserquery: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -904,6 +936,7 @@ export default {
   },
   created() {
     this.getList();
+    this.info();
   },
   methods: {
     imgUrl(imgUrl) {
@@ -1062,27 +1095,36 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        areaCode: null,
-        userId: null,
-        nurseStationCode: null,
-        nurseStationName: null,
-        nurseStationType: null,
-        agencyIntroduce: null,
-        nurseStationDescription: null,
-        longitude: null,
-        latitude: null,
-        phone: null,
-        address: null,
-        dutyPerson: null,
-        dutyPhone: null,
-        stationPictureUrl: null,
-        sort: null,
-      };
-      this.resetForm("queryForm");
-      this.handleQuery();
+      if (this.nurseStationlist[0].isAdmin == "1") {
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          areaCode: null,
+          userId: null,
+          nurseStationCode: null,
+          nurseStationName: null,
+          nurseStationType: null,
+          agencyIntroduce: null,
+          nurseStationDescription: null,
+          longitude: null,
+          latitude: null,
+          phone: null,
+          address: null,
+          dutyPerson: null,
+          dutyPhone: null,
+          stationPictureUrl: null,
+          sort: null,
+        };
+        this.resetForm("queryForm");
+        this.handleQuery();
+      } else {
+        console.log(1);
+        // this.queryParams.nurseStationCode = null;
+        this.queryParams.pageSize = 10;
+        this.queryParams.pageNum = 1;
+        this.queryParams.nurseStationType = null;
+        this.handleQuery();
+      }
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1180,6 +1222,7 @@ export default {
       console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaCode = Number(this.form.areaCode);
           this.form.nurseStationType = this.form.nurseStationType2.join(",");
           if (this.form.id != null) {
             updateStation(this.form).then((response) => {
@@ -1260,6 +1303,40 @@ export default {
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
+    //权限列表
+    info() {
+      getListByUser(this.getListByUserquery).then((res) => {
+        console.log(res);
+        if (res.rows[0].isAdmin == "1") {
+          console.log(true);
+          this.nurseStationlist = res.rows;
+          this.total2 = res.total;
+        } else {
+          this.total2 = res.total;
+          this.nurseStationlist = res.rows;
+          this.queryParams.nurseStationCode = res.rows[0].nurseStationCode;
+          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++;
+          console.log(this.getListByUserquery.pageNum);
+          getListByUser(this.getListByUserquery).then((res) => {
+            console.log(res);
+            res.rows.forEach((e) => {
+              this.nurseStationlist.push(e);
+            });
+          });
+        }
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue
index 3467cad..142a83c 100644
--- a/src/views/system/stationConsumable/index.vue
+++ b/src/views/system/stationConsumable/index.vue
@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="100px"
     >
-      <el-form-item label="护理站名称" prop="">
+      <el-form-item label="护理站名称" prop=""  v-if="nurseStationlist.find((e) => e.isAdmin == '1')">
         <el-select
           v-model="queryParams.nurseStationId"
           clearable
@@ -24,6 +24,35 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+      <el-form-item label="所属护理站" prop=""   v-else>
+        <el-select
+          v-model="queryParams.nurseStationId"
+          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="耗材包编号" prop="consumableCode">
         <el-input
           v-model="queryParams.consumableCode"
@@ -124,7 +153,6 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleport"
-          v-hasPermi="['system:stationConsumable:importData']"
           >导入</el-button
         >
       </el-col>
@@ -461,7 +489,7 @@
       </el-form>
       <el-table
         v-loading="loading"
-        :data="nurseStationlist"
+        :data="nurseStationlist2"
         @cell-dblclick="clicknurseStation"
       >
         <el-table-column width="60" align="center" label="请选择">
@@ -561,6 +589,7 @@ import {
   updateStationConsumable,
   list,
 } from "@/api/system/stationConsumable";
+import { getListByUser } from "@/api/system/userlist.js";
 import { getToken } from "@/utils/auth";
 export default {
   name: "StationConsumable",
@@ -593,9 +622,11 @@ export default {
       // 总条数
       total: 0,
       total2: 0,
+      total3: 0,
       // 护理站耗材信息表格数据
       stationConsumableList: [],
       nurseStationlist: [],
+      nurseStationlist2: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -603,6 +634,11 @@ export default {
       open2: false,
       xgopen: false,
       index: "",
+      //权限查询
+      getListByUserquery: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 查询参数
       nurseStationqueryParams: {
         pageNum: 1,
@@ -708,6 +744,7 @@ export default {
   },
   created() {
     this.getList();
+    this.info();
     this.listinfo();
   },
   methods: {
@@ -741,24 +778,6 @@ export default {
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
-    loadMore() {
-      console.log("1");
-      var a = Math.ceil(this.total2 / 10);
-      console.log(this.nurseStationlist.length);
-      if (this.nurseStationlist.length + 1 >= this.total2) {
-      } else {
-        if (this.nurseStationqueryParams.pageNum >= a) {
-        } else {
-          this.nurseStationqueryParams.pageNum++;
-          list(this.nurseStationqueryParams).then((res) => {
-            console.log(res);
-            res.rows.forEach((e) => {
-              this.nurseStationlist.push(e);
-            });
-          });
-        }
-      }
-    },
     delnurseStationConsumables(index) {
       this.form.nurseStationConsumables.splice(index, 1);
       console.log(this.form.nurseStationConsumables);
@@ -872,7 +891,7 @@ export default {
     listinfo() {
       list(this.nurseStationqueryParams).then((res) => {
         console.log(res);
-        this.nurseStationlist = res.rows;
+        this.nurseStationlist2 = res.rows;
         this.total2 = res.total;
       });
     },
@@ -884,19 +903,28 @@ export default {
     },
     /** 重置按钮操作 */
     sresetQuery() {
-      this.resetForm("queryForm");
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        nurseStationId: "",
-        userId: null,
-        consumableCode: null,
-        consumableDetail: null,
-        consumableUnit: null,
-        consumablePrice: null,
-        sort: null,
-      };
-      this.handleQuery();
+      if (this.nurseStationlist[0].isAdmin == "1") {
+        this.resetForm("queryForm");
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          nurseStationId: "",
+          userId: null,
+          consumableCode: null,
+          consumableDetail: null,
+          consumableUnit: null,
+          consumablePrice: null,
+          sort: null,
+        };
+        this.handleQuery();
+      } else {
+        this.queryParams.pageNum = 1;
+        this.queryParams.consumableCode = null;
+        this.queryParams.consumableDetail = null;
+        this.queryParams.consumableUnit = null;
+        this.queryParams.consumablePrice = null;
+        this.handleQuery();
+      }
     },
     //护理站重置
     resetQuery() {
@@ -977,6 +1005,41 @@ export default {
       this.upload.title = "用户导入";
       this.upload.open = true;
     },
+
+    //权限列表
+    info() {
+      getListByUser(this.getListByUserquery).then((res) => {
+        console.log(res);
+        if (res.rows[0].isAdmin == "1") {
+          console.log(true);
+          this.nurseStationlist = res.rows;
+          this.total3 = res.total;
+        } else {
+          this.total3 = res.total;
+          this.nurseStationlist = res.rows;
+          this.queryParams.nurseStationId = res.rows[0].id;
+          this.handleQuery();
+        }
+      });
+    },
+
+    loadMore() {
+      console.log(1);
+      var a = Math.ceil(this.total3 / 10);
+      if (this.nurseStationlist.length + 1 >= this.total3) {
+      } else {
+        if (this.getListByUserquery.pageNum >= a) {
+        } else {
+          this.getListByUserquery.pageNum++;
+          getListByUser(this.getListByUserquery).then((res) => {
+            console.log(res);
+            res.rows.forEach((e) => {
+              this.nurseStationlist.push(e);
+            });
+          });
+        }
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/system/nurseItem/index.vue b/src/views/system/stationItem/index.vue
similarity index 94%
rename from src/views/system/nurseItem/index.vue
rename to src/views/system/stationItem/index.vue
index 3520713..3a6edd9 100644
--- a/src/views/system/nurseItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -9,9 +9,10 @@
       label-width="110px"
     >
       <el-form-item
-        label="所属护理站"
+        label="护理站名称"
         prop="nurseStationId"
         label-width="100px"
+        v-if="nurseStationlist.find((e) => e.isAdmin == '1')"
       >
         <el-select
           v-model="queryParams.nurseStationId"
@@ -28,6 +29,27 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+      <el-form-item
+        label="所属护理站"
+        prop="nurseStationId"
+        label-width="100px"
+        v-else
+      >
+        <el-select
+          v-model="queryParams.nurseStationId"
+          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="护理类型" prop="nurseTypeId" label-width="90px">
         <el-select
           v-model="queryParams.nurseTypeId"
@@ -82,7 +104,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['system:nurseItem:add']"
+          v-hasPermi="['system:stationItem:add']"
           >新增</el-button
         >
       </el-col>
@@ -94,7 +116,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['system:nurseItem:edit']"
+          v-hasPermi="['system:stationItem:edit']"
           >修改</el-button
         >
       </el-col>
@@ -106,7 +128,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['system:nurseItem:remove']"
+          v-hasPermi="['system:stationItem:remove']"
           >删除</el-button
         >
       </el-col>
@@ -117,7 +139,6 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['system:nurseItem:importData']"
           >导入</el-button
         >
       </el-col>
@@ -292,8 +313,9 @@
         <el-form-item label="提前预约时长" prop="advanceAppointDuration">
           <el-input
             v-model="form.nurseStationItem.advanceAppointDuration"
-            placeholder="请输入提前预约时长(小时)"
+            placeholder="提前预约时长(单位小时)"
             type="number"
+            min="0"
           />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
@@ -465,7 +487,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
     <!-- 护理站 -->
     <el-dialog
       title="选择护理站"
@@ -507,7 +528,7 @@
       </el-form>
       <el-table
         v-loading="loading"
-        :data="nurseStationlist"
+        :data="nurseStationlist2"
         @cell-dblclick="choicestationid"
       >
         <el-table-column label="请选择" width="70" align="center">
@@ -725,6 +746,7 @@ import {
   liststation,
 } from "@/api/system/nurseItem";
 import { getToken } from "@/utils/auth";
+import { getListByUser } from "@/api/system/userlist.js";
 
 export default {
   components: { stationAcatar },
@@ -761,6 +783,7 @@ export default {
       total: 0,
       total2: 0,
       total3: 0,
+      total4: 0,
       //耗材
       stationConsumableList: [],
       // 护理站护理项目表格数据
@@ -771,6 +794,13 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      //权限查询
+      nurseStationlist: [],
+      nurseStationlist2: [],
+      getListByUserquery: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -795,7 +825,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      nurseStationlist: [],
       // 表单参数
       form: {
         nurseStationItem: {
@@ -833,6 +862,7 @@ export default {
   },
   created() {
     this.getList();
+    this.info();
     this.getInfoListinfo();
     this.stationlist();
     // this.listStationConsumableinfo();
@@ -875,7 +905,6 @@ export default {
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
     },
-
     //耗材包选择完成
     stationConsumablechoiceok() {
       this.form.nurseStationItemConsumables.forEach((e) => {
@@ -940,29 +969,13 @@ export default {
       };
       this.stationlist();
     },
-
     //下拉框
     stationlist() {
       liststation(this.nurseStationqueryParams).then((res) => {
-        this.nurseStationlist = res.rows;
+        this.nurseStationlist2 = res.rows;
         this.total2 = res.total;
       });
     },
-    loadMore() {
-      var a = Math.ceil(this.total2 / 10);
-      if (this.nurseStationlist.length + 1 >= this.total2) {
-      } else {
-        if (this.nurseStationqueryParams.pageNum >= a) {
-        } else {
-          this.nurseStationqueryParams.pageNum++;
-          liststation(this.nurseStationqueryParams).then((res) => {
-            res.rows.forEach((e) => {
-              this.nurseStationlist.push(e);
-            });
-          });
-        }
-      }
-    },
     //护理类型
     getInfoListinfo() {
       getInfoList().then((res) => {
@@ -978,7 +991,6 @@ export default {
         }
       );
     },
-
     listStationConsumableinfo() {
       if (this.form.nurseStationItem.nurseStationId != null) {
         listStationConsumable(this.StationConsumablequeryParams).then(
@@ -1086,7 +1098,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.queryParams.pageNu = 1;
+      this.queryParams.nurseTypeId = null;
+      this.queryParams.nurseItemCode = null;
+      this.queryParams.nurseItemName = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -1181,6 +1196,38 @@ export default {
       this.upload.title = "用户导入";
       this.upload.open = true;
     },
+
+    //权限列表
+    info() {
+      getListByUser(this.getListByUserquery).then((res) => {
+        console.log(res);
+        if (res.rows[0].isAdmin == "1") {
+          console.log(true);
+          this.nurseStationlist = res.rows;
+          this.total4 = res.total;
+        } else {
+          this.total4 = res.total;
+          this.nurseStationlist = res.rows;
+          this.queryParams.nurseStationId = res.rows[0].id;
+          this.handleQuery();
+        }
+      });
+    },
+    loadMore() {
+      var a = Math.ceil(this.total4 / 10);
+      if (this.nurseStationlist.length + 1 >= this.total4s) {
+      } else {
+        if (this.getListByUserquery.pageNum >= a) {
+        } else {
+          this.getListByUserquery.pageNum++;
+          getListByUser(this.getListByUserquery).then((res) => {
+            res.rows.forEach((e) => {
+              this.nurseStationlist.push(e);
+            });
+          });
+        }
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/system/userlist/index.vue b/src/views/system/userlist/index.vue
index 13e2e28..eff881b 100644
--- a/src/views/system/userlist/index.vue
+++ b/src/views/system/userlist/index.vue
@@ -8,12 +8,17 @@ export default {
     return {};
   },
   created() {
-    this.info()
+    this.info();
   },
   methods: {
     info() {
       getListByUser().then((res) => {
         console.log(res);
+        if (res.rows[0].isAdmin == "1") {
+          console.log(true);
+        } else {
+          this.$emit("itemlist", res.rows);
+        }
       });
     },
   },

From 8cf9f1c569238597bcaaedc3f61fbab99a72b551 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 23 Sep 2022 16:17:42 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |   2 +-
 src/api/system/communityInfo.js          |   7 ++
 src/views/system/communityInfo/index.vue | 148 +++++++++++++++++++++--
 3 files changed, 145 insertions(+), 12 deletions(-)

diff --git a/.env.development b/.env.development
index de7243a..00ae071 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 全医通护理站管理平台/开发环境
 # VUE_APP_BASE_API = '/dev-api'
-VUE_APP_BASE_API = 'http://192.168.16.64:8080'
+VUE_APP_BASE_API = 'http://192.168.16.85:8081'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/system/communityInfo.js b/src/api/system/communityInfo.js
index fe19e17..5433056 100644
--- a/src/api/system/communityInfo.js
+++ b/src/api/system/communityInfo.js
@@ -31,6 +31,13 @@ export function SecondaryLevelInfo(id) {
         method: 'get',
     })
 }
+//省市区
+export function SubordinateRegions(Code) {
+    return request({
+        url: `/system/area/getSubordinateRegions?areaCode=${Code}`,
+        method: 'get'
+    })
+}
 // 新增居住社区信息
 export function addCommunityInfo(data) {
     return request({
diff --git a/src/views/system/communityInfo/index.vue b/src/views/system/communityInfo/index.vue
index 3a600ec..8896028 100644
--- a/src/views/system/communityInfo/index.vue
+++ b/src/views/system/communityInfo/index.vue
@@ -238,7 +238,7 @@
           v-for="(item, index) in form.communityInfoList"
           :key="index"
           style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
-         
+
         >
           <el-form-item
             label="所属区域"
@@ -362,23 +362,82 @@
     </el-dialog>
 
     <!-- 修改居住社区信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!-- <el-form-item label="所属区域编码" prop="areaCode">
-          <el-input v-model="form.areaCode" placeholder="请输入所属区域编码" />
-        </el-form-item> -->
-        <el-form-item label="所属区域" prop="areaCode">
+    <el-dialog :title="title" :visible.sync="open" width="1060px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+        <!-- <el-form-item label="所属区域" prop="areaCode">
           <el-input
             v-model="form.areaName"
             placeholder="请输入所属区域"
             maxlength="20"
           />
-        </el-form-item>
+        </el-form-item> -->
+          <el-form-item
+            label="所属区域"
+            prop="areaCode"
+          >
+            <el-select v-model="form.province" clearable placeholder="请选择省" >
+              <el-option
+                v-for="item in arealist"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="province3(item)"
+              >
+              </el-option>
+            </el-select>
+
+            <el-select
+              v-model="form.city"
+              clearable
+              placeholder="请选择市"
+              style="margin-left: 10px"
+            >
+              <el-option
+                v-for="item in citylist"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="clickcity3(item)"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-model="form.area"
+              clearable
+              placeholder="请选择区"
+              style="margin-left: 10px"
+            >
+              <el-option
+                v-for="item in arealists"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+                @click.native="clickarea3(item)"
+              >
+              </el-option>
+            </el-select>
+            <el-select
+              v-model="form.areaCode"
+              clearable
+              placeholder="请选择街道"
+              style="margin-left: 10px"
+          
+            >
+              <el-option
+                v-for="item in streetlist"
+                :key="item.areaCode"
+                :label="item.areaName"
+                :value="item.areaCode"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
         <el-form-item label="社区名称" prop="communityName">
           <el-input
             v-model="form.communityName"
             placeholder="请输入社区名称"
             maxlength="30"
+            style="width:200px"
           />
         </el-form-item>
         <el-form-item label="社区经度" prop="communityLongitude">
@@ -386,6 +445,7 @@
             v-model="form.communityLongitude"
             placeholder="请输入社区经度"
             maxlength="20"
+             style="width:200px"
           />
         </el-form-item>
         <el-form-item label="社区纬度" prop="communityLatitude">
@@ -393,6 +453,7 @@
             v-model="form.communityLatitude"
             placeholder="请输入社区纬度"
             maxlength="20"
+             style="width:200px"
           />
         </el-form-item>
       </el-form>
@@ -413,6 +474,7 @@ import {
   updateCommunityInfo,
   FirstLevels,
   SecondaryLevelInfo,
+  SubordinateRegions,
 } from "@/api/system/communityInfo";
 
 export default {
@@ -561,7 +623,7 @@ export default {
       this.queryParams.areaCode = "";
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
-        this.SecondaryLevelInfolist = res.data;
+        // this.SecondaryLevelInfolist = res.data;
         // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
@@ -574,7 +636,21 @@ export default {
       console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
-        this.SecondaryLevelInfolist = res.data;
+        // this.SecondaryLevelInfolist = res.data;
+        // console.log(this.SecondaryLevelInfolist);
+        this.citylist = res.data;
+      });
+    },
+    // 修改
+    province3(item) {
+      // this.form.xxx[index].code=''
+      console.log(item);
+      this.form.city = "";
+      this.form.area = "";
+      this.form.areaCode = "";
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        // this.SecondaryLevelInfolist = res.data;
         // console.log(this.SecondaryLevelInfolist);
         this.citylist = res.data;
       });
@@ -583,6 +659,8 @@ export default {
     clickcity(item) {
       console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
+          this.queryParams.area = "";
+      this.queryParams.areaCode = "";
         console.log(res);
         this.arealists = res.data;
       });
@@ -593,14 +671,27 @@ export default {
       // this.queryParams.areaCode = "";
       // this.value2 = "";
       // this.value3 = "";
+  this.form.communityInfoList[index].area = "";
+      this.form.communityInfoList[index].areaCode = "";
       console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
         this.arealists = res.data;
       });
     },
+    // 修改
+     clickcity3(item) {
+      console.log(item);
+      SecondaryLevelInfo(item.id).then((res) => {
+          this.form.area = "";
+      this.form.areaCode = "";
+        console.log(res);
+        this.arealists = res.data;
+      });
+    },
     //点击区县城
     clickarea(item) {
+      this.queryParams.areaCode = "";
       //  this.queryParams.areaCode = "";
       // this.value3 = "";
       console.log(item);
@@ -613,6 +704,19 @@ export default {
     clickarea2(item, index) {
       //  this.queryParams.areaCode = "";
       // this.value3 = "";
+      
+      this.form.communityInfoList[index].areaCode = "";
+      console.log(item);
+      SecondaryLevelInfo(item.id).then((res) => {
+        console.log(res);
+        this.streetlist = res.data;
+      });
+    },
+
+     clickarea3(item) {
+       this.form.areaCode = "";
+      //  this.queryParams.areaCode = "";
+      // this.value3 = "";
       console.log(item);
       SecondaryLevelInfo(item.id).then((res) => {
         console.log(res);
@@ -624,6 +728,10 @@ export default {
       this.queryParams.areaCode = item.areaCode;
       console.log(this.queryParams);
     },
+    //  clickstreet3(item) {
+    //   this.form.areaCode = item.areaCode;
+    //   // console.log(this.queryParams);
+    // },
     // 所属省下拉框
     loadMore() {
       console.log("1");
@@ -717,6 +825,10 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      // this.arealist="",
+      this.arealists="",
+      this.streetlist="",
+      this.citylist="",
       (this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -750,8 +862,22 @@ export default {
       const id = row.id || this.ids;
       getCommunityInfo(id).then((response) => {
         this.form = response.data;
+        // this.form.province=response.data;
+        // this.form.city=response.data;
+        // this.form.area=response.data;
+        // this.form.areaCode=response.data;
         this.open = true;
         this.title = "修改居住社区信息";
+          SubordinateRegions(response.data.areaCode).then((res) => {
+            console.log(res)
+            if(res.data!==null){
+              this.form.province = res.data.provinceCode;
+            this.form.city = res.data.cityName;
+            this.form.area = res.data.regionName;
+            this.form.areaCode = res.data.streetName;
+            }
+            
+          });
       });
     },
     /** 提交按钮 */
@@ -762,7 +888,7 @@ export default {
             updateCommunityInfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-
+              this.open2 = false;
               this.getList();
             });
           } else {

From 10c27757efe1def6fc75849049a36b4f7894a588 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Fri, 23 Sep 2022 16:26:40 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=A2=AB=E6=8A=A4=E7=90=86=E4=BA=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/patientArchives/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/patientArchives/index.vue b/src/views/system/patientArchives/index.vue
index b57f1d0..13e646f 100644
--- a/src/views/system/patientArchives/index.vue
+++ b/src/views/system/patientArchives/index.vue
@@ -172,7 +172,7 @@
     />
 
     <!-- 添加或修改被护理人基本信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1018px" append-to-body >
+    <el-dialog :title="title" :visible.sync="open" width="1040px" append-to-body >
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
          <el-form-item label="姓名" prop="patientName">
           <el-input v-model="form.patientName" placeholder="请输入姓名"  :disabled="true"/>