优化求购列表

components/applyPurchase/ApplyInfo.vue

@@ -16,7 +16,9 @@
             <i class=" fa fa-long-arrow-down" :class="{active: sorting.releaseDate == 'DESC'}"></i>
           </a>-->
         </span>
-        <span class="list-title-item">产品信息</span>
+        <span class="list-title-item">数目/品牌</span>
+        <span class="list-title-item">型号/规格</span>
+        <span class="list-title-item">采购数量(PCS)</span>
         <span class="list-title-item">已报价
           <!--<a href="javascript:void(0)" @click="sortListByParam('offerAmount')">
             <i class=" fa fa-long-arrow-up" :class="{active: sorting.offerAmount == 'ASC'}"></i>
@@ -40,19 +42,19 @@
           <div class="il-item il-center">
             <div class="il-box-large il-box">
               <div :title="purchaseMan.prodTitle | nullFilter" class="fl item size-middle">
-                <span>类目(产品名称)：</span>
+                <span>类目(名称)</span>
                 <div class="content">{{(purchaseMan.prodTitle || '-') | nullFilter}}</div>
               </div>
               <div :title="purchaseMan.cmpCode" class="fl item">
-                <span>型号：</span>
+                <span>型号</span>
                 <div class="content">{{purchaseMan.cmpCode || '-'}}</div>
               </div>
               <div :title="purchaseMan.inbrand" class="fl item bottom size-middle">
-                <span>品牌：</span>
+                <span>品牌</span>
                 <div class="content">{{purchaseMan.inbrand || '-'}}</div>
               </div>
               <div :title="purchaseMan.spec" class="fl item bottom">
-                <span>规格：</span>
+                <span>规格</span>
                 <div class="content">{{purchaseMan.spec || '-'}}</div>
               </div>
             </div>
@@ -64,7 +66,7 @@
                 <span>生产日期：</span>{{purchaseMan.produceDate || '-'}}
               </div>-->
               <div :title="purchaseMan.needquantity" class="item">
-                <span>采购数量(PCS)：</span>{{purchaseMan.needquantity || '-'}}
+                {{purchaseMan.needquantity || '-'}}
               </div>
               <!--<div :title="purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'" class="item">
                 <span>单价预算：</span>{{purchaseMan.unitPrice ? (purchaseMan.currency == 'RMB' ? '￥' : '$') + purchaseMan.unitPrice : '-'}}
@@ -505,16 +507,22 @@ export default {
             }
           }
           &:nth-child(1) {
-            margin-left: 76px;
+            margin-left: 22px;
           }
           &:nth-child(2) {
-            margin-left: 345px;
+            margin-left: 150px;
           }
           &:nth-child(3) {
-            margin-left: 399px;
+            margin-left: 220px;
           }
           &:nth-child(4) {
-            margin-left: 71px;
+            margin-left: 175px;
+          }
+          &:nth-child(5) {
+            margin-left: 55px;
+          }
+          &:nth-child(6) {
+            margin-left: 100px;
           }
         }
       }
@@ -551,8 +559,8 @@ export default {
               }
             }
             &.il-left {
-              width: 236px;
-              padding: 16px 10px 0;
+              width: 165px;
+              padding: 16px 5px 0;
               div {
                 display: block;
                 &:last-child {
@@ -563,7 +571,7 @@ export default {
             }
             &.il-center {
               text-align: left;
-              width: 654px;
+              width: 740px;
               .il-box {
                 display: inline-block;
                 float: left;
@@ -572,9 +580,10 @@ export default {
                 }
               }
               .il-box-large {
-                width: 482px;
+                width: 610px;
+                margin-left:15px;
                 .fl {
-                  width: 284px;
+                  width: 320px;
                   line-height: 19px;
                   word-break: break-all;
                   white-space: unset;
@@ -587,13 +596,18 @@ export default {
                     overflow: hidden;
                     vertical-align: middle;
                     height: 38px;
+                    margin-left:10px;
                   }
                   span {
                     float: left;
+                    display:inline-block;
+                    width:75px;
+                    text-align:right;
+                    color:#3c7cf5;
                   }
                   &.size-middle {
-                    width: 198px;
-                    margin-right: 0;
+                    width: 260px;
+                    margin-right: 10px;
                     .content {
                       width: 86px;
                     }
@@ -601,12 +615,12 @@ export default {
                 }
               }
               .il-box-small {
-                width: 151px;
-                margin-left: 12px;
+                width: 100px;
+                text-align: center;
+                line-height: 90px;
+                margin-left:-15px;
                 .item {
-                  color: #020202;
-                  width: 151px;
-                  margin-bottom: 6px;
+                  color: #f71026;
                 }
               }
             }
@@ -758,10 +772,10 @@ export default {
             }
           }
           .number-content {
-            margin-left: 56px;
+            margin-left: 10px;
             line-height: 120px;
             padding-top: 0;
-            width: 77px;
+            width: 100px;
             margin-right: 34px;
             span {
               color: #5392f9;

components/applyPurchase/BatchPublish.vue

@@ -11,7 +11,8 @@
           <!--<label for="all"></label>-->
           <!--</label>全选-->
           <!--</th>-->
-          <th width="615">产品信息</th>
+          <th width="307">数目/品牌</th>
+          <th width="307">型号/规格</th>
           <th width="95">采购数量(PCS)</th>
           <!--<th width="114">生产日期</th>-->
           <th width="136"><i class="red-text">*</i>截止时间</th>
@@ -29,18 +30,9 @@
           <td>
             <div class="prod-items">
               <div class="prod-item prod-item-large" :title="item.kind">
-                <span class="pi-title">类目(产品名称)：</span>
+                <span class="pi-title">类目：</span>
                 <div class="pi-content over-ell">{{item.kind || '-'}}</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>
-                <div class="pi-content red-text" v-if="!item.code">请完善信息</div>
-                <div class="pi-content over-ell similar-select" v-if="item.codeWord && item.codeWord.length > 0" @click="setShowCodeWord(index, $event)">{{item.code}}</div>
-                <ul v-show="item.showCodeWord">
-                  <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>
@@ -55,6 +47,30 @@
                   <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" :title="item.encapsulation">
+                <span class="pi-title">封装：</span>
+                <div class="pi-content over-ell">
+                  {{item.encapsulation || '-'}}
+                </div>
+              </div>-->
+            </div>
+          </td>
+          <td>
+            <div class="prod-items">
+              <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>
+                <div class="pi-content red-text" v-if="!item.code">请完善信息</div>
+                <div class="pi-content over-ell similar-select" v-if="item.codeWord && item.codeWord.length > 0" @click="setShowCodeWord(index, $event)">{{item.code}}</div>
+                <ul v-show="item.showCodeWord">
+                  <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.spec">
                 <span class="pi-title">规格：</span>
                 <div class="pi-content over-ell">{{item.spec || '-'}}</div>
@@ -1132,10 +1148,10 @@
                   }
                   &.prod-item-large {
                     .pi-content {
-                      width: 226px;
+                      width: 265px;
                     }
                     .pi-title {
-                      width: 113px;
+                      width: 60px;
                     }
                   }
                   &.prod-item-small {