瀏覽代碼

Merge branch 'develop_szhj' of jianguan-web/qpls-md-html into develop

李磊 3 年之前
父節點
當前提交
bf13fa1861

+ 2 - 1
src/views/numsGoodsShelves/replenishmentManagement/outWarehousingModal.vue

@@ -153,7 +153,8 @@ export default {
                 replenishBillSn: _this.nowData && _this.nowData.replenishBillSn,
                 detailList: arr,
                 dispatchType: _this.form.dispatchType,
-                remarks: _this.form.remarks
+                remarks: _this.form.remarks,
+                shelfSn: _this.nowData && _this.nowData.shelfSn
               }
               _this.spinning = true
               shelfReplenishOutStock(params).then(res => {

+ 4 - 2
src/views/numsGoodsShelves/replenishmentManagement/printView.vue

@@ -19,7 +19,7 @@
           {{ nowData.dealerName }}
         </div>
         <div style="overflow: hidden;">
-          <div style="padding-right: 3pt;float: left;">
+          <div style="padding-right: 3pt;float: left;width:80%;">
             <div class="shelfName" style="margin-bottom: 2pt;">
               {{ nowData.shelfInfo.shelfName }}
             </div>
@@ -88,7 +88,7 @@ export default {
       this.nowData.dealerName = dearInfo.orgName
       this.nowData.dealerSn = dearInfo.orgSn
       this.nowData.parintUser = dearInfo.userNameCN
-      console.log(this.$store.state.user.info)
+      console.log(this.list)
     }
   },
   watch: {
@@ -99,6 +99,8 @@ export default {
     //  重定义的弹框状态
     isShow (newValue, oldValue) {
       if (!newValue) {
+        this.nowData = null
+        this.list = []
         this.$emit('close')
       }
     }

+ 2 - 2
vue.config.js

@@ -109,8 +109,8 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.188:8503/qpls-md',
-        // target: 'http://frps.chelingzhu.com:7800/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://frps.chelingzhu.com:7800/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,