1. 优化

src/views/venue/performanceHallMr/dialog/seatTemplateEdit.vue

@@ -10,7 +10,7 @@
 <template>
   <el-dialog
     :visible.sync="open"
-    width="90%"
+    width="98%"
     append-to-body
     :close-on-click-modal="false"
     @close="cancel"

src/views/venue/performanceHallMr/mixins/selectList.js

@@ -389,5 +389,66 @@ export default {
             this.dataProcess()
             this.addSelectTabelList()
         },
+        // 批量修改出票顺序
+        selectTicketingSequenceFun(){
+            console.log("this.formAll=====",this.formAll)
+            if(this.formAll.printSortIdType == 1) {
+                let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
+                for(let i=0;i<this.selectTabelList.length;i++){
+                    for(let j=0;j<this.tableDataAll.length;j++){
+                        if(this.selectTabelList[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                            listTabel[j] = {
+                                ...this.tableDataAll[j],
+                                printSortId: '按优先级出票'
+                            }
+                            break;
+                        }    
+                    }
+                }
+                this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
+            }else if(this.formAll.seatPriorityWay == 1){
+                let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
+                for(let i=0;i<this.selectTabelList.length;i++){
+                    for(let j=0;j<this.tableDataAll.length;j++){
+                        if(this.selectTabelList[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                            listTabel[j] = {
+                                ...this.tableDataAll[j],
+                                printSortId: this.formAll.setaPriorityNum
+                            }
+                            break;
+                        }    
+                    }
+                }
+                this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
+            }else{
+                let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
+                let listSelect = JSON.parse(JSON.stringify(this.selectTabelList))
+                if(this.formAll.seatPriorityPosition == 2) {
+                    listSelect.reverse()
+                }
+                console.log("fsafsdfa=====",listSelect)
+                let num = Number(this.formAll.setaPriorityNum)
+                for(let i=0;i<listSelect.length;i++){
+                    for(let j=0;j<this.tableDataAll.length;j++){
+                        if(listSelect[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                            listTabel[j] = {
+                                ...this.tableDataAll[j],
+                                printSortId: num
+                            }
+                            if(this.formAll.seatPriorityWay == 2){
+                                num = num + 1
+                            }else if(this.formAll.seatPriorityWay == 3){
+                                num = num - 1
+                            }
+                            break;
+                        }    
+                    }
+                }
+                this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
+            }
+            this.formDialogVisible = false
+            this.dataProcess()
+            this.addSelectTabelList()
+        },
     },
 }

src/views/venue/performanceHallMr/model/seatManagementTable.vue

@@ -279,6 +279,7 @@
                                     <div>
                                         <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaPriority')">优先级</el-button>
                                         <el-button type="danger" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('batchSetaDisable')">座位状态</el-button>
+                                        <el-button type="primary" :disabled="multipleSelection.length==0" size="mini" @click="openFormDialogVisible('ticketingSequence')">出票顺序</el-button>
                                     </div>
                                 </div>
                                 <div class="qu-batch-table">
@@ -313,6 +314,13 @@
                                                 <span>{{ scope.row.priority }}</span>
                                             </template>
                                         </el-table-column>
+                                        <el-table-column
+                                        align="center"
+                                        label="出票顺序">
+                                            <template slot-scope="scope">
+                                                <span>{{ scope.row.printSortId }}</span>
+                                            </template>
+                                        </el-table-column>
                                     </el-table>
                                 </div>
                             </div>
@@ -332,6 +340,7 @@
                                     </div>
                                     <div>
                                         <el-button type="danger" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectBatchSetaDisable')">座位状态</el-button>
+                                        <el-button type="danger" :disabled="selectTabelList.length==0" size="mini" @click="openFormDialogVisible('selectTicketingSequence')">出票顺序</el-button>
                                         <el-button type="info" :disabled="selectTabelList.length==0" size="mini" @click="delSelectTabelList">清除选择</el-button>
                                     </div>
                                 </div>
@@ -361,6 +370,13 @@
                                                 <span>{{ scope.row.priority }}</span>
                                             </template>
                                         </el-table-column>
+                                        <el-table-column
+                                        align="center"
+                                        label="出票顺序">
+                                            <template slot-scope="scope">
+                                                <span>{{ scope.row.printSortId }}</span>
+                                            </template>
+                                        </el-table-column>
                                     </el-table>
                                 </div>
                             </div>
@@ -473,6 +489,9 @@
                             <el-radio :label="2">不可用</el-radio>
                         </el-radio-group>
                     </el-form-item>
+                    <el-form-item label="出票顺序" prop="printSortId">
+                        <el-input v-model="formAll.printSortId" placeholder="请输入出票顺序"></el-input>
+                    </el-form-item>
                     <!-- <el-form-item label="是否禁用" prop="delFlag">
                         <el-radio-group v-model="formAll.delFlag">
                             <el-radio :label="0">禁用</el-radio>
@@ -480,6 +499,33 @@
                         </el-radio-group>
                     </el-form-item> -->
                 </div>
+                <!--  出票顺序设置 -->
+                <div v-if="['ticketingSequence','selectTicketingSequence'].indexOf(formAllType) !=-1">
+                    <el-form-item label="出票顺序" prop="printSortIdType">
+                        <el-radio-group v-model="formAll.printSortIdType">
+                            <el-radio :label="1">按照优先级出票</el-radio>
+                            <el-radio :label="2">自定义</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <div v-if="formAll.printSortIdType == 2">
+                        <el-form-item label="设置方式" prop="seatPriorityWay">
+                            <el-radio-group v-model="formAll.seatPriorityWay">
+                                <el-radio :label="1">同一级</el-radio>
+                                <el-radio :label="2">递增</el-radio>
+                                <el-radio :label="3">递减</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="开始位置" prop="seatPriorityPosition">
+                            <el-radio-group v-model="formAll.seatPriorityPosition">
+                                <el-radio :label="1">列表上到下</el-radio>
+                                <el-radio :label="2">列表下到上</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                        <el-form-item label="等级数" prop="setaPriorityNum">
+                            <el-input v-model="formAll.setaPriorityNum" placeholder="等级数"></el-input>
+                        </el-form-item>
+                    </div>
+                </div>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="formDialogVisible = false">取 消</el-button>
@@ -603,7 +649,13 @@ export default {
                 ],
                 setaPriorityNum: [
                     { required: true, message: '请输入等级数', trigger: ['blur','change'] }
-                ]
+                ],
+                printSortId: [
+                    { required: false, message: '请输入出票顺序', trigger: ['blur','change'] }
+                ],
+                printSortIdType: [
+                    { required: true, message: '请输入出票顺序类型', trigger: ['blur','change'] }
+                ],
                 /**  修改名称 结束  */
             },
             formAllType: '', // region 区域
