Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

src/views/room/leasegoods.vue

@@ -162,7 +162,7 @@ export default {
         {
           title: "物品",
           align: "center",
-          dataIndex: "goodsId",
+          dataIndex: "goodName",
         },
         {
           title: "数量",

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

@@ -312,6 +312,7 @@
               /><a-button
                 type="link"
                 :disabled="selectedRowKeys1.length == 0 || selectRoomId == '1'"
+                @click="tuidan"
               >
                 退单
               </a-button>
@@ -502,7 +503,7 @@
 </template>
 
 <script>
-import { httpAction, getAction, deleteAction } from "@/api/manage";
+import { httpAction, getAction, deleteAction, postAction } from "@/api/manage";
 import { validateDuplicateValue } from "@/utils/util";
 import moment from "moment";
 import CustomerModal from "./CustomerModal.vue";
@@ -705,16 +706,19 @@ export default {
       }, 0);
     },
     paymentAmount() {
-      var list = this.paymentList.filter((t) => t.subjectType !== 5);
-      var amount = list.reduce(function (total, item) {
-        return total + item.money;
-      }, 0);
+      // var list = this.paymentList.filter((t) => t.subjectType !== 5);
+      // var amount = list.reduce(function (total, item) {
+      //   return total + item.money;
+      // }, 0);
 
-      var list2 = this.paymentList.filter((t) => t.subjectType == 5);
-      var amount2 = list2.reduce(function (total, item) {
+      // var list2 = this.paymentList.filter((t) => t.subjectType == 5);
+      // var amount2 = list2.reduce(function (total, item) {
+      //   return total + item.money;
+      // }, 0);
+      var amount = this.paymentList.reduce(function (total, item) {
         return total + item.money;
       }, 0);
-      return amount - amount2;
+      return amount;
     },
     btnSisabled() {
       var index = this.model.livingRoomIds.findLastIndex(
@@ -928,6 +932,19 @@ export default {
       this.$refs.modalFeeForm.title = "增加消费项目";
       this.$refs.modalFeeForm.disableSubmit = false;
     },
+    tuidan() {
+      postAction(
+        "/business/busRoomBookingOrders/退你麻痹单狗东西",
+        this.selectedRowKeys1
+      ).then((res) => {
+        if (res.success) {
+          this.$message.success("退单成功");
+          this.getBookingOrderInfo();
+        } else {
+          this.$message.warning(res.message);
+        }
+      });
+    },
     partialSettle() {
       var list2 = this.feesList.filter((t) =>
         this.selectedRowKeys1.includes(t.id)
@@ -997,6 +1014,16 @@ export default {
         msg = "点餐";
       } else if (text == 8) {
         msg = "夜审房费";
+      } else if (text == 9) {
+        msg = "会议室";
+      } else if (text == 10) {
+        msg = "手工房费";
+      } else if (text == 11) {
+        msg = "水电煤抄表";
+      } else if (text == 12) {
+        msg = "赔偿费";
+      } else if (text == 13) {
+        msg = "退单结账";
       }
       return msg;
     },

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

@@ -22,30 +22,28 @@
             style="color: #fff; font-size: 30px"
           /><a-button type="link"> 调价 </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleLeaseGoods">
           <a-icon type="block" style="color: #fff; font-size: 30px" /><a-button
             type="link"
-            @click="handleLeaseGoods"
           >
             物品借用
           </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleMessage">
           <a-icon
             type="message"
             style="color: #fff; font-size: 30px"
-          /><a-button type="link" @click="handleMessage"> 客户留言 </a-button>
+          /><a-button type="link"> 客户留言 </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleUnion">
           <a-icon
             type="retweet"
             style="color: #fff; font-size: 30px"
-          /><a-button type="link" @click="handleUnion"> 联房 </a-button>
+          /><a-button type="link"> 联房 </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleLeaveNotSettle">
           <a-icon type="euro" style="color: #fff; font-size: 30px" /><a-button
             type="link"
-            @click="handleLeaveNotSettle"
           >
             先走不结
           </a-button>

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

@@ -19,7 +19,7 @@
                 v-model="model.cusName"
                 placeholder="联系人"
                 @search="handleSearch"
-                @select="(e) => handleSelectMember(e)"
+                @select="(e) => handleSelectMember(e)" style="width: 70%;"
               >
                 <template slot="dataSource">
                   <a-select-option v-for="item in customerList" :key="item.id"
@@ -27,6 +27,9 @@
                   >
                 </template>
               </a-auto-complete>
+              <a-button @click="readCardNo" style="margin-left: 10px"
+                >读取身份证</a-button
+              >
             </a-form-model-item>
           </a-col>
           <!-- <a-col :span="24">
@@ -78,7 +81,7 @@ export default {
   },
   data() {
     return {
-      model: { payType: 1, livingOrderId: "",certType:1,gender:1 },
+      model: { payType: 1, livingOrderId: "", certType: 1, gender: 1 },
       labelCol: {
         xs: { span: 24 },
         sm: { span: 5 },
@@ -132,6 +135,9 @@ export default {
     this.getbusCustomer();
   },
   methods: {
+    readCardNo() {
+      this.$message.error("接口程序未打开，请打开接口程序");
+    },
     handleSearch(value) {
       let result;
       if (!value) {
@@ -155,7 +161,7 @@ export default {
         }
       });
     },
-    add(livingOrderId,roomId) {
+    add(livingOrderId, roomId) {
       this.modelDefault.livingOrderId = livingOrderId;
       this.modelDefault.roomId = roomId;
       this.edit(this.modelDefault);
@@ -180,7 +186,11 @@ export default {
           //   phone: this.model.phone,
           //   roomId: this.model.roomId,
           // });
-          httpAction("/business/busRoomBookingOrders/update-orders?type=2", this.model, "post")
+          httpAction(
+            "/business/busRoomBookingOrders/update-orders?type=2",
+            this.model,
+            "post"
+          )
             .then((res) => {
               if (res.success) {
                 that.$message.success("修改成功");

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

@@ -6,11 +6,10 @@
                 <a-col :span="12">
                     <a-form-model-item label="消费项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="subjectType">
                         <a-select v-model="model.subjectType" style="50%" placeholder="消费项目" :allowClear="true">
-                            <a-select-option :value="1">押金</a-select-option>
-                            <a-select-option :value="2">预收房费</a-select-option>
-                            <a-select-option :value="3">每日房费</a-select-option>
                             <a-select-option :value="6">商品</a-select-option>
-                            <a-select-option :value="7">点餐</a-select-option>
+                            <a-select-option :value="10">手工房费</a-select-option>
+                            <a-select-option :value="11">水电煤抄表</a-select-option>
+                            <a-select-option :value="12">赔偿费</a-select-option>
                         </a-select>
                     </a-form-model-item>
                     <a-row>

src/views/room/modules/leasegoods/CesOrderLeaseGoodsForm.vue

@@ -46,7 +46,7 @@
               :wrapperCol="wrapperCol"
               prop="goodsId"
             >
-              <a-select v-model="model.goodsId" placeholder="请选择民族">
+              <a-select v-model="model.goodsId" placeholder="请选择物品">
                 <a-select-option
                   :value="item.id"
                   v-for="(item, index) in busDictItemList"
@@ -162,7 +162,7 @@ export default {
     //备份model原始值
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
     getAction("/business/busDictItem/list", {
-      dictId: "1639538235288539138",
+      dictId: "1659108818476990465",
     }).then((res) => {
       if (res.success) {
         this.busDictItemList = res.result.records;