Bläddra i källkod

Merge branch 'master' of ssh://was.baoshi56.com:10022/var/git/bswas

eric2h 4 år sedan
förälder
incheckning
9c91991def

+ 4 - 4
resources/views/store/receivingTasks/create.blade.php

@@ -2,7 +2,7 @@
 @section('title')开单入库-创建@endsection
 @section('head')
     <link href="{{ mix('css/element-ui.css') }}" rel="stylesheet">
-    <link rel="stylesheet" href="{{ mix('css/element/index.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/element/index.css') }}">
 @endsection
 
 @section('content')
@@ -384,8 +384,8 @@
 @section('lastScript')
 
     <script type="text/javascript" src="{{mix('js/queryForm/queryForm.js')}}"></script>
-    <script type="text/javascript" src="{{ mix('js/element-ui.js') }}"></script>
-    <script type="text/javascript" src="{{mix('js/element/index.js') }}"></script>
+    <script type="text/javascript" src="{{asset('js/element-ui.js') }}"></script>
+    <script type="text/javascript" src="{{asset('js/element/index.js') }}"></script>
     <script type="text/javascript" src="{{mix('js/lodop/LodopFuncs.js')}}"></script>
 
     <script src='http://localhost:18000/CLodopfuncs.js?name=CLODOPA'></script>
@@ -786,7 +786,7 @@
                     } = this.receiving_task_print;
                     this.clodop.PRINT_INITA(2, 0, 0, 0, "");
                     this.clodop.SET_PRINT_PAGESIZE(2, '76mm', '130mm');
-                    this.clodop.ADD_PRINT_BARCODE(20, 70, 350, 50, "Code39", number);
+                    this.clodop.ADD_PRINT_BARCODE(5, 50, 480, 80, "Code39", number);
                     this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
                     this.clodop.ADD_PRINT_TEXT(100, 15, 100, 20, "收货任务号");
                     this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);

+ 1 - 1
resources/views/store/receivingTasks/index.blade.php

@@ -296,7 +296,7 @@
 
                     this.clodop.PRINT_INITA(2, 0, 0, 0, "");
                     this.clodop.SET_PRINT_PAGESIZE(2, '76mm', '130mm');
-                    this.clodop.ADD_PRINT_BARCODE(20, 70, 350, 50, "Code39", number);
+                    this.clodop.ADD_PRINT_BARCODE(5, 50, 480, 80, "Code39", number);
                     this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);
                     this.clodop.ADD_PRINT_TEXT(100, 15, 100, 20, "收货任务号");
                     this.clodop.SET_PRINT_STYLEA(0, "FontSize", 10);