撤销入住 合并支付接口配置与支付方式

src/views/room/fangtailive.vue

@@ -1780,7 +1780,13 @@ export default {
         return;
       }else if(e.key == 17){
         console.log(row);
-        // getAction('/business/busRoomBookingOrders/reverse-living?livingOrderId='+row)
+        getAction('/business/busRoomBookingOrders/reverse-living?livingOrderId='+row.livingData.livingOrder.id).then(res=>{
+          console.log(res);
+          if (res.success) {
+            this.$message.success('撤销成功');
+            this.loadData();
+          }
+        })
       }
     },
     modalBillRoomFormOk(e) {

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

@@ -158,7 +158,7 @@
                   style="color: rgba(255, 141, 26, 1); font-size: 18px"
                 />
               </a-descriptions-item>
-              <template v-if="wakeList.length==0">
+              <template v-if="wakeList.filter(item=> { return tabSelectRoomId==1? item : tabSelectRoomId==item.roomId}).length==0">
                 <a-descriptions-item
                 label="叫醒服务"
                 :span="2"
@@ -174,12 +174,12 @@
                 <a-descriptions-item
                 label="叫醒服务"
                 :span="2"
-                v-for="(item, index) in wakeList"
+                v-for="(item, index) in wakeList.filter(item=> { return tabSelectRoomId==1? item : tabSelectRoomId==item.roomId})"
                 :key="index"
               >
               {{item.roomName}}  {{item.jxDate? item.jxDate+' /' :''}} {{item.jxTime}}
                 <a-icon
-                  v-if="wakeList.length - 1 == index"
+                  v-if="wakeList.filter(item=> { return tabSelectRoomId==1? item : tabSelectRoomId==item.roomId}).length - 1 == index"
                   type="plus-circle"
                   class="dynamic-delete-button"
                   @click="puls()"

src/views/settings/components/paySettings.vue

@@ -112,6 +112,8 @@
                 <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
+          <a @click="configuration(record)">{{record.busPayInterfaceConfig? '配置':'新增'}}</a>
+          <a-divider type="vertical" />
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
               <a>删除</a>
             </a-popconfirm>
@@ -132,6 +134,7 @@
         </div>
 
         <room-pay-type-modal ref="modalForm" @ok="modalFormOk"></room-pay-type-modal>
+        <pay-interface-config-modal ref="modalFormPay" @ok="modalFormOk"></pay-interface-config-modal>
     </a-card>
 </template>
 
@@ -142,12 +145,14 @@
     import { JeecgListMixin } from '@/mixins/JeecgListMixin'
     import roomPayTypeModal from './modules/roomPayTypeModal'
     import {hotelQueryList} from "../../../api/hotel";
+    import payInterfaceConfigModal from './modules/payInterfaceConfigModal'
 
     export default {
         name: 'paySettings',
         mixins:[JeecgListMixin, mixinDevice],
         components: {
-            roomPayTypeModal
+            roomPayTypeModal,
+            payInterfaceConfigModal
         },
         data () {
             return {
@@ -234,6 +239,12 @@
             },
         },
         methods: {
+            configuration(record){
+                // this.$refs.modalFormPay.edit()
+                this.$refs.modalFormPay.edit(record.busPayInterfaceConfig);
+                this.$refs.modalFormPay.title = record.busPayInterfaceConfig ? '配置' : '新增';
+                this.$refs.modalFormPay.disableSubmit = false;
+            },
             initDictConfig(){
             },
             initData(){

src/views/settings/systemInfo.vue

@@ -55,13 +55,13 @@
                 </span>
                 <door-lock-list></door-lock-list>
             </a-tab-pane> -->
-            <a-tab-pane key="7">
+            <!-- <a-tab-pane key="7">
                 <span slot="tab">
                     <a-icon type="payinterface" />
                     支付接口配置
                 </span>
                 <pay-api-settings></pay-api-settings>
-            </a-tab-pane>
+            </a-tab-pane> -->
             <a-tab-pane key="8">
                 <span slot="tab">
                     <a-icon type="parameter" />