فهرست منبع

Merge branch 'develop_yh5' of jianguan-web/jg-ocs-html into pre-release

李磊 2 سال پیش
والد
کامیت
595106c1a7

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.1.33",
+    "version": "2.1.35",
     "message": "发现有新版本发布,确定更新系统?"
 }

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

@@ -36,7 +36,7 @@
             key="1"
             type="default"
             class="button-info"
-            v-if="$hasPermissions('B_transferOut_print')"
+            v-if="$hasPermissions('B_transferOutType_print')"
             id="allocateBillDetail-dbfl-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('dbflPrint')">调拨分类打印</a-button>

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

@@ -30,7 +30,7 @@
             key="1"
             type="default"
             class="button-info"
-            v-if="$hasPermissions('B_transferOut_print')"
+            v-if="$hasPermissions('B_transferOutType_print')"
             id="allocateBillEdit-dbfl-print-btn"
             :disabled="localDataSource.length==0"
             @click="handlePrint('dbflPrint')">调拨分类打印</a-button>

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

@@ -5,13 +5,14 @@
         <template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
         </template>
-        <template slot="extra" v-if="$hasPermissions('B_dispatchPrint')">
+        <template slot="extra">
           <a-button
             key="3"
             type="primary"
             class="button-info"
             id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"
+            v-if="$hasPermissions('B_dispatchExport')"
             @click="openExcelModal=true">导出Excel</a-button>
           <a-divider type="vertical" />
           <a-button
@@ -20,6 +21,7 @@
             class="button-info"
             id="salesDetail-fhdy-print-btn"
             :disabled="localDataSource.length==0"
+            v-if="$hasPermissions('B_dispatchPrint')"
             @click="handlePrint('DISPATCH_BILL')">发货打印</a-button>
           <a-button
             key="1"
@@ -27,6 +29,7 @@
             class="button-info"
             id="salesDetail-fhfl-print-btn"
             :disabled="localDataSource.length==0"
+            v-if="$hasPermissions('B_dispatchTypePrint')"
             @click="handlePrint('DISPATCH_BILL_TYPE')">发货分类打印</a-button>
         </template>
       </a-page-header>

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

@@ -19,7 +19,7 @@
             type="default"
             class="button-info"
             id="salesDetail-xsfl-print-btn"
-            v-if="$hasPermissions('B_salesPrint')"
+            v-if="$hasPermissions('B_salesTypePrint')"
             :disabled="localDataSource.length==0"
             @click="handlePrint('SALES_BILL_TYPE')">销售分类打印</a-button>
           <a-divider type="vertical" />
@@ -36,7 +36,7 @@
             type="default"
             class="button-info"
             id="salesDetail-export-btn"
-            v-if="$hasPermissions('B_salesExport')"
+            v-if="$hasPermissions('B_salesTypeExport')"
             :disabled="localDataSource.length==0"
             @click="handlePrint('typeExport')">销售分类导出</a-button>
         </template>