工作提交

src/api/baseurl.js

@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.81:8082";
+var baseurl = "http://192.168.16.81:8080";
 
 export default baseurl

src/views/system/station/index.vue

@@ -207,11 +207,11 @@
           >
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column label="所属区域" align="center" prop="area">
-        label="所属区域"
+        <!-- <span>{{ scope.row.sysAreaVOList[0].provinceName }}-</span>
-        align="center"
+          <span>{{ scope.row.sysAreaVOList[0].cityName }}-</span>
-        prop="sysAreaVOList[0].streetName"
+          <span>{{ scope.row.sysAreaVOList[0].streetName }}</span> -->
-      />
+      </el-table-column>
       <el-table-column label="护理站地址" align="center" prop="address" />
       <!-- <el-table-column
         label="护理站简介"
@@ -401,6 +401,13 @@
             </el-option>
           </el-select>
         </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="nurseStationName">
           <el-input
             v-model="form.nurseStationName"
@@ -408,6 +415,23 @@
             maxlength="40"
           />
         </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="nurseStationType">
           <el-select
             v-model="form.nurseStationType2"
@@ -424,29 +448,6 @@
             </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"
@@ -556,157 +557,6 @@
       </div>
     </el-dialog>
 
-    <!-- 修改护理站信息对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="120px"
-        :inline="true"
-      >
-        <el-form-item label="所属区域" prop="areaCode">
-          <el-select
-            v-model="value"
-            clearable
-            placeholder="请选择省"
-            style="width: 127px"
-          >
-            <el-option
-              v-for="item in provincelist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="province(item)"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="value1"
-            clearable
-            placeholder="请选择市"
-            style="width: 127px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in citylist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickcity(item)"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="value2"
-            clearable
-            placeholder="请选择区"
-            style="width: 127px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in arealist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickarea(item)"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model="form.areaCode"
-            clearable
-            placeholder="请选择街道"
-            style="width: 127px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in streetlist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickstreet(item)"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="护理站名称" prop="nurseStationName">
-          <el-input
-            v-model="form.nurseStationName"
-            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="address">
-          <el-input v-model="form.address" placeholder="请输入护理站地址" />
-        </el-form-item>
-        <el-form-item label="护理类型" prop="nurseStationType">
-          <el-select
-            v-model="form.nurseStationType"
-            multiple
-            placeholder="请选择护理类型"
-            style="width: 208px"
-          >
-            <el-option
-              v-for="item in nurseStationTypelist"
-              :key="item.nurseTypeCode"
-              :label="item.nurseTypeName"
-              :value="item.nurseTypeCode"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="联系电话" prop="phone">
-          <el-input v-model="form.phone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="负责人" prop="dutyPerson">
-          <el-input v-model="form.dutyPerson" placeholder="请输入负责人" />
-        </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-form-item>
-        <el-form-item label="护理站总概述" prop="nurseStationDescription">
-          <el-input
-            style="width: 208px"
-            v-model="form.nurseStationDescription"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <el-form-item label="护理站简介" prop="agencyIntroduce">
-          <editor
-            style="margin: 0 auto"
-            v-model="form.agencyIntroduce"
-          ></editor>
-        </el-form-item>
-        <el-form-item label="护理站头像" prop="stationPictureUrl">
-          <stationAcatar
-            :img="form.stationPictureUrl"
-            :type="'stationPictureUrl'"
-          />
-        </el-form-item>
-        <el-form-item label="护理站简介头像" prop="stationPictureUrl">
-          <stationAcatar
-            :img="form.stationPictureUrl"
-            :type="'stationIntroducePcitureUrl'"
-          />
-        </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>
-      </div>
-    </el-dialog> -->
     <!-- //导入 -->
     <el-dialog
       :title="upload.title"
@@ -817,7 +667,7 @@ export default {
       value3: "",
       value2: "",
       value1: "",
-      value: "",
+      value: "360000000000",
       // 遮罩层
       loading: true,
       // 选中数组
@@ -842,7 +692,17 @@ export default {
         },
       ],
       // 护理站信息表格数据
-      stationList: [],
+      stationList: [
+        {
+          sysAreaVOList: [
+            {
+              provinceName: null,
+              cityName: null,
+              streetName: null,
+            },
+          ],
+        },
+      ],
       nurseStationlist: [],
       // 弹出层标题
       title: "",
