修改

src/pages/queryReport/salesQuery.vue

@@ -247,14 +247,6 @@
           fixed="left"
         >
           <template slot-scope="scope">
-            <div class="order-info-item">
-              <el-tag
-                type="primary"
-                size="small"
-              >
-                {{ scope.row.firstTicketTypeName }}
-              </el-tag>
-            </div>
             <div class="order-info-item">
               <div class="label">订单号：</div>
               <div class="value">{{ scope.row.orderNo }}</div>
@@ -272,6 +264,13 @@
             </el-tag> -->
           </template>
         </el-table-column>
+        <el-table-column
+          width="160"
+          prop="firstTicketTypeName"
+          show-overflow-tooltip
+          label="票种"
+        >
+        </el-table-column>
         <!-- <el-table-column
           width="75"
           prop="orderCategory"
@@ -478,7 +477,7 @@
         :page-sizes="[10, 20, 50, 100]"
         :page-size="form.pageSize"
         @size-change="handleSizeChange"
-        @current-change="getOrderList()"
+        @current-change="getOrderList"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       >

src/pages/sellManage/retail/FormInfo.vue

@@ -597,8 +597,9 @@ export default {
 
   },
   mounted () {
-    EventBus.$on('ticketChanged', () => {
-      if (!this.currentTicket) return
+    EventBus.$on('ticketChanged', (ticket) => {
+      if (!ticket) return
+      this.currentTicket = ticket
 
       setTimeout(() => {
         if (this.category === 'batch' || this.isTeam) return

src/pages/ticketSetting/ticket/Dialog.vue

@@ -894,6 +894,18 @@
                     <span class="unit" style="margin-left: 20px; font-size: 16px;">{{ scope.row.splitRatio * 100 }}%</span>
                   </template>
                 </el-table-column>
+                <el-table-column
+                  label="固定金额"
+                  min-width="90">
+                  <template slot-scope="scope">
+                    <el-input-number
+                      controls-position="right"
+                      :min="0"
+                      v-model="scope.row.fixedAmount"
+                    ></el-input-number>
+                    <Tip msg="避免小数点情况 优先按照固定金额计算分账金额否则按照分账比例" style="margin-left: 10px;"></Tip>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   width="90"
                   class-name="align-item"
@@ -1425,7 +1437,8 @@ export default {
     handleAddGhSubMerchant () {
       this.form.payGonghangTicketTypeMerchantList.push({
         gonghangMerchantId: '',
-        splitRatio: 0
+        splitRatio: 0,
+        fixedAmount: ''
       })
     },
     delGhSubMerchant (index) {