更改订单信息，护理站和部门

src/views/system/StationDepartment/index.vue

@@ -8,10 +8,27 @@
       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"
+          placeholder="请选择护理站"
+          v-loadmore="loadMore"
+          @keyup.enter.native="handleQuery"
+        >
+          <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="nurseStationId"  
+      v-else>
         <el-select
           v-model="queryParams.nurseStationId"
-          clearable
           placeholder="请选择护理站"
           v-loadmore="loadMore"
           @keyup.enter.native="handleQuery"
@@ -195,6 +212,7 @@
         <div
           v-for="(item, index) in form.nurseStationDepartmentList"
           :key="index"
+          style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
         >
           <el-form-item
             label="护理站"
@@ -341,6 +359,7 @@ import {
   updateStationDepartment,
   list,
 } from "@/api/system/StationDepartment";
+import { getListByUser } from "@/api/system/userlist.js";
 
 export default {
   name: "StationDepartment",
@@ -360,6 +379,7 @@ export default {
       // 总条数
       total: 0,
       total2: 0,
+     
       // 护理站部门信息表格数据
       StationDepartmentList: [],
       // 弹出层标题
@@ -460,6 +480,7 @@ export default {
   created() {
     this.getList();
     this.listinfo();
+    this.info();
   },
   methods: {
     //删除deldisease
@@ -493,16 +514,17 @@ export default {
     nurseinfo() {
       this.nurseStationId = row.nurseStationId;
     },
-    loadMore() {
-      console.log("1");
+   
+       //滑动下拉框
+       loadMore() {
       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(this.nurseStationqueryParams.pageNum);
+          getListByUser(this.nurseStationqueryParams).then((res) => {
             console.log(res);
             res.rows.forEach((e) => {
               this.nurseStationlist.push(e);
@@ -571,6 +593,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      if (this.nurseStationlist[0].isAdmin == "1") {
       this.resetForm("queryForm");
       this.queryParams = {
         pageNum: 1,
@@ -582,13 +605,31 @@ export default {
         phone: null,
         nurseStationName: null,
       };
-      list(this.nurseStationqueryParams).then((res) => {
-        console.log(res);
-        this.nurseStationlist = res.rows;
-        this.total2 = res.total;
-        console.log(this.nurseStationlist);
-      });
       this.handleQuery();
+    }else {
+        console.log(1);
+        this.queryParams.departmentCode = null;
+        this.queryParams.pageSize = 10;
+        this.queryParams.pageNum = 1;
+        this.queryParams.departmentName = null;
+        this.handleQuery();
+      }
+    },
+     //权限列表
+     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();
+        }
+      });
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/system/order/index.vue

@@ -52,81 +52,83 @@
           >重置</el-button
         >
       </el-form-item>
+    </el-form>
+    <!-- <right-toolbar
+      :showSearch.sync="showSearch"
+      @queryTable="getList"
+    ></right-toolbar> -->
 
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-
-      <el-table
-        v-loading="loading"
-        :data="OrderDetailsList"
-        @selection-change="handleSelectionChange"
+    <el-table
+      v-loading="loading"
+      :data="OrderDetailsList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column label="客户" align="center" prop="patientName" />
+      <el-table-column label="订单编号" align="center" prop="orderNo" />
+      <el-table-column label="订单状态" align="center" prop="orderStatus">
+        <template slot-scope="scope">
+          {{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
+          {{ scope.row.orderStatus == "WAIT_DISPATCH" ? "待派单" : "" }}
+          {{ scope.row.orderStatus == "NOT_FINISH" ? "未完成" : "" }}
+          {{ scope.row.orderStatus == "COMPLETE" ? "服务完成" : "" }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
       >
-        <el-table-column label="客户" align="center" prop="patientName" />
-        <el-table-column label="订单编号" align="center" prop="orderNo" />
-        <el-table-column label="订单状态" align="center" prop="orderStatus">
-          <template slot-scope="scope">
-            {{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
-            {{ scope.row.orderStatus == "WAIT_DISPATCH" ? "待派单" : "" }}
-            {{ scope.row.orderStatus == "NOT_FINISH" ? "未完成" : "" }}
-            {{ scope.row.orderStatus == "COMPLETE" ? "服务完成" : "" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="seeLook(scope.row)"
-              v-hasPermi="['system:nurseType:edit']"
-              >查看</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:nurseType:remove']"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-      <!-- 查看弹框 -->
-      <!-- <el-scrollbar style="height:1048px; overflow-y: scroll;"> -->
-      <el-dialog
-        title="查看订单信息"
-        :visible.sync="innerVisible4"
-        append-to-body
-        width="1048px"
-        class="orderInfo"
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="seeLook(scope.row)"
+            v-hasPermi="['system:nurseType:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:nurseType:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <!-- 查看弹框 -->
+    <el-dialog
+      title="查看订单信息"
+      :visible.sync="innerVisible4"
+      append-to-body
+      width="1048px"
+      class="orderInfo"
+    >
+      <el-form
+        :inline="true"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="120px"
       >
         <div v-for="(item, index) in query" :key="index">
-          <el-row>
-            <el-col :span="8">
               <el-form-item label="订单编号" prop="orderNo">
                 <el-input
                   v-model="item.orderNo"
                   :disabled="true"
-                  style="width: 180px"
+                  style="width: 190px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="订单状态" prop="orderStatus">
                 <el-input
                   :value="switchOrderStatus(item.orderStatus)"
@@ -135,30 +137,24 @@
                 >
                 </el-input>
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="护理站名称" prop="nurseStationName">
                 <el-input
                   v-model="item.nurseStationName"
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 225px"
+                  style="width: 240px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="订单数量" prop="orderCount">
                 <el-input
                   v-model="item.orderCount"
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 180px"
+                  style="width: 190px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="服务时间" prop="serviceDate">
                 <el-input
                   v-model="item.serviceDate"
@@ -168,30 +164,24 @@
                   style="width: 150px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="服务地址" prop="serviceAddress">
                 <el-input
                   v-model="item.serviceAddress"
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 225px"
+                  style="width: 240px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="护理项目名称" prop="nurseItemName">
                 <el-input
                   v-model="item.nurseItemName"
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 180px"
+                  style="width: 190px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="护理项目价格" prop="nurseItemPrice">
                 <el-input
                   v-model="item.nurseItemPrice"
@@ -201,19 +191,15 @@
                   style="width: 150px"
                 />
               </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
                 <el-input
                   v-model="item.itemServeDurationUnit"
                   clearable
                   @keyup.enter.native="handleQuery"
                   :disabled="true"
-                  style="width: 225px"
+                  style="width: 240px"
                 />
               </el-form-item>
-            </el-col>
-          </el-row>
           <el-table
             :data="item.appointmentOrderConsumableList"
             align="center"
@@ -242,9 +228,8 @@
             </el-table-column>
           </el-table>
         </div>
-      </el-dialog>
-    <!-- </el-scrollbar> -->
-    </el-form>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -308,6 +293,7 @@ export default {
         pageSize: 10,
       },
       query: [],
+
       // 表单参数
       form: {},
       // 表单校验
@@ -339,10 +325,8 @@ export default {
       // console.log(row);
       Detailed(id).then((res) => {
         this.OrderDetailsLists = res.data;
-        // console.log(this.OrderDetailsLists)
         this.query = res.data;
         console.log(this.query);
-        // console.log(res);
       });
     },
     /** 查询护理类型信息列表 */
@@ -387,17 +371,22 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$confirm('是否确认删除订单编号为"' + row.orderNo + '"的数据项？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+      this.$confirm(
+        '是否确认删除订单编号为"' + row.orderNo + '"的数据项？',
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(() => {
           deldetailed(row.appointOrderDetailsId).then((res) => {
             this.$message.success("删除成功");
             this.getList();
-          })
+          });
         })
-        .catch(() => {}); 
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -413,9 +402,8 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-dialog__body{
-    
-    height: 500px;
-    overflow-y: scroll;
-  }
+::v-deep .el-dialog__body {
+  height: 500px;
+  overflow-y: scroll;
+}
 </style>

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="护理站简介"