会议日程界面结算集成

src/views/markets/modules/meetingRoomSchedule/BusMeetingRoomScheduleConfirm.vue

@@ -57,7 +57,7 @@
               style="float: left; overflow: hidden"
               class="table-page-search-submitButtons"
             >
-            <!--先不实现增加预定功能-->
+              <!--先不实现增加预定功能-->
               <!-- <a-button v-if="model.roomSchedule.billStatus==0"
                 @click="handleAdd"
                 type="danger"
@@ -123,8 +123,9 @@
             <a-divider type="vertical"
           /></template>
           <template v-if="record.status == 0">
-          <a @click="handleEdit(record)">修改</a>
-          <a-divider type="vertical" /></template>
+            <a @click="handleEdit(record)">修改</a>
+            <a-divider type="vertical"
+          /></template>
           <template v-if="record.status == 0">
             <a @click="batchConfirm(record)">确认</a>
             <a-divider type="vertical" />
@@ -142,6 +143,10 @@
       :meetingRoomScheduleId="meetingRoomScheduleId"
       @ok="modalFormOk"
     ></meeting-room-schedule-detail-modal>
+    <bus-meeting-room-schedule-edit-modal-2
+      ref="modalForm2"
+      @ok="modalFormOk3"
+    ></bus-meeting-room-schedule-edit-modal-2>
   </a-card>
 </template>
 
@@ -151,7 +156,7 @@ import { mixinDevice } from "@/utils/mixin";
 import { JeecgListMixin } from "@/mixins/JeecgListMixin";
 import BusMeetingRoomScheduleEditModal from "./BusMeetingRoomScheduleEditModal";
 import meetingRoomScheduleDetailModal from "./meetingRoomScheduleDetail/meetingRoomScheduleDetailModal";
-
+import BusMeetingRoomScheduleEditModal2 from "@/views/markets/modules/meetingRoomScheduleOrder/BusMeetingRoomScheduleEditModal";
 import { httpAction, getAction, postAction } from "@/api/manage";
 
 export default {
@@ -160,6 +165,7 @@ export default {
   components: {
     BusMeetingRoomScheduleEditModal,
     meetingRoomScheduleDetailModal,
+    BusMeetingRoomScheduleEditModal2,
   },
   props: {
     couponsId: {
@@ -227,7 +233,8 @@ export default {
         },
       ],
       url: {
-        confirmBatch: "/business/busMeetingRoomScheduleDetail/confirmBatchByMeetingRoomScheduleId",
+        confirmBatch:
+          "/business/busMeetingRoomScheduleDetail/confirmBatchByMeetingRoomScheduleId",
       },
       dictOptions: {},
       superFieldList: [],
@@ -258,12 +265,12 @@ export default {
     },
   },
   methods: {
-    handleSettle(){
-      this.$message.error("结账功能暂无实现");
-    },
-    handleAdd(){
-
+    handleSettle(record) {
+      this.$refs.modalForm2.edit(record);
+      this.$refs.modalForm2.title = "结账";
+      this.$refs.modalForm2.disableSubmit = false;
     },
+    handleAdd() {},
     batchConfirm(record) {
       if (!this.url.confirmBatch) {
         this.$message.error("请设置url.confirmBatch!");
@@ -297,9 +304,10 @@ export default {
       this.dataSource = [Object.assign({}, record)];
       this.$emit("ok");
     },
-    modalFormOk(){
-
+    modalFormOk3() {
+      this.dataSource = this.dataSource[0].billStatus = 1;
     },
+    modalFormOk() {},
     add() {
       this.edit(this.modelDefault);
     },

src/views/markets/modules/meetingRoomScheduleOrder/BusMeetingRoomScheduleEditForm.vue

@@ -74,7 +74,7 @@
                 v-model="model.amount"
                 placeholder="请输入金额"
                 style="width: 100%"
-                :min="1"
+                :min="0"
               />
             </a-form-model-item>
           </a-col>