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

components/mobile/applyPurchase/SeekList.vue

@@ -82,10 +82,16 @@
             </template>
             <template v-else>
               <div v-if="seekType === 'enquiry'">
+                <p class="remain-time" v-if="activeType === 'todo' && item.inquiry.endDate - new Date() > 0">剩余&nbsp;:
+                  <span v-if="getDay(item.inquiry.endDate - new Date()) > 0" v-text="getDay(item.inquiry.endDate - new Date())"></span>
+                  <i v-if="getDay(item.inquiry.endDate - new Date()) > 0">&nbsp;天&nbsp;</i>
+                  <span v-if="getDay(item.inquiry.endDate - new Date()) <= 0" v-text="getHours(item.inquiry.endDate - new Date())"></span>
+                  <i v-if="getDay(item.inquiry.endDate - new Date()) <= 0">&nbsp;小时</i>
+                </p>
                 <p class="remain-time" v-if="(seekType === 'enquiry') && (item.status === 201 && item.invalid === 0 && item.overdue === 0 && !item.agreed)"><span>已报价</span></p>
                 <p class="remain-time" v-if="(seekType === 'enquiry') && (item.invalid === 1 || item.status === 314 || (item.inquiry.check || item.inquiry.check === 1) || item.overdue === 1)"><span>已失效</span></p>
                 <p class="remain-time" v-if="(seekType === 'enquiry') && (item.agreed === 1 && item.status === 201 && item.invalid === 0 && item.overdue === 0)"><span>已采纳</span></p>
-                <a class="remain-time" style="margin-top:1.5rem;" v-if="(seekType === 'enquiry') && (item.status===200 && item.invalid!==1 && item.overdue !== 1 && (!item.inquiry.check || item.inquiry.check === 0))" @click="goBtobDetails(item.id)">我要报价</a>
+                <a style="margin-top:-1rem;" v-if="(seekType === 'enquiry') && (item.status===200 && item.invalid!==1 && item.overdue !== 1 && (!item.inquiry.check || item.inquiry.check === 0))" @click="goBtobDetails(item.id)">我要报价</a>
                 <a v-else @click="goBtobDetails(item.id)">查看更多</a>
               </div>
               <div v-else>

pages/mobile/center/vendor/seek.vue

@@ -23,7 +23,14 @@
         return Promise.all([
           store.dispatch(`applyPurchase/loadVendorPushList`, params)
         ])
-      } else {
+      }
+    },
+    components: {
+      Seek
+    },
+    created() {
+      if (this.$route.query && this.$route.query.seekType === 'enquiry') {
+        let params = {}
         params.page = 1
         params.count = 10
         params._state = 'todo'
@@ -36,13 +43,28 @@
           'inquiry.enterprise.enName': 'asc',
           'inquiry.code': 'asc'
         }
-        return Promise.all([
-          store.dispatch(`applyPurchase/loadVendorEnquiryList`, params)
-        ])
+        this.$http.get('/sale/inquiry/info/nosearch', {params})
+          .then(response => {
+            let obj = {}
+            if (response.data) {
+              obj.first = response.data.first
+              obj.last = response.data.last
+              obj.number = response.data.page
+              obj.numberOfElements = response.data.totalPage
+              obj.size = response.data.size
+              obj.totalElements = response.data.totalElement
+              obj.content = JSON.parse(JSON.stringify(response.data.content))
+            }
+            this.$store.commit('applyPurchase/purchaseManList/GET_PURCHASEMAN_SUCCESS', obj)
+          }, err => {
+            this.$store.commit('applyPurchase/purchaseManList/GET_PURCHASEMAN_FAILURE', err)
+          })
       }
     },
