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

src/pages/studyAbroad/employment.vue

@@ -15,8 +15,9 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
-        separator="none" :data="dataList" :columns="columns" row-key="name">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
+        row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">就业信息</div>
           <q-space />
@@ -26,9 +27,8 @@
         </template>
         <template v-slot:body="props">
           <q-tr :props="props">
-
             <template v-for="col in props.cols">
-              <q-td v-if="col.name == 'Name'">
+              <q-td v-if="col.name == 'Name'" style="width:200px;">
                 {{col.value}}
               </q-td>
               <q-td v-else-if="col.name == 'SupplierName'">
@@ -40,6 +40,12 @@
                   </a>
                 </div>
               </q-td>
+              <q-td v-if="col.name=='SuggestPrice'">
+                {{col.value}}
+              </q-td>
+              <q-td v-if="col.name=='SellPrice'">
+                {{col.value}}
+              </q-td>
               <q-td v-if="col.name == 'PreferentialList'" style="padding-right:0px">
                 <div v-for="x in col.value">
                   <div class="border-bottom" v-if="x.PriceDiscountType == 1">
@@ -58,13 +64,12 @@
                     暂无优惠政策
                   </div>
                 </div>
-                <div v-if="!props.value || props.value.length == 0">
+                <div v-if="!col.value || col.value.length == 0">
                   <div class="remark-font">暂无优惠政策</div>
                 </div>
               </q-td>
-
               <q-td v-else-if="col.name == 'PreferentialListSellCommission'" style="padding-right:0px;padding-left:0px">
