Эх сурвалжийг харах

处理单位改库存,生产日期和帮主中心

wangcz 7 жил өмнө
parent
commit
3380da03dc

+ 8 - 8
components/mobile/search/componet-item.vue

@@ -28,14 +28,18 @@
       </div>
       </div>
     </div>
     </div>
     <div class="list">
     <div class="list">
-      <div class="fl">
-        <div class="name">生产日期:</div>
-        <div class="text overHidden" style="width: 1.75rem" :title="item.produceDate">{{item.produceDate || '-'}}</div>
-      </div>
+      <!--<div class="fl">-->
+        <!--<div class="name">生产日期:</div>-->
+        <!--<div class="text overHidden" style="width: 1.75rem" :title="item.produceDate">{{item.produceDate || '-'}}</div>-->
+      <!--</div>-->
       <div class="fl">
       <div class="fl">
         <div class="name">库存:</div>
         <div class="name">库存:</div>
         <div class="text overHidden" style="width: 2.3rem">{{item.reserve || '-'}}</div>
         <div class="text overHidden" style="width: 2.3rem">{{item.reserve || '-'}}</div>
       </div>
       </div>
+      <div class="fl">
+        <div class="name">起拍:</div>
+        <div class="text overHidden" style="width: 2.3rem">{{item.minBuyQty || '-'}}</div>
+      </div>
     </div>
     </div>
     <div class="list">
     <div class="list">
       <div class="fl">
       <div class="fl">
@@ -49,10 +53,6 @@
           </template>
           </template>
         </div>
         </div>
       </div>
       </div>
-      <div class="fl">
-        <div class="name">起拍:</div>
-        <div class="text overHidden" style="width: 2.3rem">{{item.minBuyQty || '-'}}</div>
-      </div>
     </div>
     </div>
     <div class="list">
     <div class="list">
       <div class="name">卖家名称:</div>
       <div class="name">卖家名称:</div>

+ 4 - 4
components/mobile/store/StoreDetail.vue

@@ -146,10 +146,10 @@
                   <i class="iconfont icon-pdf" :class="{'active': item.attach && item.attach !== '' && item.attach !== '1'}"></i>
                   <i class="iconfont icon-pdf" :class="{'active': item.attach && item.attach !== '' && item.attach !== '1'}"></i>
                 </div>
                 </div>
               </div>
               </div>
-              <div class="fl">
-                <div class="name">生产日期:</div>
-                <div class="text overHidden" style="width: 1.75rem" :title="item.produceDate">{{item.produceDate || '-'}}</div>
-              </div>
+              <!--<div class="fl">-->
+                <!--<div class="name">生产日期:</div>-->
+                <!--<div class="text overHidden" style="width: 1.75rem" :title="item.produceDate">{{item.produceDate || '-'}}</div>-->
+              <!--</div>-->
             </div>
             </div>
             <div class="list">
             <div class="list">
               <div class="name left">价格梯度<p>(pcs):</p></div>
               <div class="name left">价格梯度<p>(pcs):</p></div>

+ 2 - 2
components/mobile/supplier/SupplierDetail.vue

@@ -59,8 +59,8 @@
             <span class="item">{{product.spec || '—'}}</span>
             <span class="item">{{product.spec || '—'}}</span>
           </div>
           </div>
           <div class="prop">
           <div class="prop">
-            <span class="head">单位:</span>
-            <span class="item">{{product.unit || 'PCS'}}</span>
+            <span class="head">库存(PCS):</span>
+            <span class="item">{{product.erpReserve || 0}}</span>
           </div>
           </div>
           <a class="seek-btn" @click="publish(product)">立即询价</a>
           <a class="seek-btn" @click="publish(product)">立即询价</a>
         </li>
         </li>

+ 2 - 2
components/pcb/home/CommodityList.vue

@@ -26,7 +26,7 @@
           <tr>
           <tr>
             <th width="165"><div>品牌/物料名称</div></th>
             <th width="165"><div>品牌/物料名称</div></th>
             <th width="148"><div>型号/规格</div></th>
             <th width="148"><div>型号/规格</div></th>
-            <th width="114"><div>包装/生产日期</div></th>
+            <th width="114"><div>包装</div></th>
             <th width="125"><div>库存</div></th>
             <th width="125"><div>库存</div></th>
             <th width="149"><div>价格梯度(PCS)</div></th>
             <th width="149"><div>价格梯度(PCS)</div></th>
             <th width="67"><div>交期(天)</div></th>
             <th width="67"><div>交期(天)</div></th>
@@ -58,7 +58,7 @@
             <td>
             <td>
               <div class="package" v-if="commodity.packaging" v-text="commodity.packaging" :title="commodity.packaging"></div>
               <div class="package" v-if="commodity.packaging" v-text="commodity.packaging" :title="commodity.packaging"></div>
               <div class="package" v-if="!commodity.packaging && !commodity.produceDate">—</div>
               <div class="package" v-if="!commodity.packaging && !commodity.produceDate">—</div>