-    components: {
-      Seek
+    destroyed() {
+      this.$nextTick(() => {
+        this.$store.commit('applyPurchase/purchaseManList/GET_PURCHASEMAN_SUCCESS')
+      })
     },
     methods: {
       reloadData: function (page = 1, count = 10, keyword, seekType, activeType = 'done') {

pages/mobile/center/vendor/seek_btob_details.vue

@@ -52,7 +52,7 @@
       </div>
       <div class="orderbtob_details_middle">
         <div class="list">
-          <template v-if="listInfo.status === 200">
+          <template v-if="active === 'todo'">
             <div class="item clearfix">
               <span class="name">交货周期：</span>
               <input type="number" class="dateinput" v-model="listInfo.leadtime" >天
@@ -69,15 +69,15 @@
           <template v-else>
             <div class="item clearfix">
               <span class="name">交货周期：</span>
-              <span>{{listInfo.leadtime}}天</span>
+              <span>{{listInfo.leadtime || '-'}}天</span>
             </div>
             <div class="item clearfix">
               <span class="name">最小起订：</span>
-              <span>{{listInfo.minOrderQty}}PCS</span>
+              <span>{{listInfo.minOrderQty || '-'}}PCS</span>
             </div>
             <div class="item clearfix">
               <span class="name">最小包装：</span>
-              <span>{{listInfo.minPackQty}}PCS</span>
+              <span>{{listInfo.minPackQty || '-'}}PCS</span>
             </div>
           </template>
           <div class="item clearfix" style="position: relative">
@@ -106,7 +106,7 @@
               </div>
             </ul>
             <div style="clear:both"></div>
-            <div class="replayBtn" @click="Replay(item)" v-if="listInfo.status === 200">
+            <div class="replayBtn" @click="Replay(item)" v-if="active === 'todo'">
               报价
             </div>
           </div>
@@ -193,7 +193,12 @@
         this.listInfo.replies = replies
         this.$http.post(`/sale/inquiry/items/${this.$route.query.id}/reply?token=${this.token}`, this.listInfo).then(res => {
           this._iniFo('报价成功')
-          this.getInitInfo()
+          // this.getInitInfo()
+          let _this = this
+          setTimeout(function () {
+            // _this.$router.push(`/mobile/center/vendor/seek_btob_details?id=${this.$route.query.id}&active=done`)
+            _this.$router.go(-1)
+          }, 500)
         })
       },
       _iniFo(str) {

store/applyPurchase.js

@@ -148,7 +148,17 @@ export const actions = {
     commit('purchaseManList/REQUEST_PURCHASEMAN')
     return axios.get('/sale/inquiry/info/nosearch', {params})
       .then(response => {
-        commit('purchaseManList/GET_PURCHASEMAN_SUCCESS', response.data)
+        let obj = {}
+        if (response.data) {
+          obj.first = response.data.first
+          obj.last = response.data.last
+          obj.number = response.data.page
+          obj.numberOfElements = response.data.totalPage
+          obj.size = response.data.size
+          obj.totalElements = response.data.totalElement
+          obj.content = JSON.parse(JSON.stringify(response.data.content))
+        }
+        commit('purchaseManList/GET_PURCHASEMAN_SUCCESS', obj)
       }, err => {
         commit('purchaseManList/GET_PURCHASEMAN_FAILURE', err)
       })
@@ -159,13 +169,15 @@ export const actions = {
     return axios.get('/sale/inquiry/info/search', {params})
       .then(response => {
         let obj = {}
-        obj.first = response.data.first
-        obj.last = response.data.last
-        obj.number = response.data.page
-        obj.numberOfElements = response.data.totalPage
-        obj.size = response.data.size
-        obj.totalElements = response.data.totalElement
-        obj.content = JSON.parse(JSON.stringify(response.data.content))
+        if (response.data) {
+          obj.first = response.data.first
+          obj.last = response.data.last
+          obj.number = response.data.page
+          obj.numberOfElements = response.data.totalPage
+          obj.size = response.data.size
+          obj.totalElements = response.data.totalElement
+          obj.content = JSON.parse(JSON.stringify(response.data.content))
+        }
         commit('purchaseManList/GET_PURCHASEMAN_SUCCESS', obj)
       }, err => {
         commit('purchaseManList/GET_PURCHASEMAN_FAILURE', err)

store/applyPurchase/purchaseManList.js

@@ -40,7 +40,7 @@ export const mutations = {
   },
   GET_PURCHASEMAN_SUCCESS (state, result) {
     state.purchaseManList.fetching = false
-    state.purchaseManList.data = result
+    state.purchaseManList.data = result || []
   },
   REQUEST_PURCHASEMAN_DETAIL (state) {
     state.purchaseManDetail.fetching = true