求购

components/applyPurchase/ApplyInfo.vue

@@ -36,7 +36,7 @@
       <ul>
         <li v-for="(purchaseMan, index) in purchaseManList.content" :class="{'active': purchaseMan.active}">
           <div>{{purchaseMan.date| date}}</div>
-          <div :title="purchaseMan.userName || purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-'">{{purchaseMan.userName || purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-'}}</div>
+          <div :title="purchaseMan.userName || (purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-')">{{purchaseMan.userName || (purchaseMan.inquiry.enterprise ? purchaseMan.inquiry.enterprise.enName ? purchaseMan.inquiry.enterprise.enName : '-' : '-' || '-')}}</div>
           <div :title="purchaseMan.cmpCode">{{purchaseMan.cmpCode || '-'}}</div>
           <div :title="purchaseMan.inbrand">{{purchaseMan.inbrand || '-'}}</div>
           <div class="date-content"><span>剩余&nbsp;</span><span v-if="getDay(purchaseMan.remainingTime) > 0" v-text="getDay(purchaseMan.remainingTime)"></span><i v-if="getDay(purchaseMan.remainingTime) > 0">&nbsp;天&nbsp;</i><span v-if="getDay(purchaseMan.remainingTime) <= 0" v-text="getHours(purchaseMan.remainingTime)"></span><i v-if="getDay(purchaseMan.remainingTime) <= 0" >&nbsp;小时</i></div>
@@ -285,6 +285,7 @@
               purchaseMan.replies = this.sayPriceObj.replies
               purchaseMan.vendUU = this.user.data.enterprise.uu
               purchaseMan.vendorUserUU = this.user.data.userUU
+              purchaseMan.qutoApp = 'MALL'
               this.$http.post('/inquiry/sale/item/save', purchaseMan).then(response => {
                 this.showLoading = false
                 if (response.data.success === false) {
@@ -331,7 +332,7 @@
       },
       resetList: function () {
         this.currentSayPriceIndex = -1
-        this.$store.dispatch('applyPurchase/loadPurchaseManList', {pageNumber: this.nowPage, pageSize: this.pageSize, keyWord: this.keyWord, sorting: !this.sorting || JSON.stringify(this.sorting) === '{}' ? {releaseDate: 'DESC'} : this.sorting})
+        this.$store.dispatch('applyPurchase/loadPurchaseManList', {pageNumber: this.nowPage, pageSize: this.pageSize, keyword: this.keyWord, sorting: !this.sorting || JSON.stringify(this.sorting) === '{}' ? {releaseDate: 'DESC'} : this.sorting, enUU: this.user.data.enterprise ? this.user.data.enterprise.uu : null})
       },
       resetSayPrice: function () {
         this.sayPriceObj = {

components/applyPurchase/PublishApply.vue

@@ -116,8 +116,8 @@
             <td>
               <div>
                 <span v-if="rank.inquiry.userName">{{rank.inquiry.userName | userNameFilter}}</span>
-                <span v-if="!rank.inquiry.userName && rank.inquiry.enterprise.enName">{{rank.inquiry.enterprise.enName | enterpriseFilter}}</span>
-                <span v-if="!rank.inquiry.userName && !rank.inquiry.enterprise.enName">-</span>
+                <span v-if="!rank.inquiry.userName && rank.inquiry.enterprise">{{rank.inquiry.enterprise.enName | enterpriseFilter}}</span>
+                <span v-if="!rank.inquiry.userName && !rank.inquiry.enterprise">-</span>
                 <i>|</i>
               </div>
             </td>
@@ -250,22 +250,22 @@
           if (this.checkAll()) {
             let inquiry = {}
             let inquiryItem = {}
-            if (this.user.enterprise) {
-              inquiry.enUU = this.user.enterprise.uu
+            if (this.user.data.enterprise) {
+              inquiry.enUU = this.user.data.enterprise.uu
             }
             let date = new Date()
-            inquiry.recorderUU = this.user.userUU
+            inquiry.recorderUU = this.user.data.userUU
             inquiry.code = 'MALL' + date.getTime()
             inquiry.date = date
-            inquiry.recorder = this.user.userName
+            inquiry.recorder = this.user.data.userName
             inquiry.endDate = this.applyObj.deadline
             inquiry.sourceapp = 'MALL'
             inquiry.amount = 1
             inquiryItem.prodTitle = this.applyObj.code
-            inquiryItem.userUU = this.user.userUU
+            inquiryItem.userUU = this.user.data.userUU
             inquiryItem.source = 'MALL'
-            inquiryItem.userName = this.user.userName
-            inquiryItem.userTel = this.user.userTel
+            inquiryItem.userName = this.user.data.userName
+            inquiryItem.userTel = this.user.data.userTel
             inquiryItem.needquantity = this.applyObj.amount
             inquiryItem.inbrand = this.applyObj.brand
             inquiryItem.currency = this.applyObj.currency
@@ -284,7 +284,7 @@
 //                this.showRemindBox = true
                 this.emptyForm()
 //                this.validObj.deadline = true
-                this.$store.dispatch('applyPurchase/loadPurchaseManList', {page: 1, count: 10})
+                this.$store.dispatch('applyPurchase/loadPurchaseManList', {pageNumber: 1, pageSize: 10, enUU: this.user.data.enterprise ? this.user.data.enterprise.uu : null})
               }, error => {
                 console.log(error)
                 this.$message.error('发布失败')
@@ -334,7 +334,7 @@
       },
       checkUnitPrice: function () {
         this.validObj.unitPrice = this.applyObj.unitPrice === '' ? true : this.applyObj.unitPrice > 0 && this.applyObj.unitPrice < 100000000
-        if (this.applyObj.unitPrice <= 0) {
+        if (!this.validObj.unitPrice && this.applyObj.unitPrice <= 0) {
           this.$message.error('单价必须是大于0的数字')
         }
         return this.validObj.unitPrice