@@ -804,6 +856,7 @@ export default {
                                 //delFlag: 0, // 座位是否可用
                                 priority: '', // 座位出票顺序  数字越小越优先
                                 status: 1, //0-初始(该状态下不C端显示) 1-可用 2-不可用
+                                printSortId: '', // 座位出票顺序  数字越小越优先 （打印）
                             })
                         }
                     }
@@ -841,6 +894,7 @@ export default {
                         color: '',// 座位类型对应的颜色
                         //delFlag: 0, // 座位是否可用
                         priority: '', // 座位出票顺序  数字越小越优先
+                        printSortId: '', // 座位出票顺序  数字越小越优先 （打印）
                         status: 1, //0-初始(该状态下不C端显示) 1-可用 2-不可用
                     })
                 }
@@ -867,6 +921,7 @@ export default {
                         color: '',// 座位类型对应的颜色
                         //delFlag: 0, // 座位是否可用
                         priority: '', // 座位出票顺序  数字越小越优先
+                        printSortId: '', // 座位出票顺序  数字越小越优先 （打印）
                         status: 1, //0-初始(该状态下不C端显示) 1-可用 2-不可用
                     })
                 }
@@ -1070,6 +1125,28 @@ export default {
                    ...data
                 })))
             }
+            if(type == 'ticketingSequence') { // 出票顺序
+                this.formAllType = 'ticketingSequence'
+                this.formDialogVisibleTitle = "出票顺序设置"
+                this.formDialogVisible = true
+                this.$set(this,'formAll',JSON.parse(JSON.stringify({
+                    printSortIdType: null,
+                    seatPriorityWay: null,
+                    setaPriorityNum: null,
+                    seatPriorityPosition: null
+                })))
+            }
+            if(type == 'selectTicketingSequence') { // 出票顺序
+                this.formAllType = 'selectTicketingSequence'
+                this.formDialogVisibleTitle = "出票顺序设置"
+                this.formDialogVisible = true
+                this.$set(this,'formAll',JSON.parse(JSON.stringify({
+                    printSortIdType: null,
+                    seatPriorityWay: null,
+                    setaPriorityNum: null,
+                    seatPriorityPosition: null
+                })))
+            }
             this.$nextTick(()=>{
                 this.$refs['formAll'].clearValidate()
             })