-              <div class="date" v-if='commodity.produceDate' v-text="commodity.produceDate" :title="commodity.produceDate">2016-12-01</div>
+              <!--<div class="date" v-if='commodity.produceDate' v-text="commodity.produceDate" :title="commodity.produceDate">2016-12-01</div>-->
             </td>
             </td>
             <td style="text-align: left;vertical-align: middle;">
             <td style="text-align: left;vertical-align: middle;">
               <div class="goods" v-if="commodity.reserve">
               <div class="goods" v-if="commodity.reserve">

+ 5 - 5
components/product/ComponentGoods.vue

@@ -9,7 +9,7 @@
       <thead>
       <thead>
       <tr style="height: 40px;">
       <tr style="height: 40px;">
         <th width="180">品牌/物料名称/型号/规格</th>
         <th width="180">品牌/物料名称/型号/规格</th>
-        <th width="100">包装/生产日期</th>
+        <th width="100">包装</th>
         <th width="120">卖家名称</th>
         <th width="120">卖家名称</th>
         <th width="110">库存</th>
         <th width="110">库存</th>
         <th width="210">价格梯度(PCS)</th>
         <th width="210">价格梯度(PCS)</th>
@@ -40,10 +40,10 @@
         </td>
         </td>
         <td>
         <td>
           <div class="package" v-if="compGoods.packaging">{{compGoods.packaging}}</div>
           <div class="package" v-if="compGoods.packaging">{{compGoods.packaging}}</div>
-          <div class="package" v-if="!compGoods.packaging && compGoods.produceDate">—</div>
-          <div v-if="!compGoods.produceDate && !compGoods.packaging">—</div>
-          <div class="date" v-if="compGoods.produceDate">{{compGoods.produceDate}}</div>
-          <div class="date" v-if="!compGoods.produceDate && compGoods.packaging">—</div>
+          <div class="package" v-else>—</div>
+          <!--<div v-if="!compGoods.produceDate && !compGoods.packaging">—</div>-->
+          <!--<div class="date" v-if="compGoods.produceDate">{{compGoods.produceDate}}</div>-->
+          <!--<div class="date" v-if="!compGoods.produceDate && compGoods.packaging">—</div>-->
         </td>
         </td>
         <td class="merchantName">
         <td class="merchantName">
           <div v-if="!compGoods.storeName" style="margin-top: 20px;">—</div>
           <div v-if="!compGoods.storeName" style="margin-top: 20px;">—</div>

+ 2 - 2
components/search/ForwardGoodsList.vue

@@ -34,8 +34,8 @@
               <span class="content inline-block" :title="item.kind || item.kinden">{{item.kind || item.kinden || '-'}}</span>
               <span class="content inline-block" :title="item.kind || item.kinden">{{item.kind || item.kinden || '-'}}</span>
             </div>
             </div>
             <div class="line">
             <div class="line">
-              <span class="title inline-block">单位</span>
-              <span class="content inline-block" :title="item.unit">{{item.unit || '-'}}</span>
+              <span class="title inline-block">库存(PCS)</span>
+              <span class="content inline-block" :title="item.erpReserve">{{item.erpReserve || 0}}</span>
             </div>
             </div>
           </td>
           </td>
           <td class="single">
           <td class="single">

+ 3 - 3
components/search/GoodList.vue

@@ -42,7 +42,7 @@
           <tr style="height: 40px;">
           <tr style="height: 40px;">
             <!--<th width="80"></th>-->
             <!--<th width="80"></th>-->
             <th width="200">品牌/物料名称/型号/规格</th>
             <th width="200">品牌/物料名称/型号/规格</th>
-            <th width="100">包装/生产日期</th>
+            <th width="100">包装</th>
             <th width="110">卖家名称</th>
             <th width="110">卖家名称</th>
             <th width="140">库存</th>
             <th width="140">库存</th>
             <th width="90">梯度/pcs</th>
             <th width="90">梯度/pcs</th>
@@ -77,8 +77,8 @@
             </td>
             </td>
             <td>
             <td>
               <div class="package" v-text="item.packaging"></div>
               <div class="package" v-text="item.packaging"></div>
-              <div class="date" v-text="item.produceDate"></div>
-              <div v-if="!item.packaging && !item.produceDate">—</div>
+              <!--<div class="date" v-text="item.produceDate"></div>-->
+              <div v-if="!item.packaging">—</div>
             </td>
             </td>
             <td>
             <td>
               <div v-if="item.storeName">
               <div v-if="item.storeName">

+ 2 - 2
components/store/home/CommodityList.vue

@@ -36,7 +36,7 @@
           <tr>
           <tr>
             <th width="165"><div>品牌/物料名称</div></th>
             <th width="165"><div>品牌/物料名称</div></th>
             <th width="148"><div>型号/规格</div></th>
             <th width="148"><div>型号/规格</div></th>
