修正类目和品牌的字段绑定

components/supplier/details.vue

@@ -21,15 +21,16 @@
           <ul class="list-unstyled">
             <li class="item">
               <span>类目(名称)</span>
-              <p v-text="detail.prodName? spliceString(detail.prodName, 135) : '暂无信息'">2</p>
+              <p v-if="detail.standard === 1" v-text="detail.kind ? spliceString(detail.kind, 135) : '暂无信息'">1</p>
+              <p v-if="detail.standard === 0" v-text="detail.prodName ? spliceString(detail.prodName, 135) : '暂无信息'">1</p>
             </li>
             <li class="item">
               <span>品牌</span>
-              <p v-text="detail.brand ? detail.brand : '暂无信息'">32</p>
+              <p v-text="detail.standard === 0 ? detail.brand : detail.pbranden">2</p>
             </li>
             <li class="item">
               <span>单位</span>
-              <p v-text="detail.unit ? detail.unit : '暂无信息'">32</p>
+              <p v-text="detail.unit ? detail.unit : 'PCS'">32</p>
             </li>
             <li class="item">
               <span>规格</span>
@@ -66,11 +67,12 @@
           </li>
           <li class="form-item">
             <span>类目：</span>
-            <p v-text="detail.prodName ? spliceString(detail.prodName, 90) : '-'">3</p>
+            <p v-if="detail.standard === 1" v-text="detail.kind ? spliceString(detail.kind, 90) : '-'">1</p>
+            <p v-if="detail.standard === 0" v-text="detail.prodName ? spliceString(detail.prodName, 90) : '-'">1</p>
           </li>
           <li class="form-item">
             <span>品牌：</span>
-            <p v-text="detail.brand ? spliceString(detail.brand, 90) : '-'">3</p>
+            <p v-text="detail.standard === 0 ? spliceString(detail.brand, 90) : spliceString(detail.pbranden, 90)">2</p>
           </li>
           <li class="form-item">
             <span>规格：</span>
@@ -151,8 +153,7 @@
           }
         },
         hasDialog: false,
-        searchCode: '',
-        test: '一二三四五六攻八怕址一二三四五六攻八怕址一二三四五六攻八怕址1234567890一二三四五六攻八怕址1234567890一二三四五六攻八怕址1234567890一二三四五六攻八怕址1234567890一二三四五六攻八怕址'
+        searchCode: ''
       }
     },
     computed: {

components/supplier/merchant.vue

@@ -18,7 +18,7 @@
     </div>
 
     <div class="list_info">
-      <div class="empty" v-if="list.content.length === 0">
+      <div class="empty" v-if="!list.content || list.content.length === 0">
         <img src="/images/supplier/icon/empty.png">
         <div class="info">
           <p>暂无供应商信息</p>
@@ -84,6 +84,7 @@
         }
       },
       list () {
+        console.log(this.$store.state.supplier.merchant.merchant.data)
         return this.$store.state.supplier.merchant.merchant.data
       }
     },

components/supplier/resource.vue

@@ -68,7 +68,8 @@
                 </li>
                 <li class="item">
                   <span class="fl">类目（名称）</span>
-                  <p v-text="item.prodName ? spliceString(item.prodName, 95) : '暂无信息'">1</p>
+                  <p v-if="item.standard === 1" v-text="item.kind ? spliceString(item.kind, 95) : '暂无信息'">1</p>
+                  <p v-if="item.standard === 0" v-text="item.prodName ? spliceString(item.prodName, 95) : '暂无信息'">1</p>
                 </li>
                 <li class="item">
                   <span class="fl">规格</span>
@@ -76,11 +77,11 @@
                 </li>
                 <li class="item">
                   <span class="fl">品牌</span>
-                  <p v-text="item.brand ? spliceString(item.brand, 95) : '暂无信息'">2</p>
+                  <p v-text="item.standard === 0 ? spliceString(item.brand, 95) : spliceString(item.pbranden, 95)">2</p>
                 </li>
                 <li class="item">
                   <span class="fl">单位</span>
-                  <p v-text="item.unit ? item.unit : '暂无信息'">1</p>
+                  <p v-text="item.unit ? item.unit : 'PCS'">1</p>
                 </li>
               </ul>
             </td>
@@ -204,7 +205,6 @@
     },
     computed: {
       list () {
-        console.log(this.$store.state.supplier.material.material.data)
         return this.$store.state.supplier.material.material.data
       },
       enUser () {
@@ -247,9 +247,9 @@
       immediatelyClick (type) {
         this.hasDialog = true
         this.applyObj.cmpCode = type.cmpCode
-        this.applyObj.brand = type.brand
+        this.applyObj.brand = (type.standard === 1 ? type.pbranden : type.brand)
         this.applyObj.spec = type.spec
-        this.applyObj.prodName = type.prodName
+        this.applyObj.prodName = (type.standard === 1 ? type.kind : type.prodName)
       },
       // 时间格式化
       setDeadLineValid: function () {