护理站人员加姓名，订单查看加滚动条，删掉查看标签信息

src/views/system/order/index.vue

@@ -132,7 +132,7 @@
       :visible.sync="innerVisible4"
       append-to-body
       width="1048px"
-      class="orderInfo"
+ 
     >
       <el-form
         :inline="true"
@@ -140,6 +140,7 @@
         :model="form"
         :rules="rules"
         label-width="120px"
+        class="orderInfo"
       >
         <div v-for="(item, index) in query" :key="index">
           <el-form-item label="订单编号" prop="orderNo">
@@ -715,8 +716,8 @@ export default {
 };
 </script>
 <style scoped>
-/* ::v-deep .el-dialog__body {
-  height: 500px;
+ ::v-deep .orderInfo{
+  height: 350px;
   overflow-y: scroll;
-} */
+}
 </style>

src/views/system/person/index.vue

@@ -59,7 +59,7 @@
       <el-form-item label="姓名" prop="nursePersonName">
         <el-input
           v-model="queryParams.nursePersonName"
-          placeholder="请输入姓名"
+          placeholder="请输入居住地址"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -397,6 +397,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
     <!-- 新增护理站名称弹框 -->
     <el-dialog
       :title="title2"
@@ -406,7 +407,7 @@
     >
       <el-form
         ref="queryForm"
-        :model="nurseStationqueryParams"
+        :model="queryParams2"
         :rules="rules"
         label-width="80px"
         :inline="true"
@@ -425,7 +426,7 @@
           label-width="120"
         >
           <el-input
-            v-model="nurseStationqueryParams.nurseStationCode"
+            v-model="queryParams2.nurseStationCode"
             placeholder="请输入护理站编码"
             clearable
             @keyup.enter.native="handleQuery"
@@ -437,7 +438,7 @@
           label-width="120"
         >
           <el-input
-            v-model="nurseStationqueryParams.nurseStationName"
+            v-model="queryParams2.nurseStationName"
             placeholder="请输入护理站名称"
             clearable
             @keyup.enter.native="handleQuery"
@@ -456,8 +457,8 @@
           >
         </el-form-item>
       </el-form>
-      <el-table :data="nurseStationlist" @cell-dblclick="nurseclick">
-        <el-table-column label="请选择" width="100" align="center">
+      <el-table :data="stationLists" @cell-dblclick="nurseclick">
+        <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -477,46 +478,54 @@
         <el-table-column
           property="nurseStationCode"
           label="护理站编码"
+          width="150"
           align="center"
         >
         </el-table-column>
         <el-table-column
           property="nurseStationName"
           label="护理站名称"
+          width="150"
           align="center"
           :show-overflow-tooltip="true"
         >
         </el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           label="护理站类型"
           align="center"
           prop="nurseStationType"
         >
           <template slot-scope="scope">
             {{
-              scope.row.nurseStationType == "LX202211070001" ? "生活护理" : ""
+              scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
             }}
             {{
-              scope.row.nurseStationType == "LX202211070002" ? "医疗护理" : ""
+              scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
             }}
           </template>
-        </el-table-column> -->
+        </el-table-column>
 
-        <el-table-column property="phone" label="联系电话" align="center">
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
         </el-table-column>
         <el-table-column
           property="address"
-          label="护理站地址"
+          label="护理地址"
+          width="150"
           align="center"
           :show-overflow-tooltip="true"
         >
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total5 > 0"
-        :total="total5"
-        :page.sync="nurseStationqueryParams.pageNum"
-        :limit.sync="nurseStationqueryParams.pageSize"
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="queryParams2.pageNum"
+        :limit.sync="queryParams2.pageSize"
         @pagination="handleQuery2"
       />
     </el-dialog>
@@ -580,7 +589,7 @@
         </el-form-item>
       </el-form>
       <el-table :data="stationLists" @cell-dblclick="nurseclick2">
-        <el-table-column label="请选择" width="100" align="center">
+        <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -600,16 +609,18 @@
         <el-table-column
           property="nurseStationCode"
           label="护理站编码"
