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

components/mobile/center/outOfStorage/StorageList.vue

@@ -13,7 +13,8 @@
       </li>
       <li v-for="item in listData" v-if="handleItem === 2">
         <div class="linetext">{{switchType === 'INBOUND' ? '入库单号' : '出库单号'}}： <span>系统自动生成</span></div>
-        <div class="linetext">{{switchType === 'INBOUND' ? '发货单' : '订单号'}}： <span v-text="item.orderid || '-'">21324</span></div>
+        <div class="linetext" v-if="switchType === 'INBOUND'">发货单： <span v-text="item.invoiceid || '-'">21324</span></div>
+        <div class="linetext" v-if="switchType === 'OUTBOUND'">订单号： <span v-text="item.orderid || '-'">21324</span></div>
         <div class="linetext">{{switchType === 'INBOUND' ? '卖家名称' : '买家名称'}}： <span v-text="item.buyentername || item.buyerentername || item.buyername || '-'">21324</span></div>
         <div class="linetext">录入人： <span v-text="item.sellername || '-'">21324</span></div>
         <div class="linetext">录入时间： <span v-text="item.createtime ? baseUtils.formatDate(new Date(item.createtime), 'yyyy-MM-dd hh:mm:ss') : '-'">21324</span></div>
@@ -75,7 +76,7 @@
   .storage{
     ul{
       li{
-        padding: 0.24rem 0.24rem;
+        padding: 0.24rem 0.24rem 0;
         background: #fff;
         margin-bottom:.2rem;
         .linetext{
@@ -90,7 +91,7 @@
           }
         }
         .look-btn{
-          padding: 0.2rem 0;
+          padding: 0.2rem;
           border-top: 1px solid #d3d3d3;
           text-align: center;
         }

components/mobile/center/outOfStorage/otherStorage.vue

@@ -74,6 +74,7 @@
           spec: '',
           qty: '',
           price: '',
+          erpReserve: '',
           showSimilarCodeList: false,
         },
         similarCode:[]
@@ -94,7 +95,8 @@
               pcmpcode: '',
               spec: '',
               qty: '',
-              price: ''
+              price: '',
+              erpReserve: ''
             }
           }
           val.showSimilarCodeList = false
@@ -131,6 +133,7 @@
           spec: '',
           qty: '',
           price: '',
+          erpReserve: '',
           showSimilarCodeList: false,
         })
       },
@@ -152,6 +155,7 @@
                 this.allObj[type].pcmpcode = ''
                 this.allObj[type].spec = ''
                 this.allObj[type].productId = ''
+                this.allObj[type].erpReserve = ''
                 this.onRemind('产品库中没有找到相应产品信息')
               }
               this.allObj[type].showSimilarCodeList = response.data.length > 0
@@ -162,6 +166,7 @@
               this.allObj[type].pcmpcode = ''
               this.allObj[type].spec = ''
               this.allObj[type].productId = ''
+              this.allObj[type].erpReserve = ''
               this.onRemind('产品库中没有找到相应产品信息')
             })
         } else {
@@ -191,6 +196,7 @@
             spec: '',
             qty: '',
             price: '',
+            erpReserve: '',
             showSimilarCodeList: false,
           }
           this.allObj.push(_item)
@@ -316,6 +322,7 @@
       right: 0;
       z-index:100;
       text-align: center;