@@ -1096,7 +1173,11 @@ export default {
                         this.batchSetaDisableFun()
                     }else if(this.formAllType == 'selectBatchSetaDisable') {
                         this.selectBatchSetaDisableFun()
-                    }  
+                    }else if(this.formAllType == 'ticketingSequence') {
+                        this.ticketingSequenceFun()
+                    }else if(this.formAllType == 'selectTicketingSequence') {
+                        this.selectTicketingSequenceFun()
+                    }   
                 } else {
                     console.log('error submit!!');
                     return false;
@@ -1124,6 +1205,7 @@ export default {
                         color: color,// 座位类型对应的颜色
                         status: this.formAll.status,
                         //delFlag: this.formAll.delFlag,
+                        printSortId: this.formAll.printSortId
                     }
                     break;
                 }    
@@ -1264,6 +1346,65 @@ export default {
             this.handleQuery()
             this.dataProcess()
         },
+        // 批量修改优先级
+        ticketingSequenceFun(){
+            if(this.formAll.printSortIdType == 1) {
+                let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
+                for(let i=0;i<this.multipleSelection.length;i++){
+                    for(let j=0;j<this.tableDataAll.length;j++){
+                        if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                            listTabel[j] = {
+                                ...this.tableDataAll[j],
+                                printSortId: '按优先级出票'
+                            }
+                            break;
+                        }    
+                    }
+                }
+                this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
+            }else if(this.formAll.seatPriorityWay == 1){
+                let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
+                for(let i=0;i<this.multipleSelection.length;i++){
+                    for(let j=0;j<this.tableDataAll.length;j++){
+                        if(this.multipleSelection[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                            listTabel[j] = {
+                                ...this.tableDataAll[j],
+                                printSortId: this.formAll.setaPriorityNum
+                            }
+                            break;
+                        }    
+                    }
+                }
+                this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
+            }else{
+                let listTabel = JSON.parse(JSON.stringify(this.tableDataAll))
+                let listSelect = JSON.parse(JSON.stringify(this.multipleSelection))
+                if(this.formAll.seatPriorityPosition == 2) {
+                    listSelect.reverse()
+                }
+                let num = Number(this.formAll.setaPriorityNum)
+                for(let i=0;i<listSelect.length;i++){
+                    for(let j=0;j<this.tableDataAll.length;j++){
+                        if(listSelect[i].styleCss.id == this.tableDataAll[j].styleCss.id){
+                            listTabel[j] = {
+                                ...this.tableDataAll[j],
+                                printSortId: num
+                            }
+                            if(this.formAll.seatPriorityWay == 2){
+                                num = num + 1
+                            }else if(this.formAll.seatPriorityWay == 3){
+                                num = num - 1
+                            }
+                            break;
+                        }    
+                    }
+                }
+                this.tableDataAll = JSON.parse(JSON.stringify(listTabel))
+            }
+            this.formDialogVisible = false
+            this.handleQuery()
+            this.dataProcess()
+        },
         /**  批量操作  结束  */
 
         /** 筛选 */
