1. 新增

src/views/tourism/orderManagement/hotelsOrders/detailsBox/hotelsOrdersDetails.vue

@@ -24,25 +24,28 @@
             <el-form-item label="订单编号：">
               <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.id }}</span>
             </el-form-item>
-            <el-form-item label="归属门店：">
-              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.name }}</span>
+            <el-form-item label="酒店名称：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.shopName }}</span>
             </el-form-item>
-            <el-form-item label="就餐人数：">
+            <el-form-item label="房型名称：">
               <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.useUserNum }}</span>
             </el-form-item>
           </div>
           <div style="display: flex;">
-            <el-form-item label="下单数量：">
-              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</span>
+            <el-form-item label="预订数量：">
+              <span style="display: inline-block;display: inline-block;width: 250px;">{{ form.quantity }}间</span>
+            </el-form-item>
+            <el-form-item label="房型单价(元)：">
+              <span style="display: inline-block;width: 250px;">{{ form.salePrice }}</span>
             </el-form-item>
             <el-form-item label="订单金额(元)：">
               <span style="display: inline-block;width: 250px;">{{ form.orderPrice }}</span>
             </el-form-item>
+          </div>
+          <div style="display: flex;">
             <el-form-item label="实付金额(元)：">
               <span style="display: inline-block;width: 250px;">{{ form.realPrice }}</span>
             </el-form-item>
-          </div>
-          <div style="display: flex;">
             <el-form-item label="支付状态：">
               <span style="display: inline-block;width: 250px;">
                 <dict-tag :options="dict.type.tourism_ticketOrders_payStatus" :value="form.payStatus"/>
@@ -53,9 +56,6 @@
                 <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="form.payWay"/>
               </span>
             </el-form-item>
-            <el-form-item label="下单时间：">
-              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</span>
-            </el-form-item>
           </div>
           <div style="display: flex;">
             <el-form-item label="支付时间：">
@@ -66,32 +66,39 @@
                 <dict-tag :options="dict.type.tourism_ticketOrders_status" :value="form.status"/>
               </span>
             </el-form-item>
-            <el-form-item label="消费时间：">
-              <span style="display: inline-block;width: 250px;">{{ form.qrcodeUseTime }}</span>
+            <el-form-item label="下单日期：">
+              <span style="display: inline-block;width: 250px;">{{ form.createTime }}</span>
             </el-form-item>
           </div>
           <div style="display: flex;">
-            <el-form-item label="联系电话：">
+            <el-form-item label="预定入驻日期：">
               <span style="display: inline-block;width: 250px;">{{ form.contactMobile }}</span>
             </el-form-item>
-            <el-form-item label="接单时间：">
+            <el-form-item label="预定离店日期：">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
+            <el-form-item label="预计到店时间：">
               <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
             </el-form-item>
+          </div>
+          <div style="display: flex;">
             <el-form-item label="订单来源：">
               <span style="display: inline-block;width: 250px;">
                 <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="form.source"/>
               </span>
             </el-form-item>
-            
+            <el-form-item label="接单时间：">
+              <span style="display: inline-block;width: 250px;">{{ form.acceptTime }}</span>
+            </el-form-item>
           </div>
-          <div class="form-title"><span>下单信息</span></div>
+          <div class="form-title"><span>入驻信息</span></div>
           <div style="display: flex;padding: 10px 0 15px;">
             <el-table :data="tableList">
               <el-table-column type="index" label="编号" align="center"  />
-              <el-table-column label="菜品名称" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
-              <el-table-column label="价格(元)" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
-              <el-table-column label="下单数量" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
-              <el-table-column label="实付金额(元)" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
+              <el-table-column label="入驻人" align="center" key="goodsName" prop="goodsName" :show-overflow-tooltip="true" />
+              <el-table-column label="联系电话" align="center" key="classifyName" prop="classifyName" :show-overflow-tooltip="true" />
+              <el-table-column label="房间号" align="center" key="salePrice" prop="salePrice" :show-overflow-tooltip="true" />
+              <el-table-column label="入驻时间" align="center" key="priceSubtotal" prop="priceSubtotal" :show-overflow-tooltip="true" />
             </el-table>
           </div>
         </el-form>

src/views/tourism/orderManagement/hotelsOrders/hotelsOrders.vue

@@ -13,10 +13,28 @@
                         @keyup.enter.native="handleQuery"
                     />
                 </el-form-item>