-            <th width="114"><div>包装/生产日期</div></th>
+            <th width="114"><div>包装</div></th>
             <th width="125"><div>库存</div></th>
             <th width="125"><div>库存</div></th>
             <!-- <th width="90">数量</th>
             <!-- <th width="90">数量</th>
              <th width="90">香港交货<span style="font-size: 12px;">($)</span></th>
              <th width="90">香港交货<span style="font-size: 12px;">($)</span></th>
@@ -71,7 +71,7 @@
             <td>
             <td>
               <div class="package" v-if="commodity.packaging" v-text="commodity.packaging" :title="commodity.packaging"></div>
               <div class="package" v-if="commodity.packaging" v-text="commodity.packaging" :title="commodity.packaging"></div>
               <div class="package" v-if="!commodity.packaging && !commodity.produceDate">—</div>
               <div class="package" v-if="!commodity.packaging && !commodity.produceDate">—</div>
-              <div class="date" v-if='commodity.produceDate' v-text="commodity.produceDate" :title="commodity.produceDate">2016-12-01</div>
+              <!--<div class="date" v-if='commodity.produceDate' v-text="commodity.produceDate" :title="commodity.produceDate">2016-12-01</div>-->
             </td>
             </td>
             <td style="text-align: left;vertical-align: middle;">
             <td style="text-align: left;vertical-align: middle;">
               <div class="goods" v-if="commodity.reserve">
               <div class="goods" v-if="commodity.reserve">

+ 2 - 2
components/supplier/details.vue

@@ -29,8 +29,8 @@
               <p v-text="detail.standard !== 1 ? detail.brand : detail.pbranden">2</p>
               <p v-text="detail.standard !== 1 ? detail.brand : detail.pbranden">2</p>
             </li>
             </li>
             <li class="item">
             <li class="item">
-              <span>单位</span>
-              <p v-text="detail.unit ? detail.unit : 'PCS'">32</p>
+              <span>库存(PCS)</span>
+              <p v-text="detail.erpReserve ? detail.erpReserve : 0">32</p>
             </li>
             </li>
             <li class="item">
             <li class="item">
               <span>规格</span>
               <span>规格</span>

+ 3 - 3
components/supplier/resource.vue

@@ -51,7 +51,7 @@
           <th width="66">序号</th>
           <th width="66">序号</th>
           <th width="1008">
           <th width="1008">
             <span>原厂型号 / 品牌</span>
             <span>原厂型号 / 品牌</span>
-            <span>物料名称 / 单位</span>
+            <span>物料名称 / 库存(PCS)</span>
             <span>规格</span>
             <span>规格</span>
           </th>
           </th>
           <th width="116">操作</th>
           <th width="116">操作</th>
@@ -79,8 +79,8 @@
                   <p v-text="item.standard !== 1 ? spliceString(item.brand, 95) : spliceString(item.pbranden, 95)">2</p>
                   <p v-text="item.standard !== 1 ? spliceString(item.brand, 95) : spliceString(item.pbranden, 95)">2</p>
                 </li>
                 </li>
                 <li class="item">
                 <li class="item">
-                  <span class="fl">单位</span>
-                  <p v-text="item.unit ? item.unit : 'PCS'">1</p>
+                  <span class="fl">库存(PCS)</span>
+                  <p v-text="item.erpReserve ? item.erpReserve : 0">1</p>
                 </li>
                 </li>
               </ul>
               </ul>
             </td>
             </td>

+ 5 - 0
pages/help/helpList/_id.vue

@@ -59,6 +59,11 @@
         store.dispatch('loadHelpTitle', route.params)
         store.dispatch('loadHelpTitle', route.params)
       ])
       ])
     },
     },
+    mounted () {
+      if(this.helpList && this.helpList.length === 1) {
+        this.$router.push(`/help/helpDetail/${this.helpList[0].num}`)
+      }
+    },
     computed: {
     computed: {
       helpTitle () {
       helpTitle () {
         return this.$store.state.help.title.data
         return this.$store.state.help.title.data

+ 2 - 2
pages/mobile/search/newkeycode.vue

@@ -182,8 +182,8 @@
                      <div class="text overHidden">{{item.spec || '-'}}</div>
                      <div class="text overHidden">{{item.spec || '-'}}</div>
                    </div>
                    </div>
                    <div class="list">
                    <div class="list">
-                     <div class="name">单位:</div>
-                     <div class="text overHidden">{{item.unit || 'PCS'}}</div>
+                     <div class="name">库存(PCS):</div>
+                     <div class="text overHidden">{{item.erpReserve || 0}}</div>
                    </div>
                    </div>
                    <div class="list clearfix" style="overflow: inherit;">
                    <div class="list clearfix" style="overflow: inherit;">
                      <div class="fl">
                      <div class="fl">