From 15855dc8271459b041c2767747c98dbd67c92776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Mon, 20 Feb 2023 11:43:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E9=A1=B9=E7=9B=AE+=E6=8A=A4?=
 =?UTF-8?q?=E7=90=86=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/station.js              |    9 +-
 src/views/system/station/index.vue     | 1243 ++++++++++++++----------
 src/views/system/stationItem/index.vue |   78 +-
 3 files changed, 835 insertions(+), 495 deletions(-)

diff --git a/src/api/system/station.js b/src/api/system/station.js
index 418a9ec..ad0f5f5 100644
--- a/src/api/system/station.js
+++ b/src/api/system/station.js
@@ -36,7 +36,14 @@ export function updateStation(data) {
         data: data
     })
 }
-
+// 查询护理机构分类信息列表
+export function listStationClassify(query) {
+    return request({
+        url: '/system/stationClassify/list',
+        method: 'get',
+        params: query
+    })
+}
 // 删除护理站信息
 export function delStation(id) {
     return request({
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index ec76220..72b9fc0 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -16,15 +16,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="所属护理站" prop="nurseStationName">
+      <el-form-item label="护理站名称" prop="nurseStationName">
         <el-input
           v-model="getListByUserquery.nurseStationName"
-          placeholder="请输入护理站"
+          placeholder="请输入护理站名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
       <el-form-item>
         <el-button
           type="primary"
@@ -38,7 +37,6 @@
         >
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -78,10 +76,9 @@
 
       <right-toolbar
         :showSearch.sync="showSearch"
-        @queryTable="info"
+        @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
     <el-table
       v-loading="loading"
       :data="nurseStationlist"
@@ -100,7 +97,6 @@
         prop="nurseStationName"
         :show-overflow-tooltip="true"
       />
-
       <el-table-column label="所属区域" align="center" prop="area">
         <template slot-scope="scope">
           <span>{{
@@ -148,7 +144,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total2 > 0"
       :total="total2"
@@ -156,7 +151,7 @@
       :limit.sync="getListByUserquery.pageSize"
       @pagination="info"
     />
-    <!-- 新增护理站信息对话框 -->
+    <!-- 新增修改护理站信息对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
@@ -270,13 +265,40 @@
             maxlength="11"
           />
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
-          <el-input
-            placeholder="请输入排序"
-            v-model="form.sort"
-            maxlength="8"
-            oninput="value=value.replace(/[^\d]/g,'')"
-          />
+        <el-form-item label="护理机构分类" required>
+          <template>
+            <el-button
+              @click="clickinnerVisible()"
+              type=""
+              style="
+                width: 208px;
+                text-align: left;
+                height: 36px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                color: #c0c4cc;
+                margin-top: -10px;
+              "
+              v-if="form.classifyNameList == '请选择护理站所属机构分类'"
+              >{{ form.classifyNameList }}</el-button
+            >
+            <el-button
+              @click="clickinnerVisible()"
+              type=""
+              style="
+                width: 208px;
+                text-align: left;
+                height: 36px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                margin-top: -10px;
+              "
+              v-else
+              >{{ form.classifyNameList }}</el-button
+            >
+          </template>
         </el-form-item>
         <el-form-item label="负责人" prop="dutyPerson">
           <el-input
@@ -292,6 +314,70 @@
             maxlength="11"
           />
         </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input
+            placeholder="请输入排序"
+            v-model="form.sort"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            maxLength="5"
+          />
+        </el-form-item>
+        <el-form-item label="营业概述" prop="openingHoursDescribe">
+          <el-input
+            style="width: 208px"
+            v-model="form.openingHoursDescribe"
+            placeholder="请输入护理站营业概述"
+            maxlength="150"
+          />
+        </el-form-item>
+        <el-form-item label="上午营业时间" >
+          <el-time-select
+            style="width: 208px"
+            placeholder="上午营业开始时间"
+            v-model="form.morningOpenStartTime"
+            :picker-options="{
+              start: '07:00',
+              step: '00:30',
+              end: '14:00',
+            }"
+          >
+          </el-time-select>
+          <el-time-select
+            style="width: 208px; margin-left: 10px"
+            placeholder="上午营业结束时间"
+            v-model="form.morningOpenEndTime"
+            :picker-options="{
+              start: '08:00',
+              step: '00:30',
+              end: '14:30',
+            }"
+          >
+          </el-time-select>
+        </el-form-item>
+        <el-form-item label="下午营业时间" >
+          <el-time-select
+            style="width: 208px"
+            placeholder="下午营业开始时间"
+            v-model="form.afternoonOpenStartTime"
+            :picker-options="{
+              start: '12:00',
+              step: '00:30',
+              end: '18:00',
+            }"
+          >
+          </el-time-select>
+          <el-time-select
+            style="width: 208px; margin-left: 10px"
+            placeholder="下午营业结束时间"
+            v-model="form.afternoonOpenEndTime"
+            :picker-options="{
+              start: '13:00',
+              step: '00:30',
+              end: '20:00',
+            }"
+          >
+          </el-time-select>
+        </el-form-item>
         <el-form-item label="护理站总概述" prop="nurseStationDescription">
           <el-input
             style="width: 540px"
@@ -355,8 +441,8 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.labelSort"
-                  maxlength="10"
                   oninput="value=value.replace(/[^\d]/g,'')"
+                  maxLength="5"
                 ></el-input>
               </template>
             </el-table-column>
@@ -384,6 +470,101 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 护理分类 -->
+    <el-dialog
+      title="选择护理机构分类"
+      :visible.sync="Classifyshow"
+      width="1100px"
+      append-to-body
+      :before-close="cancelClassifyshow"
+    >
+      <el-form :model="classifyquery" label-width="150px" :inline="true">
+        <el-form-item label="护理机构分类编码" prop="classifyCode">
+          <el-input
+            v-model="classifyquery.classifyCode"
+            placeholder="请输入护理机构分类编码"
+          />
+        </el-form-item>
+        <el-form-item label="护理机构分类名称" prop="classifyName">
+          <el-input
+            v-model="classifyquery.classifyName"
+            placeholder="请输入护理机构分类名称"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="classifylistInfo"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="classifylistcancel"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="loading"
+        :data="classifylist"
+        @cell-dblclick="setCheckedData"
+      >
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              circle
+              @click="setCheckedData(scope.row)"
+              v-if="checkedDataList.find((e) => e == scope.row.id)"
+            ></el-button>
+
+            <el-button
+              style="width: 15px; height: 15px"
+              circle
+              v-else
+              @click="setCheckedData(scope.row)"
+            >
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="classifyCode"
+          label="护理项目分类编码"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="classifyName"
+          label="护理项目分类名称"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="classifytotal > 0"
+        :total="classifytotal"
+        :page.sync="classifyquery.pageNum"
+        :limit.sync="classifyquery.pageSize"
+        @pagination="classifylistInfo"
+      />
+      <el-button
+        type="primary"
+        size="mini"
+        @click="choiceclassify"
+        style="
+          margin-top: 30px;
+          margin-left: 85%;
+          width: 100px;
+          height: 50px;
+          font-size: 15px;
+        "
+        >选择完成</el-button
+      >
+    </el-dialog>
     <!-- //导入 -->
     <el-dialog
       :title="upload.title"
@@ -424,11 +605,15 @@
   </div>
 </template>
 
-<!-- station/list -->
 <script>
+// import stationjs from "./stationjs";
+// export default stationjs;
+
 import {
+  listStation,
   getStation,
   delStation,
+  listStationClassify,
   addStation,
   updateStation,
   getFirstLevelInfo,
@@ -443,490 +628,564 @@ export default {
   components: { stationAcatar, editor },
   name: "Station",
   data() {
-    var checkMobile = (rule, value, cb) => {
-      // 验证手机号的正则表达式
-      const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
-      if (regMobile.test(value)) {
-        return cb();
-      }
-      cb(new Error("请输入正确的联系电话"));
-    };
-    // 验证手机号的规则
-    var checkMobile2 = (rule, value, cb) => {
-      // 验证手机号的正则表达式
-      const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
-      if (!value) {
-        //所以当没有值的时候，我们直接callback，让他不校验直接执行下一步
-        return cb();
-      } else {
-        if (regMobile.test(value)) {
-          return cb();
-        } else {
-          cb(new Error("请输入正确的联系电话"));
-        }
-      }
-    };
-    return {
-      imgsurl: { pictureUrlList: [] },
-      imageUrl: "",
-      imageUrl2: "",
-      imgtwo: "",
-      imgone: "",
-      handstationlist: [], //页面搜索list
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url:
-          process.env.VUE_APP_BASE_API +
-          "/system/station/insertNurseStationImportList",
-      },
-      //护理类型
-      nurseTypeCode: "nurse_type_code",
-      nurseStationTypelist: [],
-      nurseStationType2: null,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      total2: 0,
-      //所属护理类型
-      typelooks: [],
-      //所属标签
-      looknurseStationLabel: [
-        {
-          labelDescription: "",
-          sort: "",
+      // var checkMobile = (rule, value, cb) => {
+      //     // 验证手机号的正则表达式
+      //     const regMobile =
+      //         /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+      //     if (regMobile.test(value)) {
+      //         return cb();
+      //     }
+      //     cb(new Error("请输入正确的联系电话"));
+      // };
+      // 验证手机号的规则
+      // var checkMobile2 = (rule, value, cb) => {
+      //     // 验证手机号的正则表达式
+      //     const regMobile =
+      //         /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
+      //     if (!value) {
+      //         //所以当没有值的时候，我们直接callback，让他不校验直接执行下一步
+      //         return cb();
+      //     } else {
+      //         if (regMobile.test(value)) {
+      //             return cb();
+      //         } else {
+      //             cb(new Error("请输入正确的联系电话"));
+      //         }
+      //     }
+      // };
+      return {
+          imgsurl: { pictureUrlList: [] },
+          imageUrl: "",
+          imageUrl2: "",
+          imgtwo: "",
+          imgone: "",
+          // 用户导入参数
+          upload: {
+              // 是否显示弹出层（用户导入）
+              open: false,
+              // 弹出层标题（用户导入）
+              title: "",
+              // 是否禁用上传
+              isUploading: false,
+              // 设置上传的请求头部
+              headers: { Authorization: "Bearer " + getToken() },
+              // 上传的地址
+              url: process.env.VUE_APP_BASE_API +
+                  "/system/station/insertNurseStationImportList",
+          },
+          //护理类型
+          nurseTypeCode: "nurse_type_code",
+          nurseStationTypelist: [],
+          nurseStationType2: null,
+          // 遮罩层
+          loading: true,
+          // 选中数组
+          ids: [],
+          // 非单个禁用
+          single: true,
+          // 非多个禁用
+          multiple: true,
+          // 显示搜索条件
+          showSearch: true,
+          // 总条数
+          total2: 0,
+          classifytotal: 0,
+          //所属标签
+          looknurseStationLabel: [{
+              labelDescription: "",
+              sort: "",
+              idd: 1,
+          },],
+          // 护理站信息表格数据
+          stationList: [{
+              sysAreaVOList: [{
+                  provinceName: null,
+                  cityName: null,
+                  streetName: null,
+              },],
+          },],
+          nurseStationlist: [],
+          // 弹出层标题
+          title: "",
+          // 是否显示弹出层
+          open: false,
+          Classifyshow: false,
+          afternoonOpenStartTimeStr: "",
+          afternoonOpenEndTimeStr: "",
+          //权限查询
+          getListByUserquery: {
+              pageNum: 1,
+              pageSize: 10,
+          },
+          // 表单参数
+          form: {
+              nurseStationClassifyIds: [],
+          },
           idd: 1,
-        },
-      ],
-      // 护理站信息表格数据
-      stationList: [
-        {
-          sysAreaVOList: [
-            {
-              provinceName: null,
-              cityName: null,
-              streetName: null,
-            },
-          ],
-        },
-      ],
-      nurseStationlist: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      typeopen: false,
-      nurseStationLabelopen: false,
-      //权限查询
-      getListByUserquery: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      // 查询参数
-      // 表单参数
-      form: {},
-      idd: 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: "",
-          },
-        ],
+          provincelist: [],
+          arealist: [],
+          citylist: [],
+          streetlist: [],
+          classifylist: [],
 
-        dutyPhone: [
-          {
-            validator: checkMobile2,
-            trigger: "blur",
-            message: "",
+          classifyquery: {
+              pageNum: 1,
+              pageSize: 10,
+              classifyCode: "",
+              classifyName: "",
           },
-        ],
-        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" },
-        ],
-      },
-    };
+          resid: null,
+          // 表单校验
+          rules: {
+              // morningOpenStartTime: [
+              //     { required: true, message: "请选择上午营业时间", trigger: "blur" },
+              // ],
+              // afternoonOpenStartTimeStr: [
+              //     { required: true, message: "请选择下午营业时间", trigger: "blur" },
+              // ],
+              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: "请输入手机号",
+              },],
+
+              dutyPhone: [{
+                  // validator: checkMobile2,
+                  trigger: "blur",
+                  message: "请输入联系电话",
+              },],
+              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" },
+              ],
+          },
+
+          checkedDataList: []// 选择的护理机构分类
+      };
   },
   created() {
-    this.getaddress();
-    this.info();
-    this.infos();
+      this.getaddress();
+      this.info();
+      this.classifylistInfo();
   },
   methods: {
-    imgs(item) {
-      this.imgsurl.pictureUrlList.push(item);
-    },
-    imgUrl(imgUrl) {
-      this.form.stationPictureUrl = imgUrl;
-    },
-    imgUrl2(imgUrl) {
-      this.form.stationIntroducePcitureUrl = imgUrl;
-    },
-    delnurseStationLabelList(index, item) {
-      console.log(index, item);
-      console.log();
-      // this.looknurseStationLabel.splice(index,1)
-      if (this.looknurseStationLabel.length === 1) {
-        this.looknurseStationLabel = [
-          {
-            labelDescription: "",
-            sort: "",
-            idd: 1,
-          },
-        ];
-      } else {
-        this.looknurseStationLabel.splice(index, 1);
-      }
-
-      console.log(this.form.nurseStationLabelList);
-    },
-    addnurseStationLabelList() {
-      if (this.looknurseStationLabel.length == 5) {
-        this.$message.error("最多只能5条");
-      } else {
-        this.idd++;
-        var obj = {
-          labelDescription: "",
-          sort: "",
-          idd: this.idd,
-        };
-        this.looknurseStationLabel.push(obj);
-      }
-      console.log(this.looknurseStationLabel);
-    },
-
-    //点击街道
-    clickstreet(item) {
-      this.form.areaCode = item.areaCode;
-      console.log(item, this.form);
-    },
-    //点击区县城
-    clickarea(item) {
-      this.form.areaCode = "";
-      this.form.streetCode = "";
-      getSecondaryLevelInfo(item.id).then((res) => {
-        this.streetlist = res.data;
-      });
-    },
-    //点击市
-    clickcity(item) {
-      this.form.regionName = "";
-      this.form.areaCode = "";
-      this.form.streetCode = "";
-      getSecondaryLevelInfo(item.id).then((res) => {
-        this.arealist = res.data;
-      });
-    },
-    //点击省
-    province(item) {
-      this.form.cityName = "";
-      this.form.regionName = "";
-      this.form.areaCode = "";
-      this.form.streetCode = "";
-      getSecondaryLevelInfo(item.id).then((res) => {
-        this.citylist = res.data;
-      });
-    },
-    /** 查询护理站信息列表 */
-    getaddress() {
-      getFirstLevelInfo().then((res) => {
-        this.provincelist = res.data;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      var obj = { pictureUrlList: [] };
-      if (this.imgone != this.form.stationIntroducePcitureUrl) {
-        obj.pictureUrlList.push(this.form.stationIntroducePcitureUrl);
-      }
-      if (this.imgtwo != this.form.stationPictureUrl) {
-        obj.pictureUrlList.push(this.form.stationPictureUrl);
-      }
-      if (obj.pictureUrlList.length > 0) {
-        updatePicture(obj).then((res) => {});
-      }
-
-      if (this.imgsurl.pictureUrlList.length > 0) {
-        updatePicture(this.imgsurl).then((res) => {});
-      }
-      this.imgsurl = { pictureUrlList: [] };
-      this.open = false;
-      this.reset();
-      this.arealist = [];
-      this.citylist = [];
-      this.streetlist = [];
-    },
-    // 表单重置
-    reset() {
-      this.nurseStationType2 = [];
-      this.form = {
-        id: null,
-        areaCode: 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,
-        stationIntroducePcitureUrl: null,
-        sort: null,
-        nurseStationLabelList: [],
-        streetCode: null,
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    liststationinfo() {
-      this.loading = true;
-      this.info();
-    },
-    handleQuery() {
-      this.loading = true;
-      this.getListByUserquery.pageNum = 1;
-      this.info();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.getListByUserquery = {
-        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();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.looknurseStationLabel = [
-        {
-          labelDescription: "",
-          sort: "",
-          idd: 1,
-        },
-      ];
-      this.title = "添加护理站信息";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      this.loading = true;
-      const id = row.id || this.ids;
-      getStation(id).then((response) => {
-        this.form = response.data;
-        this.form.streetCode = this.form.streetName;
-        this.imgone = this.form.stationIntroducePcitureUrl;
-        this.imgtwo = this.form.stationPictureUrl;
-        this.looknurseStationLabel = response.data.nurseStationLabel;
-        this.open = true;
-        this.loading = false;
-        console.log(this.form);
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.form.nurseStationLabelList = this.looknurseStationLabel;
-      this.form.nurseStationType = this.nurseStationType2;
-      console.log(this.form);
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.form.areaCode = Number(this.form.areaCode);
-          this.form.nurseStationType = this.nurseStationType2.join(",");
-          if (this.form.id != null) {
-            updateStation(this.form).then((response) => {
-              var obj = { pictureUrlList: [] };
-              if (this.imgone != this.form.stationIntroducePcitureUrl) {
-                obj.pictureUrlList.push(this.imgone);
-              }
-              if (this.imgtwo != this.form.stationPictureUrl) {
-                obj.pictureUrlList.push(this.imgtwo);
-              }
-              if (obj.pictureUrlList.length > 0) {
-                updatePicture(obj).then((res) => {});
-              }
-              this.imgsurl = { pictureUrlList: [] };
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.info();
-            });
+      imgs(item) {
+          this.imgsurl.pictureUrlList.push(item);
+      },
+      imgUrl(imgUrl) {
+          this.form.stationPictureUrl = imgUrl;
+      },
+      imgUrl2(imgUrl) {
+          this.form.stationIntroducePcitureUrl = imgUrl;
+      },
+      delnurseStationLabelList(index, item) {
+          console.log(index, item);
+          console.log();
+          // this.looknurseStationLabel.splice(index,1)
+          if (this.looknurseStationLabel.length === 1) {
+              this.looknurseStationLabel = [{
+                  labelDescription: "",
+                  sort: "",
+                  idd: 1,
+              },];
           } else {
-            addStation(this.form).then((response) => {
-              if (response.code) {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.info();
-              } else {
-                this.form.nurseStationType = obj;
-              }
-            });
+              this.looknurseStationLabel.splice(index, 1);
           }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal
-        .confirm("是否确认删除此护理站信息？")
-        .then(function () {
-          return delStation(ids);
-        })
-        .then(() => {
-          var obj = { pictureUrlList: [] };
-          obj.pictureUrlList.push(row.stationIntroducePcitureUrl);
-          obj.pictureUrlList.push(row.stationPictureUrl);
-          if (obj.pictureUrlList.length > 0) {
-            updatePicture(obj).then((res) => {});
+
+          console.log(this.form.nurseStationLabelList);
+      },
+      addnurseStationLabelList() {
+          if (this.looknurseStationLabel.length == 5) {
+              this.$message.error("最多只能5条");
+          } else {
+              this.idd++;
+              var obj = {
+                  labelDescription: "",
+                  sort: "",
+                  idd: this.idd,
+              };
+              this.looknurseStationLabel.push(obj);
           }
+          console.log(this.looknurseStationLabel);
+      },
+      //点击街道
+      clickstreet(item) {
+          this.form.areaCode = item.areaCode;
+          console.log(item, this.form);
+      },
+      //点击区县城
+      clickarea(item) {
+          this.form.areaCode = "";
+          this.form.streetCode = "";
+          getSecondaryLevelInfo(item.id).then((res) => {
+              this.streetlist = res.data;
+          });
+      },
+      //点击市
+      clickcity(item) {
+          this.form.regionName = "";
+          this.form.areaCode = "";
+          this.form.streetCode = "";
+          getSecondaryLevelInfo(item.id).then((res) => {
+              this.arealist = res.data;
+          });
+      },
+      //点击省
+      province(item) {
+          this.form.cityName = "";
+          this.form.regionName = "";
+          this.form.areaCode = "";
+          this.form.streetCode = "";
+          getSecondaryLevelInfo(item.id).then((res) => {
+              this.citylist = res.data;
+          });
+      },
+      /** 获取省列表 */
+      getaddress() {
+          getFirstLevelInfo().then((res) => {
+              this.provincelist = res.data;
+          });
+      },
+      getList() {
           this.info();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        "system/station/export",
-        {
-          ...this.getListByUserquery,
-        },
-        `station_${new Date().getTime()}.xlsx`
-      );
-    },
-    /** 导入按钮操作 */
-    handledata() {
-      this.upload.title = "护理站信息导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download(
-        "/system/station/downloadTemplate?fileType=nurseStation",
-        {},
-        `护理站信息导入模板.xlsx`
-      );
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert(
-        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
-        "导入结果",
-        { dangerouslyUseHTMLString: true }
-      );
-      this.info();
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    //护理站限列表
-    info() {
-      //加个所属区域
-      getListByUser(this.getListByUserquery).then((res) => {
-        this.nurseStationlist = res.rows;
-        this.total2 = res.total;
-        this.loading = false;
-      });
-    },
-    infos() {
-      var queryFor = {
-        pageNum: 1,
-        pageSize: 9999,
-      };
-      getListByUser(queryFor).then((res) => {
-        console.log(res);
-        this.handstationlist = res.rows;
-      });
-    },
+      },
+
+      // 取消按钮
+      cancel() {
+          var obj = { pictureUrlList: [] };
+          if (this.imgone != this.form.stationIntroducePcitureUrl) {
+              obj.pictureUrlList.push(this.form.stationIntroducePcitureUrl);
+          }
+          if (this.imgtwo != this.form.stationPictureUrl) {
+              obj.pictureUrlList.push(this.form.stationPictureUrl);
+          }
+          if (obj.pictureUrlList.length > 0) {
+              updatePicture(obj).then((res) => { });
+          }
+          if (this.imgsurl.pictureUrlList.length > 0) {
+              updatePicture(this.imgsurl).then((res) => { });
+          }
+          this.imgsurl = { pictureUrlList: [] };
+          this.open = false;
+          this.reset();
+          this.arealist = []
+          this.citylist = []
+          this.streetlist = []
+      },
+      // 表单重置
+      reset() {
+          this.nurseStationType2 = [];
+          this.form = {
+              id: null,
+              areaCode: 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,
+              stationIntroducePcitureUrl: null,
+              sort: null,
+              nurseStationLabelList: [],
+              streetCode: null,
+              openingHoursDescribe: null,
+              afternoonOpenStartTimeStr: "00:00:00", //下午开始
+              afternoonOpenEndTimeStr: "00:00:00", //下午结束
+              morningOpenEndTimeStr: "00:00:00", //上午结束
+              morningOpenStartTimeStr: "00:00:00", //上午开始
+              nurseStationClassifyIds: [],
+              classifyNameList: '请选择护理站所属机构分类',
+          };
+          this.resetForm("form");
+      },
+      //护理机构分类
+      clickinnerVisible() {
+          this.classifylistInfo();
+          // 回显数据
+          this.checkedDataList = JSON.parse(JSON.stringify(this.form.nurseStationClassifyIds));
+
+          this.Classifyshow = true;
+      },
+
+      classifylistcancel() {
+          this.classifyquery = {
+              pageNum: 1,
+              pageSize: 10,
+              classifyCode: "",
+              classifyName: "",
+          };
+          this.classifylistInfo();
+      },
+      // 设置已选数据
+      setCheckedData(e) {
+          // 若已存在id 则为删除
+          if (this.checkedDataList.find(el => el == e.id)) {
+              this.checkedDataList = this.checkedDataList.filter(ele => ele != e.id)
+          }
+          else {
+              // 不存在 添加进id
+              this.checkedDataList.push(e.id);
+          }
+      },
+      // 完成选择
+      choiceclassify() {
+          this.form.nurseStationClassifyIds = JSON.parse(JSON.stringify(this.checkedDataList));
+          // 根据id获取到所有name
+          if (this.form.nurseStationClassifyIds.length == 0) {
+              this.form.classifyNameList = '请选择护理站所属机构分类'
+          } else {
+              this.form.classifyNameList = "";
+              this.form.nurseStationClassifyIds.forEach(f => {
+                  let classify = this.classifylist.find(d => d.id == f)
+                  this.form.classifyNameList += classify.classifyName + ","
+              })
+              this.form.classifyNameList = this.form.classifyNameList.substring(0, this.form.classifyNameList.length - 1)
+          }
+          this.cancelClassifyshow();
+      },
+      /** 查询护理机构分类信息列表 */
+      classifylistInfo() {
+          listStationClassify(this.classifyquery).then((response) => {
+              this.classifylist = response.rows;
+              this.classifytotal = response.total;
+              this.loading = false;
+          });
+      },
+      cancelClassifyshow() {
+          // this.classifylistInfo();
+          this.Classifyshow = false;
+
+      },
+      //护理站列表
+      info() {
+          this.loading = true
+          getListByUser(this.getListByUserquery).then((res) => {
+              this.nurseStationlist = res.rows;
+              this.total2 = res.total;
+              this.loading = false
+          });
+      },
+      handleQuery() {
+          this.loading = true;
+          this.getListByUserquery.pageNum = 1;
+          this.info();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+          this.getListByUserquery = {
+              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();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+          this.ids = selection.map((item) => item.id);
+          this.single = selection.length !== 1;
+          this.multiple = !selection.length;
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+          this.reset();
+          this.open = true;
+          this.looknurseStationLabel = [{
+              labelDescription: "",
+              sort: "",
+              idd: 1,
+          },];
+          this.title = "添加护理站信息";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+          this.reset();
+          this.loading = true;
+          const id = row.id || this.ids;
+          getStation(id).then((response) => {
+              if (response.data.nurseClassifyInfoList) {
+                  response.data.nurseStationClassifyIds = []
+                  response.data.nurseClassifyInfoList.forEach(e => {
+                      response.data.nurseStationClassifyIds.push(e.id)
+                  })
+              }
+              this.form = response.data;
+              this.form.streetCode = this.form.streetName;
+              this.imgone = this.form.stationIntroducePcitureUrl;
+              this.imgtwo = this.form.stationPictureUrl;
+              this.looknurseStationLabel = response.data.nurseStationLabel;
+              this.open = true;
+              this.loading = false;
+              console.log(this.form);
+          });
+      },
+      /** 提交按钮 */
+      submitForm() {
+          if (this.form.afternoonOpenStartTime) {
+              this.form.afternoonOpenStartTimeStr= this.form.afternoonOpenStartTime
+          }else{
+              this.form.afternoonOpenStartTimeStr= "00:00:00"
+          }
+          if (!this.form.afternoonOpenEndTime) {
+              this.form.afternoonOpenEndTimeStr= "00:00:00"
+          }else{
+              this.form.afternoonOpenEndTimeStr= this.form.afternoonOpenEndTime
+          }
+          if (!this.form.morningOpenStartTime) {
+              this.form.morningOpenStartTimeStr= "00:00:00"
+          }else{
+              this.form.morningOpenStartTimeStr= this.form. morningOpenStartTime
+          }
+          if (!this.form.morningOpenEndTime) {
+              this.form.morningOpenEndTimeStr= "00:00:00"
+          }else{
+              this.form.morningOpenEndTimeStr= this.form.morningOpenEndTime
+          }
+          this.form.nurseStationLabelList = this.looknurseStationLabel;
+          this.form.nurseStationType = this.nurseStationType2;
+          this.$refs["form"].validate((valid) => {
+              if (valid) {
+                  this.form.areaCode = Number(this.form.areaCode);
+                  this.form.nurseStationType = this.nurseStationType2.join(",");
+                  if (this.form.id != null) {
+                      updateStation(this.form).then((response) => {
+                          var obj = { pictureUrlList: [] };
+                          if (this.imgone != this.form.stationIntroducePcitureUrl) {
+                              obj.pictureUrlList.push(this.imgone);
+                          }
+                          if (this.imgtwo != this.form.stationPictureUrl) {
+                              obj.pictureUrlList.push(this.imgtwo);
+                          }
+                          this.imgsurl = { pictureUrlList: [] };
+                          if (obj.pictureUrlList.length > 0) {
+                              updatePicture(obj).then((res) => { });
+                          }
+                          this.$modal.msgSuccess("修改成功");
+                          this.open = false;
+                          this.getList();
+                      });
+                  } else {
+                      addStation(this.form).then((response) => {
+                          if (response.code) {
+                              this.$modal.msgSuccess("新增成功");
+                              this.open = false;
+                              this.getList();
+                          } else {
+                              this.form.nurseStationType = obj;
+                          }
+                      });
+                  }
+              }
+          });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+          const ids = row.id || this.ids;
+          this.$modal
+              .confirm("是否确认删除此护理站信息？")
+              .then(function () {
+                  return delStation(ids);
+              })
+              .then(() => {
+                  var obj = { pictureUrlList: [] };
+                  obj.pictureUrlList.push(row.stationIntroducePcitureUrl);
+                  obj.pictureUrlList.push(row.stationPictureUrl);
+                  if (obj.pictureUrlList.length > 0) {
+                      updatePicture(obj).then((res) => { });
+                  }
+                  this.getList();
+                  this.$modal.msgSuccess("删除成功");
+              })
+              .catch(() => { });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+          this.download(
+              "system/station/export", {
+              ...this.getListByUserquery,
+          },
+              `station_${new Date().getTime()}.xlsx`
+          );
+      },
+      /** 导入按钮操作 */
+      handledata() {
+          this.upload.title = "护理站信息导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          this.download(
+              "/system/station/downloadTemplate?fileType=nurseStation", {},
+              `护理站信息导入模板.xlsx`
+          );
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(
+              "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+              response.msg +
+              "</div>",
+              "导入结果", { dangerouslyUseHTMLString: true }
+          );
+          this.getList();
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
   },
 };
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index 9e930df..f0d0249 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -283,6 +283,47 @@
             >
           </template>
         </el-form-item>
+        <el-form-item label="提前预约时长" prop="nurseStationItem.advanceAppointDuration">
+        <el-select
+              v-model="form.nurseStationItem.advanceAppointDuration"
+              placeholder="请选择提前预约时长"
+              style="width:208px"
+            >
+              <el-option
+               style="width:208px"
+                v-for="item in optionlist"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+     
+      
+        <el-form-item label="预约人数上限" prop="nurseStationItem.appointmentLimitCount">
+          <el-input
+            placeholder="请输入预约人数上限"
+            v-model="form.nurseStationItem.appointmentLimitCount"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            maxLength="8"
+          />
+        </el-form-item>
+        <el-form-item label="预约时间间隔" prop="nurseStationItem.appointmentTimeInterval">
+        <el-select
+        style="width:208px"
+              v-model="form.nurseStationItem.appointmentTimeInterval"
+              placeholder="请选择预约时间间隔"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
         <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
             placeholder="请输入排序"
@@ -821,6 +862,31 @@ export default {
       total2: 0,
       total3: 0,
       total4: 0,
+      options: [{
+                    value: 'HALF_HOUR',
+                    label: '半小时'
+                }, {
+                    value: 'ONE_HOUR',
+                    label: '一小时'
+                },
+                {
+                    value: ' NINETY_MINUTES',
+                    label: '九十分钟'
+                },
+                {
+                    value: 'TWO_HOUR',
+                    label: '两小时'
+                }
+
+            ],
+            value: "",
+            optionlist: [{
+                value: 'HALF_DAY',
+                label: '半天'
+            }, {
+                value: 'ONE_DAY',
+                label: '一天'
+            }, ],
       //耗材
       stationConsumableList: [],
       // 护理站护理项目表格数据
@@ -882,6 +948,15 @@ export default {
         "nurseStationItem.sort": [
           { required: true, message: "排序不能为空", trigger: "blur" },
         ],
+        "nurseStationItem.advanceAppointDuration": [
+                    { required: true, message: "提前预约时长不能为空", trigger: "blur" },
+                ],
+                 // }, ],
+                 "nurseStationItem.appointmentTimeInterval": [{
+                    required: true,
+                    trigger: "blur",
+                    message: "请选择预约时间点间隔",
+                }, ],
         // "nurseStationItem.advanceAppointDuration": [
         //   { required: true, message: "提前预约时长不能为空", trigger: "blur" },
         // ],
@@ -1266,7 +1341,7 @@ export default {
             this.form.nurseStationItemPrices.forEach((e) => {
               e.price = Number(e.price);
             });
-            this.form.nurseStationItem.advanceAppointDuration = 0;
+
             updateNurseItem(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -1276,7 +1351,6 @@ export default {
             this.form.nurseStationItemPrices.forEach((e) => {
               e.price = Number(e.price);
             });
-            this.form.nurseStationItem.advanceAppointDuration = 0;
             addNurseItem(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.$forceUpdate();