lilei před 3 roky
rodič
revize
a8ad74901f

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

@@ -573,7 +573,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调拨退货确认',
               icon: 'vertical-align-top',
-              // permission: 'M_allocateReturnConfirmationList'
+              permission: 'M_allocateReturnConfirmationList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -585,7 +585,7 @@ export const asyncRouterMap = [
                   title: '调拨退货确认列表',
                   icon: 'vertical-align-top',
                   hidden: true,
-                  // permission: 'M_allocateReturnConfirmationList'
+                  permission: 'M_allocateReturnConfirmationList'
                 }
               }
             ]
@@ -1093,7 +1093,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调拨退货列表',
               icon: 'pull-request',
-              // permission: 'M_transferReturnList'
+              permission: 'M_transferReturnList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1395,7 +1395,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调拨退货单报表',
               icon: 'profile',
-              // permission: 'M_transferReturnReportList'
+              permission: 'M_transferReturnReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1407,7 +1407,7 @@ export const asyncRouterMap = [
                   title: '调拨退货单报表列表',
                   icon: 'profile',
                   hidden: true,
-                  // permission: 'M_transferReturnReportList'
+                  permission: 'M_transferReturnReportList'
                 }
               }
             ]
@@ -1420,7 +1420,7 @@ export const asyncRouterMap = [
             meta: {
               title: '调拨退货单明细报表',
               icon: 'profile',
-              // permission: 'M_transferReturnDetailReportList'
+              permission: 'M_transferReturnDetailReportList'
             },
             hideChildrenInMenu: true,
             children: [{
@@ -1431,7 +1431,7 @@ export const asyncRouterMap = [
                 title: '调拨退货单明细报表列表',
                 icon: 'profile',
                 hidden: true,
-                // permission: 'M_transferReturnDetailReportList'
+                permission: 'M_transferReturnDetailReportList'
               }
             }]
           },

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

