浏览代码

Merge branch 'deploy' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy

lilei 3 年之前
父节点
当前提交
0aac9be968
共有 28 个文件被更改,包括 146 次插入81 次删除
  1. 8 8
      src/config/router.config.js
  2. 3 2
      src/views/basicData/bulkPartsTypeManagement/list.vue
  3. 3 2
      src/views/basicData/customerTypeManagement/list.vue
  4. 1 0
      src/views/basicData/expenseType/list.vue
  5. 1 0
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  6. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  7. 1 1
      src/views/bulkManagement/bulkWarehousingOrder/edit.vue
  8. 8 6
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  9. 1 7
      src/views/customerManagement/customerInfo/list.vue
  10. 11 2
      src/views/financialManagement/companyCollectionPayment/list.vue
  11. 15 2
      src/views/financialManagement/companyReceivablePayable/list.vue
  12. 18 9
      src/views/financialManagement/expenseManagement/list.vue
  13. 18 14
      src/views/financialManagement/financialCollection/list.vue
  14. 18 13
      src/views/financialManagement/financialPayment/list.vue
  15. 1 1
      src/views/financialManagement/warehousingAudit/detail.vue
  16. 14 5
      src/views/financialManagement/warehousingAudit/list.vue
  17. 1 1
      src/views/financialManagement/withdrawalManagement/list.vue
  18. 1 0
      src/views/inventoryManagement/inventoryQuery/list.vue
  19. 2 1
      src/views/inventoryManagement/inventoryWarning/list.vue
  20. 1 0
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  21. 1 0
      src/views/inventoryManagement/warehouse/list.vue
  22. 1 0
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  23. 1 1
      src/views/productManagement/productCategory/list.vue
  24. 1 0
      src/views/productManagement/productInfo/list.vue
  25. 5 1
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  26. 2 2
      src/views/salesManagement/salesReturn/list.vue
  27. 4 1
      src/views/storeManagement/bind/list.vue
  28. 4 1
      src/views/storeManagement/userAuthorization/list.vue

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

@@ -1307,8 +1307,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '入库审核详情',
                   icon: 'pull-request',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'M_warehousingAudit_detail'
                 }
               }
             ]
@@ -1474,8 +1474,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '单位应收应付',
                   icon: 'transaction',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'M_collectionPayment'
                 }
               },
               {
@@ -1485,8 +1485,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '单位应收应付详情',
                   icon: 'transaction',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'M_companyReceivablePayable_detail'
                 }
               }
             ]
@@ -1521,8 +1521,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '单位收付款记录详情',
                   icon: 'file-protect',
-                  hidden: true
-                  // permission: 'B_goodsManage_edit'
+                  hidden: true,
+                  permission: 'M_companyCollectionPayment_detail'
                 }
               }
             ]

+ 3 - 2
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="bulkPartsTypeList-wrap">
-	  <a-spin :spinning="spinning" tip="Loading...">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 操作按钮 -->
       <div class="table-operator-nobor">
         <a-button v-if="$hasPermissions('B_basicData_bulkPartsType_add')" id="bulkPartsTypeList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
@@ -32,6 +32,7 @@
             @click="handleDel(record)"
             id="bulkPartsTypeList-del-btn"
             style="margin: 0 0 0 8px;">删除</a-button>
+          <span v-if="!$hasPermissions('B_basicData_bulkPartsType_edit') && !$hasPermissions('B_basicData_bulkPartsType_del')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -103,7 +104,7 @@ export default {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
               _this.spinning = false
-            }else{
+            } else {
               _this.spinning = false
             }
           })

+ 3 - 2
src/views/basicData/customerTypeManagement/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="customerTypeList-wrap">
-	  <a-spin :spinning="spinning" tip="Loading...">
+    <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -47,6 +47,7 @@
             class="button-error"
             @click="handleDel(record)"
             id="customerTypeList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_basicData_customerType_edit') && !$hasPermissions('B_basicData_customerType_del')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -119,7 +120,7 @@ export default {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
               _this.spinning = false
-            }else{
+            } else {
               _this.spinning = false
             }
           })

+ 1 - 0
src/views/basicData/expenseType/list.vue

@@ -43,6 +43,7 @@
             icon="delete"
             id="expenseType-del"
             @click="handleDel(record)">删除</a-button>
