Kaynağa Gözat

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

chenrui 3 yıl önce
ebeveyn
işleme
c9027068e0

+ 1 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template v-if="$hasPermissions('B_transferOut_print')" slot="extra">
           <a-button key="2" id="allocateBillDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')">打印预览</a-button>
           <a-button key="1" type="primary" id="allocateBillDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
         </template>

+ 1 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">调往对象:{{ $route.params.name || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra">
+        <template v-if="$hasPermissions('B_transferOut_print')" slot="extra">
           <a-button key="2" id="allocateBillEdit-preview-btn" :disabled="chooseLoadData.length==0" @click="handlePrint('preview')">打印预览</a-button>
           <a-button key="1" type="primary" id="allocateBillEdit-print-btn" :disabled="chooseLoadData.length==0" @click="handlePrint('print')">快捷打印</a-button>
         </template>

+ 19 - 8
src/views/allocationManagement/transferOut/list.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card size="small" :bordered="false" class="allocateBillList-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      
+
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -63,7 +63,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -77,7 +77,7 @@
         bordered>
         <!-- 单号 -->
         <template slot="allocateNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+          <span :class="$hasPermissions('M_transferOut_detail')?'active':'common'" @click="handleDetail(record)">{{ record.allocateNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -88,25 +88,25 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
             class="button-warning"
             @click="handleExamine(record)"
             id="allocateBillList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
             class="button-info"
             @click="handleEdit(record)"
             id="allocateBillList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="(record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
             class="button-error"
             @click="handleDel(record)"
             id="allocateBillList-del-btn">删除</a-button>
-          <span v-if="(record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT')">--</span>
+          <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT'))||(!$hasPermissions('B_transferOut_audit') && !$hasPermissions('M_transferOut_edit') && !$hasPermissions('B_transferOut_del'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -245,7 +245,9 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
+      if (this.$hasPermissions('M_transferOut_detail')) {
+        this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.allocateSn}` })
+      }
     },
     //  编辑
     handleEdit (row) {
@@ -293,3 +295,12 @@ export default {
   }
 }
 </script>
+<style lang="less">
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="financialCollectionList-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)">
@@ -125,14 +125,14 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <span :class="$hasPermissions('B_salesDetail')?'active':'common'" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.financialStatus=='WAIT'"
+            v-if="record.financialStatus=='WAIT' && $hasPermissions('B_financialCollection_receipt')"
             class="button-warning"
             @click="handleAudit(record)"
             id="financialCollectionList-audit-btn">收款</a-button>
@@ -250,7 +250,9 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+      if (this.$hasPermissions('B_salesDetail')) {
+        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+      }
     },
     // 收款
     handleAudit (row) {
@@ -266,7 +268,7 @@ export default {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
               _this.spinning = false
-            }else{
+            } else {
               _this.spinning = false
             }
           })
@@ -329,5 +331,12 @@ export default {
     .sTable{
       margin-top: 20px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 12 - 4
src/views/financialManagement/returnConfirmation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="returnConfirmationList-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)">
@@ -67,14 +67,14 @@
         bordered>
         <!-- 销退单号 -->
         <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <span :class="$hasPermissions('B_returnConfirmation_detail')?'active':'common'" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT'"
+            v-if="record.billStatus=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
             class="button-warning"
             @click="handleAudit(record)"
             id="returnConfirmationList-audit-btn">退货确认</a-button>
@@ -165,6 +165,7 @@ export default {
     },
     // 详情
     handleDetail (row) {
+      if (!this.$hasPermissions('B_returnConfirmation_detail')) { return }
       this.itemSn = row.salesReturnBillSn
       this.openModal = true
     },
@@ -201,7 +202,7 @@ export default {
           _this.$message.success(res.message)
           _this.$refs.table.refresh()
           _this.spinning = false
-        }else{
+        } else {
           _this.spinning = false
         }
       })
@@ -215,5 +216,12 @@ export default {
     .sTable{
       margin-top: 20px;
     }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   }
 </style>

+ 38 - 25
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -1,6 +1,6 @@
 <template>
   <a-card size="small" :bordered="false" class="warehousingConfirmationList-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)">
@@ -29,7 +29,7 @@
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px">
+      <div v-if="$hasPermissions('B_warehousingConfirmationpl')" style="margin-bottom: 15px">
         <a-button type="primary" id="warehousingConfirmationList-export" :loading="loading" @click="handleBatchAudit">批量确认</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
@@ -47,14 +47,14 @@
         bordered>
         <!-- 入库单号 -->
         <template slot="stockPutNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.stockPutNo }}</span>
+          <span :class="$hasPermissions('B_warehousingConfirmationDetail')?'active':'common'" @click="handleDetail(record)">{{ record.stockPutNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.auditState=='WAIT'"
+            v-if="record.auditState=='WAIT' && $hasPermissions('B_warehousingConfirmationAlone')"
             class="button-warning"
             @click="handleAudit(record)"
             id="warehousingConfirmationList-audit-btn">入库确认</a-button>
@@ -142,17 +142,21 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-          this.onSelectChange(selectedRowKeys)
-        },
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.auditState != 'WAIT'
-          }
-        })
+      if (this.$hasPermissions('B_warehousingConfirmationpl')) {
+        return {
+			  selectedRowKeys: this.selectedRowKeys,
+			  onChange: (selectedRowKeys, selectedRows) => {
+			    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+			    this.onSelectChange(selectedRowKeys)
+			  },
+			  getCheckboxProps: record => ({
+			    props: {
+			      disabled: record.auditState != 'WAIT'
+			    }
+			  })
+        }
+      } else {
+        return null
       }
     }
   },
@@ -165,9 +169,11 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      this.itemSn = row.stockPutSn
-      this.nowData = row
-      this.openModal = true
+      if (this.$hasPermissions('B_warehousingConfirmationDetail')) {
+        this.itemSn = row.stockPutSn
+        this.nowData = row
+        this.openModal = true
+      }
     },
     closeModal () {
       this.itemSn = ''
@@ -175,18 +181,18 @@ export default {
       this.openModal = false
     },
     // 通过
-    handleConfirmationOk(){
-      if(this.isBatch){  //  批量
+    handleConfirmationOk () {
+      if (this.isBatch) { //  批量
         this.auditOrder(this.selectedRowKeys, true)
-      }else{
+      } else {
         this.auditOrder([this.confirmationInfo.stockPutSn], true)
       }
     },
     // 不通过
-    handleConfirmationFail(){
-      if(this.isBatch){  //  批量
+    handleConfirmationFail () {
+      if (this.isBatch) { //  批量
         this.auditOrder(this.selectedRowKeys, false)
-      }else{
+      } else {
         this.auditOrder([this.confirmationInfo.stockPutSn], false)
       }
     },
@@ -215,7 +221,7 @@ export default {
           _this.$refs.table.refresh()
           _this.confirmationModal = false
           _this.spinning = false
-        }else{
+        } else {
           _this.confirmationModal = false
           _this.spinning = false
         }
@@ -245,6 +251,13 @@ export default {
       margin-top: 20px;
     }
   }
+	.active{
+		color: #ed1c24;
+		cursor: pointer;
+	}
+	.common{
+		color: #000;
+	}
   .confirmation-modal{
     .ant-modal-body{
       padding: 32px 32px 24px;

+ 2 - 0
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -77,9 +77,11 @@
         <a-button
           size="small"
           type="link"
+          v-if="$hasPermissions('B_orderStatistics_detail')"
           @click="handleDetail(record)"
           class="button-success"
           id="orderStatisticsList-edit-btn">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 详情 -->

+ 2 - 0
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -82,9 +82,11 @@
         <a-button
           size="small"
           type="link"
+          v-if="$hasPermissions('B_productStatistics_detail')"
           class="button-success"
           @click="handleDetail(record)"
           id="productStatisticsList-detail-btn">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 详情 -->

+ 22 - 16
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -26,8 +26,9 @@
       </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_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
         <a-button
+          v-if="$hasPermissions('B_sparePartsAudit')"
           id="bulkWarehousingOrderList-batchAudit"
           type="primary"
           class="button-warning"
@@ -51,7 +52,7 @@
         bordered>
         <!-- 入库单号 -->
         <template slot="sparePartsNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
+          <span :class="$hasPermissions('B_sparePartsDetail')?'active':'common'" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
         </template>
         <!-- 财务状态 -->
         <template slot="settleState" slot-scope="text, record">
@@ -62,18 +63,18 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsEdit')"
             @click="handleEdit(record)"
             class="button-info"
             id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT'"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsDel')"
             @click="handleDel(record)"
             class="button-error"
             id="bulkWarehousingOrderList-del-btn">删除</a-button>
-          <span v-if="record.state != 'WAIT_AUDIT'">--</span>
+          <span v-if="record.state != 'WAIT_AUDIT'||(!$hasPermissions('B_sparePartsEdit') && !$hasPermissions('B_sparePartsDel'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -143,17 +144,21 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      return {
-        selectedRowKeys: this.selectedRowKeys,
-        onChange: (selectedRowKeys, selectedRows) => {
-          console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-          this.onSelectChange(selectedRowKeys)
-        },
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.state != 'WAIT_AUDIT'
-          }
-        })
+      if (this.$hasPermissions('B_sparePartsAudit')) {
+        return {
+			  selectedRowKeys: this.selectedRowKeys,
+			  onChange: (selectedRowKeys, selectedRows) => {
+			    console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
+			    this.onSelectChange(selectedRowKeys)
+			  },
+			  getCheckboxProps: record => ({
+			    props: {
+			      disabled: record.state != 'WAIT_AUDIT'
+			    }
+			  })
+        }
+      } else {
+        return null
       }
     }
   },
@@ -176,6 +181,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
+      if (!this.$hasPermissions('B_sparePartsDetail')) { return }
       this.itemSn = row.sparePartsSn
       this.openDetailModal = true
     },

+ 1 - 1
src/views/salesManagement/backorder/detailModal.vue

@@ -9,7 +9,7 @@
     @cancle="isShow=false"
     :width="960">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div style="padding: 0 12px;text-align: right;">
+      <div style="padding: 0 12px;text-align: right;" v-if="$hasPermissions('B_oosPrint')">
         <a-button id="backorderDetail-preview-btn" :disabled="localDataSource.length==0" @click="handlePrint('preview')" style="margin-right: 15px;">打印预览</a-button>
         <a-button type="primary" id="backorderDetail-print-btn" :disabled="localDataSource.length==0" @click="handlePrint('print')">快捷打印</a-button>
       </div>

+ 2 - 1
src/views/salesManagement/backorder/list.vue

@@ -33,7 +33,8 @@
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleDetail(record)" id="backorderList-detail-btn">详情</a-button>
+        <a-button size="small" type="link" @click="handleDetail(record)" v-if="$hasPermissions('B_oosDetail')" id="backorderList-detail-btn">详情</a-button>
+        <span v-else>--</span>
       </template>
     </s-table>
     <!-- 详情 -->

+ 3 - 2
src/views/salesManagement/examineVerify/list.vue

@@ -86,7 +86,8 @@
         bordered>
         <!-- 下推单号 -->
         <template slot="dispatchBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.dispatchBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record)">{{ record.dispatchBillNo }}</span>
+          <span v-else>{{ record.dispatchBillNo }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -94,7 +95,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.billStatus=='WAIT_STOCK_UP_AUDIT'"
+            v-if="record.billStatus=='WAIT_STOCK_UP_AUDIT'&&$hasPermissions('B_dispatchAduit')"
             @click="handleExamine(record)"
             id="examineVerifyList-examine-btn">备货审核</a-button>
           <span v-else>--</span>

+ 5 - 5
src/views/salesManagement/outboundOrder/list.vue

@@ -61,7 +61,7 @@
         </a-form>
       </div>
       <!-- 列表 -->
-      <div style="margin-bottom: 15px">
+      <div style="margin-bottom: 15px" v-if="$hasPermissions('B_stockOut')">
         <a-button type="primary" id="outboundOrder-export" :loading="loading" @click="handleOutbound()">批量出库</a-button>
         <span style="margin-left: 8px">
           <template v-if="hasSelected">{{ `已选 ${selectedRowKeys.length} 项` }}</template>
@@ -71,7 +71,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="rowSelection"
+        :row-selection="$hasPermissions('B_stockOut')?rowSelection:null"
         :rowKey="(record) => record.stockOutSn"
         :columns="columns"
         :data="loadData"
@@ -87,7 +87,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT'"
+            v-if="record.state=='WAIT'&&$hasPermissions('B_stockOut')"
             class="button-primary"
             @click="handleOutbound(record)"
             id="outboundOrderList-out-btn">出库</a-button>
@@ -198,9 +198,9 @@ export default {
     //  详情
     handleDetail (row) {
       //  根据出库类型跳转对应页面
-      if (row.outBizType == 'SALES') { //  销售出库
+      if (row.outBizType == 'SALES' && this.$hasPermissions('B_dispatchDetail')) { //  销售出库
         this.$router.push({ path: `/salesManagement/pushOrderManagement/detail/${row.outBizSubSn}/stockOut` })
-      } else if (row.outBizType == 'ALLOCATE') { //  调拨出库
+      } else if (row.outBizType == 'ALLOCATE' && this.$hasPermissions('M_transferOut_detail')) { //  调拨出库
         this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.outBizSn}` })
       } else if (row.outBizType == 'CHECK_ORDER_OUT') { //  库存盘点盘亏
 

+ 1 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -5,7 +5,7 @@
         <template slot="subTitle">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
         </template>
-        <template slot="extra">
+        <template slot="extra" v-if="$hasPermissions('B_dispatchPrint')">
           <a-button
             key="4"
             type="primary"

+ 4 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -70,11 +70,13 @@
       bordered>
       <!-- 销售单号 -->
       <template slot="salesBillNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+        <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+        <span v-else>{{ record.salesBillNo }}</span>
       </template>
       <!-- 备货单号 -->
       <template slot="dispatchBillNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+        <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+        <span v-else>{{ record.dispatchBillNo }}</span>
       </template>
     </s-table>
   </a-card>

+ 2 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -72,7 +72,7 @@
         size="large"
         style="width: 150px;"
         id="salesDetail-edit-btn"
-        v-if="detailData&&detailData.salesBillSource != 'PURCHASE' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT')"
+        v-if="detailData&&detailData.salesBillSource != 'PURCHASE' && (detailData.billStatus == 'WAIT_SUBMIT' || detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
         @click="handleEdit(record)"
       >
         编辑
@@ -83,7 +83,7 @@
         type="primary"
         class="button-info"
         id="salesDetail-edit-btn"
-        v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')"
+        v-if="detailData&&detailData.salesBillSource == 'PURCHASE' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
         @click="handleEdit(record)"
       >
         改单

+ 13 - 10
src/views/salesManagement/salesQuery/list.vue

@@ -110,10 +110,13 @@
         bordered>
         <!-- 销售单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <a-badge :count="'改'+record.changeTimes" :offset="[0,-10]" v-if="record.changeTimes>0">
-            <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
-          </a-badge>
-          <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <div v-if="$hasPermissions('B_salesDetail')">
+            <a-badge :count="'改'+record.changeTimes" :offset="[0,-10]" v-if="record.changeTimes>0">
+              <span style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+            </a-badge>
+            <span v-else style="color: #00aaff;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          </div>
+          <div v-else>{{ record.salesBillNo }}</div>
         </template>
         <!-- 总数量 -->
         <template slot="totalQty" slot-scope="text, record">
@@ -129,7 +132,7 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_AUDIT'"
+            v-if="record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
             @click="handleEexamine(record)"
           >审核</a-button>
 
@@ -137,7 +140,7 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'OUTING_WAREHOUSE'&&record.totalUnpushedQty>0"
+            v-if="record.billStatus == 'OUTING_WAREHOUSE'&&record.totalUnpushedQty>0&&$hasPermissions('B_salesDispatch')"
             @click="handleDispatch(record)"
           >下推</a-button>
 
@@ -145,7 +148,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             编辑
@@ -154,7 +157,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')"
+            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             改单
@@ -163,7 +166,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             删除
@@ -172,7 +175,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')"
+            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             取消

+ 3 - 3
src/views/salesManagement/salesReturn/detail.vue

@@ -47,7 +47,7 @@
           class="button-warning"
           style="width: 150px;"
           size="large"
-          v-if="detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')"
+          v-if="detailData&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesReturnAudit')"
           @click="visibleAudit=true"
           id="salesReturn-eexamine-btn">审核</a-button>
         <a-button
@@ -56,7 +56,7 @@
           size="large"
           style="width: 150px;"
           id="salesDetail-edit-btn"
-          v-if="detailData&&detailData.salesReturnBillSource == 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'WAIT_SUBMIT')"
+          v-if="detailData&&detailData.salesReturnBillSource == 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'WAIT_SUBMIT')&&$hasPermissions('B_salesReturnEdit')"
           @click="handleEdit()"
         >
           编辑
@@ -64,7 +64,7 @@
         <a-button
           size="large"
           style="width: 150px;"
-          v-if="detailData&&detailData.salesReturnBillSource != 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')"
+          v-if="detailData&&detailData.salesReturnBillSource != 'SALES' && (detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesReturnEdit')"
           type="primary"
           class="button-info"
           @click="handleEdit()"

+ 9 - 8
src/views/salesManagement/salesReturn/list.vue

@@ -69,7 +69,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button type="primary" class="button-error" @click="openModal = true">新增</a-button>
+        <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesReturnNew')" @click="openModal = true">新增</a-button>
       </div>
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 10px;">
@@ -91,7 +91,8 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesReturnBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesReturnDetail')" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
+          <span v-else>{{ record.salesReturnBillNo }}</span>
         </template>
         <!-- 财务状态 -->
         <!-- <template slot="financialStatus" slot-scope="text, record">
@@ -103,40 +104,40 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT'"
+            v-if="(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnAudit')"
             @click="handleEexamine(record)"
             id="salesReturn-eexamine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.billStatus == 'WAIT_CHECK'"
+            v-if="record.billStatus == 'WAIT_CHECK'&&$hasPermissions('B_salesReturnCheck')"
             @click="handleCheck(record)"
             id="salesReturn-eexamine-btn">品检</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesReturnEdit')"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="salesReturn-edit-btn">编辑</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')"
+            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnEdit')"
             type="link"
             class="button-info"
             @click="handleEdit(record)"
             id="salesReturn-edit-btn">改单</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')"
+            v-if="record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesReturnDel')"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             id="salesReturn-del-btn">删除</a-button>
           <a-button
             size="small"
-            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')"
+            v-if="record.salesReturnBillSource != 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT')&&$hasPermissions('B_salesReturnDel')"
             type="link"
             class="button-error"
             @click="handleDel(record)"

+ 3 - 1
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -61,6 +61,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                v-if="$hasPermissions('B_oosDetailExportByBuyer')"
                 id="shortageStatisticsCList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
@@ -100,7 +101,8 @@
         bordered>
         <!-- 单号 -->
         <template slot="salesBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+          <span v-else>{{ record.salesBillNo }}</span>
         </template>
       </s-table>
     </a-spin>