소스 검색

修改冲突

pengyh 1 년 전
부모
커밋
7071b0805a
1개의 변경된 파일2개의 추가작업 그리고 0개의 파일을 삭제
  1. 2 0
      src/views/mallManagement/order/order_list/index.vue

+ 2 - 0
src/views/mallManagement/order/order_list/index.vue

@@ -634,6 +634,8 @@ import { cancelOrder, getList, goodsDeliver, saveRemark, batchShipment, batchRem
 import { getExpress, getCompanyList } from "@/api/common";
 import { downloadFiles, handleImport } from '@/utils/util'
 import { commonTemplateDownload } from '@/api/common.js'
+import printPreview from '../components/preview.vue'
+import { disAutoConnect, hiprint } from 'vue-plugin-hiprint'
 import import_mixin from '@/components/template/import_mixin.js'
 import * as Storage from "@/api/storage";
 import '@/styles/order-list.scss'