Merge branch 'dev-market-20200813' of...

Merge branch 'dev-market-20200813' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-market-20200813

src/views/goods/goods-manage.vue

@@ -124,6 +124,17 @@
       :visible.sync="batchDialog"
       width="30%"
       center>
+      <el-dialog
+        width="30%"
+        title="导入失败原因"
+        :visible.sync="innerVisible"
+        append-to-body>
+        <div class="upload-error">
+          <div class="error-tem" style="padding:5px" v-for="(item,index) in validateFailedList" :key="index">
+            {{'第'+item.rowNumber+'行：'}}{{item.validateResultList.join(',')}}
+          </div>
+        </div>
+      </el-dialog>
       <div class="batch-dia">
         <div class="batch-dia-item">
           <span class="s-l">1、下载模板</span>
@@ -201,6 +212,7 @@
           pageSize:	10,
           storeId:0,
         },
+        innerVisible:false,
         selectList:[],
         batchParm:{
           batchUpdateSaleStatusReq: {
@@ -216,6 +228,7 @@
         typeList: [],
         //uploadUrl:getBaseUrl('store/goods/import'),
         postData:{},
+        validateFailedList:[]
       }
     },
     created() {
@@ -293,35 +306,43 @@
             }];
 
             let req = {
-                fileArray: fileArray,
-                import_type: 2,
+                base64Str : e.target.result.substr(e.target.result.indexOf("base64,") + 7),
+                //import_type: 2,
             };
-            req.token = localStorage.getItem('storageToken');
-            self.postData = JSON.stringify(req);
+            //req.token = localStorage.getItem('storageToken');
+            //self.postData = JSON.stringify(req);
 
-            uploadExcel(self.postData).then(res => {
+            uploadExcel(req).then(res => {
+              
               if(res.code != '000000'){
                 return self.$message({
                   message: '上传失败，请重新上传!',
                   type: 'error'
                 });
               }
-              self.$message({
-                message: '上传成功!',
-                type: 'success'
-              });
-              self.batchDialog = false
-              setTimeout(()=>{
-                self.getLists()
-              },2000)
+              if(res.data.allPass){
+
+                self.$message({
+                  message: '上传成功!',
+                  type: 'success'
+                });
+                self.batchDialog = false
+                setTimeout(()=>{
+                  self.getLists()
+                },2000)
+              }else{
+                self.innerVisible = true
+                self.validateFailedList = res.data.validateFailedList || []
+              }
+
 
             })
         };
         reader.readAsDataURL(file);
       },
       uploadTemp(){
-        let url = ""
-        window.href = url
+        let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx"
+        window.location.href = url
       },
       getLever(id=0){