1. 优化

src/App.vue

@@ -51,7 +51,7 @@ export default {
 // }
 </style>
 <style lang="scss">
-  .app-container {
+  .app-container-scheduling {
     padding: 20px 20px 10px !important;
     .app-container_flex_auto {
       display: flex;

src/api/ticketMr/schedulingConfiguration.js

@@ -66,6 +66,16 @@ export const goodsPageList = (query) => {
   })
 }
 
+// 票务查询（新）
+
+export const goodsPageListNew = (query) => {
+  return request({
+    url: '/goods/goods/listGoodsByPerformId',
+    method: 'get',
+    params: query
+  })
+}
+
 // 销售信息
 
 export const seatTypeTmpSaleCount = (query) => {

src/main.js

@@ -46,6 +46,7 @@ import designer from '@/components/formDesigner';
 import axios from 'axios';
 import '@/utils/directives'; // 弹窗拖拽
 
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey

src/views/finance/InvoiceRecords/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container app-container-scheduling">
     <div class="app-container_flex_auto">
       <div class="app-container_form" v-show="showSearch">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
@@ -76,7 +76,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="app-container_table app-container-main" :class="showSearch ? 'mt15' : ''">
+      <div class="app-container_table" :class="showSearch ? 'mt15' : ''">
         <el-row :gutter="10" class="mb8">
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -152,7 +152,6 @@
       </div>
       <div class="app-container_table_page">
         <pagination
-          v-show="total>0"
           :total="total"
           :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize"
@@ -160,14 +159,6 @@
         />
       </div>
     </div>
-    
-
-    
-
-    
-
-    
-
     <!-- 详情 -->
     <details-dia ref="detailsDia" @getList="getList"></details-dia>
     <!-- 关联订单 -->
@@ -180,8 +171,10 @@
 import { pageList,orderInvoiceRed } from '@/api/financeMr/InvoiceRecords'
 import detailsDia from "./dialog/details.vue";
 import relatedOrders from "./dialog/relatedOrders.vue";
+import { myMixin } from "@/utils/mixin.js"
 export default {
   name: "InvoiceRecords",
+  //mixins: [myMixin],
   dicts: ['Invoicing_type','lookup_type'],
   components: { detailsDia,relatedOrders },
   data() {
@@ -293,3 +286,23 @@ export default {
   }
 };
 </script>
+<style scoped lang="scss">
+.app-container-scheduling ::v-deep .el-select__tags {
+    flex-wrap: inherit !important;
+    overflow-x: auto !important;
+}
+.app-container-scheduling ::v-deep .el-form-item__content {
+  position: relative;
+}
+.app-container-scheduling ::v-deep .el-form-item__content .query_clear{
+  position: absolute;
+  top: -15px;
+  right: -10px;
+  display: none;
+  cursor: pointer;
+  z-index: 99;
+}
+.app-container-scheduling ::v-deep .el-form-item__content:hover .query_clear {
+  display: block;
+}
+</style>

src/views/ticket/schedulingConfiguration/dialog/addAndEdit.vue

@@ -179,7 +179,7 @@
 </template>
 
 <script>
-import { saveAndEdit, goodsPageList as goodsPageListApi, } from "@/api/ticketMr/schedulingConfiguration";
+import { saveAndEdit, goodsPageListNew } from "@/api/ticketMr/schedulingConfiguration";
 import { goodsPageList } from '@/api/programmeMr/programmeMr'
 import { merchantPageList } from '@/api/performanceHallMr/performanceHallMr'
 import { pageList as getInventoryTemplateApi } from '@/api/ticketMr/InventoryTemplate'
@@ -334,8 +334,13 @@ export default {
     /**  票务信息  */
     async goodsPageListFun(value){
       try {
-        let res = await goodsPageListApi({
-          performId: value
+        if(!this.form.auditoriumId || !this.form.performId) {
+          this.goodsPageListS = []
+          return
+        }
+        let res = await goodsPageListNew({
+          performId: this.form.performId,
+          auditoriumId: this.form.auditoriumId
         })
         if(res.code == 200){
           this.goodsPageListS = res.data
@@ -357,6 +362,8 @@ export default {
           this.inventoryTemplateList = []
           return 
         } 
+        await this.goodsPageListFun(value)
+        // 获取库存模板
         let res = await getInventoryTemplateApi({
           auditoriumId: value,
           pageNum: 1,

src/views/windowTicketSales/rebook.vue

@@ -78,7 +78,7 @@
                 <el-button 
                 type="primary" 
                 @click="handleRebook(scope.row)"
-                v-if="scope.row.allowReSubmit == 1"
+                v-if="scope.row.allowReSubmit == 1 && scope.row.channelType != 'group'"
                 >改签</el-button>
               </template>
             </el-table-column>