Sfoglia il codice sorgente

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

chenrui 1 anno fa
parent
commit
15bf0247e8

+ 1 - 0
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -10,6 +10,7 @@
             key="3"
             type="primary"
             class="button-info"
+            v-if="$hasPermissions('B_salesOrderWarehouseExport')"
             @click="handlePrint">导出Excel</a-button>
         </template>
       </a-page-header>

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.111/ocs-admin',
+        // target: 'http://192.168.2.111/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {