瀏覽代碼

增加BUG

wangcz 7 年之前
父節點
當前提交
4f4113cf54

+ 2 - 2
components/applyPurchase/SayPrice.vue

@@ -264,9 +264,9 @@
         }
       },
       onTaxrateBlur () {
-        if (!this.sayPriceObj.taxrate || this.sayPriceObj.taxrate < 1 || this.sayPriceObj.taxrate >= 100 || this.sayPriceObj.taxrate.toString().indexOf('.') !== -1) {
+        if (!this.sayPriceObj.taxrate || this.sayPriceObj.taxrate < 0 || this.sayPriceObj.taxrate >= 100 || this.sayPriceObj.taxrate.toString().indexOf('.') !== -1) {
           this.validSayPrice.taxrate = false
-          this.$message.error('交期请填写1-99之间的正整数')
+          this.$message.error('税率请填写0-99之间的正整数')
         } else {
           this.validSayPrice.taxrate = true
         }

+ 2 - 2
components/mobile/applyPurchase/SayPrice.vue

@@ -273,9 +273,9 @@
         }
       },
       onTaxrateBlur () {
-        if (!this.sayPriceObj.taxrate || this.sayPriceObj.taxrate < 1 || this.sayPriceObj.taxrate >= 100 || this.sayPriceObj.taxrate.toString().indexOf('.') !== -1) {
+        if (!this.sayPriceObj.taxrate || this.sayPriceObj.taxrate < 0 || this.sayPriceObj.taxrate >= 100 || this.sayPriceObj.taxrate.toString().indexOf('.') !== -1) {
           this.validSayPrice.taxrate = false
-          this.$message.error('交期请填写1-99之间的正整数')
+          this.$message.error('税率请填写0-99之间的正整数')
         } else {
           this.validSayPrice.taxrate = true
         }

+ 13 - 1
pages/mobile/center/user/supplier/index.vue

@@ -13,7 +13,9 @@
               <div class="address clearfix"><span class="fl">地址:</span><div class="fl" style="width:5.6rem">{{item.vendorEnterprise.enAddress}}</div></div>
               <div class="list-item"><span>联系人:</span>{{item.vendorUser.userName}}</div>
               <div class="list-item"><span>供应商电话:</span>{{item.vendorUser.userTel}}</div>
-              <div class="list-item"><span>采购对接人:</span>{{item.saleContacts ? item.saleContacts.toString() : '-'}}</div>
+              <div class="list-item"><span>采购对接人:</span>
+                <span class="wrap-text">{{item.saleContacts ? item.saleContacts.toString() : '-'}}</span>
+              </div>
             </div>
             <div class="customer-btob-wrapper-bottom clearfix">
               <div @click="addUserInfo(item)"><i class="iconfont icon-allocation"></i>分配</div>
@@ -123,6 +125,7 @@
               this.$http.post(`/vendorDistribute/bindUserToVendor/${this.modalObj.customer.id}`, this.modalObj.originList).then(data => {
                 this.onMind('转移成功!')
                 this.closeModal()
+                this.setSelect()
               }, err => {
                 this.onMind(err.data)
                 this.closeModal()
@@ -137,6 +140,7 @@
           this.$http.post(`/vendorDistribute/bindVendor/${this.modalObj.customer.id}`, this.modalObj.originList).then(res => {
             this.onMind('分配成功!')
             this.closeModal()
+            this.setSelect()
           }).catch(err => {
             this.onMind('保存失败!')
             this.closeModal()
@@ -389,6 +393,14 @@
           }
           span {
             color: #666666;
+            &.wrap-text{
+              width: 4.5rem;
+              white-space: normal;
+              display: inline-block;
+              word-wrap: break-word;
+              word-break: break-all;
+              vertical-align: top;
+            }
           }
         }
       }

+ 12 - 3
pages/mobile/center/vendor/customer/index.vue

@@ -19,13 +19,12 @@
         <div v-if="resourceList.content && resourceList.content.length > 0">
           <div class="customer-btob-wrapper-list" v-for="(item, index) in resourceList.content">
             <div class="customer-btob-wrapper-content">
-              <!--<div class="list-item"><span>UU:</span>{{item.myEnterprise.uu}}</div>-->
               <div class="list-item"><span>客户名称:</span><a>{{item.myEnterprise.enName}}</a></div>
               <div class="address clearfix"><span class="fl">地址:</span><div class="fl" style="width:5.6rem">{{item.myEnterprise.enAddress}}</div></div>
               <div class="list-item"><span>客户联系人:</span>{{item.myUser.userName}}</div>
               <div class="list-item"><span>客户电话:</span>{{item.myUser.userTel}}</div>
-              <div class="list-item"><span>业务对接人:</span>{{item.purchaseContacts ? item.purchaseContacts.toString() : '-'}}
-                <!--<span v-for="(names, key) in item.myContacts">{{names.userName}}{{item.myContacts.length - 1 > key ? ',' : ''}}</span>-->
+              <div class="list-item"><span>业务对接人:</span>
+                <span class="wrap-text">{{item.purchaseContacts ? item.purchaseContacts.toString() : '-'}}</span>
               </div>
             </div>
             <div class="customer-btob-wrapper-bottom clearfix">
@@ -136,6 +135,7 @@
                 this.$http.post(`/account/user/transferUserToVendor/${this.modalObj.customer.myEnterprise.uu}`, this.modalObj.originList).then(data => {
                   this.onMind('转移成功!')
                   this.closeModal()
+                  this.setSelect()
                 }, err => {
                   this.onMind(err.data)
                   this.closeModal()
@@ -161,6 +161,7 @@
                 }).then(data => {
                   this.onMind('转移成功!')
                   this.closeModal()
+                  this.setSelect()
                 }, err => {
                   this.onMind(err.data)
                   this.closeModal()
@@ -426,6 +427,14 @@
           }
           span {
             color: #666666;
+            &.wrap-text{
+              width: 4.5rem;
+              white-space: normal;
+              display: inline-block;
+              word-wrap: break-word;
+              word-break: break-all;
+              vertical-align: top;
+            }
           }
         }
       }