snow пре 2 година
родитељ
комит
5f01a24dff

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
dist/static/js/0.js


+ 5 - 0
src/views/serviceParam/paymentChannelGrossProfit/columns.js

@@ -20,6 +20,11 @@ export const categoryColumns = [
     prop: 'cat_name',
     label: '一级分类名称'
   },
+  {
+    prop: 'channel_name',
+    label: '支付渠道名称',
+    _slot_: 'channel_name'
+  },
   {
     prop: 'rate',
     label: '支付渠道毛利率',

+ 113 - 113
src/views/serviceParam/paymentChannelGrossProfit/index.vue

@@ -1,123 +1,118 @@
 <template>
  <div class="sort pagePadding" style="padding-right: 20px;">
-     <div class="table__wrapper" v-if="powers.some((i) => i == '001')">
-      <ex-table
-        ref="paymentChannelRef"
-        class="fl"
-        style="width:48%"
-        v-loading="loadings.paymentChannel"
-        :table="table"
-        :data="datas.paymentChannel"
-        :columns="paymentChannelColumns"
-        :page="pageInfo.paymentChannel"
-        :size="size"
-        :row-key="row => row.id"
-        @page-curr-change="handlePageChange"
-        @page-size-change="handleSizeChange"
-        @screen-reset="
-          pageInfo.paymentChannel.curr = 1;
-          parmValue.paymentChannel.page = 1;
-          onSearchPaymentChannelGrossProfit();
-        "
-        @screen-submit="
-          pageInfo.paymentChannel.curr = 1;
-          parmValue.paymentChannel.page = 1;
-          onSearchPaymentChannelGrossProfit();
-        "
-      >
-        <template #selection="{scope}">
-            <el-radio  v-model="selectedRow" :label="scope.row"><i></i></el-radio>
-        </template>
+    <div class="table__wrapper" v-if="powers.some((i) => i == '001')">
+      <div style="width:49%;margin-top:10px;">
+        <div style="width: 100%;height:40px">
+         <div style="display:inline-flex;align-items: center;">
+           <p style="text-align:right;margin-right: 10px;width:160px">支付渠道名称:</p>
+           <el-input 
+             size="mini" 
+             placeholder="支付渠道名称"
+             v-model="parmValue.paymentChannel['channel_name']"
+             clearable
+             @change="pageInfo.paymentChannel.curr = 1;parmValue.paymentChannel.page = 1;onSearchPaymentChannelGrossProfit()" 
+           />
+         </div>
 
-        <template #table-header="{}">
-          <div style="width: 100%">
-              <div style="display:inline-flex;align-items: center;">
-                <p style="text-align:right;margin-right: 10px;width:160px">支付渠道名称:</p>
-                <el-input 
-                  size="mini" 
-                  placeholder="支付渠道名称"
-                  v-model="parmValue.paymentChannel['channel_name']"
-                  clearable
-                  @change="pageInfo.paymentChannel.curr = 1;parmValue.paymentChannel.page = 1;onSearchPaymentChannelGrossProfit()" 
-                />
-              </div>
-              
-              <div class="fr">
-                <el-button size="mini" type="primary" @click="onSearchPaymentChannelGrossProfit">刷新</el-button>
-              </div>
-            </div>
-          </template>
-      </ex-table>
+         <div class="fr">
+           <el-button size="mini" type="primary" @click="onSearchPaymentChannelGrossProfit">刷新</el-button>
+         </div>
+        </div>
+          <div class="table-wrapper">
+            <ex-table
+              ref="paymentChannelRef"
+              v-loading="loadings.paymentChannel"
+              :table="table"
+              :data="datas.paymentChannel"
+              :columns="paymentChannelColumns"
+              :page="pageInfo.paymentChannel"
+              :size="size"
+              :row-key="row => row.id"
+              @page-curr-change="handlePageChange"
+              @page-size-change="handleSizeChange"
+              @screen-reset="
+                pageInfo.paymentChannel.curr = 1;
+                parmValue.paymentChannel.page = 1;
+                onSearchPaymentChannelGrossProfit();
+              "
+              @screen-submit="
+                pageInfo.paymentChannel.curr = 1;
+                parmValue.paymentChannel.page = 1;
+                onSearchPaymentChannelGrossProfit();
+              "
+            >
+              <template #selection="{scope}">
+                  <el-radio  v-model="selectedRow" :label="scope.row"><i></i></el-radio>
+              </template>
+            </ex-table>
+          </div>
+      </div>
 
-      <ex-table
-       class="fr"
-        v-loading="loadings.category"
-        style="width:49%"
-        v-if="powers.some((i) => i == '001')"
-        :table="table"
-        :data="datas.category"
-        :columns="categoryColumns"
-        :page="pageInfo.category"
-        :size="size"
-        :noPagination="true"
-        @page-curr-change="value => handlePageChange(value,true)"
-        @page-size-change="value => handleSizeChange(value,true)"
-        @screen-reset="
-          pageInfo.category.curr = 1;
-          parmValue.category.page = 1;
-          onSearchcategorylist();
-        "
-        @screen-submit="
-          pageInfo.category.curr = 1;
-          parmValue.category.page = 1;
-          onSearchcategorylist();
-        "
-      >
-        <template #table-header="{}">
-            <div style="width:100%">
-              <div style="display:inline-flex;align-items: center;">
-                <p style="text-align:right;margin-right: 10px;width:160px">一级分类名称:</p>
-                <el-input size="mini" 
-                   v-model="parmValue.category['cat_name']"
-                   placeholder="一级分类名称" 
-                   clearable
-                  @change=" 
-                    pageInfo.category.curr = 1;
-                    parmValue.category.page = 1;
-                    onSearchcategorylist()" 
-                 />
-              </div>
 
-              <div class="fr">
-                <el-button size="mini" @click="parmValue.category.cat_name = '';onSearchcategorylist()">重置</el-button>
-                <el-button size="mini" type="primary" @click="onSearchcategorylist">刷新</el-button>
-              </div>
-            </div>
-        </template>
+      <div style="width:49%;margin-top:10px">
+         <div style="width:100%;height:40px">
+           <div style="display:inline-flex;align-items: center;">
+             <p style="text-align:right;margin-right: 10px;width:160px">一级分类名称:</p>
+             <el-input size="mini" 
+                v-model="parmValue.category['cat_name']"
+                placeholder="一级分类名称" 
+                clearable
+               @change=" 
+                 pageInfo.category.curr = 1;
+                 parmValue.category.page = 1;
+                 onSearchcategorylist()" 
+              />
+           </div>
 
-        <template #rate="{scope}">
-          {{Number(scope.row.rate).toFixed(2)}}%
-        </template>
+           <div class="fr">
+             <el-button size="mini" @click="parmValue.category.cat_name = '';onSearchcategorylist()">重置</el-button>
+             <el-button size="mini" type="primary" @click="onSearchcategorylist">刷新</el-button>
+           </div>
+         </div>
+         <div class="table-wrapper">
+           <ex-table
+               v-loading="loadings.category"
+               v-if="powers.some((i) => i == '001')"
+               :table="table"
+               :data="datas.category"
+               :columns="categoryColumns"
+               :page="pageInfo.category"
+               :size="size"
+               :noPagination="true"
+               @page-curr-change="value => handlePageChange(value,true)"
+               @page-size-change="value => handleSizeChange(value,true)"
+               @screen-reset="
+                 pageInfo.category.curr = 1;
+                 parmValue.category.page = 1;
+                 onSearchcategorylist();
+               "
+               @screen-submit="
+                 pageInfo.category.curr = 1;
+                 parmValue.category.page = 1;
+                 onSearchcategorylist();
+               "
+             >
+               <template #rate="{scope}">
+                 {{Number(scope.row.rate).toFixed(2)}}%
+               </template>
 
-        <template #operation="{ scope }">
-          <!-- <el-tooltip
-            v-if="powers.some((i) => i == '007')"
-            effect="dark"
-            content="查看"
-            placement="top"
-          >
-            <i class="el-icon-view tb-icon" @click="setRate(scope.row, actionTypes.PREVIEW)"></i>
-          </el-tooltip> -->
-          <el-tooltip
-            v-if="powers.some((i) => i == '005')"
-            effect="dark"
-            content="修改"
-            placement="top"
-          >
-            <i class="el-icon-edit tb-icon" @click="setRate(scope.row,actionTypes.UPDATE)"></i>
-          </el-tooltip>
-       </template>
-      </ex-table>
+               <template #channel_name>
+                 {{selectedRow.channel_name}}
+               </template>
+
+               <template #operation="{ scope }">
+                 <el-tooltip
+                   v-if="powers.some((i) => i == '005')"
+                   effect="dark"
+                   content="修改"
+                   placement="top"
+                 >
+                   <i class="el-icon-edit tb-icon" @click="setRate(scope.row,actionTypes.UPDATE)"></i>
+                 </el-tooltip>
+              </template>
+            </ex-table>
+         </div>
+      </div>
      </div>
 
     <no-auth v-else />
@@ -461,6 +456,11 @@ export default {
   gap: 20px;
 }
 
+.table-wrapper{
+  height: calc(100vh - 120px);
+  overflow-x: auto;
+}
+
 .sort {
   .my-breadcrumb {
     .my-breadcrumb-item {

Неке датотеке нису приказане због велике количине промена