lilei 2 rokov pred
rodič
commit
9c3a6d2125

+ 1 - 1
public/version.json

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

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

@@ -19,35 +19,35 @@
             key="4"
             type="primary"
             class="button-info"
-            v-if="$hasPermissions('B_transferOut_detail_export')"
-            id="allocateBillDetail-export-btn"
+            v-if="$hasPermissions('B_transferOut_print')"
+            id="allocateBillDetail-db-print-btn"
             :disabled="localDataSource.length==0"
-            @click="handleExcel('ALLOCATE_BILL','调拨明细')">导出Excel</a-button>
+            @click="handlePrint('dbPrint')">调拨打印</a-button>
           <a-button
             key="3"
             type="default"
             class="button-info"
-            v-if="$hasPermissions('B_transferOutType_export')"
-            id="allocateBillDetail-export-btn"
+            v-if="$hasPermissions('B_transferOutType_print')"
+            id="allocateBillDetail-dbfl-print-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('dbflExport')">调拨分类导出</a-button>
+            @click="handlePrint('dbflPrint')">调拨分类打印</a-button>
           <a-divider type="vertical" />
           <a-button
             key="2"
             type="primary"
             class="button-info"
-            v-if="$hasPermissions('B_transferOut_print')"
-            id="allocateBillDetail-db-print-btn"
+            v-if="$hasPermissions('B_transferOut_detail_export')"
+            id="allocateBillDetail-export-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('dbPrint')">调拨打印</a-button>
+            @click="handleExcel('ALLOCATE_BILL','调拨明细')">导出Excel</a-button>
           <a-button
             key="1"
             type="default"
             class="button-info"
-            v-if="$hasPermissions('B_transferOutType_print')"
-            id="allocateBillDetail-dbfl-print-btn"
+            v-if="$hasPermissions('B_transferOutType_export')"
+            id="allocateBillDetail-export-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('dbflPrint')">调拨分类打印</a-button>
+            @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">

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

@@ -13,35 +13,35 @@
             key="4"
             type="primary"
             class="button-info"
-            v-if="$hasPermissions('B_transferOut_detail_export')"
-            id="allocateBillDetail-export-btn"
+            v-if="$hasPermissions('B_transferOut_print')"
+            id="allocateBillEdit-db-print-btn"
             :disabled="localDataSource.length==0"
-            @click="handleExcel('ALLOCATE_BILL','调拨明细')">导出Excel</a-button>
+            @click="handlePrint('dbPrint')">调拨打印</a-button>
           <a-button
             key="3"
             type="default"
             class="button-info"
-            v-if="$hasPermissions('B_transferOutType_export')"
-            id="allocateBillDetail-export-btn"
+            v-if="$hasPermissions('B_transferOutType_print')"
+            id="allocateBillEdit-dbfl-print-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('dbflExport')">调拨分类导出</a-button>
+            @click="handlePrint('dbflPrint')">调拨分类打印</a-button>
           <a-divider type="vertical" />
           <a-button
             key="2"
             type="primary"
             class="button-info"
-            v-if="$hasPermissions('B_transferOut_print')"
-            id="allocateBillEdit-db-print-btn"
+            v-if="$hasPermissions('B_transferOut_detail_export')"
+            id="allocateBillDetail-export-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('dbPrint')">调拨打印</a-button>
+            @click="handleExcel('ALLOCATE_BILL','调拨明细')">导出Excel</a-button>
           <a-button
             key="1"
             type="default"
             class="button-info"
-            v-if="$hasPermissions('B_transferOutType_print')"
-            id="allocateBillEdit-dbfl-print-btn"
+            v-if="$hasPermissions('B_transferOutType_export')"
+            id="allocateBillDetail-export-btn"
             :disabled="localDataSource.length==0"
-            @click="handlePrint('dbflPrint')">调拨分类打印</a-button>
+            @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">

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

@@ -10,35 +10,35 @@
             key="4"
             type="primary"
             class="button-info"
-            id="purchaseOrderDetail-export-btn"
+            id="salesDetail-fhdy-print-btn"
             :disabled="localDataSource.length==0"
-            v-if="$hasPermissions('B_dispatchExport')"
-            @click="openExcelModal=true">导出Excel</a-button>
+            v-if="$hasPermissions('B_dispatchPrint')"
+            @click="handlePrint('DISPATCH_BILL')">发货打印</a-button>
           <a-button
             key="3"
             type="default"
             class="button-info"
             id="salesDetail-fhfl-print-btn"
             :disabled="localDataSource.length==0"
-            v-if="$hasPermissions('B_dispatchTypeExport')"
-            @click="handleFlExport('DISPATCH_BILL_TYPE')">发货分类导出</a-button>
+            v-if="$hasPermissions('B_dispatchTypePrint')"
+            @click="handlePrint('DISPATCH_BILL_TYPE')">发货分类打印</a-button>
           <a-divider type="vertical" />
           <a-button
             key="2"
             type="primary"
             class="button-info"
-            id="salesDetail-fhdy-print-btn"
+            id="purchaseOrderDetail-export-btn"
             :disabled="localDataSource.length==0"
-            v-if="$hasPermissions('B_dispatchPrint')"
-            @click="handlePrint('DISPATCH_BILL')">发货打印</a-button>
+            v-if="$hasPermissions('B_dispatchExport')"
+            @click="openExcelModal=true">导出Excel</a-button>
           <a-button
             key="1"
             type="default"
             class="button-info"
             id="salesDetail-fhfl-print-btn"
             :disabled="localDataSource.length==0"
-            v-if="$hasPermissions('B_dispatchTypePrint')"
-            @click="handlePrint('DISPATCH_BILL_TYPE')">发货分类打印</a-button>
+            v-if="$hasPermissions('B_dispatchTypeExport')"
+            @click="handleFlExport('DISPATCH_BILL_TYPE')">发货分类导出</a-button>
         </template>
       </a-page-header>
       <!-- 基础信息 -->

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.115:8003/ocs-admin',
+        target: 'http://192.168.0.182:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {