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

src/components/FinancialModule/TradeCommission/commissionDialog.vue

@@ -13,6 +13,9 @@
 .cursor-pointer {
   cursor: pointer;
 }
+.el-pagination {
+    border: none !important;
+}
 
 </style>
 <template>
@@ -90,10 +93,13 @@
                     <td>{{item.Periods}}</td>
                     <td>{{item.Description?item.Description:'-'}}</td>
                 </tr>
+                <tr v-if="dataList.length==0">
+                    <td style="text-align:center" colspan="13">暂无数据</td>
+                </tr>
                 </table>
-                <div v-if="dataList.length==0"
+                <!-- <div v-if="dataList.length==0"
                     style="width: 100%;border:1px solid #fff;display: flex;align-items: center;justify-content: center;height: 60px;margin-top: 30px;"
-                >暂无数据</div>
+                >暂无数据</div> -->
                 <!-- 分页 -->
                 <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
                 layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>

src/router/config.js

@@ -4005,7 +4005,7 @@ export default {
             { //财务 财务单据 我的财务单据详情
               path: '/FinancialDocumentsDetail',
               name: 'FinancialDocumentsDetail',
-              component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetailSPF'], resolve),
+              component: resolve => require(['@/components/FinancialModule/FinancialDocumentsDetail'], resolve),
               meta: {
                 title: '单据详情'
               },
@@ -4110,7 +4110,7 @@ export default {
             }, { //财务 财务单据 新增财务单据 页面
               path: '/addFinancialDocuments',
               name: 'addFinancialDocuments',
-              component: resolve => require(['@/components/FinancialModule/addFinancialDocumentsSPF'], resolve),
+              component: resolve => require(['@/components/FinancialModule/addFinancialDocuments'], resolve),
               meta: {
                 title: '新增付款单据'
               },