+          width="150"
           align="center"
         >
         </el-table-column>
         <el-table-column
           property="nurseStationName"
           label="护理站名称"
+          width="150"
           align="center"
         >
         </el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           label="护理站类型"
           align="center"
           prop="nurseStationType"
@@ -622,18 +633,28 @@
               scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
             }}
           </template>
-        </el-table-column> -->
-
-        <el-table-column property="phone" label="联系电话" align="center">
         </el-table-column>
-        <el-table-column property="address" label="护理站地址" align="center">
+
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="address"
+          label="护理地址"
+          width="150"
+          align="center"
+        >
         </el-table-column>
       </el-table>
       <pagination
-        v-show="total5 > 0"
-        :total="total5"
-        :page.sync="nurseStationqueryParams.pageNum"
-        :limit.sync="nurseStationqueryParams.pageSize"
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="queryParams2.pageNum"
+        :limit.sync="queryParams2.pageSize"
         @pagination="handleQuery2"
       />
     </el-dialog>
@@ -684,7 +705,7 @@
         :data="StationDepartmentLists"
         @cell-dblclick="StationDepartmentclick"
       >
-        <el-table-column label="请选择" width="100" align="center">
+        <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -704,12 +725,14 @@
         <el-table-column
           property="departmentCode"
           label="科室编码"
+          width="150"
           align="center"
         >
         </el-table-column>
         <el-table-column
           property="departmentName"
           label="科室名称"
+          width="150"
           align="center"
         >
         </el-table-column>
@@ -717,10 +740,16 @@
         <el-table-column
           property="departmentPerson"
           label="科室负责人"
+          width="150"
           align="center"
         >
         </el-table-column>
-        <el-table-column property="phone" label="联系电话" align="center">
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
         </el-table-column>
       </el-table>
       <pagination
@@ -786,7 +815,7 @@
         :data="StationDepartmentLists"
         @cell-dblclick="StationDepartmentclick2"
       >
-        <el-table-column label="请选择" width="100" align="center">
+        <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -806,12 +835,14 @@
         <el-table-column
           property="departmentCode"
           label="科室编码"
+          width="150"
           align="center"
         >
         </el-table-column>
         <el-table-column
           property="departmentName"
           label="科室名称"
+          width="150"
           align="center"
         >
         </el-table-column>
@@ -819,12 +850,14 @@
         <el-table-column
           property="departmentPerson"
           label="科室负责人"
+          width="150"
           align="center"
         >
         </el-table-column>
         <el-table-column
           property="phone"
           label="联系电话"
+          width="150"
           align="center"
         >
         </el-table-column>
@@ -837,6 +870,7 @@
         @pagination="handleQuery3"
       />
     </el-dialog>
+
     <!-- 修改 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -849,6 +883,7 @@
           <el-button
             disabled
             type=""
+            @click="clickinnerVisible2"
             v-if="nurseStationName == '请选择护理站名称'"
             style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
             >{{ nurseStationName }}</el-button
@@ -856,6 +891,7 @@
           <el-button
             disabled
             type=""
+            @click="clickinnerVisible2"
             v-else
             style="
               width: 362px;
@@ -893,6 +929,13 @@
             >{{ departmentName }}</el-button
           >
         </el-form-item>
+        <el-form-item label="姓名" prop="nursePersonName" >
+          <el-input
+            maxlength="15"
+            v-model="form.nursePersonName"
+            placeholder="请输入姓名"
+          />
+        </el-form-item>
         <el-form-item
           label="护理人职称"
           prop="nursePersonType"
@@ -937,7 +980,6 @@
             maxlength="11"
           />
         </el-form-item>
-
         <el-form-item label="居住地址" prop="address">
           <el-input
             v-model="form.address"
