Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

package.json

@@ -100,6 +100,7 @@
     "vue-meta": "2.4.0",
     "vue-okr-tree": "^1.0.17",
     "vue-pdf-embed": "1",
+    "vue-plugin-hiprint": "^0.0.56",
     "vue-print-nb": "^1.7.5",
     "vue-property-decorator": "^9.1.2",
     "vue-resize-sensor": "^2.0.0",

src/views/emis/emisPrintTpl/designerPanel.vue

@@ -1,6 +1,6 @@
 <template>
   <div >
-
+    <KrPrintDesigner ref="printDesigner" :temp-value="value" :widget-options="widgets" @save="handleSave" />
   </div>
 </template>
 
@@ -10,18 +10,17 @@
 </template> -->
 <script>
 import { listEmisPrintTpl, getEmisPrintTpl, delEmisPrintTpl, addEmisPrintTpl, updateEmisPrintTpl } from "@/api/emis/emisPrintTpl";
-// import KrPrintDesigner from "@/components/PrintDesigner/index.vue";
-// import "kr-print-designer/lib/kr-print-designer.css";
-// KrPrintDesigner
+import KrPrintDesigner from "@/components/PrintDesigner/index.vue";
+import "@/components/PrintDesigner/assets/style/index.scss";
 
-import { OutStockOptions, InStockOptions } from './data/options'
+import { OutStockOptions, InStockOptions } from '@/views/emis/emisPrintTpl/data/options.js'
 export default {
   props:{
     id:{
         type:[Number,Array]
     }
   },
-  components: {  },
+  components: { KrPrintDesigner },
   data() {
     return {
        // 遮罩层