@@ -104,7 +104,7 @@ export default {
   },
   computed: {
     isEdit () {
-      return this.basicInfoData && ((this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData.state == 'FINANCIAL_REJECT') || (this.basicInfoData.state == 'AUDIT_REJECT')) && this.$hasPermissions('M_transferOut_edit')
+      return this.basicInfoData && ((this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData.state == 'FINANCIAL_REJECT') || (this.basicInfoData.state == 'AUDIT_REJECT')) && this.$hasPermissions('B_transferReturnEdit')
     },
     columns () {
       const arr = [

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

@@ -118,7 +118,7 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
-                <span v-if="$hasPermissions('B_isShowPrice')">退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>
+                <span>退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->

+ 1 - 1
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -110,7 +110,7 @@
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
                 退货总数量:<strong>{{ (basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0)) ? basicInfoData.totalQty : '--' }}</strong> ,
-                <span v-if="$hasPermissions('B_isShowPrice')">退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>
+                <span>退货总金额(¥):<strong>{{ (basicInfoData&&(basicInfoData.totalPrice || basicInfoData.totalPrice==0)) ? basicInfoData.totalPrice : '--' }}</strong></span>
               </div>
             </a-alert>
             <!-- 筛选条件 -->

+ 7 - 9
src/views/allocationManagement/transferReturn/list.vue

@@ -61,7 +61,7 @@
       </div>
       <!-- 操作按钮 -->
       <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferOut_add')" id="transferReturn-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
       </div>
       <!-- 列表 -->
       <s-table
@@ -77,7 +77,7 @@
         bordered>
         <!-- 单号 -->
         <template slot="allocateReturnNo" slot-scope="text, record">
-          <a-button v-if="$hasPermissions('M_transferOut_detail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.allocateReturnNo }}</a-button>
+          <a-button v-if="$hasPermissions('M_transferReturnDetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.allocateReturnNo }}</a-button>
           <span v-else>{{ record.allocateReturnNo }}</span>
         </template>
         <!-- 操作 -->
@@ -85,7 +85,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferReturnAudit')"
             class="button-warning"
             @click="handleExamine(record)"
             id="transferReturn-examine-btn">审核</a-button>
@@ -93,20 +93,20 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="record.state=='WAIT_CHECK'"
+            v-if="record.state=='WAIT_CHECK' && $hasPermissions('M_transferReturnCheck')"
             @click="handleCheck(record)"
             id="transferReturn-examine-btn">品检</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnEdit')"
             class="button-info"
             @click="handleEdit(record)"
             id="transferReturn-edit-btn">编辑</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
+            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'FINANCIAL_REJECT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferReturnDel')"
             class="button-error"
             @click="handleDel(record)"
             id="transferReturn-del-btn">删除</a-button>
@@ -266,9 +266,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      if (this.$hasPermissions('M_transferOut_detail')) {
-        this.$router.push({ name: 'transferReturnDetail', params: { sn: row.allocateReturnSn } })
-      }
+      this.$router.push({ name: 'transferReturnDetail', params: { sn: row.allocateReturnSn } })
     },
     //  编辑
     handleEdit (row) {

+ 3 - 3
src/views/allocationManagement/transferReturn/print.vue

@@ -3,7 +3,7 @@
     <a-button
       key="1"
       type="default"
-      v-if="$hasPermissions('B_transferOut_print')"
+      v-if="$hasPermissions('B_transferReturnPrint')"
       id="editGrap-db-print-btn"
       :disabled="disabled"
       @click="handlePrint('views')">打印预览</a-button>
@@ -11,7 +11,7 @@
       key="2"
       type="primary"
       class="button-info"
-      v-if="$hasPermissions('B_transferOut_print')"
+      v-if="$hasPermissions('B_transferReturnPrint')"
       id="editGrap-dbfl-print-btn"
       :disabled="disabled"
       @click="handlePrint('print')">快捷打印</a-button>
@@ -20,7 +20,7 @@
       key="3"
       type="primary"
       class="button-warning"
-      v-if="$hasPermissions('B_transferOut_detail_export')"
+      v-if="$hasPermissions('B_transferReturnExport')"
       id="editGrap-export-btn"
       :disabled="disabled"
       @click="handleExcel">导出Excel</a-button>

+ 6 - 7
src/views/financialManagement/allocateReturnConfirmation/list.vue

@@ -69,7 +69,7 @@
         bordered>
         <!-- 销退单号 -->
         <template slot="allocateReturnNo" slot-scope="text, record">
-          <a-button v-if="$hasPermissions('B_returnConfirmation_detail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.allocateReturnNo }}</a-button>
+          <a-button v-if="$hasPermissions('M_allocateReturnConfirmationDetail')" size="small" type="link" class="button-info" @click="handleDetail(record)">{{ record.allocateReturnNo }}</a-button>
           <span v-else>{{ record.allocateReturnNo }}</span>
         </template>
         <!-- 操作 -->
@@ -77,7 +77,7 @@
           <a-button
             size="small"
             type="link"
-            v-if="record.state=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_returnConfirmation_return')"
+            v-if="record.state=='WAIT_FINANCIAL_AUDIT' && $hasPermissions('B_allocateReturnConfirmationAudit')"
             class="button-warning"
             @click="handleAudit(record)"
             id="transferReturnConfirmation-audit-btn">退货确认</a-button>
@@ -148,14 +148,14 @@ export default {
         { title: '退货总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'totalBadQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'totalBackStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '确认时间', dataIndex: 'financeAuditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(8, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      }
+      // if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
+      //   arr.splice(8, 0, { title: '退货总金额', dataIndex: 'totalPrice', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+      // }
       return arr
     }
   },
@@ -181,7 +181,6 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      if (!this.$hasPermissions('B_returnConfirmation_detail')) { return }
       this.itemSn = row.allocateReturnSn
       this.openModal = true
     },