+          <span v-if="!$hasPermissions('B_basicData_expenseType_add') && !$hasPermissions('B_basicData_expenseType_edit') && !$hasPermissions('B_basicData_expenseType_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 0
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -36,6 +36,7 @@
             class="button-error"
             @click="handleDel(record)"
             id="storeTransferOutTypeList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('B_basicData_storeTransferOutType_edit') && !$hasPermissions('B_basicData_storeTransferOutType_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -19,7 +19,7 @@
           <a-tag color="orange" v-if="basicInfoData&&basicInfoData.settleStateDictValue">{{ basicInfoData.settleStateDictValue }}</a-tag>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_bulkWarehousingOrder_print')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -9,7 +9,7 @@
           <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_bulkWarehousingOrder_print')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 8 - 6
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -66,6 +66,7 @@
                   @click="handleExport"
                   :disabled="disabled"
                   :loading="exportLoading"
+                  v-if="$hasPermissions('B_bulkWarehousingOrder_export')"
                   id="bulkWarehousingOrderList-export">导出</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
@@ -78,7 +79,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+        <a-button v-if="$hasPermissions('B_bulkWarehousingOrder_add')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -96,7 +97,8 @@
         bordered>
         <!-- 散件单号 -->
         <template slot="sparePartsPurchaseNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
