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

# Conflicts:
#	src/views/system/station/index.vue

src/views/system/station/index.vue

@@ -211,15 +211,12 @@
         </template>
       </el-table-column>
       <el-table-column label="所属区域" align="center" prop="area">
-         
         <template slot-scope="scope">
-
           <span>{{
             scope.row.areaName !== "null-null-null-null"
               ? scope.row.areaName
               : ""
           }}</span>
-
         </template>
       </el-table-column>
       <el-table-column
@@ -357,7 +354,7 @@
       >
         <el-form-item label="所属区域" prop="areaCode">
           <el-select
-            v-model="value"
+            v-model="form.provinceName"
             clearable
             placeholder="请选择省"
             style="width: 129px"
@@ -372,7 +369,7 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="value1"
+            v-model="form.cityName"
             clearable
             placeholder="请选择市"
             style="width: 129px; margin-left: 10px"
@@ -387,7 +384,7 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="value2"
+            v-model="form.regionName"
             clearable
             placeholder="请选择区"
             style="width: 129px; margin-left: 10px"
@@ -402,7 +399,7 @@
             </el-option>
           </el-select>
           <el-select
-            v-model="value3"
+            v-model="form.streetName"
             clearable
             placeholder="请选择街道"
             style="width: 129px; margin-left: 10px"
@@ -744,7 +741,7 @@ export default {
       // 是否显示弹出层
       open: false,
       typeopen: false,
-      // nurseStationLabelopen: false,
+      nurseStationLabelopen: false,
       //权限查询
       getListByUserquery: {
         pageNum: 1,
@@ -1009,22 +1006,6 @@ 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;
         this.total = response.total;
         this.loading = false;
@@ -1093,74 +1074,21 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row, "看一当前行数据");
       this.reset();
       this.loading = true;
       const id = row.id || this.ids;
-      getStation(id)
+      getStation(id).then((response) => {
-        .then((response) => {
+        console.log(response);
-          this.resid = response.data.nurseStationList.id;
+        this.form = response.data;
-          this.form = response.data.nurseStationList;
+        this.looknurseStationLabel = response.data.nurseStationLabel;
-          if (
+        this.nurseStationType2 = this.form.nurseStationType.split(",");
-            !this.form.nurseStationType ||
+        console.log(this.list);
-            this.form.nurseStationType == null ||
-            this.form.nurseStationType.length == 0
-          ) {
-          } else {
-            this.nurseStationType2 = this.form.nurseStationType.split(",");
-            this.form.nurseStationType = this.nurseStationType2;
-          }
-          // this.form.nurseStationLabelList = [];
-          this.title = "修改护理站信息";
-          getSubordinateRegions(response.data.sysAreaVOList.streetCode).then(
-            (res) => {
-              if (res.data) {
-                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: "",
-                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.form);
-            // console.log(this.form.nurseStationLabelList);
-            // this.form.nurseStationLabelList = obj;
 
-            // res.rows.forEach((e) => {
+        this.open = true;
-            //   this.form.nurseStationLabelList.push(e);
+        this.loading = false;
-            // });
+        console.log(this.form);
-          });
+      });
-          this.open = true;
-          this.loading = false;
-          console.log(this.form);
-        });
     },
     /** 提交按钮 */
     submitForm() {