huang_an пре 1 година
родитељ
комит
b0507e4a75
4 измењених фајлова са 14 додато и 7 уклоњено
  1. 2 0
      package.json
  2. 7 4
      src/enum/dict.js
  3. 3 0
      src/main.js
  4. 2 3
      vue.config.js

+ 2 - 0
package.json

@@ -44,6 +44,8 @@
     "vue-countup-v2": "^4.0.0",
     "vue-echarts": "^6.2.3",
     "vue-i18n": "^8.27.2",
+    "vue-printjs": "1.0.0",
+    "vue-qr": "4.0.9",
     "vue-router": "^3.6.4",
     "vue2-ace-editor": "0.0.15",
     "vuedraggable": "^2.24.3",

+ 7 - 4
src/enum/dict.js

@@ -59,7 +59,8 @@ export default {
   预警类型: 'warning_type',
   包装强度: 'packagingStrength',
   包装密度: 'packagingDensity',
-  编码间隔符: 'codeSpaceMark'
+  编码间隔符: 'codeSpaceMark',
+  条码分类: 'strip_type'
 };
 
 export const numberList = [
@@ -84,7 +85,8 @@ export const reviewStatus = {
   3: '审核不通过'
 };
 //编码粗规则
-export const roughRule = [{
+export const roughRule = [
+  {
     label: '数字',
     value: 1
   },
@@ -104,9 +106,10 @@ export const roughRule = [{
     label: '流水码',
     value: 5
   }
-]
+];
 //编码细规则
-export const fineRule = [{
+export const fineRule = [
+  {
     label: '0-9',
     value: '1',
     pid: '1',

+ 3 - 0
src/main.js

@@ -20,6 +20,9 @@ import authSelection from '@/components/authSelection';
 Vue.component('HeaderTitle', HeaderTitle);
 Vue.component('authSelection', authSelection);
 
+import Print from 'vue-printjs';
+Vue.use(Print);
+
 // // register globally
 Vue.component('tinymce', TinymceEditor);
 import '@/icons';

+ 2 - 3
vue.config.js

@@ -33,9 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
-        // target: 'http://192.168.1.107:18086',
-        // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.125:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''