Merge remote-tracking branch 'origin/yan_0916_护理类型信息' into sdl_20220916_护理站人员功能

src/api/system/order.js

@@ -2,23 +2,25 @@ import request from '@/utils/request'
 // 查询护理类型信息列表
 export function appointmentOrderDetailsList(query) {
     return request({
-        url: '/system/appointmentOrderDetails/appointmentOrderDetailsList',
+        url: 'system/appointmentOrder/list',
         method: 'get',
         params: query
     })
 }
 
+
 export function Detailed(id) {
     return request({
         url: `/system/appointmentOrderDetails/Detailed`+`?orderNo=${id}`,
         method: 'get',
-       
+
     })
 }
 //删除
-export function deldetailed(id) {
+export function deldetailed(appointmentOrderId) {
     return request({
-        url: '/system/appointmentOrderDetails/' + id,
-        method: 'delete'
+        url: '/system/appointmentOrder/'+appointmentOrderId,
+        method: 'post',
+
     })
 }

src/layout/components/Navbar.vue

@@ -21,7 +21,7 @@
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip> -->
+        </el-tooltip>
 
       </template>
 

src/views/system/StationDepartment/index.vue

@@ -8,7 +8,7 @@
       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"
@@ -25,7 +25,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="护理站" prop="nurseStationId"  
+      <el-form-item label="护理站" prop="nurseStationId"
       v-else>
         <el-select
           v-model="queryParams.nurseStationId"
@@ -364,6 +364,16 @@ import { getListByUser } from "@/api/system/userlist.js";
 export default {
   name: "StationDepartment",
   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("请输入正确的联系电话"));
+    };
     return {
       nurseStationlist: [],
       // 遮罩层
@@ -379,7 +389,7 @@ export default {
       // 总条数
       total: 0,
       total2: 0,
-     
+
       // 护理站部门信息表格数据
       StationDepartmentList: [],
       // 弹出层标题
@@ -438,12 +448,13 @@ export default {
             },
           ],
           phone: [
-            {
-              required: true,
-              message: "请选择联系电话",
-              trigger: "blur",
-            },
-          ],
+          {
+            required: true,
+            validator: checkMobile,
+            trigger: "blur",
+            message: "",
+          },
+        ],
         },
         nurseStationId: [
           {
@@ -469,14 +480,15 @@ export default {
         phone: [
           {
             required: true,
-            message: "请选择联系电话",
+            validator: checkMobile,
             trigger: "blur",
+            message: "",
           },
         ],
       },
     };
   },
-  
+
   created() {
     this.getList();
     // this.listinfo();
@@ -514,7 +526,7 @@ export default {
     nurseinfo() {
       this.nurseStationId = row.nurseStationId;
     },
-   
+
        //滑动下拉框
        loadMore() {
       var a = Math.ceil(this.total2 / 10);
@@ -628,6 +640,7 @@ export default {
           this.nurseStationlist = res.rows;
           this.queryParams.nurseStationId = res.rows[0].id;
           this.handleQuery();
+          console.log(this.queryParams)
         }
       });
     },
@@ -678,7 +691,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除护理站部门信息编号为"' + ids + '"的数据项？')
+        .confirm('是否确认删除护理站部门信息的数据项？')
         .then(function () {
           return delStationDepartment(ids);
         })

src/views/system/order/index.vue

@@ -318,7 +318,6 @@ export default {
           break;
       }
     },
-
     seeLook(row) {
       this.innerVisible4 = true;
       const id = row.orderNo;
@@ -371,8 +370,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      // console.log('row :>> ', row);
       this.$confirm(
-        '是否确认删除订单编号为"' + row.orderNo + '"的数据项？',
+        '是否确认删除订单信息的数据项？',
         "提示",
         {
           confirmButtonText: "确定",
@@ -381,9 +381,10 @@ export default {
         }
       )
         .then(() => {
-          deldetailed(row.appointOrderDetailsId).then((res) => {
+          deldetailed(row.appointmentOrderId).then((res) => {
             this.$message.success("删除成功");
             this.getList();
+            // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
           });
         })
         .catch(() => {});
@@ -406,4 +407,4 @@ export default {
   height: 500px;
   overflow-y: scroll;
 }
-</style>
+</style>