update

src/components/CommodityMan/goodsListEdit.vue

@@ -464,7 +464,7 @@
               </div>
               <el-row>
                 <el-col :span="12">
-                  <UE :defaultMsg=defaultMsg :config=config ref="ue"></UE>
+                  <UE :defaultMsg="defaultMsg" :config=config ref="ue"></UE>
                 </el-col>
               </el-row>
             </el-card>
@@ -1017,9 +1017,11 @@
 
       };
     },
-    created() {},
+    created() {
+      
+    },
     mounted() {
-      this.$refs.ue.InitData();
+      this.$refs.ue.loadUe();
       if (this.$route.query.GoodsId) {
         this.GoodsId = this.$route.query.GoodsId;
         this.getData()
@@ -1517,10 +1519,8 @@
           // this.addMsg.CustomShareImagePath = this.domainManager().ImageUrl+msg.url;
         }
         if (this.imgType == 3) {
-          
           let imgListIndex1=this.imgListIndex1;
           let imgListIndex2=this.imgListIndex2;
-          
           this.SpecificationList[imgListIndex1].SpecificationValueList[imgListIndex2].Image=this.domainManager().ImageUrl+msg.url;
           
         }
@@ -1560,6 +1560,12 @@
             this.fenleiData = pageData;
             this.fenleiData.forEach(item => {
               item.CategoryName = item.Name;
+              item.ChildList.forEach(item2=>{
+                    item2.CategoryName = item2.Name;
+                    item2.ChildList.forEach(item3=>{
+                        item3.CategoryName = item3.Name;
+                    })
+                })
             })
           }
 
@@ -1574,7 +1580,9 @@
           this.SpecificationList = this.addMsg.SpecificationList;
           if (this.addMsg.SeparateDistributionType == 1) {
             this.disList1 = this.addMsg.DistributionCommissionTreeList;
-            this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList
+            if(this.addMsg.DistributionCommissionTreeList.length>0){
+              this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList
+            }
           }
           if (this.addMsg.SeparateDistributionType == 2) {
             this.disList2 = this.addMsg.DistributionCommissionTreeList;
@@ -1585,7 +1593,10 @@
             GradeCommissionList: this.GradeCommissionList
           };
           this.disList1.push(objNew);
-          this.$refs.ue.SetVal(this.addMsg.GoodsDetails);
+          if(this.addMsg.GoodsDetails && this.addMsg.GoodsDetails!=''){
+            this.$refs.ue.SetVal(this.addMsg.GoodsDetails);
+          }
+          
         })
       },
       getRule() {

src/components/orderMan/orderList.vue

@@ -2,10 +2,22 @@
   <div class="orderList">
     <div class="head-title">
       订单列表
+      <el-upload
+          class="upload-demo"
+          ref="upload"
+          :action="importFileUrl"
+          :multiple="true" 
+          :on-success="successUpload"
+          :show-file-list="false"
+          accept=".csv, .xlsx,.xls">
+          <el-button size="small" type="primary">
+          批量导入</el-button>
+      </el-upload>
       <el-button @click="dialogVisible=true" style="float:right;margin-top: -5px;" size="small" type="primary">批量导出
       </el-button>
       <el-button @click="ClearHsz" style="float:right;margin-top: -5px;margin-right:20px" size="small" type="primary">
         清空回收站</el-button>
+      
     </div>
     <div class="content">
       <div>
@@ -418,6 +430,7 @@
     name: "orderList",
     data() {
       return {
+        importFileUrl: this.domainManager().UploadFileUrl,
         priceType: 1,
         priceMsg: {
           Income: '',
@@ -590,6 +603,17 @@
     },
     mounted() {},
     methods: {
+      successUpload(file){
+        let path=file.data.Path;
+        this.apipost("/api/order/SetGoodsOrderBatchImport", {FilePath:path}, res => {
+          if (res.data.resultCode == 1) {
+            this.Success(res.data.message)
+          }else{
+            this.Error(res.data.message)
+          }
+
+        })
+        },
       // 订单操作
       priceForm(formName) {
         this.$refs[formName].validate((valid) => {
@@ -1162,6 +1186,11 @@
 </script>
 
 <style>
+  .orderList .upload-demo{
+    float:right;
+    margin-top: -5px;
+    margin-left:20px;
+  }
   .orderList .pendSelect .el-input {
     width: 100px;
   }

src/router/index.js

@@ -245,6 +245,13 @@ export default new Router({
           name: 'goodsListEdit',
           component: resolve => require(['@/components/CommodityMan/goodsListEdit'], resolve),
         },
+        // 商品管理 批量导入
+        {
+          path: '/bulkImport',
+          name: 'bulkImport',
+          component: resolve => require(['@/components/CommodityMan/bulkImport'], resolve),
+        },
+        
         // 商品管理 淘宝CSV
         {
           path: '/taoBaoCSV',