Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/studyAbroad/supplier.vue

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">供应商信息</div>
@@ -18,6 +18,11 @@
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增供应商" @click="EditSupplier(null)" />
           </div>
         </template>
+        <template v-slot:body-cell-LinkAddress="props">
+          <q-td>
+            <div style="width:300px;white-space:normal; word-break:break-all;">{{props.row.LinkAddress}}</div> 
+          </q-td>
+        </template>
         <template v-slot:body-cell-Id="props">
           <q-td :props="props">
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"