@@ -1453,7 +1594,7 @@ export default {
     justify-content: center;
     align-items: center;
     --top-tool-h: 60px;
-    --left-tool-w: 300px
+    --left-tool-w: 350px
 }
 .sm-box-top-tool {
     width: 100%;

src/views/windowTicketSales/ticketingCollection.vue

@@ -1,142 +1,154 @@
 <template>
-    <div class="app-container app-container-me">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="订单号" label-width="80px">
-          <el-input
-            v-model="queryParams.orderId"
-            placeholder="请输入订单号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="取票码" label-width="80px">
-          <el-input
-            v-model="queryParams.qrcodeNo"
-            placeholder="请输入取票码"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="购票人手机号:" label-width="110px" prop="saleMobile">
-          <el-input
-            v-model="queryParams.saleMobile"
-            placeholder="请输入购票人手机号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="身份证号:" label-width="120px" prop="idcard">
-          <el-input
-            v-model="queryParams.idcard"
-            placeholder="请输入身份证号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          >
-            <el-button slot="append" :loading="idcardLoading" size="mini" type="primary" @click="readCert">{{ idcardLoading ? '识别中':'识别' }}</el-button>
-          </el-input>
-        </el-form-item>
-        <el-form-item label="座位号" label-width="80px">
-          <el-input
-            v-model="queryParams.seatName"
-            placeholder="请输入座位号"
-            clearable
-            style="width: 240px;"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="订单状态">
-          <el-select
-            v-model="queryParams.orderStatus"
-            placeholder="订单状态"
-            clearable
-            style="width: 100%"
-          >
-            <el-option
-              v-for="dict in dict.type.order_status_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+    <div class="app-container app-container-me" :style="{'--q-height':qHeight}">
+      <div class="app-container-query" ref="queryFormBox">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+          <el-form-item label="订单号" label-width="80px">
+            <el-input
+              v-model="queryParams.orderId"
+              placeholder="请输入订单号"
+              clearable
+              style="width: 240px;"
+              @keyup.enter.native="handleQuery"
             />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-  
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-                :disabled="multipleSelection.length == 0"
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="openMultipleSelectionVisible"
-                v-hasPermi="['windowTicketSales:ticketingCollection:print']"
-              >批量打印门票</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-  
-      <el-table 
-      ref="tables" 
-      v-loading="loading" 
-      :data="dataList" 
-      @selection-change="handleSelectionChange"
-      border>
-        <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
-        <el-table-column label="姓名" align="center" prop="name" />
-        <el-table-column label="身份证号" align="center" prop="idcard" />
-        <el-table-column label="购票人手机号" align="center" prop="saleMobile" />
-        <el-table-column label="取票码" align="center" prop="qrcodeNo" />
-        <el-table-column label="订单号" align="center" prop="orderId" />
-        <el-table-column label="剧目名称" align="center" prop="performName" />
-        <el-table-column label="票务名称" align="center" prop="goodsName" />
-        <el-table-column label="座位信息" align="center" prop="seatName" />
-        <el-table-column label="座位类型" align="center" prop="seatTypeName" />
-        <el-table-column label="节目播出日期" align="center" prop="performDate" />
-        <el-table-column label="下单时间" align="center" prop="createTime" />
-        <el-table-column label="购票渠道" align="center" prop="source">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.order_form_type" :value="scope.row.source"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="订单状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="打印次数" align="center" prop="printNum" />
-        <el-table-column label="操作" align="center" fixed="right" width="80" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
+          </el-form-item>
+          <el-form-item label="取票码" label-width="80px">
+            <el-input
+              v-model="queryParams.qrcodeNo"
+              placeholder="请输入取票码"
+              clearable
+              style="width: 240px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="购票人手机号:" label-width="110px" prop="saleMobile">
+            <el-input
+              v-model="queryParams.saleMobile"
+              placeholder="请输入购票人手机号"
+              clearable
+              style="width: 240px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="身份证号:" label-width="120px" prop="idcard">
+            <el-input
+              v-model="queryParams.idcard"
+              placeholder="请输入身份证号"
+              clearable
+              style="width: 240px;"
+              @keyup.enter.native="handleQuery"
+            >
+              <el-button slot="append" :loading="idcardLoading" size="mini" type="primary" @click="readCert">{{ idcardLoading ? '识别中':'识别' }}</el-button>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="座位号" label-width="80px">
+            <el-input
+              v-model="queryParams.seatName"
+              placeholder="请输入座位号"
+              clearable
+              style="width: 240px;"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="订单状态">
+            <el-select
+              v-model="queryParams.orderStatus"
+              placeholder="订单状态"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="dict in dict.type.order_status_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      
+      <div class="app-container-table-box">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
             <el-button
-              size="mini"
-              type="text"
-              @click="handleOpen([scope.row])"
-              v-hasPermi="['windowTicketSales:ticketingCollection:print']"
-            >打印门票</el-button>
-          </template>
-        </el-table-column>
-        <template slot="empty">
-            <div>
-                <span>未查询到相关订单，请重新输入！</span>
-            </div>
-        </template>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+                  :disabled="multipleSelection.length == 0"
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="openMultipleSelectionVisible"
+                  v-hasPermi="['windowTicketSales:ticketingCollection:print']"
+                >批量打印门票</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <div class="app-container-table-info">
+          <el-table 
+          ref="tables" 
+          height="100%"
+          v-loading="loading" 
+          :data="dataList" 
+          @selection-change="handleSelectionChange"
+          @sort-change="sortChangeFun"
+          border>
+            <el-table-column type="selection" width="55"></el-table-column>
+            <el-table-column label="序号" align="center" type="index" width="50"></el-table-column>
+            <el-table-column label="姓名" align="center" prop="name" />
+            <el-table-column label="身份证号" align="center" width="150" prop="idcard" />
+            <el-table-column label="购票人手机号" align="center" width="100" prop="saleMobile" />
+            <el-table-column label="取票码" align="center" width="100" prop="qrcodeNo" />
+            <el-table-column label="订单号" align="center" width="150" prop="orderId" />
+            <el-table-column label="剧目名称" align="center" width="100" prop="performName" />
+            <el-table-column label="票务名称" align="center" width="220" prop="goodsName" />
+            <el-table-column label="座位信息" align="center" width="100" prop="seatName" />
+            <el-table-column label="座位类型" align="center" width="150" prop="seatTypeName" />
+            <el-table-column label="节目播出日期" align="center" width="100" prop="performDate" />
+            <el-table-column label="下单时间" align="center" width="200" prop="createTime" />
+            <el-table-column label="购票渠道" align="center" prop="source">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.order_form_type" :value="scope.row.source"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.order_status_type" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="打印次数" align="center" prop="printNum" />
+            <el-table-column label="操作" align="center" fixed="right" width="80" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="handleOpen([scope.row])"
+                  v-hasPermi="['windowTicketSales:ticketingCollection:print']"
+                >打印门票</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="打印顺序" sortable="custom" align="center" width="100px" prop="printSortId" />
+            <el-table-column label="优先级" sortable="custom" align="center"  width="100px" prop="sortIndex" />
+            <template slot="empty">
+                <div>
+                    <span>未查询到相关订单，请重新输入！</span>
+                </div>
+            </template>
+          </el-table>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page-sizes="[100, 200, 300, 400]"
+            :page-size="queryParams.pageSize"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
+      </div>
+      
       <!--  批量打印顺序  -->
       <el-dialog
         title="批量打印顺序"
@@ -224,7 +236,7 @@
         // 查询参数
         queryParams: {
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 100,
           // type: undefined
           //orderStatus: "3"
         },
@@ -250,6 +262,7 @@
         dialogVisibleLoading: false,
 
         idcardLoading: false,
+        qHeight: '0px',
       };
     },
     created() {
@@ -261,6 +274,15 @@
       //this.getList();
       //this.getPrintListApi()
     },