-                <div v-for="x in props.value">
+                <div v-for="x in col.value">
                   <div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
                     :class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
                     {{ x.SaleCommissionType == 1 ? "￥" : ""
@@ -75,13 +80,12 @@
                     <div class="remark-font">暂无佣金信息</div>
                   </div>
                 </div>
-                <div v-if="!props.value || props.value.length == 0">
+                <div v-if="!col.value || col.value.length == 0">
                   <div class="remark-font">暂无佣金信息</div>
                 </div>
               </q-td>
-
               <q-td v-else-if="col.name == 'PreferentialListB2BCommission'" style="padding-left:0px">
-                <div v-for="x in props.value">
+                <div v-for="x in col.value">
                   <div class="border-bottom" style="padding-left: 16px"
                     :class="{ 'text-red': x.B2BCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
                     {{ x.B2BCommissionType == 1 ? "￥" : ""
@@ -92,11 +96,14 @@
                     <div class="remark-font">暂无佣金信息</div>
                   </div>
                 </div>
-                <div v-if="!props.value || props.value.length == 0">
+                <div v-if="!col.value || col.value.length == 0">
                   <div class="remark-font">暂无佣金信息</div>
                 </div>
               </q-td>
-              <q-td v-else-if="col.name == 'Id'">
+              <q-td v-if="col.name=='SaleStateName'">
+                {{col.value}}
+              </q-td>
+              <q-td v-else-if="col.name == 'Id'" style="width:200px;">
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                   @click="EditStudy(props.row)" />
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
@@ -108,11 +115,10 @@
           </q-tr>
           <q-tr :props="props">
             <q-td colspan="100%" class="bg-grey-2">
-              <div class="flex row items-start">
-                <q-badge color="negative" class="q-mr-md">
-                  备注：
-                </q-badge>
-                <div>{{props.row.Remark}}}</div>
+              <div style="display:flex;">
+                <div style="flex-shrink:0">备注：</div>
+                <div style="width:100%;word-break:break-all;word-wrap:break-word;white-space:normal">
+                  {{props.row.Remark}}</div>
               </div>
             </q-td>
           </q-tr>

src/pages/studyAbroad/studyabroad.vue

@@ -15,8 +15,10 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
-        separator="none" :data="dataList" :columns="columns" row-key="name">
+
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
+        row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">留学信息</div>
           <q-space />
@@ -24,9 +26,14 @@
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增留学" @click="EditStudy(null)" />
           </div>
         </template>
-        <template v-slot:body-cell-SupplierName="props">
-          <q-td>
-            <div>{{props.row.SupplierName}}</div>
+        <template v-slot:body="props">
+          <q-tr :props="props">
+            <template v-for="col in props.cols">
+              <q-td v-if="col.name == 'Name'" style="width:200px;">
+                {{col.value}}
+              </q-td>
+              <q-td v-else-if="col.name == 'SupplierName'">
+                <div>{{col.value}}</div>
                 <div>
                   <a :href="props.row.SupplierContract" style="color:#2961FE;text-decoration:none;"
                     v-if="props.row.SupplierContract" target="_blank">
@@ -34,10 +41,14 @@
                   </a>
                 </div>
               </q-td>
-        </template>
-        <template v-slot:body-cell-PreferentialList="props">
-          <q-td :props="props" style="padding-right:0px">
-            <div v-for="x in props.value">
+              <q-td v-if="col.name=='SuggestPrice'">
+                {{col.value}}
+              </q-td>
+              <q-td v-if="col.name=='SellPrice'">
+                {{col.value}}
+              </q-td>
+              <q-td v-if="col.name == 'PreferentialList'" style="padding-right:0px">
+                <div v-for="x in col.value">
                   <div class="border-bottom" v-if="x.PriceDiscountType == 1">
                     买{{ x.BuyNum }}送{{ x.SendNum }}
                   </div>
@@ -54,14 +65,12 @@
                     暂无优惠政策
                   </div>
                 </div>
-            <div v-if="!props.value || props.value.length == 0">
+                <div v-if="!col.value || col.value.length == 0">
                   <div class="remark-font">暂无优惠政策</div>
                 </div>
               </q-td>
-        </template>
-        <template v-slot:body-cell-PreferentialListSellCommission="props">
-          <q-td :props="props" style="padding-right:0px;padding-left:0px">
-            <div v-for="x in props.value">
+              <q-td v-else-if="col.name == 'PreferentialListSellCommission'" style="padding-right:0px;padding-left:0px">
+                <div v-for="x in col.value">
                   <div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
                     :class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
                     {{ x.SaleCommissionType == 1 ? "￥" : ""
@@ -72,16 +81,14 @@
                     <div class="remark-font">暂无佣金信息</div>
                   </div>
                 </div>
-            <div v-if="!props.value || props.value.length == 0">
+                <div v-if="!col.value || col.value.length == 0">
                   <div class="remark-font">暂无佣金信息</div>
                 </div>
               </q-td>
-        </template>
-        <template v-slot:body-cell-PreferentialListB2BCommission="props">
-          <q-td :props="props" style="padding-left:0px">
-            <div v-for="x in props.value">
-              <div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.B2BCommissionType == 1 }"
-                v-if="x.PriceDiscountType != 0">
+              <q-td v-else-if="col.name == 'PreferentialListB2BCommission'" style="padding-left:0px">
+                <div v-for="x in col.value">
+                  <div class="border-bottom" style="padding-left: 16px"
+                    :class="{ 'text-red': x.B2BCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
                     {{ x.B2BCommissionType == 1 ? "￥" : ""
                   }}{{ x.B2BCommissionMoney
                   }}{{ x.B2BCommissionType == 0 ? "%" : "" }}
@@ -90,13 +97,14 @@
                     <div class="remark-font">暂无佣金信息</div>
                   </div>
                 </div>
-            <div v-if="!props.value || props.value.length == 0">
+                <div v-if="!col.value || col.value.length == 0">
                   <div class="remark-font">暂无佣金信息</div>
                 </div>
               </q-td>
-        </template>
-        <template v-slot:body-cell-Id="props">
-          <q-td :props="props">
+              <q-td v-if="col.name=='SaleStateName'">
+                {{col.value}}
+              </q-td>
+              <q-td v-else-if="col.name == 'Id'" style="width:200px;">
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
                   @click="EditStudy(props.row)" />
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
@@ -105,6 +113,17 @@
                   style="font-weight:400" label="申请审核" @click="applyApply(props.row)" />
               </q-td>
             </template>
+          </q-tr>
+          <q-tr :props="props">
+            <q-td colspan="100%" class="bg-grey-2">
+              <div style="display:flex;">
+                <div style="flex-shrink:0">备注：</div>
+                <div style="width:100%;word-break:break-all;word-wrap:break-word;white-space:normal">
+                  {{props.row.Remark}}</div>
+              </div>
+            </q-td>
+          </q-tr>
+        </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount"
             :input="true" @input="changePage" />
@@ -197,12 +216,6 @@
             align: "left",
             field: row => row.PreferentialList
           },
-          {
-            name: 'Remark',
-            label: '备注',
-            field: 'Remark',
-            align: 'left'
-          },
           {
             name: 'SaleStateName',
             label: '销售状态',