调整修改

src/views/room/fangtailive.vue

@@ -532,6 +532,28 @@
                           style="width: 126px"
                           @click="(e) => onMenuClick(e, roomLive)"
                         >
+                        <a-menu-item
+                            key="1"
+                            v-if="
+                              (!roomLive.livingData ||
+                                !roomLive.livingData.livingOrder) &&
+                              roomLive.roomInfo.roomStatus !== 6 &&
+                              roomLive.roomInfo.roomStatus !== 5
+                            "
+                          >
+                            入住
+                          </a-menu-item>
+                          <a-menu-item
+                            key="2"
+                            v-if="
+                              (!roomLive.livingData ||
+                                !roomLive.livingData.livingOrder) &&
+                              roomLive.roomInfo.roomStatus !== 6 &&
+                              roomLive.roomInfo.roomStatus !== 5
+                            "
+                          >
+                            预定</a-menu-item
+                          >
                         <template
                             v-if="
                               roomLive.roomInfo.roomStatus === 3 ||
@@ -540,7 +562,7 @@
                           >
                             <a-menu-item key="16"> 结账退房 </a-menu-item>
 
-                            <!-- <a-menu-item key="8"> 查房 </a-menu-item> -->
+                            <a-menu-item key="8"> 查房 </a-menu-item>
 
                             <a-menu-item key="10"> 续住收款 </a-menu-item>
 
@@ -548,7 +570,9 @@
 
                             <!-- <a-menu-item key="9"> 入账 </a-menu-item> -->
 
-                            <a-sub-menu key="sub1">
+                            <a-menu-item key="96"> 制/注房卡 </a-menu-item>
+
+                            <!-- <a-sub-menu key="sub1">
                               <span slot="title"><span>制/注房卡</span></span>
                               <a-menu-item key="11"> 制新卡 </a-menu-item>
                               <a-menu-item key="12"> 复制卡 </a-menu-item>
@@ -556,7 +580,7 @@
                               <a-menu-item key="12"> 注销卡 </a-menu-item>
                               <a-menu-item key="11"> 发密码 </a-menu-item>
                               <a-menu-item key="12"> 门卡记录 </a-menu-item>
-                            </a-sub-menu>
+                            </a-sub-menu> -->
                             
                             <!-- <a-menu-item key="14"> 合并联房 </a-menu-item>
 
@@ -579,7 +603,7 @@
                           >
                             置脏
                           </a-menu-item>
-                          <a-sub-menu key="sub2">
+                          <a-sub-menu key="sub2" v-if="roomLive.roomInfo.roomStatus === 3 || roomLive.roomInfo.roomStatus === 4">
                               <span slot="title"><span>修改房态</span></span>
                               <template
                                 v-if="
@@ -613,7 +637,7 @@
                                 </a-menu-item>
                               </template>
                               <template v-if="roomLive.roomInfo.roomStatus === 3 || roomLive.roomInfo.roomStatus === 4">
-                                <a-menu-item key="97"> 停用 </a-menu-item>
+                                <a-menu-item v-if="roomLive.roomInfo.roomStatus === 1 || roomLive.roomInfo.roomStatus === 2" key="97"> 停用 </a-menu-item>
                                 <a-menu-item key="97"> 保密房 </a-menu-item>
                                 <a-menu-item key="97"> 免打扰 </a-menu-item>
                                 <a-menu-item key="97"> 免查询 </a-menu-item>
@@ -634,30 +658,9 @@
 
                             <a-menu-item key="7"> 账单 </a-menu-item>
                           </template> -->
-                          <a-menu-item
-                            key="1"
-                            v-if="
-                              (!roomLive.livingData ||
-                                !roomLive.livingData.livingOrder) &&
-                              roomLive.roomInfo.roomStatus !== 6 &&
-                              roomLive.roomInfo.roomStatus !== 5
-                            "
-                          >
-                            入住
-                          </a-menu-item>
-                          <a-menu-item
-                            key="2"
-                            v-if="
-                              (!roomLive.livingData ||
-                                !roomLive.livingData.livingOrder) &&
-                              roomLive.roomInfo.roomStatus !== 6 &&
-                              roomLive.roomInfo.roomStatus !== 5
-                            "
-                          >
-                            预定</a-menu-item
-                          >
                           
-                          <!-- <template
+                          
+                          <template
                             v-if="
                               roomLive.roomInfo.roomStatus !== 3 &&
                               roomLive.roomInfo.roomStatus !== 4
@@ -687,7 +690,7 @@
                             >
                               锁房
                             </a-menu-item>
-                          </template> -->
+                          </template>
                           
 
                           <a-menu-item key="18"> 日志 </a-menu-item>
