Selaa lähdekoodia

添加线上支付权限

chenrui 6 kuukautta sitten
vanhempi
commit
0d77501df8

+ 6 - 6
src/config/router.config.js

@@ -217,8 +217,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '线上支付订单',
-              icon: 'rocket'
-              // permission: 'M_onlinePayOrderList'
+              icon: 'rocket',
+              permission: 'M_onlinePayOrderList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -229,8 +229,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '线上支付订单',
                   icon: 'rocket',
-                  hidden: true
-                  // permission: 'M_onlinePayOrderList'
+                  hidden: true,
+                  permission: 'M_onlinePayOrderList'
                 }
               },
               {
@@ -241,8 +241,8 @@ export const asyncRouterMap = [
                   title: '线上支付订单详情',
                   icon: 'rocket',
                   hidden: true,
-                  replaceTab: true
-                  // permission: 'M_onlinePayOrderDetail'
+                  replaceTab: true,
+                  permission: 'M_onlinePayOrderDetail'
                 }
               }
             ]

+ 4 - 11
src/views/numsGoodsShelves/onlinePayInvoice/detail.vue

@@ -98,7 +98,7 @@
             :data="loadData"
             :defaultLoadData="false"
             bordered>
-            <!-- 付款时间 -->
+            <!-- 付款时间 审核不通过/已取消/待审核 不显示付款时间-->
             <template slot="auditDateInfo" slot-scope="text, record">
               <div v-if="record.billStatus&&(record.billStatus=='WAIT_OUT_WAREHOUSE'||record.billStatus=='FINISH')">
                 {{ record.auditDate }}
@@ -140,6 +140,7 @@ export default {
     }
   },
   data () {
+    const _this = this
     return {
       spinning: false,
       disabled: false,
@@ -181,14 +182,8 @@ export default {
       },
       detailData: null, //  详情数据
       isShowBisiceInfo: false, // 显示基础内容
-      countData: null// 统计信息
-    }
-  },
-  computed: {
-    // 列定义
-    columns () {
-      const _this = this
-      const arr = [
+      countData: null, // 统计信息
+      columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '下单时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购单号', dataIndex: 'purchaseBillNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -202,8 +197,6 @@ export default {
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', scopedSlots: { customRender: 'financialStatusInfo' } },
         { title: '到账状态', dataIndex: 'receivedMoneyFlag', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
-      // 审核不通过/已取消/待审核 不显示付款时间
-      return arr
     }
   },
   methods: {

+ 5 - 29
src/views/numsGoodsShelves/withdrawalManagementNew/billFlowModal.vue

@@ -141,7 +141,7 @@ export default {
         { title: '客户名称', dataIndex: 'customerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联单号', dataIndex: 'bizOrderNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '金额', dataIndex: 'tradeAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '交易类型', dataIndex: 'tradeTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text ? '已选' : '--' } },
+        { title: '交易类型', dataIndex: 'tradeTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '交易状态', dataIndex: 'dealStateDictValue', width: '8%', align: 'center', scopedSlots: { customRender: 'status' } }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -165,8 +165,7 @@ export default {
           return data
         })
       },
-      detailData: null,
-      rowSelectionInfo: null // 已选数据
+      detailData: null // 统计
     }
   },
   methods: {
@@ -188,33 +187,10 @@ export default {
         }
       })
     },
-    // 表格选中项
-    rowSelectionFun (obj) {
-      this.rowSelectionInfo = obj || null
-    },
-    // 重新选择
-    handleReSel () {
-      this.$emit('ok', [])
-      this.resetSearchForm()
-    },
-    // 关联单据创建时间
+    //  创建时间  change
     createDateChange (date) {
-      this.queryParam.bizCreateBeginDate = date[0]
-      this.queryParam.bizCreateEndDate = date[1]
-    },
-    //  审核时间  change
-    dateChange (date) {
-      this.queryParam.auditBeginDate = date[0]
-      this.queryParam.auditEndDate = date[1]
-    },
-    // 确定
-    handleSave () {
-      if (this.totalNums) {
-        this.$emit('ok', this.rowSelectionInfo && this.rowSelectionInfo.selectedRows)
-        this.resetSearchForm()
-      } else {
-        this.$message.info('请选择单据')
-      }
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
     // 重置
     resetSearchForm () {

+ 1 - 1
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -41,7 +41,7 @@
     <!-- 申请提现 -->
     <applyWithdrawal :isOpenModal="showModal" @close="showModal=false" @refresh="getPageInfo"></applyWithdrawal>
     <!-- 交易流水 -->
-    <billFlowModal :openModal="showBillFlowModal" @close="showBillFlowModal=false" @ok="showBillFlowModal=false"></billFlowModal>
+    <billFlowModal :openModal="showBillFlowModal" @close="showBillFlowModal=false"></billFlowModal>
   </a-card>
 </template>
 

+ 4 - 4
src/views/salesManagement/onlinePayOrder/list.vue

@@ -93,7 +93,7 @@
               <a-button id="salesManagementList-reset" style="margin-left: 5px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
               <a-button
                 type="primary"
-                v-if="$hasPermissions('B_salesExport')"
+                v-if="$hasPermissions('B_onlinePayExport')"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
@@ -160,7 +160,7 @@
           bordered>
           <!-- 销售单号 -->
           <template slot="salesBillNo" slot-scope="text, record">
-            <span class="table-td-link" :id="'salesManagementList-detail-'+record.id" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+            <span class="table-td-link" :id="'salesManagementList-detail-'+record.id" v-if="$hasPermissions('M_onlinePayOrderDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
             <span v-else>{{ record.salesBillNo }}</span>
             <a-badge count="改" :number-style="{ zoom:'80%',marginLeft:'5px' }" v-if="record.billStatus=='SUPERIOR_CHANGE'"></a-badge>
           </template>
@@ -194,14 +194,14 @@
               size="small"
               type="link"
               class="button-primary"
-              v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')"
+              v-if="record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_onlinePayAudit')"
               @click="handleEexamine(record)"
             >审核</a-button>
             <a-button
               :id="'salesManagementList-outStock-'+record.id"
               size="small"
               type="link"
-              v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')"
+              v-if="record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_onlinePayStockOut')"
               class="button-primary"
               @click="handleSend(record)"
             >出库</a-button>