Merge remote-tracking branch 'origin/feature/201812-wangcz' into feature/201812-wangcz

components/applyPurchase/BatchPublish.vue

@@ -29,7 +29,7 @@
           </td>-->
           <td>
             <div class="prod-items">
-              <div class="prod-item prod-item-large" :title="item.kind">
+              <div class="prod-item prod-item-large" :title="item.brand">
                 <span class="pi-title"><i class="red-text">*</i>品牌：</span>
                 <div class="pi-content over-ell" v-if="item.brand && (!item.brandWord || item.brandWord.length == 0)" :title="item.brand">{{item.brand}}</div>
                 <div class="pi-content red-text" v-if="!item.brand">请完善信息</div>
@@ -43,9 +43,11 @@
                 <div class="pi-content over-ell" v-if="item.unitPrice">{{(item.currency === 'RMB' ? '¥' : '$') + item.unitPrice}}</div>
                 <div class="pi-content over-ell" v-else="!item.unitPrice">-</div>
               </div>-->
-              <div class="prod-item prod-item-large" :title="item.brand">
-                <span class="pi-title">类目(产品名称)：</span>
-                <div class="pi-content over-ell">{{item.kind || '-'}}</div>
+              <div class="prod-item prod-item-large" :title="item.kind">
+                <span class="pi-title"><i class="red-text">*</i>类目(产品名称)：</span>
+                <div class="pi-content over-ell" v-if="item.kind && (!item.kindWord || item.kindWord.length == 0)" :title="item.kind">{{item.kind}}</div>
+                <div class="pi-content red-text" v-if="!item.kind">请完善信息</div>
+                <!--<div class="pi-content over-ell">{{item.kind || '-'}}</div>-->
               </div>
               <!--<div class="prod-item prod-item-small" :title="item.encapsulation">
                 <span class="pi-title">封装：</span>
@@ -164,8 +166,8 @@
                 </ul>
               </div>
               <div class="prod-item prod-item-large">
-                <span class="pi-title">类目(产品名称)：</span>
-                <input type="text" class="form-control" v-model="modifyObj.kind" @input="onProdTitleInput">
+                <span class="pi-title"><i class="red-text">*</i>类目(产品名称)：</span>
+                <input type="text" class="form-control" v-model="modifyObj.kind" :class="{'error': !validObj.kind}" @input="onProdTitleInput" @blur="checkKind">
               </div>
               <!--<div class="prod-item prod-item-small pi-select">
                 <span class="pi-title">单价预算：</span>
@@ -268,7 +270,8 @@
 //          produceDate: true,
           amount: true,
           deadline: true,
-          spec: true
+          spec: true,
+          kind: true
         },
 //        successResult: 0,
         showSimilarCodeList: false,
@@ -374,7 +377,8 @@
           unitPrice: true,
           amount: true,
           deadline: true,
-          spec: true
+          spec: true,
+          kind: true
         }
       },
       listenPage: function (page) {
@@ -632,6 +636,18 @@
         this.validObj.amount = (!this.modifyObj.amount || this.modifyObj.amount === '') ? true : this.modifyObj.amount > 0 && this.modifyObj.amount < 1000000000
         return this.validObj.amount
       },
+      checkKind: function() {
+        let nullStrFlag = checkNullStr(this.modifyObj.kind)
+        this.validObj.kind = this.modifyObj.kind && this.modifyObj.kind !== ''
+        // if (!this.validObj.kind) {
+        if (!nullStrFlag) {
+          this.$message.error('类目输入不合法')
+        } else if (!this.validObj.kind) {
+          this.$message.error('类目不能为空')
+        }
+        // }
+        return this.validObj.kind
+      },
       checkSpec: function () {
         let nullStrFlag = checkNullStr(this.modifyObj.spec)
         this.validObj.spec = nullStrFlag
@@ -641,7 +657,7 @@
         return this.validObj.spec
       },
       checkAll: function () {
-        return this.checkCode() && this.checkBrand() && this.checkDeadline() && this.checkUnitPrice() && this.checkAmount() && this.checkSpec()
+        return this.checkBrand() && this.checkCode() && this.checkKind() && this.checkDeadline() && this.checkUnitPrice() && this.checkAmount() && this.checkSpec()
       },
       checkDeadline: function () {
         this.validObj.deadline = this.modifyObj.deadline && this.modifyObj.deadline !== '' && this.isValidDate(this.modifyObj.deadline)
@@ -1152,10 +1168,10 @@
                   }
                   &.prod-item-large {
                     .pi-content {
-                      width: 226px;
+                      width: 224px;
                     }
                     .pi-title {
-                      width: 115px;
+                      width: 117px;
                     }
                   }
                   &.prod-item-small {
@@ -1178,7 +1194,7 @@
                     overflow-y: auto;
                     overflow-x: hidden;
                     border-radius: 2px;
-                    width: 226px;
+                    width: 224px;
                     li {
                       height: 30px;
                       line-height: 30px;
@@ -1371,7 +1387,7 @@
                   position: relative;
                   &.prod-item-large {
                     input {
-                      width: 226px;
+                      width: 224px;
                     }
                   }
                   &.prod-item-small {
@@ -1410,10 +1426,10 @@
                 }
                 &:nth-child(4) {
                   div {
-                    width: 106px;
+                    width: 125px;
                     overflow: unset;
                     input {
-                      width: 106px;
+                      width: 115px;
                       border-radius: 2px;
                       border: 1px solid #dadada;
                     }

pages/mobile/center/vendor/productdetails.vue

@@ -53,7 +53,7 @@
         </div>
         <div class="pull-right">
           <span class="name">生产日期:</span>
-          <input type="text" placeholder="2018-02-05" v-model="chooseItem.produceDate" class="input dateInput" maxlength="10" />
+          <input type="text" placeholder="2018-02-05" v-model="chooseItem.produceDate" class="input dateInput" maxlength="12" />
         </div>
       </div>
       <div class="list clearfix">
@@ -333,6 +333,11 @@
       },
       // 保存
       save() {
+      // else if (!/^\d{4}[-/]\d{2}[-/]\d{2}$/.test(this.chooseItem.produceDate)) {
+      //     this.timeoutCount++
+      //     this.collectResult = '请输入正确的生产日期'
+      //     return false
+      //   }
         if (!this.chooseItem.reserve) {
           this.timeoutCount++
           this.collectResult = '库存'
@@ -345,10 +350,6 @@
           this.timeoutCount++
           this.collectResult = '请填写生产日期'
           return false
-        } else if (!/^\d{4}[-/]\d{2}[-/]\d{2}$/.test(this.chooseItem.produceDate)) {
-          this.timeoutCount++
-          this.collectResult = '请输入正确的生产日期'
-          return false
         } else {
           let isHas = false
           for (let i = 0; i < this.chooseItem.prices.length; i++) {