Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

components/mobile/center/outOfStorage/otherStorage.vue

@@ -191,7 +191,7 @@
           }
           this.allObj[index].qty = this.baseUtils.cutOutString(item.qty, chineseIndex)
         } else if (item.qty.length > 9) {
-          this.onRemind ('数量不能高于1亿')
+          this.onRemind ('数量不能高于10亿')
           this.allObj[index].qty = this.baseUtils.cutOutString(item.qty, 9)
         }
       },

components/search/ForwardGoodsList.vue

@@ -5,7 +5,7 @@
         <tr>
           <th width="25%">型号/品牌</th>
           <th width="25%">卖家名称</th>
-          <th width="25%">物料名称/单位</th>
+          <th width="25%">物料名称/库存(PCS)</th>
           <th width="15%">规格</th>
           <th width="15%"></th>
         </tr>

pages/mobile/center/user/invoice/index.vue

@@ -20,12 +20,12 @@
             <div class="mi-list-bottom clearfix">
               <div class="list clearfix">
                 <div class="pull-left">发票抬头：</div>
-                <div class="pull-left overhidden" style="width: 1.85rem">{{item.head}}</div>
+                <div class="pull-left overhidden">{{item.head}}</div>
               </div>
               <div class="list clearfix">
                 <div class="clearfix">
                   <div class="pull-left">收票人：</div>
-                  <div class="pull-left overhidden" style="width:2.1rem">{{item.name}}</div>
+                  <div class="pull-left overhidden">{{item.name}}</div>
                 </div>
               </div>
               <div class="list clearfix">
@@ -38,7 +38,7 @@
               <div class="list ">
                 <div class="clearfix">
                   <div class="pull-left">收票地址：</div>
-                  <div class="pull-left" style="width: 5rem;">
+                  <div class="pull-left overhidden">
                     {{item.detailAddress}}
                   </div>
                 </div>
@@ -57,12 +57,12 @@
               <div class="mi-list-bottom clearfix">
                 <div class="list clearfix">
                   <div class="pull-left">发票抬头：</div>
-                  <div class="pull-left overhidden" style="width: 1.85rem">{{item.head}}</div>
+                  <div class="pull-left overhidden">{{item.head}}</div>
                 </div>
                 <div class="list" >
                   <div class="clearfix">
                     <div class="pull-left">单位电话：</div>
-                    <div class="pull-left overhidden" style="width: 4.6rem;">
+                    <div class="pull-left overhidden">
                       {{item.companyPhone || '-'}}
                     </div>
                   </div>
@@ -71,7 +71,7 @@
                 <div class="list">
                   <div class="clearfix">
                     <div class="pull-left">单位地址：</div>
-                    <div class="pull-left overhidden" style="width: 4.6rem;">
+                    <div class="pull-left overhidden">
                       {{item.companyAddress || '-'}}
                     </div>
                   </div>
@@ -80,7 +80,7 @@
                 <div class="list">
                   <div class="clearfix">
                     <div class="pull-left">税务登记号：</div>
-                    <div class="pull-left overhidden" style="width: 4.8rem;">
+                    <div class="pull-left overhidden" style="width: 4.5rem;">
                       {{item.companyTaxNumber || '-'}}
                     </div>
                   </div>
@@ -89,7 +89,7 @@
                 <div class="list">
                   <div class="clearfix">
                     <div class="pull-left">开户银行名称：</div>
-                    <div class="pull-left overhidden" style="width: 4.6rem;">
+                    <div class="pull-left overhidden" style="width: 4.4rem;">
                       {{item.bankName || '-'}}
                     </div>
                   </div>
@@ -98,7 +98,7 @@
                 <div class="list">
                   <div class="clearfix">
                     <div class="pull-left">开户银行账户：</div>
-                    <div class="pull-left overhidden" style="width: 4.6rem;">
+                    <div class="pull-left overhidden" style="width: 4.4rem;">
                       {{item.bankAccount || '-'}}
                     </div>
                   </div>
@@ -106,7 +106,7 @@
                 <div class="list clearfix">
                   <div class="clearfix">
                     <div class="pull-left">收票人：</div>
-                    <div class="pull-left overhidden" style="width:2.1rem">{{item.name}}</div>
+                    <div class="pull-left overhidden">{{item.name}}</div>
                   </div>
                 </div>
                 <div class="list">
@@ -119,7 +119,7 @@
                 <div class="list ">
                   <div class="clearfix">
                     <div class="pull-left">收票地址：</div>
-                    <div class="pull-left" style="width: 5rem;">
+                    <div class="pull-left overhidden">
                       {{item.detailAddress}}
                     </div>
                   </div>
@@ -594,7 +594,9 @@
             line-height: 0.55rem;
           }
           .overhidden {
-            @include overFlowHidden()
+            width:75%;
+            word-wrap: break-word;
+            word-break: break-all;
           }
           .w50 {
             width: 50%;

pages/mobile/center/vendor/outOfStorage/purchase/_storeid.vue

@@ -175,6 +175,7 @@
             if(arr.length <= 0) {
               this.onRemind('最少填写一个发货数量')
             } else {
+              this.allObj.sendType = type.sendType
               this.allObj.map = arr
               this.allObj.jsonSdAddress = this.storageList.jsonAddress
               this.$http.post(`/trade/invoice/inFpu/save?id=${this.storageList.id}`, this.allObj)

store/index.js

@@ -110,7 +110,7 @@ export const actions = {
   },
   // 获取币别信息
   loadCurrencyData ({commit}) {
-    return axios.get('basic/enterprise/currency')
+    return axios.get('/basic/enterprise/currency')
       .then(res => {
         commit('option/SET_CURRENCY', res.data)
       })

store/option.js

@@ -137,7 +137,7 @@ export const mutations = {
     state.wechatInfo.fetching = false
   },
   SET_CURRENCY (state, result) {
-    state.currency = result.data ? result.data.data : 'RMB'
+    state.currency = result.data || 'RMB'
   },
   GET_MESSAGETYPE (state, result) {
     state.messageType = result || ''