From d1cab7e2fd8705382802c364e71b2e9b11f98118 Mon Sep 17 00:00:00 2001
From: zhh <zh@thinkerx.com>
Date: Tue, 19 Jun 2018 09:27:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/product/components/ProductInfoDetail.vue   | 14 ++++++++++++++
 src/views/pms/product/index.vue                    |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/pms/product/components/ProductInfoDetail.vue b/src/views/pms/product/components/ProductInfoDetail.vue
index 82ded47c..7cf7d72b 100644
--- a/src/views/pms/product/components/ProductInfoDetail.vue
+++ b/src/views/pms/product/components/ProductInfoDetail.vue
@@ -116,8 +116,10 @@
       selectProductCateValue: function (newValue) {
         if (newValue != null && newValue.length === 2) {
           this.value.productCategoryId = newValue[1];
+          this.value.productCategoryName= this.getCateNameById(this.value.productCategoryId);
         } else {
           this.value.productCategoryId = null;
+          this.value.productCategoryName=null;
         }
       }
     },
@@ -154,6 +156,18 @@
           }
         });
       },
+      getCateNameById(id){
+        let name=null;
+        for(let i=0;i<this.productCateOptions.length;i++){
+          for(let j=0;i<this.productCateOptions[i].children.length;j++){
+            if(this.productCateOptions[i].children[j].value===id){
+              name=this.productCateOptions[i].children[j].label;
+              return name;
+            }
+          }
+        }
+        return name;
+      },
       handleNext(formName){
         this.$refs[formName].validate((valid) => {
           if (valid) {
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index fb0eaae0..91de3bf2 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -216,7 +216,7 @@
       :visible.sync="editSkuInfo.dialogVisible"
       width="40%">
       <span>商品货号：</span>
-      <span>{{editSkuInfo.productName}}</span>
+      <span>{{editSkuInfo.productSn}}</span>
       <el-input placeholder="按sku编号搜索" v-model="editSkuInfo.keyword" size="small" style="width: 50%;margin-left: 20px">
         <el-button slot="append" icon="el-icon-search" @click="handleSearchEditSku"></el-button>
       </el-input>
@@ -301,7 +301,7 @@
         editSkuInfo:{
           dialogVisible:false,
           productId:null,
-          productName:'',
+          productSn:'',
           productAttributeCategoryId:null,
           stockList:[],
           productAttr:[],
@@ -435,7 +435,7 @@
       handleShowSkuEditDialog(index,row){
         this.editSkuInfo.dialogVisible=true;
         this.editSkuInfo.productId=row.id;
-        this.editSkuInfo.productName=row.name;
+        this.editSkuInfo.productSn=row.productSn;
         this.editSkuInfo.productAttributeCategoryId = row.productAttributeCategoryId;
         this.editSkuInfo.keyword=null;
         fetchSkuStockList(row.id,{keyword:this.editSkuInfo.keyword}).then(response=>{