检查项目限制人数相关功能完善

public/index.html

@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue

@@ -72,7 +72,7 @@
                 >
                   <p v-show="!weekInfoItem.morningOpen" class="none">无</p>
                   <div
-                    v-show="weekInfoItem.morningOpen && (weekInfoItem.morning.maxNumber == weekInfoItem.morning.orderNum)"
+                    v-show="weekInfoItem.morningOpen && (weekInfoItem.morning.maxNumber <= weekInfoItem.morning.orderNum)"
                     class="yue-man"
                   >
                     <p>约满</p>
@@ -114,7 +114,7 @@
                 >
                   <p v-show="!weekInfoItem.afterOpen" class="none">无</p>
                   <div
-                    v-show="weekInfoItem.afterOpen && (weekInfoItem.after.maxNumber == weekInfoItem.after.orderNum)"
+                    v-show="weekInfoItem.afterOpen && (weekInfoItem.after.maxNumber <= weekInfoItem.after.orderNum)"
                     class="yue-man"
                   >
                     <p>约满</p>
@@ -234,13 +234,14 @@ export default {
         this.doctorList = res.data
         if (typeof this.curIndex === 'number'){
           if (this.curTime===1){
-            const weekInfoItem = this.doctorList.length && this.doctorList[this.curIndex].weekInfo[this.curWeekInfoIndex]
+            const item = this.doctorList.length && this.doctorList[this.curIndex]
+            const weekInfoItem = item.weekInfo[this.curWeekInfoIndex]
             this.curPatients = weekInfoItem.morning.appointPatients
-            this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum
+            this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum || !item.needLimit
           }else {
             const weekInfoItem = this.doctorList.length && this.doctorList[this.curIndex].weekInfo[this.curWeekInfoIndex]
             this.curPatients = weekInfoItem.after.appointPatients
-            this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum
+            this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum || !item.needLimit
           }
         }
       } else {
@@ -375,11 +376,11 @@ export default {
         if (morOrAft===1){
           this.curPatients = weekInfoItem.morning.appointPatients
           this.$refs.numberManageRef.dateInfo = weekInfoItem.date + '上午'
-          this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum
+          this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum || !item.needLimit
         }else {
           this.curPatients = weekInfoItem.after.appointPatients
           this.$refs.numberManageRef.dateInfo = weekInfoItem.date + '下午'
-          this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum
+          this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum || !item.needLimit
         }
         this.$refs.numberManageRef.curProject = item // 当前改约的项目
         this.$refs.numberManageRef.projectName = item.itemName