入住增加消费项

src/views/room/fangtailive.vue

@@ -620,7 +620,7 @@
     <upkeep-room-modal ref="modalForm" @ok="modalWxFormOk"></upkeep-room-modal>
     <bill-room-info-modal
       ref="ModalBillRoomInfo"
-      @ok="modalFormOk"
+      @ok="modalLockRoomFormOk"
     ></bill-room-info-modal>
     <bill-room-form-modal
       ref="ModalBillRoomForm"

src/views/room/modules/checkIn/BillRoomInfo.vue

@@ -259,15 +259,21 @@
           <div style="display: flex">
             <div style="display: flex; flex-direction: column">
               <a-icon
-                type="import"
+                type="tool"
                 style="color: rgba(255, 141, 26, 1); font-size: 18px"
-              /><a-button type="link"> 退单 </a-button>
+              /><a-button
+                type="link"
+                :disabled="selectRoomId == '1'"
+                @click="addProjectFee"
+              >
+                增加消费
+              </a-button>
             </div>
             <div style="display: flex; flex-direction: column">
               <a-icon
-                type="tool"
+                type="import"
                 style="color: rgba(255, 141, 26, 1); font-size: 18px"
-              /><a-button type="link"> 补单 </a-button>
+              /><a-button type="link"> 退单 </a-button>
             </div>
             <div style="display: flex; flex-direction: column">
               <a-icon
@@ -416,6 +422,7 @@
     <customer-modal ref="modalCustomerForm" @ok="modalFormOk"></customer-modal>
     <refund-modal ref="modalRefundForm" @ok="modalFormOk"></refund-modal>
     <payment-modal ref="modalPaymentForm" @ok="modalFormOk"></payment-modal>
+    <fee-modal ref="modalFeeForm" @ok="modalFormOk"></fee-modal>
   </div>
 </template>
 
@@ -426,6 +433,7 @@ import moment from "moment";
 import CustomerModal from "./CustomerModal.vue";
 import RefundModal from "./RefundModal.vue";
 import PaymentModal from "./PaymentModal.vue";
+import FeeModal from "./FeeModal";
 import { match } from "assert";
 const columns = [
   // {
@@ -527,7 +535,7 @@ const date = new Date();
 const endDate = new Date(date.setDate(date.getDate() + 1));
 export default {
   name: "BusMeetingRoomForm",
-  components: { CustomerModal, RefundModal, PaymentModal },
+  components: { CustomerModal, RefundModal, PaymentModal, FeeModal },
   props: {
     //表单禁用
     disabled: {
@@ -692,6 +700,16 @@ export default {
         },
       });
     },
+    addProjectFee() {
+      var index = this.model.livingRoomIds.findLastIndex(
+        (t) => t.roomId == this.selectRoomId
+      );
+      var livingRoom = this.model.livingRoomIds[index];
+      this.$refs.modalFeeForm.add();
+      this.$refs.modalFeeForm.livingOrderId = livingRoom.livingOrder.id;
+      this.$refs.modalFeeForm.title = "增加消费项目";
+      this.$refs.modalFeeForm.disableSubmit = false;
+    },
     partialSettle() {
       var list2 = this.feesList.filter((t) =>
         this.selectedRowKeys1.includes(t.id)
@@ -754,11 +772,9 @@ export default {
         msg = "优惠金额";
       } else if (text == 5) {
         msg = "结账收款";
-      }
-      else if (text == 6) {
+      } else if (text == 6) {
         msg = "商品";
-      }
-      else if (text == 7) {
+      } else if (text == 7) {
         msg = "点餐";
       }
       return msg;

src/views/room/modules/checkIn/BillRoomInfoModal.vue

@@ -120,7 +120,7 @@
       },
       submitCallback(){
         this.$emit('ok');
-        this.visible = false;
+        // this.visible = false;
       },
       handleCancel () {
         this.close()

src/views/stock/depositoryingoods.vue

@@ -174,7 +174,7 @@ export default {
         {
           title: "仓库名称",
           align: "center",
-          dataIndex: "name",
+          dataIndex: "depositoryName",
         },
         {
           title: "商品规格",
@@ -223,13 +223,6 @@ export default {
     };
   },
   created() {
-    getAction("/kc/kcDepository/list", {
-      state: 1,
-    }).then((res) => {
-      if (res.success) {
-        this.depositoryList = res.result.records;
-      }
-    });
   },
   methods: {},
 };