@@ -1031,26 +891,23 @@ export default {
     },
     //点击省
     province(item) {
-      console.log(item);
       this.value1 = "";
       this.value2 = "";
       this.value3 = "";
       getSecondaryLevelInfo(item.id).then((res) => {
-        console.log(res);
         this.citylist = res.data;
       });
     },
     /** 查询护理站信息列表 */
     getList() {
-      this.loading = true;
       this.liststationinfo();
-
       getFirstLevelInfo().then((res) => {
         this.provincelist = res.data;
       });
       getInfoList().then((res) => {
         this.nurseStationTypelist = res.data;
       });
+      this.loading = true;
     },
     // 取消按钮
     cancel() {
@@ -1088,8 +945,23 @@ export default {
     /** 搜索按钮操作 */
     liststationinfo() {
       listStation(this.queryParams).then((response) => {
+        response.rows.forEach((e) => {
+          if (e.sysAreaVOList == []) {
+          } else if (e.sysAreaVOList == null) {
+          } else if (!e.sysAreaVOList) {
+          } else if (e.sysAreaVOList.length == 0) {
+          } else if (e.sysAreaVOList.length > 0) {
+            e.area =
+              e.sysAreaVOList[0].provinceName +
+              "-" +
+              e.sysAreaVOList[0].cityName +
+              "-" +
+              e.sysAreaVOList[0].regionName +
+              "-" +
+              e.sysAreaVOList[0].streetName;
+          }
+        });
         this.stationList = response.rows;
-        console.log("this.stationList :>> ", this.stationList);
         this.total = response.total;
         this.loading = false;
       });
@@ -1174,16 +1046,17 @@ export default {
           // this.form.nurseStationLabelList = [];
           this.title = "修改护理站信息";
           getSubordinateRegions(response.data.areaCode).then((res) => {
-            this.value = res.data.provinceCode;
+            this.value = String(res.data.provinceCode);
             this.value1 = res.data.cityName;
             this.value2 = res.data.regionName;
             this.value3 = res.data.streetName;
+            console.log(typeof this.value);
           });
         })
         .then(() => {
+          this.looknurseStationLabel = [];
           getLabelList(this.resid).then((res) => {
             this.looknurseStationLabel = res;
-
             if (this.looknurseStationLabel.length == 0) {
               var obj = {
                 labelDescription: "",
@@ -1206,8 +1079,6 @@ export default {
               };
               this.looknurseStationLabel.push(obj);
             }
-            console.log(this.looknurseStationLabel);
-
             // console.log(this.form);
             // console.log(this.form.nurseStationLabelList);
             // this.form.nurseStationLabelList = obj;
@@ -1216,7 +1087,6 @@ export default {
             //   this.form.nurseStationLabelList.push(e);
             // });
           });
-          console.log(this.form);
           this.open = true;
         });
     },
@@ -1311,9 +1181,7 @@ export default {
     //权限列表
     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 {

src/views/system/stationItem/index.vue

@@ -287,7 +287,10 @@
             >
           </template>
         </el-form-item>
-        <el-form-item label="护理项目名称" prop="nurseItemName">
+        <el-form-item
+          label="护理项目名称"
+          prop="nurseStationItem.nurseItemName"
+        >
           <el-input
             v-model="form.nurseStationItem.nurseItemName"
             placeholder="请输入护理项目名称"
@@ -310,7 +313,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="提前预约时长" prop="advanceAppointDuration">
+        <el-form-item
+          label="提前预约时长"
+          prop="nurseStationItem.advanceAppointDuration"
+        >
           <el-input
             v-model="form.nurseStationItem.advanceAppointDuration"
             placeholder="提前预约时长(单位小时)"
@@ -318,7 +324,7 @@
             min="0"
           />
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
+        <el-form-item label="排序" prop="nurseStationItem.sort">
           <el-input
             v-model="form.nurseStationItem.sort"
             placeholder="不可输入小数点"
@@ -841,14 +847,16 @@ export default {
       ids: 1,
       // 表单校验
       rules: {
-        nurseItemName: [
+        "nurseStationItem.nurseItemName": [
           { required: true, message: "护理项目名称不能为空", trigger: "blur" },
         ],
         "nurseStationItem.nurseItemContent": [
           { required: true, message: "项目内容简介不能为空", trigger: "blur" },
         ],
-        sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+        "nurseStationItem.sort": [
-        advanceAppointDuration: [
+          { required: true, message: "排序不能为空", trigger: "blur" },
+        ],
+        "nurseStationItem.advanceAppointDuration": [
           { required: true, message: "提前预约时长不能为空", trigger: "blur" },
         ],
         "nurseStationItem.nurseStationId": [