+    mounted() {
+      this.resizeObserver = new ResizeObserver(entries => {
+        for (let entry of entries) {
+          const { width, height } = entry.contentRect;
+          this.qHeight = height + 'px'
+        }
+      });
+      this.resizeObserver.observe(this.$refs.queryFormBox);
+    },
     activated() {
       if(this.$route.query&&this.$route.query.orderId) {
         this.$set(this.queryParams,'orderId',this.$route.query.orderId)
@@ -273,7 +295,13 @@
         this.loading = true;
         pageList(this.queryParams)
         .then(response => {
-            this.dataList = response.data.rows;
+            let list = response.data.rows;
+            list.forEach((item,index)=>{
+              let num = item.printSortId == '按优先级出票' ? index : item.printSortId
+              item.printSortId = index
+              item.sortIndex = index
+            })
+            this.dataList = list
             this.total = response.data.total;
             this.loading = false;
             console.log("this.multipleSelection=====",this.multipleSelection)
@@ -506,8 +534,87 @@
           this.idcardLoading = false
           //return result;
             console.log(result,obj)
+        },
+        sortChangeFun (row) {
+          console.log("row=====",row)
+          if(this.dataList.length == 0) return
+          let list = JSON.parse(JSON.stringify(this.dataList))
+          if(row.order == 'descending') {
+            list.sort((a,b)=>{
+              return a[row.prop] - b[row.prop]
+            })
+          }else {
+            list.sort((a,b)=>{
+              return b[row.prop] - a[row.prop]
+            })
           }
+          this.dataList = list
         }
+    },
+        
         
   };
-  </script>
+  </script>
+  <style lang="scss" scoped>
+
+  .upload-btn {
+    width: 100px;
+    height: 100px;
+    background-color: #fbfdff;
+    border: dashed 1px #c0ccda;
+    border-radius: 5px;
+    i {
+      font-size: 30px;
+      margin-top: 20px;
+    }
+    &-text {
+      margin-top: -10px;
+    }
+  }
+  .avatar {
+    cursor: pointer;
+  }
+.app-container {
+  height: calc( 100vh - 110px );
+  box-sizing: border-box;
+}
+.app-container-query {
+  
+}
+.app-container-table-box {
+  height: calc( 100% - var(--q-height) );
+  .app-container-table-info {
+    height: calc( 100% - 100px );
+  }
+}
+
+.upload-box {
+  ::v-deep .el-upload--picture-card {
+    display: none;
+  }
+} 
+
+::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 100px;
+    height: 100px;
+    line-height: 100px;
+    text-align: center;
+  }
+  ::v-deep .avatar {
+    width: 100px;
+    height: 100px;
+    display: block;
+  }
+</style>