浏览代码

修改冲突

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'