1

src/views/room/fangtailive.vue

@@ -729,9 +729,9 @@ export default {
     toTeamPage() {
       this.$router.push({
         // path: "/room/scheduleteamdetail",
-        // query: { id: "YD20230331115905024" },
+        // query: { id: "YD20230403170240075" },
         name: "room-scheduleteamdetail",
-        params: { id: 'YD20230331115905024' },
+        params: { id: 'YD20230403170240075' },
       });
     },
     addScheduleTeam() {

src/views/room/modules/scheduleTeam/BatchSelectRoomTypeForm.vue

@@ -300,7 +300,11 @@ export default {
           this.model.dueOutTimeSpan = moment(mDate.format("HH:mm"), "HH:mm");
           this.loadRooms();
         });
+      } else {
+        this.loadRooms();
       }
+    } else {
+      this.loadRooms();
     }
   },
   methods: {

src/views/room/modules/scheduleTeam/EditScheduleRoomFormMain.vue

@@ -313,6 +313,7 @@
       @ok="modalBatchSelectRoomTypeFormOk"
       :orderInfo="model.orderInfo"
       :batchRoomsTypeList="batchRoomsTypeList"
+      :hourRoomRuleList="hourRoomRuleList"
     ></batch-select-room-type-form-modal>
     <edit-batch-select-room-type-form-modal
       ref="modalEditBatchSelectRoomTypeForm"
@@ -510,7 +511,7 @@ export default {
     },
   },
   created() {
-    this.load()
+    this.load();
   },
   mounted() {
     // this.pulsBatch();
@@ -612,6 +613,22 @@ export default {
       }).then((res) => {
         if (res.success) {
           this.model = res.result;
+          var publicConsumeProject = [];
+          if (this.model.orderInfo.publicRoomFee == 1) {
+            publicConsumeProject.push(1);
+          }
+          if (this.model.orderInfo.publicConsumeFee == 1) {
+            publicConsumeProject.push(2);
+          }
+          if (this.model.orderInfo.publicVipFee == 1) {
+            publicConsumeProject.push(3);
+          }
+          if (this.model.orderInfo.publicMeetingFee == 1) {
+            publicConsumeProject.push(4);
+          }
+
+          // this.model.orderInfo.publicConsumeProject = publicConsumeProject;
+          this.$set(this.model.orderInfo,'publicConsumeProject',publicConsumeProject)
 
           this.getbusCustomer();
           // this.loadRooms();
@@ -845,7 +862,27 @@ export default {
     },
     submitForm() {
       const that = this;
-
+      if (
+        that.model.orderInfo.publicConsumeProject &&
+        that.model.orderInfo.publicConsumeProject.length > 0
+      ) {
+        var publicRoomFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 1
+        );
+        that.model.orderInfo.publicRoomFee = publicRoomFee ? 1 : 0;
+        var publicConsumeFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 2
+        );
+        that.model.orderInfo.publicConsumeFee = publicConsumeFee ? 1 : 0;
+        var publicVipFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 3
+        );
+        that.model.orderInfo.publicVipFee = publicVipFee ? 1 : 0;
+        var publicMeetingFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 4
+        );
+        that.model.orderInfo.publicMeetingFee = publicMeetingFee ? 1 : 0;
+      }
       // 触发表单验证
       this.$refs.form.validate((valid) => {
         if (valid) {

src/views/room/modules/scheduleTeam/ScheduleRoomForm.vue

@@ -1004,6 +1004,27 @@ export default {
         that.$message.warning("请先添加批次");
         return;
       }
+      if (
+        that.model.orderInfo.publicConsumeProject &&
+        that.model.orderInfo.publicConsumeProject.length > 0
+      ) {
+        var publicRoomFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 1
+        );
+        that.model.orderInfo.publicRoomFee = publicRoomFee ? 1 : 0;
+        var publicConsumeFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 2
+        );
+        that.model.orderInfo.publicConsumeFee = publicConsumeFee ? 1 : 0;
+        var publicVipFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 3
+        );
+        that.model.orderInfo.publicVipFee = publicVipFee ? 1 : 0;
+        var publicMeetingFee = that.model.orderInfo.publicConsumeProject.some(
+          (t) => t == 4
+        );
+        that.model.orderInfo.publicMeetingFee = publicMeetingFee ? 1 : 0;
+      }
       // 触发表单验证
       this.$refs.form.validate((valid) => {
         if (valid) {