lilei 3 年 前
コミット
9d166b744b

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

@@ -1187,7 +1187,7 @@ export const asyncRouterMap = [
             meta: {
               title: '资金账户管理',
               icon: 'file-protect',
-              // permission: 'M_fundAccountList'
+              permission: 'M_fundAccountList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1199,7 +1199,7 @@ export const asyncRouterMap = [
                   title: '资金账户列表',
                   icon: 'file-protect',
                   hidden: true,
-                  // permission: 'M_fundAccountList'
+                  permission: 'M_fundAccountList'
                 }
               },
               {
@@ -1211,7 +1211,7 @@ export const asyncRouterMap = [
                   icon: 'file-protect',
                   hidden: true,
                   replaceTab: true,
-                  // permission: 'M_fundAccount_detail'
+                  permission: 'M_fundAccount_detail'
                 }
               }
             ]

+ 7 - 5
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -432,11 +432,13 @@ export default {
       this.pageInit()
     }
     // 结算账户状态查询
-    this.GetSettleAccountState().then(res => {
-      if (res.status == 200) {
-        this.enableFundAccount = res.data.functionEnableFlag == 1
-      }
-    })
+    if (this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')) {
+      this.GetSettleAccountState().then(res => {
+        if (res.status == 200) {
+          this.enableFundAccount = res.data.functionEnableFlag == 1
+        }
+      })
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 7 - 5
src/views/financialManagement/expenseManagement/edit.vue

@@ -222,11 +222,13 @@ export default {
       this.pageInit()
     }
     // 结算账户状态查询
-    this.GetSettleAccountState().then(res => {
-      if (res.status == 200) {
-        this.enableFundAccount = res.data.functionEnableFlag == 1
-      }
-    })
+    if(this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')){
+    	this.GetSettleAccountState().then(res => {
+    	  if (res.status == 200) {
+    		this.enableFundAccount = res.data.functionEnableFlag == 1
+    	  }
+    	})
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 7 - 5
src/views/financialManagement/financialCollection/list.vue

@@ -443,11 +443,13 @@ export default {
       this.pageInit()
     }
     // 结算账户状态查询
-    this.GetSettleAccountState().then(res => {
-      if (res.status == 200) {
-        this.enableFundAccount = res.data.functionEnableFlag == 1
-      }
-    })
+    if(this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')){
+    	this.GetSettleAccountState().then(res => {
+    	  if (res.status == 200) {
+    		this.enableFundAccount = res.data.functionEnableFlag == 1
+    	  }
+    	})
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 7 - 5
src/views/financialManagement/financialPayment/list.vue

@@ -383,11 +383,13 @@ export default {
       this.pageInit()
     }
     // 结算账户状态查询
-    this.GetSettleAccountState().then(res => {
-      if (res.status == 200) {
-        this.enableFundAccount = res.data.functionEnableFlag == 1
-      }
-    })
+    if(this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')){
+    	this.GetSettleAccountState().then(res => {
+    	  if (res.status == 200) {
+    		this.enableFundAccount = res.data.functionEnableFlag == 1
+    	  }
+    	})
+    }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {})

+ 8 - 6
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -131,12 +131,14 @@ export default {
     },
     // 编辑信息
     setData (data) {
-      settleAccountDetail({ settleAccountSn: data.settleAccountSn }).then(res => {
-        if (res.status == '200') {
-          this.form = Object.assign(this.form, res.data || {})
-          this.isEdit = true
-        }
-      })
+      if (data && data.settleAccountSn) {
+        settleAccountDetail({ settleAccountSn: data.settleAccountSn }).then(res => {
+          if (res.status == '200') {
+            this.form = Object.assign(this.form, res.data || {})
+            this.isEdit = true
+          }
+        })
+      }
     }
   },
   watch: {

+ 14 - 12
src/views/financialManagement/fundAccountManagement/list.vue

@@ -2,7 +2,7 @@
   <div class="funAccountList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="funAccountList-page-search-wrapper">
+      <div ref="tableSearch" v-if="$hasPermissions('B_fundAccountEnable')" class="funAccountList-page-search-wrapper">
         <div>
           资金账户功能:
           <a-radio-group
@@ -22,7 +22,7 @@
       <a-card size="small" :bordered="false">
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button id="funAccountList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+          <a-button id="funAccountList-add" v-if="$hasPermissions('B_FA_New')" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
         </div>
         <!-- 列表 -->
         <s-table
@@ -41,7 +41,7 @@
             <a-button
               size="small"
               type="link"
-              v-if="record.state == 'ENABLE'||record.state == 'DISABLE'"
+              v-if="(record.state == 'ENABLE'||record.state == 'DISABLE')&&$hasPermissions('B_FA_QYJY')"
               class="button-primary"
               @click="handleEnable(record)"
               id="foundAcount-enable-btn">
@@ -51,28 +51,28 @@
             <a-button
               size="small"
               type="link"
-              v-if="record.state == 'ENABLE'||record.state == 'DISABLE'"
+              v-if="(record.state == 'ENABLE'||record.state == 'DISABLE')&&$hasPermissions('M_fundAccount_detail')"
               class="button-primary"
               @click="handleDetail(record)"
               id="foundAcount-detail-btn">资金明细</a-button>
             <a-button
               size="small"
               type="link"
-              v-if="record.state == 'WAIT'"
+              v-if="record.state == 'WAIT'&&$hasPermissions('B_FA_Audit')"
               class="button-primary"
               @click="handleAudit(record)"
               id="foundAcount-audit-btn">审核</a-button>
             <a-button
               size="small"
               type="link"
-              v-if="record.state == 'WAIT'"
+              v-if="record.state == 'WAIT'&&$hasPermissions('B_FA_Edit')"
               class="button-primary"
               @click="handleEdit(record)"
               id="foundAcount-edit-btn">编辑</a-button>
             <a-button
               size="small"
               type="link"
-              v-if="record.state == 'WAIT'"
+              v-if="record.state == 'WAIT'&&$hasPermissions('B_FA_delete')"
               class="button-error"
               @click="handleDel(record)"
               id="foundAcount-del-btn">删除</a-button>
@@ -241,11 +241,13 @@ export default {
         _this.setTableH()
       })
       // 结算账户状态查询
-      this.GetSettleAccountState().then(res => {
-        if (res.status == 200) {
-          _this.enableFundAccount = res.data.functionEnableFlag
-        }
-      })
+      if(this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')){
+      	this.GetSettleAccountState().then(res => {
+      	  if (res.status == 200) {
+      		this.enableFundAccount = res.data.functionEnableFlag == 1
+      	  }
+      	})
+      }
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 1 - 1
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -80,7 +80,7 @@
               <a-col :md="4" :sm="24">
                 <a-form-item label="">
                   <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
-                  <a-checkbox v-model="queryParam.productEnabledFlag" :checked="queryParam.productEnabledFlag" id="inventoryQueryList-productEnabledFlag">显示禁用产品</a-checkbox>
+                  <a-checkbox v-model="queryParam.productEnabledFlag" :checked="queryParam.productEnabledFlag" id="inventoryQueryList-productEnabledFlag">包括禁用产品</a-checkbox>
                 </a-form-item>
               </a-col>
             </template>

+ 7 - 5
src/views/salesManagement/salesQuery/edit.vue

@@ -663,11 +663,13 @@ export default {
       this.pageInit()
     }
     // 结算账户状态查询
-    this.GetSettleAccountState().then(res => {
-      if (res.status == 200) {
-        this.enableFundAccount = res.data.functionEnableFlag == 1
-      }
-    })
+    if(this.$hasPermissions('M_fundAccountList') && this.$hasPermissions('B_fundAccountEnable')){
+    	this.GetSettleAccountState().then(res => {
+    	  if (res.status == 200) {
+    		this.enableFundAccount = res.data.functionEnableFlag == 1
+    	  }
+    	})
+    }
   },
   deactivated () {
     // this.dataSource = []