Browse Source

Merge commit '62672f06caabd1a3a11ac2f4bee84511535c4f11' into HEAD

gitadmin 3 years ago
parent
commit
a83158106c
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/views/numsGoodsShelves/replenishmentManagement/list.vue
  2. 2 2
      vue.config.js

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -77,7 +77,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button v-if="record.billState=='WAIT_CONFIRM'" size="small" type="link" class="button-primary" @click.stop="handleConfirm(record)">确认</a-button>
-          <a-button size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
+          <a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handlePrintSticker(record)">打印贴签</a-button>
           <a-button v-if="record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleOutWarehousing(record)">出库</a-button>
           <a-button v-if="record.billState=='WAIT_CHECK'" size="small" type="link" class="button-primary" @click.stop="handlePutWarehousing(record)">签收</a-button>
           <a-button v-if="record.billState=='WAIT_CONFIRM' || record.billState=='WAIT_OUT_STOCK'" size="small" type="link" class="button-primary" @click.stop="handleCancelOrder(record)">取消补货单</a-button>

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.151:8503/qpls-md',
+        // target: 'http://192.168.16.151:8503/qpls-md',
         // target: 'http://frps.chelingzhu.com:7800/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,