不知道说点什么好

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

@@ -68,11 +68,14 @@
                         </a-auto-complete>
                       </a-form-model-item>
                     </a-col> -->
-                    <a-col :span="8">
+                    <a-col :span="12">
                       <a-form-model-item
                         label="姓名"
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
+                        :labelCol="{ xs: { span: 24 }, sm: { span: 5 } }"
+                        :wrapperCol="{
+                          xs: { span: 24 },
+                          sm: { span: 16 },
+                        }"
                         :prop="`roomIds[${aindex}].key1`"
                         :rules="[
                           {
@@ -96,13 +99,14 @@
                             >
                           </template>
                         </a-auto-complete>
+                        <a-icon type="contacts" style="font-size: 18px;margin-left: 5px;" @click="readCardNo" />
                         <span style="cursor: pointer;" v-if="room.busMemberCard&&room.busMemberCard.id" @click="showMemberCard(room.busMemberCard)">会员</span>
                         <span style="cursor: pointer;" v-if="room.busMarketAgreementUnit&&room.busMarketAgreementUnit.id" @click="showAgreementUnit(room.busMarketAgreementUnit)"> 协议</span>
                         <span style="cursor: pointer;" v-if="room.ruZhuHistory&&room.ruZhuHistory.phone" @click="showRuZhuHistory(room.ruZhuHistory.phone)"> 客史</span>
                         
                       </a-form-model-item>
                     </a-col>
-                    <a-col :span="8">
+                    <a-col :span="6">
                       <a-form-model-item
                         label="性别"
                         :labelCol="labelCol"
@@ -122,7 +126,7 @@
                         </a-select>
                       </a-form-model-item>
                     </a-col>
-                    <a-col :span="8">
+                    <a-col :span="6">
                       <a-form-model-item
                         label="民族"
                         :labelCol="labelCol"
@@ -312,6 +316,7 @@
                             placeholder="手机号"
                             style="width: 120px"
                           ></a-input>
+                          <a-icon type="contacts" style="font-size: 18px;margin-left: 5px;" @click="readCardNo" />
                           <a-icon
                             type="minus-circle"
                             style="color: #f56c6c"
@@ -1373,6 +1378,9 @@ export default {
     //  this.getcesRoomLayout();
   },
   methods: {
+    readCardNo() {
+      this.$message.error("接口程序未打开，请打开接口程序");
+    },
     contractTeamIdChange(e) {
       this.model.orderInfo.contractTeamId = e;
       getAction("/business/busMarketAgreementCustomer/list", {
@@ -2143,6 +2151,8 @@ export default {
           customerName: t.key1,
           gender: t.key2,
           phone: t.key5,
+          nation: t.key3,
+          address: t.key6,
           roomId: t.id,
         };
         if (!t.livingCustomers2 || t.livingCustomers2.length == 0) {

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

@@ -20,7 +20,22 @@
                             </a-col>
                             
                         </a-row>
-                        <a-row :gutter="[24,24]">
+                        <a-row :gutter="24">
+                            <a-col :span="12">
+                                <!-- <a-form-item label="">
+                                    <j-input placeholder="姓名" v-model="queryParam.name" style="width: 200px"></j-input>
+                                </a-form-item> -->
+                                地址:{{(dataSource[0] || {}).address || ''}}
+                            </a-col>
+                            <a-col :span="12">
+                                <!-- <a-form-item label="">
+                                    <j-input placeholder="手机号码" v-model="queryParam.name" style="width: 200px"></j-input>
+                                </a-form-item> -->
+                                民族:{{(dataSource[0] || {}).nation || ''}}
+                            </a-col>
+                            
+                        </a-row>
+                        <a-row :gutter="24">
                             <a-col :span="12">
                                 <!-- <a-form-item label="">
                                     <j-input placeholder="证件号码" v-model="queryParam.name" style="width: 200px"></j-input>
@@ -142,18 +157,19 @@ export default {
                 {
                     title: "序号",
                     align: "center",
+                    width:60,
                     // dataIndex: "type",
-                    customCell:() => {
-                        return {
-                        style: {
-                            wordWrap:'break-word',
-                            wordBreak:'break-all',
-                            whiteSpace:'normal',
-                            minHeight:'50px',
-                            width: '50px',
-                        }
-                        }
-                    },
+                    // customCell:() => {
+                    //     return {
+                    //     style: {
+                    //         wordWrap:'break-word',
+                    //         wordBreak:'break-all',
+                    //         whiteSpace:'normal',
+                    //         minHeight:'50px',
+                    //         width: '50px',
+                    //     }
+                    //     }
+                    // },
                     scopedSlots: { customRender: 'num' }
                 },
                 {