no message

src/components/common/mixins/userMixin.js

-// 用户数据通用 Mixin
+// 用户相关数据通用 Mixin
 export const userMixin = {
   data() {
     return {

src/components/cruiseShip/list/cruiseShipOrderList.vue

@@ -141,7 +141,7 @@
 
       <!-- 抽屉插槽 -->
       <template slot="drawer" slot-scope="{ visible, close }">
-        <CruiseShipInfo v-if="visible&&userInfo.SimpleEasy==1&&ShowType==1" 
+        <CruiseShipInfo v-if="visible&&ShowType==1" 
         :isDrawerMode="true" :details="selectedSpotData"
         @close="close" @save-success="handleSaveSuccess"/>
 
@@ -336,6 +336,7 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, Offset) {
+
       if ((num == 2 || num == 3) && (row.Income+row.PlatformMoney) <= 0) {
         this.Info(this.$t('objFill.qinxianzhidanzaizhicbtkdj'))
         return
@@ -362,6 +363,8 @@ export default {
       }
       if (Offset) {
         this.ShowType = 6
+      }else{
+        this.ShowType = 0
       }
       query = {
         blank: "y",

src/components/cruiseShip/supplier/cruiseSupplierConfig.js

-// 邮轮列表配置
-export const scenicSpotListConfig = {
-  // 表格基础配置
-  tableConfig: {
-    height: '100%',
-    border: true,
-    stripe: true,
-    size: 'mini',
-    'empty-text': '暂无邮轮数据'
-  },
-
-  // 分页配置
-  paginationConfig: {
-    background: true,
-    layout: 'total, sizes, prev, pager, next, jumper',
-    'pager-count': 7,
-    'hide-on-single-page': false,
-    'page-sizes': [10, 14, 20, 25, 50, 100],
-    'page-size': 14,
-    'current-page': 1,
-    small: false,
-    disabled: false,
-    'prev-text': '',
-    'next-text': '',
-    total: 0
-  },
-
-  // 分页默认配置
-  defaultPagination: {
-    currentPage: 1,
-    pageSize: 14,
-    total: 0,
-    pageSizes: [10, 14, 20, 25, 50, 100]
-  },
-
-  // 列配置工厂函数
-  createColumns: (options = {}) => [
-    {
-      id: 'scenic-name-column',
-      label: '邮轮名称',
-      prop: 'Name',
-      minWidth: 150,
-      // fixed: 'left',
-      type: 'link',
-      slotName: 'scenicName',
-      filter: {
-        type: 'input',
-        key: 'NameFilter',
-        placeholder: '输入邮轮名称'
-      }
-    },
-    {
-      id: 'city-column',
-      label: '城市',
-      prop: 'CityName',
-      minWidth: 100,
-      slotName: 'cityName',
-      filter: {
-        type: 'select',
-        key: 'CityFilter',
-        placeholder: '选择城市',
-        searchable: true,
-        multiple: true,
-        options: options.cityList || []
-      }
-    },
-    {
-      id: 'ticket-type-column',
-      label: '邮轮类型',
-      prop: 'TicketTypeName',
-      minWidth: 120,
-      slotName: 'ticketType',
-      filter: {
-        type: 'select',
-        key: 'TicketTypeFilter',
-        placeholder: '选择邮轮类型',
-        multiple: true,
-        options: options.ticketTypeList || []
-      }
-    },
-
-    {
-      label: '邮轮名称英文',
-      prop: 'RealName',
-      minWidth: 150,
-      slotName: 'realName',
-      emptyText: '-',
-      filter: {
-        type: 'input',
-        key: 'EnNameFilter',
-        placeholder: '输入邮轮英文名称'
-      }
-    },
-    {
-      label: '营业时间',
-      prop: 'OpeningHours',
-      minWidth: 150,
-      slotName: 'businessHours',
-      emptyText: '-'
-    },
-    {
-      label: '最后更新时间',
-      prop: 'UpdateDate',
-      minWidth: 150,
-      slotName: 'updateDate',
-      emptyText: '-'
-    },
-    {
-      label: '状态',
-      prop: 'Status',
-      minWidth: 80,
-      slotName: 'status',
-      filter: {
-        type: 'select',
-        key: 'StatusFilter',
-        placeholder: '选择状态',
-        options: [
-          { label: '正常', value: '0' },
-          { label: '删除', value: '1' }
-        ]
-      }
-    }
-  ],
-
-  // 操作列配置
-  actionColumn: {
-    label: '操作',
-    width: 120,
-    fixed: 'right'
-  },
-
-  // 高级查询配置
-  advancedSearchConfig: {
-    title: '高级查询',
-    buttonText: '高级查询',
-    width: 600,
-    fields: [
-      {
-        key: 'QCountry',
-        label: '国家',
-        type: 'select',
-        placeholder: '选择国家',
-        span: 8,
-        options: [] // 动态填充
-      },
-      {
-        key: 'QProvince',
-        label: '省份',
-        type: 'select',
-        placeholder: '选择省份',
-        span: 8,
-        options: [] // 动态填充
-      }
-    ]
-  },
-
-  // 工具操作配置
-  toolActions: [
-    // {
-    //   command: 'add',
-    //   label: '添加邮轮',
-    //   type: 'primary',
-    //   icon: 'el-icon-plus',
-    //   permission: 'scenic.add'
-    // },
-    {
-      command: 'export',
-      label: '导出数据',
-      icon: 'el-icon-download',
-      permission: 'scenic.export'
-    },
-    {
-      command: 'importData',
-      label: '导入数据',
-      icon: 'el-icon-upload2',
-      permission: 'scenic.import'
-    },
-    {
-      command: 'refresh',
-      label: '刷新',
-      icon: 'el-icon-refresh',
-      type: 'default'
-    },
-    {
-      command: 'clearFilters',
-      label: '清除筛选',
-      icon: 'el-icon-delete',
-      type: 'warning'
-    }
-  ],
-
-  // 抽屉配置
-  drawerConfig: {
-    title: '邮轮信息',
-    size: '90%',
-    direction: 'rtl'
-  },
-
-  // API 配置
-  apiConfig: {
-    list: 'ticketcoupons_post_GetPageList',
-    delete: 'ticketcoupons_post_Remove',
-    export: 'dmcstatistics_post_GetTicketCouponsExport',
-    import: 'ticketcoupons_post_ImportData',
-    countryList: 'dict_post_Destination_GetCountry',
-    provinceList: 'dict_post_Destination_GetChildList',
-    employeeList: 'admin_get_EmployeeGetList',
-    ticketTypeList: 'ticketcoupons_get_GetBYTicketTypeEnumList',
-    batchDelete: 'ticketcoupons_post_BatchRemove',
-    uploadTemplate: 'file_post_UploadTemplate',
-    cityList:'dict_post_Destination_GetCityList'
-  },
-
-  // 默认查询参数
-  defaultQueryParams: {
-    pageIndex: 1,
-    pageSize: 14,
-    Name: "",
-    QCountry: "",
-    QProvince: "",
-    QCity: "",
-    QDistrict: "",
-    Status: "0",
-    TicketType: "-1",
-    UpdateBy: 0,
-    SelectType: 1
-  },
-
-  // 分页配置工具方法
-  createPaginationConfig: (options = {}) => ({
-    ...scenicSpotListConfig.paginationConfig,
-    ...options
-  }),
-
-  // 验证分页参数
-  validatePaginationParams: (pageIndex, pageSize, total) => {
-    const validPageSizes = [10, 14, 20, 25, 50, 100]
-    const normalizedPageSize = validPageSizes.includes(pageSize) ? pageSize : 14
-    const maxPage = total > 0 ? Math.ceil(total / normalizedPageSize) : 1
-    const normalizedPageIndex = Math.max(1, Math.min(pageIndex, maxPage))
-
-    return {
-      pageIndex: normalizedPageIndex,
-      pageSize: normalizedPageSize,
-      isValid: pageIndex === normalizedPageIndex && pageSize === normalizedPageSize
-    }
-  }
-}
-
-// 导出默认配置
-export default scenicSpotListConfig
-
-// 导出分页配置工具方法
-export const createPaginationConfig = scenicSpotListConfig.createPaginationConfig
-export const validatePaginationParams = scenicSpotListConfig.validatePaginationParams

src/router/config.js

@@ -1913,14 +1913,6 @@ export default {
                 title: '邮轮订单OP'
               },
             },
-            {
-              path: '/cruiseShipSupplier',
-              name: 'cruiseShipSupplier',
-              component: resolve => require(['@/components/cruiseShip/supplier/cruiseShipSupplier'], resolve),
-              meta: {
-                title: '邮轮供应商'
-              },
-            },
             {
               path: '/TicketManager', //机票列表
               name: 'TicketManager',