Merge branch 'yuantest' into test

src/views/system/goods/add/components/goodsspecifications.vue

@@ -24,9 +24,9 @@
               >
                 <span style="float: left" class="span-style">{{ itemSN.name }}</span>
                 <span style="float: right" class="spe-span-del el-icon-circle-close" @click.stop="deleteSpeOption(itemSN,index)"></span>
-                <div class="flag">
+                <!-- <div class="flag">
                   <svg-icon icon="edit" iconClass="template_edit_style" @click="addSpeName(index)"/>
-                </div>
+                </div> -->
               </el-option>
             </el-select>
             <!--<span>数据填写不完整</span>-->
@@ -273,6 +273,8 @@ export default {
         id: 0,
         name: ''
       };
+      //获取现在时间生成唯一id
+      let nowTime=new Date().getTime()
       let localArr = [];
       let localJSON = '';
       // 去 首尾空格
@@ -292,7 +294,7 @@ export default {
         localJSON = JSON.stringify(localArr);
       }else {
         let localObj = {
-          id: this.speOptions.length,
+          id: nowTime.toString(36).slice(0,24)+nowTime,
           name: this.specName_sm
         };
         this.speOptions.push(localObj);