Dung Diego

up

...@@ -52,25 +52,39 @@ ...@@ -52,25 +52,39 @@
52 <input type="file" ref="pdf" accept=".pdf" style="display:none" @change="upload_pdf"> 52 <input type="file" ref="pdf" accept=".pdf" style="display:none" @change="upload_pdf">
53 </div></div> 53 </div></div>
54 <div class="row mt-3"> 54 <div class="row mt-3">
55 - <div class="col" v-for="(value, key) in order"> 55 + <div
56 - <span>@{{ key }} @{{ value }}</span> 56 + class="col"
57 + v-for="field in mst_field.filter(f => [0, 3].includes(f.field_type))"
58 + :key="field.field_name"
59 + >
60 + <strong>@{{ field.name }}</strong> :
61 + @{{ row[field.field_name] }}
57 </div> 62 </div>
58 </div> 63 </div>
59 - <div class="row mt-3" v-if="table.length"> 64 + <div class="row mt-3" >
60 <div class="col"> 65 <div class="col">
61 - <table> 66 + <table class="table table-bordered">
62 <thead> 67 <thead>
63 <tr> 68 <tr>
64 - <th v-for="(value, key) in table[0]" :key="key"> 69 + <th
65 - @{{ key }} 70 + v-for="field in mst_field.filter(f => [1, 2].includes(f.field_type))"
71 + :key="field.field_name"
72 + >
73 + @{{ field.name }}
66 </th> 74 </th>
67 </tr> 75 </tr>
68 </thead> 76 </thead>
69 77
70 <tbody> 78 <tbody>
71 - <tr v-for="(item, index) in table" :key="index"> 79 + <tr
72 - <td v-for="(value, key) in table[0]" :key="key"> 80 + v-for="(item, index) in table"
73 - @{{ item[key] }} 81 + :key="index"
82 + >
83 + <td
84 + v-for="field in mst_field.filter(f => [1, 2].includes(f.field_type))"
85 + :key="field.field_name"
86 + >
87 + @{{ item[field.field_name] }}
74 </td> 88 </td>
75 </tr> 89 </tr>
76 </tbody> 90 </tbody>
......