处理买家中心采购订单内容

nuxt.config.js

@@ -147,7 +147,6 @@ module.exports = {
   proxyTable: {
     // B2B服务接口 uasUrl
     '/btob/**': uasUrl,
-    '/sale/**': uasUrl,
     '/purchase/arCheck': uasUrl,
     '/sale/inquiry/**': uasUrl,
     '/purc/inquiry/**': uasUrl,
@@ -155,12 +154,13 @@ module.exports = {
     '/sale/apBill/**': uasUrl,
     '/sale/apCheck/**': uasUrl,
     '/sale/tender/**': uasUrl,
+    '/sale/sample/**': uasUrl,
+    '/sale/**': uasUrl,
     '/tender/purc/**': uasUrl,
     '/tender/getUnreadIds/**': uasUrl,
     '/token**': uasUrl,
     '/authentication**': uasUrl,
     '/authentication/**': uasUrl,
-    '/sale/sample/**': uasUrl,
     '/vendor/customer/**': uasUrl,
     '/vendor/info/**': uasUrl,
     '/vendorPerformanceAssess/info/**': uasUrl,

pages/mobile/center/user/btobapCheck.vue → pages/mobile/center/user/btobarCheck.vue

@@ -41,7 +41,6 @@
             <div class="invoice-btob-wrapper-middle">
               <div class="invoice-btob-wrapper-middle-title">{{item.vendor.enName}}</div>
               <div><span>单据编号：</span><a>{{item.code}}</a></div>
-              <div><span>{{item.currency}}：</span>{{item.checkAmount | toFixedNum}}</div>
             </div>
             <div class="invoice-btob-wrapper-content">
               <div><span>对账期间：</span>{{item.fromDate | time}} - {{item.toDate | time}}</div>

pages/mobile/center/user/index.vue

@@ -30,11 +30,11 @@
       <div class="block-wrap seek-operation">
         <p><i></i>更多业务</p>
         <ul>
-          <nuxt-link tag="li" to="/mobile/order?type=buyer" class="content-line">
+          <nuxt-link tag="li" to="/mobile/order/orderbtob?type=buyer" class="content-line">
             <img src="/images/mobile/center/user/order.jpg" alt="">
             <p>采购订单</p>
           </nuxt-link>
-          <nuxt-link tag="li" to="/mobile/center/user/payCenter" class="content-line">
+          <nuxt-link tag="li" to="/mobile/center/user/btobarCheck" class="content-line">
             <img src="/images/mobile/center/user/payfor_icon.png" alt="">
             <p>应付对账</p>
           </nuxt-link>

pages/mobile/center/user/payCenter.vue

@@ -2,7 +2,7 @@
   <div class="vendor-payCnter">
     <div class="order-tab">
       <div class="order-tab-wrapper clearfix">
-        <nuxt-link class="fl tab" to="/mobile/center/user/btobapCheck" tag="div" >
+        <nuxt-link class="fl tab" to="/mobile/center/user/btobarCheck" tag="div" >
           B2B
         </nuxt-link>
         <div class="fl active tab">商城</div>

pages/mobile/center/vendor/index.vue

@@ -42,7 +42,7 @@
       <div class="block-wrap seek-operation">
         <p><i></i>更多业务</p>
         <ul>
-          <nuxt-link tag="li" to="/mobile/order/orderbtob">
+          <nuxt-link tag="li" to="/mobile/order/orderbtob?type=saler">
             <img src="/images/mobile/center/user/order.jpg" alt="">
             <p>销售订单</p>
           </nuxt-link>

pages/mobile/order/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="order-wrapper">
-    <div class="order-tab" v-if="vendorType === 'saler'">
+    <div class="order-tab">
       <div class="order-tab-wrapper clearfix">
-        <nuxt-link class="fl tab" to="/mobile/order/orderbtob" tag="div" >
+        <nuxt-link class="fl tab" :to="`/mobile/order/orderbtob?type=${vendorType === 'saler' ? 'saler' : 'buyer'}`" tag="div" >
           B2B
         </nuxt-link>
         <div class="fl active tab">商城</div>

pages/mobile/order/orderbtob.vue

@@ -3,7 +3,7 @@
     <div class="order-tab">
       <div class="order-tab-wrapper clearfix">
         <div class="fl active tab">B2B</div>
-        <nuxt-link class="fl tab" to="/mobile/order?type=saler" tag="div" >
+        <nuxt-link class="fl tab" :to="`/mobile/order?type=${vendorType === 'saler' ? 'saler' : 'buyer'}`" tag="div" >
           商城
         </nuxt-link>
       </div>
@@ -11,6 +11,7 @@
     <div class="order-nav">
       <div :class="activeType === 'todo' ? 'active': ''" @click="ChangeList('todo')"><span>待回复</span></div>
       <div :class="activeType === 'done' ? 'active' : ''" @click="ChangeList('done')"><span>已回复</span></div>
+      <div :class="activeType === 'waiting' ? 'active' : ''" @click="ChangeList('waiting')"><span>待收货</span></div>
       <div :class="activeType === 'end' ? 'active' : ''" @click="ChangeList('end')"><span>已结案</span></div>
     </div>
     <div class="search-content search-content2">
@@ -45,6 +46,9 @@
             <div v-else-if="activeType === 'done'" class="done">
               已回复
             </div>
+            <div v-else-if="activeType === 'waiting'" class="done">
+              待收货
+            </div>
             <div v-else-if="activeType === 'end'" class="end">
               已结案
             </div>
@@ -83,22 +87,38 @@
     created() {
       this.getResource('')
     },
+    computed: {
+      vendorType() {
+        return this.$route.query.type
+      }
+    },
     methods: {
       goDetails(item) {
-        this.$router.push('/mobile/order/orderbtob_details?id=' + item.id)
+        this.$router.push('/mobile/order/orderbtob_details?type=' + this.vendorType + '&id=' + item.id)
       },
       getResource(Reset, key) {
-        let _url = '/sale/orders/info/nosearch'
-        if (key) {
-          _url = '/sale/orders/info/search'
-        }
-        this.$http.get(_url, {params: {
+        let _url = ''
+        let filterParams = {
           _state: this.activeType,
           count: 10,
           page: this.page,
-          searchFilter: {'fromDate': 1293811200000, 'endDate': new Date().getTime(), 'keyword': this.keyword},
-          sorting: {date: 'desc', id: 'desc'}
-        }}).then(res => {
+          searchFilter: {'fromDate': 1293811200000, 'endDate': new Date().getTime(), 'keyword': this.keyword}
+        }
+        if (this.vendorType === 'buyer') {
+          filterParams.sorting = {'display': 'desc', 'date': 'desc'}
+            _url = '/sale/orders/purc/info/nosearch'
+          if (key) {
+            _url = '/sale/orders/purc/info/search'
+          }
+        } else {
+          filterParams.sorting = {date: 'desc', id: 'desc'}
+            _url = '/sale/orders/info/nosearch'
+          if (key) {
+            _url = '/sale/orders/info/search'
+          }
+        }
+        this.$http.get(_url, {params: filterParams})
+          .then(res => {
           if (Reset !== '') {
             this.orderList = []
           }
@@ -194,7 +214,7 @@
         height: 0.82rem;
         line-height: 0.82rem;
         display: inline-block;
-        width: 33.3%;
+        width: 25%;
         text-align: center;
         font-size: .28rem;
         color: #666;

pages/mobile/order/orderbtob_details.vue

@@ -6,34 +6,75 @@
     </div>
     <div class="orderbtob_details_content">
       <div class="orderbtob_details_top">
-        <div class="item">
-          <span class="name">客户：</span>
-          {{listInfo.enterprise.enName}}
-        </div>
-        <div class="item">
-          <span class="name">收货地址：</span>
-          {{listInfo.enterprise.enAddress}}
-        </div>
-        <div class="item">
-          <span class="name">订单号：</span>
-          {{listInfo.code}}
-        </div>
-        <div class="item">
-          <span class="name">单据时间：</span>
-          {{listInfo.date | time}}
-        </div>
-        <div class="item">
-          <span class="name">备注：</span>
-          {{listInfo.remark || '无'}}
-        </div>
-        <div class="item">
-          <span class="name">币别：</span>
-          {{listInfo.currency}}
-        </div>
-        <div class="item">
-          <span class="name">金额：</span>
-          {{listInfo.sum}}
-        </div>
+        <template v-if="vendorType === 'saler'">
+          <div class="item">
+            <span class="name">客户：</span>
+            {{listInfo.enterprise.enName}}
+          </div>
+          <div class="item">
+            <span class="name">收货地址：</span>
+            {{listInfo.enterprise.enAddress}}
+          </div>
+          <div class="item">
+            <span class="name">订单号：</span>
+            {{listInfo.code}}
+          </div>
+          <div class="item">
+            <span class="name">单据时间：</span>
+            {{listInfo.date | time}}
+          </div>
+          <div class="item">
+            <span class="name">币别：</span>
+            {{listInfo.currency}}
+          </div>
+          <div class="item">
+            <span class="name">金额：</span>
+            {{listInfo.sum | toFixedNum}}
+          </div>
+          <div class="item">
+            <span class="name">备注：</span>
+            {{listInfo.remark || '无'}}
+          </div>
+        </template>
+        <template v-else>
+          <div class="item">
+            <span class="name">供应商：</span>
+            {{listInfo.receiveName}}
+          </div>
+          <div class="item">
+            <span class="name">录单人：</span>
+            {{listInfo.recorder}}
+          </div>
+          <div class="item">
+            <span class="name">交货地址：</span>
+            {{listInfo.shipAddress}}
+          </div>
+          <div class="item">
+            <span class="name">订单号：</span>
+            {{listInfo.code}}
+          </div>
+          <div class="item">
+            <span class="name">单据时间：</span>
+            {{listInfo.date | time}}
+          </div>
+          <div class="item">
+            <span class="name">付款方式：</span>
+            {{listInfo.payments || '无'}}
+          </div>
+          <div class="item">
+            <span class="name">币别：</span>
+            {{listInfo.currency}}
+          </div>
+          <div class="item">
+            <span class="name">金额：</span>
+            {{listInfo.sum | toFixedNum}}
+          </div>
+          <div class="item">
+            <span class="name">备注：</span>
+            {{listInfo.remark || '无'}}
+          </div>
+        </template>
+
       </div>
       <div class="orderbtob_details_middle">
         <div class="list" v-for="(item, index) in listInfo.orderItems">
@@ -50,14 +91,20 @@
           <div class="item">
             <span class="name">购买数量：</span>{{item.qty}}
           </div>
+          <div class="item" v-if="item.acceptQty">
+            <span class="name">已验收：</span>{{item.acceptQty}}{{item.product.unit}}
+          </div>
+          <div class="item" v-if="item.returnQty">
+            <span class="name">已验退：</span>{{item.returnQty}}{{item.product.unit}}
+          </div>
           <ul class="bottom" v-if="item.replayList.length > 0">
             <li v-for="ls in item.replayList">
               <span style="margin-right:0.1rem"> <strong>{{ls.date | time}}</strong></span>
-              <span style="margin-right:0.1rem">{{ls.recorder}}回复数量：</span>
-              <span>{{ls.qty}}</span>
+              <span style="margin-right:0.1rem">{{ls.recorder}}</span>
+              <span>回复数量：{{ls.qty}}</span>
             </li>
           </ul>
-          <div v-if="(!item.replyQty || item.replyQty < item.qty) && listInfo.end !== 1">
+          <div v-if="(!item.replyQty || item.replyQty < item.qty) && listInfo.end !== 1 && listInfo.display !== 1">
             <div class="item clearfix">
               <span class="name">回复数量：</span>
               <input type="number" class="dateinput" v-model="count">
@@ -108,6 +155,11 @@
       this.getInitInfo()
       this._getToken()
     },
+    computed: {
+      vendorType() {
+        return this.$route.query.type
+      }
+    },
     methods: {
       Replay(item) {
         if (this.count === '') {
@@ -142,7 +194,13 @@
         })
       },
       getInitInfo() {
-        this.$http.get(`/sale/orders/${this.$route.query.id}/info`).then(res => {
+        let _url = ''
+        if (this.vendorType === 'saler') {
+          _url = `/sale/orders/${this.$route.query.id}/info`
+        } else {
+          _url = `/sale/orders/purc/${this.$route.query.id}/info`
+        }
+        this.$http.get(_url).then(res => {
           res.data.sum = 0
           res.data.orderItems.forEach(item => {
             res.data.sum += item.qty * item.price
@@ -167,6 +225,9 @@
             return year + '-' + month + '-' + day
           }
         }
+      },
+      toFixedNum: function (num) {
+        return num ? parseFloat(num).toFixed(2) : '-'
       }
     },
     components: {