+      background: #f1f3f6;
       span{
         display:inline-block;
         width:30%;

pages/mobile/center/vendor/material.vue

@@ -241,7 +241,7 @@
                 </span>
                 <div style="clear:both"></div>
                 <div class="uploadImgBtn pull-left" v-if="MaterielItem.standard !== 1">上传规格书<input type="file" class="com-input" @change.stop="update" accept=".pdf" /></div>
-                <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="MaterielItem.standard !== 1 && MaterielItem.Regulpic !== ''" >该规格书正在审核中</div>
+                <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="MaterielItem.standard !== 1 && MaterielItem.Regulpic !== '' && MaterielItem.IsSave" >该规格书正在审核中</div>
               </div>
 
               <div class="update-materiel-wrapper-list clearfix">

pages/mobile/center/vendor/outOfStorage/index.vue

@@ -109,7 +109,7 @@
         handler: function (val) {
           if (val && val.content) {
             if(this.isChange){
-              this.storageList = val.content
+              this.storageList = []
               this.isChange = false
             }
             this.storageList = [...this.storageList, ...val.content]
@@ -206,11 +206,11 @@
       filterRecord () {
         this.filterParams.page = 1
         this.filter.page = 1
-        this.filterParams.type = this.switchType
         this.isChange = true
         this.reloadList()
       },
       reloadList () {
+        this.filterParams.type = this.switchType
         if(this.handleItem === 0) {
           this.$store.dispatch('product/getLoadStorageData', this.filterParams)
         } else if(this.handleItem === 2) {

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

@@ -14,7 +14,7 @@
         <div class="storage-info">
           <div class="linetext">入库单： <span>系统自动生成</span></div>
           <div class="linetext">卖家名称： <span v-text="storageList.buyentername || storageList.buyername">21324</span></div>
-          <div class="linetext">所属订单： <span v-text="storageList.purchaseid || '-'">21324</span></div>
+          <div class="linetext">所属订单： <span v-text="storageList.orid || '-'">21324</span></div>
           <div class="linetext" v-if="allObj.logistics">物流公司：<span v-text="allObj.logistics.companyName"></span></div>
           <div class="linetext" v-if="allObj.logistics">物流单号：<span v-text="allObj.logistics.number"></span></div>
           <div class="linetext">录入人： <span v-text="storageList.sellername || '-'">21324</span></div>
@@ -28,7 +28,7 @@
             <div class="linetext width50 fl">物料名称： <span v-text="item.kiName || '-'">21324</span></div>
             <div class="linetext width50 fl">规格： <span v-text="item.spec || '-'">21324</span></div>
             <div class="linetext width50 fl">入库数(PCS)：<span v-text="item.qty || '-'">-</span></div>
-            <div class="linetext width50 fl">单价({{currency === 'RMB' ? '¥': '$'}})： <span class="base-color" v-text="item.price || '-'">21324</span></div>
+            <div class="linetext width50 fl">单价({{currency === 'RMB' ? '¥': '$'}})： <span class="base-color" v-text="item.taxUnitprice || '-'">21324</span></div>
           </li>
         </ul>
       </div>
@@ -48,7 +48,7 @@
           </div>
           <div class="linetext">出库单： <span>系统自动生成</span></div>
           <div class="linetext">买家名称： <span v-text="storageList.buyentername || storageList.buyername">21324</span></div>
-          <div class="linetext">所属订单： <span v-text="storageList.purchaseid || '-'">21324</span></div>
+          <div class="linetext">所属订单： <span v-text="storageList.orderid || '-'">21324</span></div>
           <div class="linetext"><em>*</em>物流公司：<span>
             <input style="width:3rem;" type="text" readonly placeholder="请选择物流公司" v-model="allObj.logisticsInfo.companyName" @click.stop="showLogistics = !showLogistics">
           </span></div>
@@ -71,7 +71,7 @@
               <span v-if="item.qty === item.number">-</span>
               <input style="width:1.2rem;" v-else type="text" v-model="item.qty" @blur="ChangeSendCount(item, item.qty)">
             </div>
-            <div class="linetext width50 fl">单价(¥)： <span class="base-color" v-text="item.taxUnitprice || '-'">21324</span></div>
+            <div class="linetext width50 fl">单价(¥)： <span class="base-color" v-text="item.taxUnitPrice || '-'">21324</span></div>
           </li>
         </ul>
       </div>
@@ -231,6 +231,7 @@
       left: 0;
       right: 0;
       text-align: center;
+      background: #f1f3f6;
       span{
         display:inline-block;
         width:30%;

pages/mobile/order/details.vue

@@ -187,28 +187,28 @@
             {{orderList.paytype === '1103' ? '线下付款' : '线下付款'}}
           </div>
         </div>
-        <!--<div class="clearfix">-->
-          <!--<template v-if="logisticsInfo.length === 0">-->
-            <!--<div class="name pull-left">物流信息</div>-->
-            <!--<div class="pull-right"  style="line-height: 0.88rem">暂无信息</div>-->
-          <!--</template>-->
-          <!--<template v-else>-->
-            <!--<div class="name" style="line-height: 0.88rem;">物流信息</div>-->
-            <!--<ul class="logistics_ul" v-if="logisticsInfo.length > 0" style="width: 100%">-->
-              <!--<li class="clearfix" v-for="(item, index) in logisticsInfo">-->
-                <!--<div class="pull-left" :class="index > 0 ? '' : 'marginL'">-->
-                  <!--<div class="logistics_icon" :class="index > 0 ? '' : 'active'">-->
-                    <!--<div class="red" v-if="index === 0"></div>-->
-                  <!--</div>-->
-                <!--</div>-->
-                <!--<div class="pull-right" :class="index > 0 ? '' : 'marginT'">-->
-                  <!--<div class="logistics_time">{{item.AcceptTime}}</div>-->
-                  <!--<div class="logistics_info">{{item.AcceptStation}}</div>-->
-                <!--</div>-->
-              <!--</li>-->
-            <!--</ul>-->
-          <!--</template>-->
-        <!--</div>-->
+        <div class="clearfix">
+          <template v-if="logisticsInfo.length === 0">
+            <div class="name pull-left">物流信息</div>
+            <div class="pull-right"  style="line-height: 0.88rem">暂无信息</div>
+          </template>
+          <template v-else>
+            <div class="name" style="line-height: 0.88rem;">物流信息</div>
+            <ul class="logistics_ul" v-if="logisticsInfo.length > 0" style="width: 100%">
+              <li class="clearfix" v-for="(item, index) in logisticsInfo">
+                <div class="pull-left" :class="index > 0 ? '' : 'marginL'">
+                  <div class="logistics_icon" :class="index > 0 ? '' : 'active'">
+                    <div class="red" v-if="index === 0"></div>
+                  </div>
+                </div>
+                <div class="pull-right" :class="index > 0 ? '' : 'marginT'">
+                  <div class="logistics_time">{{item.AcceptTime}}</div>
+                  <div class="logistics_info">{{item.AcceptStation}}</div>
+                </div>
+              </li>
+            </ul>
+          </template>
+        </div>
       </div>
       <div class="order-details-moreinfo clearfix">
         <div class="clearfix moreinfoList">

pages/mobile/order/logistics.vue

@@ -1,5 +1,14 @@
 <template>
     <div class="order-wrapper">
+      <div class="navtop" v-if="getRouter === 'buyer'" style="margin-bottom: 0.1rem;background: #fff;padding:0.2rem">
+        <div class="navtop_title" style="color: #666;font-size: 0.28rem;">请选择发货单查看对应的物流信息</div>
+        <div class="ids clearfix">
+          <div style="margin-top: 5px" v-for="(item, index) in idsList"  v-bind:key="index">
+            <span class="mobile-cart-check" :class="index === nowIds ? 'active': ''" @click.stop.prevent="changeInds(index)"></span>
+            <span @click.stop.prevent="changeInds(index)">{{item}}</span>
+          </div>
+        </div>
+      </div>
       <div class="logistics_top clearfix">
         <div class="pull-left">
           <div class="name">订单编号：<span class="red">{{detailsInfo.orderid}}</span></div>
@@ -44,7 +53,9 @@
           detailsInfo: {},
           logistics: {},
           logisticsInfo: {},
-          status: ''
+          status: '',
+          idsList: [],
+          nowIds: 0
         }
       },
       async asyncData ({route}) {
@@ -58,15 +69,31 @@
           res = await axios.get(`/trade/purchase/purchaseId/${route.query.uuid}`)
           resultInfo = res.data.data
         }
+        let _idsList = resultInfo.inIds.split(',')
         return {
-          detailsInfo: resultInfo
+          detailsInfo: resultInfo,
+          idsList: _idsList
+        }
+      },
+      computed: {
+        getRouter() {
+          return this.$route.query.type
         }
       },
       created() {
-        if (this.detailsInfo.lgtId) {
-          this.$http.get(`/trade/logistics/${this.detailsInfo.lgtId}`).then(data => {
-            this.logistics = data.data
-            this.$http.get(`/kdn/logistics/query?companyName=${data.data.companyName}&logisticsCode=${data.data.number}`).then(res => {
+          this.getInfo()
+        // }
+      },
+      methods: {
+        changeInds(ind) {
+          this.nowIds = ind
+          this.logistics = {}
+          this.getInfo()
+        },
+        getInfo() {
+          this.$http.get(`/trade/order/invoiceid?id=${this.detailsInfo.id}&invoiceid=${this.idsList[this.nowIds]}`).then(data => {
+            this.logistics = data.data.data.logistics
+            this.$http.get(`/kdn/logistics/query?companyName=${this.logistics.companyName}&logisticsCode=${this.logistics.number}`).then(res => {
               let str = res.data.traces
               this.logisticsInfo = JSON.parse(res.data.traces).reverse()
               if (str.indexOf('揽件') !== -1 || str.indexOf('收件') !== -1 || str.indexOf('转运') !== -1 || str.indexOf('运输') !== -1 || str.indexOf('发往') !== -1 ||
@@ -198,5 +225,30 @@
         margin-top: 0.2rem;
       }
     }
+    .navtop {
+      .ids{
+        div {
+          width: 100%;
+          font-size: 0.24rem;
+          color: #333;
+          line-height: .36rem;
+          .mobile-cart-check{
+            min-width: .36rem;
+            height: .36rem;
+            background: url(/images/mobile/center/user/car-noChecked.png) no-repeat;
+            background-size: contain;
+            vertical-align: middle;
+            margin-bottom: .02rem;
+            display: inline-block;
+            margin-right: 0.11rem;
+            display: inline-block;
+            vertical-align: middle;
+            &.active {
+              background-image: url(/images/mobile/center/user/car-checked.png);
+            }
+          }
+        }
+      }
+    }
   }
 </style>