excel导入

src/dashoo.cn/backend/api/controllers/oilsupplier/goodsaptitude.go

@@ -1243,11 +1243,12 @@ func (this *OilGoodsAptitudeController) ImportExcel() {
 	columnArr := strings.Split(Fstrs, ",")
 
 	defer func() {
+		fmt.Println("=====================")
 		session.Close()
 	}()
 
 	codemap := make(map[string]int)
-	for i := 3; i < len(sheet.Rows); i++ {
+	for i := 2; i < len(sheet.Rows); i++ {
 		lineNo := strconv.Itoa(i + 1)
 		this.OperationCell(svc, lineNo, columnArr, codemap, sheet.Rows[i].Cells, &errLineNum)
 	}
@@ -1281,29 +1282,23 @@ func (this *OilGoodsAptitudeController) OperationCell(svc *goodsaptitude.OilGood
 	parentId := 0
 	classId := 0
 	cellsArrLen := len(cellsArr)
-	cellD := strings.TrimSpace(cellsArr[3].String())
+	cellD := strings.TrimSpace(cellsArr[6].String())
 	var valstr = ""
-	for idx, cell := range cellsArr {
-		if idx < 4 {
-			cellstr := cell.String()
-			//fmt.Printf("%s\n", cellstr)
-			if strings.TrimSpace(cellstr) == "" {
-				break
-			}
-			cellArr := strings.Fields(cellstr)
-
-			//id := sessionsvc.SelectGoodsAptitudeClassCode(cellArr[0])
 
+	for i := 0; i < cellsArrLen; {
+		if i < 8 {
 			var entity goodsaptitudeclass.Tmp_OilGoodsAptitudeClass
-			_, has := codemap[cellArr[0]]
+
+			cellval := strings.TrimSpace(cellsArr[i].String())
+			fmt.Println(cellval)
+			_, has := codemap[cellval]
 			if !has {
-				if idx != 0 {
-					upcellstr := cellsArr[idx-1].String()
-					upcellArr := strings.Fields(upcellstr)
-					parentId = codemap[upcellArr[0]]
+				if i != 0 {
+					upcode := cellsArr[i-2].String()
+					parentId = codemap[upcode]
 				}
-				entity.Code = cellArr[0]
-				entity.Name = cellArr[1]
+				entity.Code = cellval
+				entity.Name = strings.TrimSpace(cellsArr[i+1].String())
 				entity.Edition = "1"
 				entity.ParentId = parentId
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -1316,21 +1311,67 @@ func (this *OilGoodsAptitudeController) OperationCell(svc *goodsaptitude.OilGood
 					break
 				}
 				classId = entity.Id
-				if idx != 3 {
-					codemap[cellArr[0]] = entity.Id
+				if i <= 6 {
+					codemap[cellval] = entity.Id
 				}
 			}
 		}
-		if idx >= 4 {
-			valstr += "'" + cellsArr[idx].String() + "',"
+		if i >= 8 {
+			valstr += "'" + cellsArr[i].String() + "',"
+			i++
+		} else {
+			i += 2
 		}
 	}
+
+	//for idx, cell := range cellsArr {
+	//	if idx < 4 {
+	//		cellstr := cell.String()
+	//		//fmt.Printf("%s\n", cellstr)
+	//		if strings.TrimSpace(cellstr) == "" {
+	//			break
+	//		}
+	//		cellArr := strings.Fields(cellstr)
+	//
+	//		//id := sessionsvc.SelectGoodsAptitudeClassCode(cellArr[0])
+	//
+	//		var entity goodsaptitudeclass.Tmp_OilGoodsAptitudeClass
+	//		_, has := codemap[cellArr[0]]
+	//		if !has {
+	//			if idx != 0 {
+	//				upcellstr := cellsArr[idx-1].String()
+	//				upcellArr := strings.Fields(upcellstr)
+	//				parentId = codemap[upcellArr[0]]
+	//			}
+	//			entity.Code = cellArr[0]
+	//			entity.Name = cellArr[1]
+	//			entity.Edition = "1"
+	//			entity.ParentId = parentId
+	//			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	//			entity.CreateBy = this.User.Realname
+	//			entity.CreateOn = time.Now()
+	//
+	//			_, err := svc.InsertEntityBytbl(Tmp_OilGoodsAptitudeClassName, &entity)
+	//			if err != nil {
+	//				panic(err)
+	//				break
+	//			}
+	//			classId = entity.Id
+	//			if idx != 3 {
+	//				codemap[cellArr[0]] = entity.Id
+	//			}
+	//		}
+	//	}
+	//	if idx >= 4 {
+	//		valstr += "'" + cellsArr[idx].String() + "',"
+	//	}
+	//}
 	if cellD != "" {
 		valstr = strings.Trim(valstr, ",")
 		valstr = strings.Replace(valstr, "是", "1", -1)
-		log.Println(cellsArr[3].String() + "==" + valstr)
+		log.Println(cellsArr[6].String() + "==" + valstr)
 		var columnstr = ""
-		for l := 0; l < cellsArrLen-4; l++ {
+		for l := 0; l < cellsArrLen-8; l++ {
 			columnstr += columnArr[l] + ","
 		}
 		columnstr = strings.Trim(columnstr, ",")
@@ -2074,10 +2115,10 @@ func (this *OilGoodsAptitudeController) OilCompare() {
 		//Compare.ManufacturerCode = sheet.Rows[i].Cells[22].Value
 		//Compare.ManufacturerName = sheet.Rows[i].Cells[23].Value
 		Compare.Diff = "0"
-		if len(List)<1 {
+		if len(List) < 1 {
 			Compare.Diff = "1"
 		}
-		if len(List)>0 {
+		if len(List) > 0 {
 			var certsublist2 []suppliercertsub.OilSupplierCertSub
 			namewhere := "SupplierId = '" + strconv.Itoa(List[0].Id) + "' and Code ='" + Compare.SortCoding + "'"
 			svc.GetEntitysByWhere(OilSupplierCertSubName, namewhere, &certsublist2)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -687,20 +687,6 @@
         },
         tableColumns: [
 
-          {
-            prop: 'Code',
-            label: '编码',
-            width: 120,
-            sort: true
-          },
-
-          {
-            prop: 'Name',
-            label: '名称',
-            width: 150,
-            sort: true
-          },
-
           {
             prop: 'Code1',
             label: '大类编码',