-                <el-form-item label="归属门店:" prop="merchantName">
+                <el-form-item label="酒店名称:" prop="merchantName">
                     <el-input
                         v-model="queryParams.merchantName"
-                        placeholder="请输入归属门店"
+                        placeholder="请输入酒店名称"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="房型名称:" prop="merchantName">
+                    <el-input
+                        v-model="queryParams.merchantName"
+                        placeholder="请输入房型名称"
+                        clearable
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                    />
+                </el-form-item>
+                <el-form-item label="联系人:" prop="merchantName">
+                    <el-input
+                        v-model="queryParams.merchantName"
+                        placeholder="请输入联系人"
                         clearable
                         style="width: 240px"
                         @keyup.enter.native="handleQuery"
@@ -114,26 +132,29 @@
           <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
             <el-table-column type="index" label="序号" align="center"  />
             <el-table-column label="订单编号" align="center" key="id" prop="id" v-if="columns[0].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="归属门店" align="center" key="merchantName" prop="merchantName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="实付金额(元)" align="center" key="realPrice" prop="realPrice" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-            <el-table-column label="支付状态" align="center" key="payStatus" prop="payStatus" v-if="columns[3].visible" :show-overflow-tooltip="true">
+            <el-table-column label="酒店名称" align="center" key="merchantName" prop="merchantName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="房型名称" align="center" key="merchantName" prop="merchantName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="预定房间数(间)" align="center" key="merchantName" prop="merchantName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="实付金额(元)" align="center" key="realPrice" prop="realPrice" v-if="columns[4].visible" :show-overflow-tooltip="true" />
+            <el-table-column label="支付状态" align="center" key="payStatus" prop="payStatus" v-if="columns[5].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.tourism_ticketOrders_payStatus" :value="scope.row.payStatus"/>
               </template>
             </el-table-column>
-            <el-table-column label="支付方式" align="center" key="payWay" prop="payWay" v-if="columns[4].visible" :show-overflow-tooltip="true">
+            <el-table-column label="支付方式" align="center" key="payWay" prop="payWay" v-if="columns[6].visible" :show-overflow-tooltip="true">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.tourism_ticketOrders_payWay" :value="scope.row.payWay"/>
               </template>
             </el-table-column>
-            <el-table-column label="联系电话" align="center" key="memberMobile" prop="memberMobile" v-if="columns[5].visible"></el-table-column>
-            <el-table-column label="下单时间" align="center" key="createTime" prop="createTime" v-if="columns[6].visible"></el-table-column>
-            <el-table-column label="订单来源" align="center" key="source" prop="source" v-if="columns[7].visible">
+            <el-table-column label="联系人" align="center" key="memberMobile" prop="memberMobile" v-if="columns[7].visible"></el-table-column>
+            <el-table-column label="联系电话" align="center" key="memberMobile" prop="memberMobile" v-if="columns[8].visible"></el-table-column>
+            <el-table-column label="下单时间" align="center" key="createTime" prop="createTime" v-if="columns[9].visible"></el-table-column>
+            <el-table-column label="订单来源" align="center" key="source" prop="source" v-if="columns[10].visible">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.tourism_ticketOrders_source" :value="scope.row.source"/>
               </template>
             </el-table-column>
-            <el-table-column label="订单状态" align="center" key="orderStatus" prop="orderStatus" v-if="columns[8].visible">
+            <el-table-column label="订单状态" align="center" key="orderStatus" prop="orderStatus" v-if="columns[11].visible">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.tourism_ticketOrders_status" :value="scope.row.orderStatus"/>
               </template>
@@ -243,10 +264,13 @@
         // 控制列表是否显示
         columns: [
           { key: 0, label: `订单编号`, visible: true },
-          { key: 2, label: `归属门店`, visible: true },
+          { key: 1, label: `酒店名称`, visible: true },
+          { key: 2.1, label: `房型名称`, visible: true },
+          { key: 2.2, label: `预定房间数`, visible: true },
           { key: 3.5, label: `实付金额(元)`, visible: true },
           { key: 3, label: `支付状态`, visible: true },
           { key: 4, label: `支付方式`, visible: true },
+          { key: 5.5, label: `联系人`, visible: true },
           { key: 5, label: `联系电话`, visible: true },
           { key: 6, label: `下单时间`, visible: true },
           { key: 7, label: `订单来源`, visible: true },