测试bug修改

components/applyPurchase/ApplyInfo.vue

@@ -46,6 +46,7 @@
             </div>
             <div class="il-box-small il-box">
               <div :title="purchaseMan.encapsulation" class="item"><span>封装：</span>{{purchaseMan.encapsulation || '-'}}</div>
+              <div :title="purchaseMan.produceDate" class="item"><span>生产日期：</span>{{purchaseMan.produceDate || '-'}}</div>
               <div :title="purchaseMan.needquantity" class="item"><span>采购数量：</span>{{purchaseMan.needquantity || '-'}}</div>
               <div :title="purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'" class="item"><span>单价预算：</span>{{purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'}}</div>
             </div>
@@ -413,7 +414,7 @@
                 .item {
                   color: #020202;
                   width: 121px;
-                  margin-bottom: 16px;
+                  margin-bottom: 6px;
                 }
               }
             }

components/applyPurchase/BatchPublish.vue

@@ -32,20 +32,6 @@
                 <span class="pi-title">类目：</span>
                 <div class="pi-content over-ell">{{item.kind || '-'}}</div>
               </div>
-              <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>
-                <div class="pi-content similar-select over-ell" v-if="item.brandWord && item.brandWord.length > 0" @click="setShowBrandWord(index, $event)">{{item.brand}}</div>
-                <ul v-show="item.showBrandWord">
-                  <li v-for="brand in item.brandWord" @click="modifyItemByWord(index, brand.nameEn, 'brand')" :title="brand.nameEn">{{brand.nameEn}}</li>
-                </ul>
-              </div>
-              <div class="prod-item prod-item-small">
-                <span class="pi-title">单价预算：</span>
-                <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.code">
                 <span class="pi-title"><i class="red-text">*</i>型号：</span>
                 <div class="pi-content over-ell" v-if="item.code && (!item.codeWord || item.codeWord.length == 0)" :title="item.code">{{item.code}}</div>
@@ -55,6 +41,20 @@
                   <li v-for="code in item.codeWord" @click="modifyItemByWord(index, code.code, 'code')" :title="code.code">{{code.code}}</li>
                 </ul>
               </div>
+              <div class="prod-item prod-item-small">
+                <span class="pi-title">单价预算：</span>
+                <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"><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>
+                <div class="pi-content similar-select over-ell" v-if="item.brandWord && item.brandWord.length > 0" @click="setShowBrandWord(index, $event)">{{item.brand}}</div>
+                <ul v-show="item.showBrandWord">
+                  <li v-for="brand in item.brandWord" @click="modifyItemByWord(index, brand.nameEn, 'brand')" :title="brand.nameEn">{{brand.nameEn}}</li>
+                </ul>
+              </div>
               <div class="prod-item prod-item-large" :title="item.spec">
                 <span class="pi-title">规格：</span>
                 <div class="pi-content over-ell">{{item.spec || '-'}}</div>
@@ -145,10 +145,10 @@
                 <input type="text" class="form-control" v-model="modifyObj.kind" @input="onProdTitleInput">
               </div>
               <div class="prod-item prod-item-large">
-                <span class="pi-title"><i class="red-text">*</i>品牌：</span>
-                <input type="text" class="form-control" v-model="modifyObj.brand" :class="{'error': !validObj.brand}" @blur="checkBrand" @input="onBrandChange">
-                <ul class="brand-similar-list" v-show="showSimilarBrandList">
-                  <li v-for="sBrand in similarBrand" @click="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
+                <span class="pi-title"><i class="red-text">*</i>型号：</span>
+                <input type="text" class="form-control" v-model="modifyObj.code" :class="{'error': !validObj.code}" @blur="checkCode" @input="onCodeChange" >
+                <ul v-show="showSimilarCodeList">
+                  <li v-for="sCode in similarCode" @click="setCode(sCode.code)">{{sCode.code}}</li>
                 </ul>
               </div>
               <div class="prod-item prod-item-small pi-select">
@@ -160,10 +160,10 @@
                 <input class="form-control" type="number" v-model="modifyObj.unitPrice" :class="{'error': !validObj.unitPrice}" @blur="checkUnitPrice" @input="onUnitPriceInput">
               </div>
               <div class="prod-item prod-item-large">
-                <span class="pi-title"><i class="red-text">*</i>型号：</span>
-                <input type="text" class="form-control" v-model="modifyObj.code" :class="{'error': !validObj.code}" @blur="checkCode" @input="onCodeChange" >
-                <ul v-show="showSimilarCodeList">
-                  <li v-for="sCode in similarCode" @click="setCode(sCode.code)">{{sCode.code}}</li>
+                <span class="pi-title"><i class="red-text">*</i>品牌：</span>
+                <input type="text" class="form-control" v-model="modifyObj.brand" :class="{'error': !validObj.brand}" @blur="checkBrand" @input="onBrandChange">
+                <ul class="brand-similar-list" v-show="showSimilarBrandList">
+                  <li v-for="sBrand in similarBrand" @click="setBrand(sBrand.nameEn)">{{sBrand.nameEn}}</li>
                 </ul>
               </div>
               <div class="prod-item prod-item-large">
@@ -1255,7 +1255,7 @@
                                 font-size: 16px;
                                 vertical-align: middle;
                                 position: absolute;
-                                top: 13px;
+                                top: 12px;
                                 cursor: pointer;
                                 &.not-allowed {
                                   cursor: not-allowed;
@@ -1270,7 +1270,7 @@
                               }
                               input {
                                 width: 81px;
-                                height: 26.1px;
+                                height: 26px;
                                 text-align: center;
                                 line-height: normal;
                                 vertical-align: middle;