chenrui 6 kuukautta sitten
vanhempi
commit
0d7150e347

+ 2 - 2
src/config/salesManageService.js

@@ -70,8 +70,8 @@ export default {
             title: '销售单转单',
             icon: 'monitor',
             hidden: true,
-            replaceTab: true
-            // permission: 'B_salesTransfer'
+            replaceTab: true,
+            permission: 'B_salesTransfer'
           }
         },
         {

+ 5 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -91,6 +91,10 @@ export default {
     chooseList: { // 发货经销商库存
       type: Array,
       default: function () { return [] }
+    },
+    showTransferDealer: {// 显示发货经销商库存
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -262,7 +266,7 @@ export default {
           arr.push({ title: '第三方库存', field: 'thirdStockQty', width: 80, key: 'mm', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } })
         }
       }
-      if (this.detailData && this.detailData.billStatus && (this.detailData.billStatus == 'TRANSFER_YES' || this.detailData.billStatus == 'TRANSFER_AUDIT_REJECT' || this.detailData.billStatus == 'TRANSFER_FINISH')) {
+      if (this.showTransferDealer) {
         arr.push({ title: '发货经销商库存', field: 'transferDealerStockQty', width: 100, key: 'tt', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return transferDealerInfo(row, row[column.field], h) } })
         this.colspanNums = this.colspanNums + 1
       }

+ 11 - 6
src/views/salesManagement/salesQueryNew/detail.vue

@@ -126,7 +126,7 @@
                       </a-select>
                     </a-form-item>
                   </a-col>
-                  <a-col flex="260px" v-if="$route.params.pageType!='salesNewDetailAudit'&&(detailData&&detailData.promoFlag!=1&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&detailData.salesBillSource=='PURCHASE'&&detailData.orderType=='TIRE')">
+                  <a-col flex="260px" v-if="showTransferDealer">
                     <a-form-item label="发货经销商库存">
                       <v-select
                         code="STOCK_LABEL"
@@ -149,7 +149,7 @@
               <a-button
                 id="salesDetail-updateStock"
                 type="primary"
-                v-if="$route.params.pageType!='salesNewDetailAudit'&&(detailData&&detailData.promoFlag!=1&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&detailData.salesBillSource=='PURCHASE'&&detailData.orderType=='TIRE')"
+                v-if="showTransferDealer"
                 style="margin:0 10px;"
                 @click="openDealerModal"
                 class="button-dealerStock">选择发货经销商</a-button>
@@ -171,7 +171,8 @@
             :maxHeight="pageHeight"
             :chooseList="chooseDealerList"
             :transferQty="transferQty"
-            :showCityPrice="isCityPrice">
+            :showCityPrice="isCityPrice"
+            :showTransferDealer="showTransferDealer">
           </detailProductList>
         </div>
       </a-card>
@@ -183,7 +184,7 @@
         type="primary"
         class="button-info"
         id="salesDetail-audit-btn"
-        v-if="$route.params.pageType!='salesNewDetailAudit'&&(detailData&&detailData.promoFlag!=1&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&detailData.salesBillSource=='PURCHASE'&&detailData.orderType=='TIRE')"
+        v-if="$hasPermissions('B_salesEdit')&&$route.params.pageType!='salesNewDetailAudit'&&(detailData&&detailData.promoFlag!=1&&(detailData.billStatus == 'WAIT_AUDIT'||detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || detailData.billStatus == 'TRANSFER_AUDIT_REJECT')&&detailData.salesBillSource=='PURCHASE'&&detailData.orderType=='TIRE')"
         @click="handleOrder()"
       >
         转单
@@ -206,7 +207,7 @@
         type="primary"
         class="button-info"
         id="salesDetail-audit-btn"
-        v-if="detailData&&detailData.billStatus == 'SUPERIOR_WAIT_AUDIT'"
+        v-if="$hasPermissions('B_higherLevelAudit')&&detailData&&detailData.billStatus == 'SUPERIOR_WAIT_AUDIT'"
         @click="handleTransferAudit"
       >
         审核
@@ -359,7 +360,11 @@ export default {
     },
     // 是否显示库存列
     showStock () {
-      return this.detailData && (this.detailData.billStatus == 'WAIT_AUDIT' || this.detailData.billStatus == 'HQ_CHANGE') && this.$hasPermissions('B_salesAudit')
+      return this.detailData && (this.detailData.billStatus == 'WAIT_AUDIT' || this.detailData.billStatus == 'HQ_CHANGE' || this.detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || this.detailData.billStatus == 'TRANSFER_AUDIT_REJECT') && this.$hasPermissions('B_salesAudit')
+    },
+    // 是否显示发货经销商按钮  发货经销商库存
+    showTransferDealer () {
+      return this.$hasPermissions('B_salesEdit') && this.$route.params.pageType != 'salesNewDetailAudit' && (this.detailData && this.detailData.promoFlag != 1 && (this.detailData.billStatus == 'WAIT_AUDIT' || this.detailData.billStatus == 'SUPERIOR_AUDIT_REJECT' || this.detailData.billStatus == 'TRANSFER_AUDIT_REJECT') && this.detailData.salesBillSource == 'PURCHASE' && this.detailData.orderType == 'TIRE')
     },
     // 表格高度计算
     pageHeight () {

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

@@ -255,7 +255,7 @@
                 size="small"
                 type="link"
                 class="button-success"
-                v-if="record.promoFlag!=1&&(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'SUPERIOR_AUDIT_REJECT' || record.billStatus == 'TRANSFER_AUDIT_REJECT')&&record.salesBillSource=='PURCHASE'&&record.orderType==='TIRE'"
+                v-if="$hasPermissions('B_salesEdit')&&record.promoFlag!=1&&(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'SUPERIOR_AUDIT_REJECT' || record.billStatus == 'TRANSFER_AUDIT_REJECT')&&record.salesBillSource=='PURCHASE'&&record.orderType==='TIRE'"
                 @click="handleDetail(record,'salesNewDetailTransfer')"
               >
                 转单
@@ -265,7 +265,7 @@
                 size="small"
                 type="link"
                 class="button-info"
-                v-if="record.billStatus == 'SUPERIOR_WAIT_AUDIT'"
+                v-if="$hasPermissions('B_higherLevelAudit')&&record.billStatus == 'SUPERIOR_WAIT_AUDIT'"
                 @click="handleDetail(record,'salesNewDetailTransfer')"
               >
                 上级审核