@@ -1150,21 +1192,9 @@ export default {
       index: "",
       // 表单校验
       rules: {
+      
         nursePersonName: [
-          {
-            required: true,
-            message: "护理站人员名称不能为空",
-            trigger: "blur",
-          },
-        ],
-        departmentName: [
-          { required: true, message: "所属科室不能为空", trigger: "blur" },
-        ],
-        // nurseStationId: [
-        //   { required: true, message: "所属护理站不能为空", trigger: "blur" },
-        // ],
-        nursePersonName: [
-          { required: true, message: "护理人姓名不能为空", trigger: "blur" },
+          { required: true, message: "姓名不能为空", trigger: "blur" },
         ],
         nursePersonType: [
           { required: true, message: "护理人职称不能为空", trigger: "blur" },
@@ -1254,10 +1284,23 @@ export default {
     },
     // 新增护理站按钮
     clickinnerVisible(item, index) {
+      // console.log(item);
       this.stationid = item.nurseStationId;
       this.innerVisible = true;
       this.index = index;
     },
+    // 修改护理站按钮
+    clickinnerVisible2() {
+      stationList(this.queryParams2).then((res) => {
+        this.stationLists = res.rows;
+        this.total2 = res.total;
+        this.loading = false;
+      });
+      // console.log(item);
+      this.stationid2 = this.form.nurseStationId;
+      this.innerVisiblexg = true;
+      // this.index = index;
+    },
     //xialakuang
     // loadMore() {
     //   console.log("1");
@@ -1303,6 +1346,7 @@ export default {
         address: "",
         sex: "",
         nurseStationId: "",
+
         departmentName: "请选择所属科室",
         // departname: "",
         nurseStationName: "请选择护理站名称",
@@ -1332,6 +1376,7 @@ export default {
       this.nurseStationName = row.nurseStationName;
       this.stationid2 = row.id;
       this.form.nurseStationId = row.id;
+      console.log(this.form);
       this.innerVisiblexg = false;
       this.form.nursename = row.nurseStationName;
     },
@@ -1429,13 +1474,18 @@ export default {
       };
       this.resetForm("form");
     },
+
     /** 搜索按钮操作 */
     handleQuery2() {
-      getListByUser(this.nurseStationqueryParams).then((res) => {
-        this.total5 = res.total;
-        this.nurseStationlist = res.rows;
+      this.queryParams.pageNum = 1;
+      stationList(this.queryParams2).then((res) => {
+        this.stationLists = res.rows;
+        this.total2 = res.total;
+        this.loading = false;
       });
+      this.innerVisible = true;
     },
+
     handleQuery3() {
       console.log(this.queryParams3);
       StationDepartmentList(this.queryParams3).then((response) => {
@@ -1461,14 +1511,17 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery2() {
-      this.nurseStationqueryParams = {
+      this.queryParams2 = {
         pageNum: 1,
         pageSize: 10,
         nurseStationName: null,
         id: null,
         nurseStationId: null,
       };
-      this.handleQuery2();
+      stationList(this.queryParams2).then((res) => {
+        this.stationLists = res.rows;
+        this.total2 = res.total;
+      });
     },
     resetQuery3() {
       this.queryParams3 = {
@@ -1502,6 +1555,7 @@ export default {
           phone: null,
           address: null,
         };
+
         this.handleQuery();
       } else {
         console.log(1);
@@ -1552,6 +1606,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         // this.form.nursename = null;
         // this.form.nurseStationId = null;
+
         if (valid) {
           if (this.form.id != null) {
             updatePerson(this.form).then((response) => {

src/views/system/station/index.vue

@@ -250,13 +250,13 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-search"
             @click="looknurseStationLabelList(scope.row)"
             >查看标签信息</el-button
-          >
+          > -->
           <el-button
             size="mini"
             type="text"
@@ -311,7 +311,7 @@
     </el-dialog>
 
     <!-- 查看标签信息 -->
-    <el-dialog
+    <!-- <el-dialog
       title="标签信息"
       :visible.sync="nurseStationLabelopen"
       width="700px"
@@ -335,7 +335,7 @@
           >关闭窗口</el-button
         >
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
     <!-- 新增护理站信息对话框 -->
     <el-dialog
@@ -907,14 +907,14 @@ export default {
       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);
-      });
-    },
+    // 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);