@@ -1903,6 +1906,16 @@ export default {
         });
       }else if( e.key==97 ){
         that.$message.success("设置成功");
+      }else if( e.key == 96){
+        let obj = {
+          ...row.roomInfo,
+          layoutName:row.layout.name,
+          roomInfo:{
+            key1:row.livingData.livingCustomers.customerName,
+            key5:row.livingData.livingCustomers.phone
+          }
+        }
+        this.$refs.batchCardModalCopy.edit([obj])
       }
     },
     modalBillRoomFormOk(e) {

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

@@ -95,7 +95,7 @@
               /></a-descriptions-item>
 
               <a-descriptions-item label="宾客类型">
-                {{ customerTypeName(item.livingOrder.customerType) }}
+                {{ customerTypeName( item.livingOrder && item.livingOrder.customerType) }}
                 <a-icon
                   v-if="livingIndex > 0"
                   @click="editCustomerType(item)"
@@ -103,14 +103,14 @@
                   style="color: rgba(255, 141, 26, 1); font-size: 18px"
               /></a-descriptions-item>
               <a-descriptions-item label="入住时间">
-                {{ item.livingOrder.arrivalTime }}
+                {{ item.livingOrder && item.livingOrder.arrivalTime }}
               </a-descriptions-item>
               <a-descriptions-item label="房价方案"> -- </a-descriptions-item>
               <a-descriptions-item label="预离时间">
-                {{ item.livingOrder.dueOutTime }}
+                {{ item.livingOrder && item.livingOrder.dueOutTime }}
               </a-descriptions-item>
               <a-descriptions-item label="订单来源">
-                {{ customerSourceName(item.livingOrder.customerSource) }}
+                {{ customerSourceName( item.livingOrder && item.livingOrder.customerSource) }}
                 <a-icon
                   v-if="livingIndex > 0"
                   @click="editCustomerSource(item)"
@@ -118,7 +118,7 @@
                   style="color: rgba(255, 141, 26, 1); font-size: 18px"
               /></a-descriptions-item>
               <a-descriptions-item label="入住类型">
-                {{  getlivingTypeText(item.livingOrder.livingType) }}
+                {{  getlivingTypeText( item.livingOrder && item.livingOrder.livingType) }}
                 <a-icon
                   v-if="livingIndex > 0"
                   @click="editBookingType(item)"
@@ -127,10 +127,10 @@
                 />
               </a-descriptions-item>
               <a-descriptions-item label="入住天数">
-                {{ item.livingOrder.dayCount }}
+                {{ item.livingOrder && item.livingOrder.dayCount }}
               </a-descriptions-item>
               <a-descriptions-item label="早餐券">
-                {{ item.livingOrder.breakfastNum }}
+                {{ item.livingOrder && item.livingOrder.breakfastNum }}
                 <a-icon
                   v-if="livingIndex > 0"
                   @click="editBreakfastNum(item)"
@@ -139,10 +139,10 @@
                 />
               </a-descriptions-item>
               <a-descriptions-item label="外部单号">
-                {{ model.orderInfo.outerOrdersNo }}
+                {{ item.livingOrder && model.orderInfo.outerOrdersNo }}
               </a-descriptions-item>
               <a-descriptions-item label="销售员工">
-                {{ warranterName(item.livingOrder.warranter) }}
+                {{ warranterName( item.livingOrder && item.livingOrder.warranter) }}
                 <a-icon
                   v-if="livingIndex > 0"
                   @click="editWarranter(item)"
@@ -150,7 +150,7 @@
                   style="color: rgba(255, 141, 26, 1); font-size: 18px"
               /></a-descriptions-item>
               <a-descriptions-item label="订单备注" :span="2">
-                {{ item.livingOrder.remark
+                {{ item.livingOrder && item.livingOrder.remark
                 }}<a-icon
                   v-if="livingIndex > 0"
                   @click="editRemark(item)"
@@ -533,7 +533,7 @@
         v-model="wakeTime.id"
       >
         <a-select-option
-          :value="item.livingOrder.id"
+          :value=" item.livingOrder && item.livingOrder.id"
           v-for="(item, index) in (model.livingRoomIds || []).filter(
             (item) => item.roomName != '全部'
           )"
@@ -872,7 +872,7 @@ export default {
       let ids = [];
       this.model.livingRoomIds.forEach((item) => {
         if (item.roomName != "全部") {
-          ids.push(item.livingOrder.id);
+          ids.push( item.livingOrder && item.livingOrder.id);
         }
       });
       getAction("/fw/fwLivingJx/list?livingOrderId=" + ids.toString()).then(
@@ -979,11 +979,14 @@ export default {
     },
     editCustomer(item) {
       var customer = item.livingCustomers[0] || {};
+      console.log(item);
+      console.log(customer);
       var obj = {
         orderId: item.livingOrder.id,
         cusName: customer.customerName,
         cusPhone: customer.phone,
         cusId: customer.id,
+        gender: customer.gender
       };
       this.$refs.modalEditCustomer.edit(obj);
       this.$refs.modalEditCustomer.title = "修改";
@@ -1289,6 +1292,7 @@ export default {
               if (res.result && res.result.length > 0) {
                 this.feesList = res.result.filter((t) => t.feeType === 1);
                 this.oldfeesList = JSON.parse(JSON.stringify(this.feesList));
+                this.tabChange(this.tabSelectRoomId)
                 this.paymentList = res.result.filter((t) => t.feeType === 2);
                 this.oldpaymentList = JSON.parse(
                   JSON.stringify(this.paymentList)

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

@@ -32,7 +32,7 @@
               >
             </a-form-model-item>
           </a-col>
-          <!-- <a-col :span="24">
+          <a-col :span="24">
             <a-form-model-item
               label="性别"
               :labelCol="labelCol"
@@ -44,7 +44,7 @@
                 <a-radio :value="2">女</a-radio>
               </a-radio-group>
             </a-form-model-item>
-          </a-col> -->
+          </a-col>
           <a-col :span="24">
             <a-form-model-item
               label="手机号"
@@ -58,6 +58,19 @@
               ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item
+              label="证件号"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              prop="certNo"
+            >
+              <a-input
+                v-model="model.certNo"
+                placeholder="请输入证件号"
+              ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>