+          <span v-if="$hasPermissions('B_bulkWarehousingOrder_detail')" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsPurchaseNo }}</span>
+          <span v-else>{{ record.sparePartsPurchaseNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -107,25 +109,25 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state != 'FINISH'"
+            v-if="record.state != 'FINISH' && $hasPermissions('B_bulkWarehousingOrder_edit')"
             @click="handleEdit(record)"
             class="button-info"
             id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_PUT_WAREHOUSE'"
+            v-if="record.state == 'WAIT_PUT_WAREHOUSE' && $hasPermissions('B_bulkWarehousingOrder_put')"
             @click="handleWarehouse(record)"
             class="button-primary"
             id="bulkWarehousingOrderList-warehouse-btn">入库</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state != 'FINISH'"
+            v-if="record.state != 'FINISH' && $hasPermissions('B_bulkWarehousingOrder_del')"
             @click="handleDel(record)"
             class="button-error"
             id="bulkWarehousingOrderList-del-btn">删除</a-button>
-          <span v-if="(record.state == 'FINISH') && (record.state != 'WAIT_PUT_WAREHOUSE')">--</span>
+          <span v-if="(record.state == 'FINISH' && (!$hasPermissions('B_bulkWarehousingOrder_edit'))) && (!$hasPermissions('B_bulkWarehousingOrder_del') && record.state == 'FINISH') && (record.state != 'WAIT_PUT_WAREHOUSE' && (!$hasPermissions('B_bulkWarehousingOrder_put')))">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 7
src/views/customerManagement/customerInfo/list.vue

@@ -109,13 +109,7 @@
             class="button-success"
             @click="handleDetail(record)"
             id="customerManagementList-detail-btn">详情</a-button>
-          <!-- <a-button
-            size="small"
-            v-if="$hasPermissions('B_customer_customerInfo_del') && record.satelliteFlag!=1"
-            type="link"
-            class="button-error"
-            @click="handleDel(record)"
-            id="customerManagementList-del-btn">删除</a-button> -->
+          <span v-if="!$hasPermissions('B_customer_customerInfo_edit') && !$hasPermissions('B_customer_customerInfo_detail')">--</span>
         </template>
         <template slot="enableAction" slot-scope="text, record">
           <a-switch v-if="$hasPermissions('B_customer_customerInfo_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>

+ 11 - 2
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -79,7 +79,7 @@
       bordered>
       <!-- 结算单号 -->
       <template slot="unitSettleNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
+        <span :class="$hasPermissions('M_companyCollectionPayment_detail')?'active':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
       </template>
     </s-table>
   </a-card>
@@ -150,7 +150,9 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/companyCollectionPayment/detail/${row.id}/${row.unitSettleSn}` })
+      if (this.$hasPermissions('M_companyCollectionPayment_detail')) {
+        this.$router.push({ path: `/financialManagement/companyCollectionPayment/detail/${row.id}/${row.unitSettleSn}` })
+      }
     },
     // 合计
     getTotal (param) {
@@ -199,5 +201,12 @@ export default {
     .sTable{
       margin-top: 15px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 15 - 2
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -45,8 +45,21 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" class="button-info" @click="handleCollectionPayment(record)" id="companyReceivablePayableList-collectionPayment-btn">收付款</a-button>
-        <a-button size="small" type="link" class="button-success" @click="handleDetail(record)" id="companyReceivablePayableList-detail-btn">详情</a-button>
+        <a-button
+          v-if="$hasPermissions('M_collectionPayment')"
+          size="small"
+          type="link"
+          class="button-info"
+          @click="handleCollectionPayment(record)"
+          id="companyReceivablePayableList-collectionPayment-btn">收付款</a-button>
+        <a-button
+          v-if="$hasPermissions('M_companyReceivablePayable_detail')"
+          size="small"
+          type="link"
+          class="button-success"
+          @click="handleDetail(record)"
+          id="companyReceivablePayableList-detail-btn">详情</a-button>
+        <span v-if="!$hasPermissions('M_collectionPayment') && !$hasPermissions('M_companyReceivablePayable_detail')">--</span>
       </template>
     </s-table>
   </a-card>

+ 18 - 9
src/views/financialManagement/expenseManagement/list.vue

@@ -57,7 +57,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="expenseManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button v-if="$hasPermissions('B_expenseNew')" id="expenseManagementList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -79,32 +79,32 @@
         </template>
         <!-- 状态 -->
         <template slot="accountExpensesNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ text }}</span>
+          <span :class="$hasPermissions('B_expenseDetail')?'active':'common'" @click="handleDetail(record)">{{ text }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseAudit')"
             class="button-warring"
             @click="handleAudit(record)"
-            id="expenseManagement-edit-btn">审核</a-button>
+            id="expenseManagement-audit-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseEdit')"
             class="button-info"
             @click="handleEdit(record)"
             id="expenseManagement-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_expenseDel')"
             class="button-error"
             @click="handleDel(record)"
             id="expenseManagement-del-btn">删除</a-button>
-          <span v-if="record.state != 'WAIT_AUDIT'">--</span>
+          <span v-if="record.state != 'WAIT_AUDIT'||( !$hasPermissions('B_expenseAudit')&& !$hasPermissions('B_expenseEdit') && !$hasPermissions('B_expenseDel'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -228,8 +228,10 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.itemId = row.id
-      this.openModal = true
+      if ($hasPermissions('B_expenseDetail')) {
+        this.itemId = row.id
+        this.openModal = true
+      }
     },
     //  审核
     handleAudit (row) {
@@ -306,5 +308,12 @@ export default {
     .sTable{
       margin-top: 15px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 18 - 14
src/views/financialManagement/financialCollection/list.vue

@@ -67,7 +67,7 @@
           <strong>¥{{ totalData.unsettleAmount }}</strong>
         </div>
       </a-alert>
-      <div style="margin-bottom: 15px">
+      <div v-if="$hasPermissions('B_financialCollectionPl')" style="margin-bottom: 15px">
         <a-button type="primary" id="financialCollectionList-export" :loading="loading" @click="handleCollection">批量收款</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">
@@ -93,7 +93,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.settleState == 'SETTLED'"
+            v-if="record.settleState == 'SETTLED' && $hasPermissions('B_financialCollectionDetail')"
             @click="handleVoucher(record)"
             id="financialCollectionList-voucher-btn">凭证</a-button>
           <a-button
@@ -101,10 +101,10 @@
             type="link"
             :loading="loading"
             class="button-warning"
-            v-if="record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1"
+            v-if="record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1 && $hasPermissions('B_financialCollectionSing')"
             @click="handleCollectionSing(record)"
             id="financialCollectionList-pay-btn">收款</a-button>
-          <span v-if="!(record.settleState == 'SETTLED') && !(record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1)">--</span>
+          <span v-if="(!(record.settleState == 'SETTLED') && !(record.settleState == 'UNSETTLE'&&record.satelliteFlag!=1))||(!$hasPermissions('B_financialCollectionSing') && !$hasPermissions('B_financialCollectionDetail'))">--</span>
           <!-- satelliteFlag为1,是卫星仓 -->
         </template>
       </s-table>
@@ -189,16 +189,20 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          this.selectedRowKeys = selectedRowKeys
-        },
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.settleState == 'SETTLED'
-          }
-        })
+      if (this.$hasPermissions('B_financialCollectionPl')) {
+        return {
+			  selectedRowKeys: this.selectedRowKeys,
+			  onChange: (selectedRowKeys, selectedRows) => {
+			    this.selectedRowKeys = selectedRowKeys
+			  },
+			  getCheckboxProps: record => ({
+			    props: {
+			      disabled: record.settleState == 'SETTLED'
+			    }
+			  })
+        }
+      } else {
+        return null
       }
     }
   },

+ 18 - 13
src/views/financialManagement/financialPayment/list.vue

@@ -66,7 +66,7 @@
           <strong>¥{{ totalData.unsettleAmount }}</strong>
         </div>
       </a-alert>
-      <div style="margin-bottom: 15px">
+      <div v-if="$hasPermissions('B_financialPaymentPl')" style="margin-bottom: 15px">
         <a-button type="primary" id="finacialPay-export" :loading="loading" @click="handlePayment">批量付款</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">
@@ -92,7 +92,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.settleState == 'SETTLED'"
+            v-if="record.settleState == 'SETTLED' && $hasPermissions('B_financialPaymentDetail')"
             @click="handleVoucher(record)"
             id="finacialPay-voucher-btn">凭证</a-button>
           <a-button
@@ -100,9 +100,10 @@
             type="link"
             class="button-warning"
             :loading="loading"
-            v-else
+            v-else-if="record.settleState != 'SETTLED' && $hasPermissions('B_financialPaymentSing')"
             @click="handlePay(record)"
             id="finacialPay-pay-btn">付款</a-button>
+          <span v-else>--</span>
         </template>
       </s-table>
     </a-spin>
@@ -187,16 +188,20 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          this.selectedRowKeys = selectedRowKeys
-        },
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.settleState == 'SETTLED'
-          }
-        })
+      if (this.$hasPermissions('B_financialPaymentPl')) {
+        return {
+			  selectedRowKeys: this.selectedRowKeys,
+			  onChange: (selectedRowKeys, selectedRows) => {
+			    this.selectedRowKeys = selectedRowKeys
+			  },
+			  getCheckboxProps: record => ({
+			    props: {
+			      disabled: record.settleState == 'SETTLED'
+			    }
+			  })
+        }
+      } else {
+        return null
       }
     }
   },

+ 1 - 1
src/views/financialManagement/warehousingAudit/detail.vue

@@ -8,7 +8,7 @@
           <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.receivingBillNo) || '--' }}</p>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template v-if="$hasPermissions('B_warehousingDetail_print')" slot="extra">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 14 - 5
src/views/financialManagement/warehousingAudit/list.vue

@@ -62,26 +62,26 @@
         bordered>
         <!-- 采购入库单号 -->
         <template slot="receivingBillNo" slot-scope="text, record">
-          <span v-if="record.receivingBillNo" style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.receivingBillNo }}</span>
+          <span v-if="record.receivingBillNo" :class="$hasPermissions('M_warehousingAudit_detail')?'active':'common'" @click="handleDetail(record)">{{ record.receivingBillNo }}</span>
           <span v-else>--</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
-            v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT'"
+            v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT' && $hasPermissions('B_receivingAudit')"
             type="link"
             class="button-info"
             @click="handleExamine(record, 1)"
             id="warehousingAudit-adopt-btn">通过</a-button>
           <a-button
             size="small"
-            v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT'"
+            v-if="record.auditState=='WAIT_PUT_WAREHOUSE_AUDIT'&& $hasPermissions('B_receivingAudit')"
             type="link"
             class="button-warning"
             @click="handleExamine(record, 2)"
             id="warehousingAudit-unadopt-btn">不通过</a-button>
-          <span v-if="record.auditState!='WAIT_PUT_WAREHOUSE_AUDIT'">--</span>
+          <span v-if="record.auditState!='WAIT_PUT_WAREHOUSE_AUDIT'|| !$hasPermissions('B_receivingAudit')">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -166,7 +166,9 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.receivingBillSn}` })
+      if (this.$hasPermissions('M_warehousingAudit_detail')) {
+        this.$router.push({ path: `/financialManagement/warehousingAudit/detail/${row.receivingBillSn}` })
+      }
     },
     //  审核
     handleExamine (row, type) {
@@ -207,5 +209,12 @@ export default {
     .sTable{
       margin-top: 15px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 1 - 1
src/views/financialManagement/withdrawalManagement/list.vue

@@ -20,7 +20,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="withdrawalManagementList-tx" type="primary" class="button-warning" @click="handleCashOut">申请提现</a-button>
+      <a-button v-if="$hasPermissions('B_withdrawalManagement_cashOut')" id="withdrawalManagementList-tx" type="primary" class="button-warning" @click="handleCashOut">申请提现</a-button>
       <div style="display: inline-block;margin-left: 80px;">可提现余额: <strong>¥{{ accountInfo&&(accountInfo.balance || accountInfo.balance==0) ? accountInfo.balance : '--' }}</strong> 元</div>
     </div>
     <!-- 列表 -->

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

@@ -117,6 +117,7 @@
             class="button-warning"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
+          <span v-if="!$hasPermissions('B_inventoryInventoryQueryDetail') && !$hasPermissions('B_inventoryInventoryQueryStock')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 2 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -97,7 +97,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :dataSource="loadData"
-        :scroll="{ x: 2120, y: tableHeight }"
+        :scroll="{ x: 2200, y: tableHeight }"
         :pagination="paginationProps"
         bordered>
         <!-- 产品分类 -->
@@ -160,6 +160,7 @@
             class="button-info"
             @click="handleSave(record)"
             id="inventoryWarningList-add-btn">保存</a-button>
+          <span v-if="!$hasPermissions('B_inventoryWarningSave')">--</span>
         </template>
       </a-table>
     </a-spin>

+ 1 - 0
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -53,6 +53,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button size="small" v-if="$hasPermissions('B_satelliteWarehouseInventoryAdd')" type="link" @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
+          <span v-if="!$hasPermissions('B_satelliteWarehouseInventoryAdd')">--</span>
         </template>
       </a-table>
     </a-spin>

+ 1 - 0
src/views/inventoryManagement/warehouse/list.vue

@@ -55,6 +55,7 @@
             class="button-error"
             @click="handleDel(record)"
             id="warehouseList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('M_inventoryWarehouseStoringLocationList') && !$hasPermissions('B_inventory_warehouse_edit') && !$hasPermissions('B_inventory_warehouse_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 0
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -56,6 +56,7 @@
               class="button-error"
               @click="handleDel(record)"
               id="storingLocationList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_inventory_warehouse_storingLocation_edit') && !$hasPermissions('B_inventory_warehouse_storingLocation_del')">--</span>
           </template>
         </s-table>
       </a-card>

+ 1 - 1
src/views/productManagement/productCategory/list.vue

@@ -43,7 +43,7 @@
             icon="delete"
             id="productCategory-del"
             @click="handleDel(record)">删除</a-button>
-          <span v-if="record.sysFlag != 0">--</span>
+          <span v-if="!(record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')&&record.sysFlag == 0) && !(record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')&&record.sysFlag == 0) && !(record.pid != 0 && $hasPermissions('B_product_dealerProductType_del')&&record.sysFlag == 0)">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 0
src/views/productManagement/productInfo/list.vue

@@ -120,6 +120,7 @@
             class="button-success"
             @click="handleDetail(record)"
             id="productInfoList-detail-btn">详情</a-button>
+          <span v-if="!$hasPermissions('B_product_dealerProduct_edit') && !$hasPermissions('B_product_dealerProduct_detail')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 1
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -111,7 +111,11 @@ export default {
           const no = 0
           for (var i = 0; i < data.length; i++) {
             data[i].no = no + i + 1
-            data[i].address = data[i].provinceName + '-' + data[i].cityName + '-' + data[i].countyName + '-' + data[i].addr
+            const provinceName = data[i].provinceName ? (data[i].provinceName + '-') : ''
+            const cityName = data[i].cityName ? (data[i].cityName + '-') : ''
+            const countyName = data[i].countyName ? (data[i].countyName + '-') : ''
+            const addr = data[i].addr || ''
+            data[i].address = provinceName + cityName + countyName + addr
           }
           this.disabled = false
           return data

+ 2 - 2
src/views/salesManagement/salesReturn/list.vue

@@ -165,8 +165,8 @@ export default {
         { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: 260, align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退款总金额', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总款数', dataIndex: 'totalCategory', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalCategory', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '是否抓单', dataIndex: 'grabFlag', width: 100, align: 'center', customRender: function (text) { return ['否', '是'][text] } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center' },

+ 4 - 1
src/views/storeManagement/bind/list.vue

@@ -24,7 +24,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="bindList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button v-if="$hasPermissions('B_storeManagementBind_add')" id="bindList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -43,13 +43,16 @@
             type="link"
             class="button-info"
             @click="handleEdit(record)"
+            v-if="$hasPermissions('B_storeManagementBind_edit')"
             id="bindList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
+            v-if="$hasPermissions('B_storeManagementBind_del')"
             id="bindList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_storeManagementBind_edit') &&!$hasPermissions('B_storeManagementBind_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 4 - 1
src/views/storeManagement/userAuthorization/list.vue

@@ -29,7 +29,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="userAuthList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+        <a-button v-if="$hasPermissions('B_storeManagementUserAuth_add')" id="userAuthList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -52,13 +52,16 @@
             type="link"
             class="button-info"
             @click="handleEdit(record)"
+            v-if="$hasPermissions('B_storeManagementUserAuth_edit')"
             id="userAuthList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
+            v-if="$hasPermissions('B_storeManagementUserAuth_del')"
             id="userAuthList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_storeManagementUserAuth_edit') && !$hasPermissions('B_storeManagementUserAuth_del')">--</span>
         </template>
       </s-table>
     </a-spin>