Dung Diego

up

...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 class OcrController extends Controller 12 class OcrController extends Controller
13 { 13 {
14 public function index(Request $request){ 14 public function index(Request $request){
15 - return view('dashboard',['ocr'=>[],'mst_field'=>MstField::get()]); 15 + return view('dashboard',['ocr'=>[],'mst_template'=>[],'mst_field'=>MstField::get(),]);
16 } 16 }
17 public function show_pdf(Request $request) 17 public function show_pdf(Request $request)
18 { 18 {
......
...@@ -54,8 +54,16 @@ ...@@ -54,8 +54,16 @@
54 <div class="row mt-3"> 54 <div class="row mt-3">
55 <div 55 <div
56 class="col" 56 class="col"
57 + v-for="(k,v) in mst_template"
58 + >
59 + <strong>@{{ k }}</strong> :
60 + @{{ v }}
61 + </div>
62 + </div>
63 + <div class="row mt-3">
64 + <div
65 + class="col"
57 v-for="field in mst_field.filter(f => [0, 3].includes(f.field_type))" 66 v-for="field in mst_field.filter(f => [0, 3].includes(f.field_type))"
58 - :key="field.field_name"
59 > 67 >
60 <strong>@{{ field.name }}</strong> : 68 <strong>@{{ field.name }}</strong> :
61 @{{ order[field.field_name] }} 69 @{{ order[field.field_name] }}
...@@ -68,7 +76,6 @@ ...@@ -68,7 +76,6 @@
68 <tr> 76 <tr>
69 <th 77 <th
70 v-for="field in mst_field.filter(f => [1, 2].includes(f.field_type))" 78 v-for="field in mst_field.filter(f => [1, 2].includes(f.field_type))"
71 - :key="field.field_name"
72 > 79 >
73 @{{ field.name }} 80 @{{ field.name }}
74 </th> 81 </th>
...@@ -82,7 +89,6 @@ ...@@ -82,7 +89,6 @@
82 > 89 >
83 <td 90 <td
84 v-for="field in mst_field.filter(f => [1, 2].includes(f.field_type))" 91 v-for="field in mst_field.filter(f => [1, 2].includes(f.field_type))"
85 - :key="field.field_name"
86 > 92 >
87 @{{ item[field.field_name] }} 93 @{{ item[field.field_name] }}
88 </td> 94 </td>
...@@ -106,6 +112,7 @@ ...@@ -106,6 +112,7 @@
106 ocr_window : null, 112 ocr_window : null,
107 order:{},table:[], 113 order:{},table:[],
108 mst_field:{!! json_encode($mst_field) !!}, 114 mst_field:{!! json_encode($mst_field) !!},
115 + mst_template:{!! json_encode($mst_template) !!},
109 }, 116 },
110 mounted() { 117 mounted() {
111 }, 118 },
......