前后:列表

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitude.go

@@ -68,6 +68,119 @@ type OilGoodsAptitude struct {
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }
 
+type OilGoodsAptitudeTmp struct {
+	Code             string `xorm:"default '' VARCHAR(50) 'code'"`
+	Name             string `xorm:"default '' VARCHAR(50) 'name'"`
+	Id                int       `xorm:"not null pk autoincr INT(10)"`
+	ClassId           int       `xorm:"not null default '' comment('编码') INT(11)"`
+	GoodsLevel        string    `xorm:"default '' comment('物资级别') VARCHAR(8)"`
+	GoodsDesc         string    `xorm:"default '' comment('产品说明') VARCHAR(50)"`
+	Standard          string    `xorm:"default '' comment('标准备案') VARCHAR(8)"`
+	CompanyType       string    `xorm:"default '' comment('供应商类型') VARCHAR(50)"`
+	F01               string    `xorm:"default '' VARCHAR(2)"`
+	F02               string    `xorm:"default '' VARCHAR(2)"`
+	F03               string    `xorm:"default '' VARCHAR(2)"`
+	F04               string    `xorm:"default '' VARCHAR(2)"`
+	F05               string    `xorm:"default '' VARCHAR(2)"`
+	F06               string    `xorm:"default '' VARCHAR(2)"`
+	F07               string    `xorm:"default '' VARCHAR(2)"`
+	F08               string    `xorm:"default '' VARCHAR(2)"`
+	F09               string    `xorm:"default '' VARCHAR(2)"`
+	F10               string    `xorm:"default '' VARCHAR(2)"`
+	F11               string    `xorm:"default '' VARCHAR(2)"`
+	F12               string    `xorm:"default '' VARCHAR(2)"`
+	F13               string    `xorm:"default '' VARCHAR(2)"`
+	F14               string    `xorm:"default '' VARCHAR(2)"`
+	F15               string    `xorm:"default '' VARCHAR(2)"`
+	F16               string    `xorm:"default '' VARCHAR(2)"`
+	F17               string    `xorm:"default '' VARCHAR(2)"`
+	F18               string    `xorm:"default '' VARCHAR(2)"`
+	F19               string    `xorm:"default '' VARCHAR(2)"`
+	F20               string    `xorm:"default '' VARCHAR(2)"`
+	F21               string    `xorm:"default '' VARCHAR(2)"`
+	F22               string    `xorm:"default '' VARCHAR(2)"`
+	F23               string    `xorm:"default '' VARCHAR(2)"`
+	F24               string    `xorm:"default '' VARCHAR(2)"`
+	F25               string    `xorm:"default '' VARCHAR(2)"`
+	F26               string    `xorm:"default '' VARCHAR(2)"`
+	F27               string    `xorm:"default '' VARCHAR(2)"`
+	F28               string    `xorm:"default '' VARCHAR(2)"`
+	F29               string    `xorm:"default '' VARCHAR(2)"`
+	F30               string    `xorm:"default '' VARCHAR(2)"`
+	F31               string    `xorm:"default '' VARCHAR(2)"`
+	F32               string    `xorm:"default '' VARCHAR(2)"`
+	F33               string    `xorm:"default '' VARCHAR(2)"`
+	F34               string    `xorm:"default '' VARCHAR(2)"`
+	F35               string    `xorm:"default '' VARCHAR(2)"`
+	F36               string    `xorm:"default '' VARCHAR(2)"`
+	F37               string    `xorm:"default '' VARCHAR(2)"`
+	F38               string    `xorm:"default '' VARCHAR(2)"`
+	F39               string    `xorm:"default '' VARCHAR(2)"`
+	F40               string    `xorm:"default '' VARCHAR(2)"`
+	F41               string    `xorm:"default '' VARCHAR(2)"`
+	F42               string    `xorm:"default '' VARCHAR(2)"`
+	F43               string    `xorm:"default '' VARCHAR(2)"`
+	F44               string    `xorm:"default '' VARCHAR(2)"`
+	F45               string    `xorm:"default '' VARCHAR(2)"`
+	F46               string    `xorm:"default '' VARCHAR(2)"`
+
+	TmpF01               string    `json:"tmpF01"`
+	TmpF02               string    `json:"tmpF02"`
+	TmpF03               string    `json:"tmpF03"`
+	TmpF04               string    `json:"tmpF04"`
+	TmpF05               string    `json:"tmpF05"`
+	TmpF06               string    `json:"tmpF06"`
+	TmpF07               string    `json:"tmpF07"`
+	TmpF08               string    `json:"tmpF08"`
+	TmpF09               string    `json:"tmpF09"`
+	TmpF10               string    `json:"tmpF10"`
+	TmpF11               string    `json:"tmpF11"`
+	TmpF12               string    `json:"tmpF12"`
+	TmpF13               string    `json:"tmpF13"`
+	TmpF14               string    `json:"tmpF14"`
+	TmpF15               string    `json:"tmpF15"`
+	TmpF16               string    `json:"tmpF16"`
+	TmpF17               string    `json:"tmpF17"`
+	TmpF18               string    `json:"tmpF18"`
+	TmpF19               string    `json:"tmpF19"`
+	TmpF20               string    `json:"tmpF20"`
+	TmpF21               string    `json:"tmpF21"`
+	TmpF22               string    `json:"tmpF22"`
+	TmpF23               string    `json:"tmpF23"`
+	TmpF24               string    `json:"tmpF24"`
+	TmpF25               string    `json:"tmpF25"`
+	TmpF26               string    `json:"tmpF26"`
+	TmpF27               string    `json:"tmpF27"`
+	TmpF28               string    `json:"tmpF28"`
+	TmpF29               string    `json:"tmpF29"`
+	TmpF30               string    `json:"tmpF30"`
+	TmpF31               string    `json:"tmpF31"`
+	TmpF32               string    `json:"tmpF32"`
+	TmpF33               string    `json:"tmpF33"`
+	TmpF34               string    `json:"tmpF34"`
+	TmpF35               string    `json:"tmpF35"`
+	TmpF36               string    `json:"tmpF36"`
+	TmpF37               string    `json:"tmpF37"`
+	TmpF38               string    `json:"tmpF38"`
+	TmpF39               string    `json:"tmpF39"`
+	TmpF40               string    `json:"tmpF40"`
+	TmpF41               string    `json:"tmpF41"`
+	TmpF42               string    `json:"tmpF42"`
+	TmpF43               string    `json:"tmpF43"`
+	TmpF44               string    `json:"tmpF44"`
+	TmpF45               string    `json:"tmpF45"`
+	TmpF46               string    `json:"tmpF46"`
+	Edition           string    `xorm:"not null default '' VARCHAR(10)"`
+	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
+	DeletionStateCode int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn          time.Time `xorm:"DATETIME"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(50)"`
+	ModifiedOn        time.Time `xorm:"DATETIME"`
+	ModifiedUserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(50)"`
+}
+
 type OilGoodsAptitude_2 struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
 	Code              string    `xorm:"default '' VARCHAR(50)"`

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitudeService.go

@@ -370,8 +370,6 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(entitiesPtr interf
 			a.ContactName,a.CommercialNo,a.LinkAddress,a.LinkProvince,
 			a.LinkCity,a.LinkStreet,a.BusinessScope,b.InStyle, b.Id CertId,
 			group_concat(DISTINCT header.Code) AS headerCodes,
-			COUNT(sub.Id) AS subCnt,
-			COUNT(sub.SubClassId > 0 or null) AS noSubCnt,
 			min(sub.SubClassId) as MinClassId,
 			(
 			((if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) > 0) or (max(goods.F01) is null) or (max(goods.F01) = ''), TRUE, FALSE)) or 
@@ -474,6 +472,49 @@ func (s *OilGoodsAptitudeService) GetPagingTmpSubEntities(pageIndex, itemsPerPag
 	return total
 }
 
+func (s *OilGoodsAptitudeService) GetPClassEntities(pageIndex, itemsPerPage int64, orderby string,
+	asc bool, entitiesPtr interface{}, having string) (total int64) {
+
+	var sql string
+	sql = `SELECT a.*,b.*,tmpa.F01 AS tmpF01,tmpa.F02 AS tmpF02,tmpa.F03 AS tmpF03,tmpa.F04 AS tmpF04,tmpa.F05 AS tmpF05,tmpa.F06 AS tmpF06,tmpa.F07 AS tmpF07,
+		 tmpa.F08 AS tmpF08,tmpa.F09 AS tmpF09,tmpa.F10 AS tmpF10,tmpa.F11 AS tmpF11,tmpa.F12 AS tmpF12,tmpa.F13 AS tmpF13,tmpa.F14 AS tmpF14,
+		 tmpa.F15 AS tmpF15,tmpa.F16 AS tmpF16,tmpa.F17 AS tmpF17,tmpa.F18 AS tmpF18,tmpa.F19 AS tmpF19,tmpa.F20 AS tmpF20,tmpa.F21 AS tmpF21,
+		 tmpa.F22 AS tmpF22,tmpa.F23 AS tmpF23,tmpa.F24 AS tmpF24,tmpa.F25 AS tmpF25,tmpa.F26 AS tmpF26,tmpa.F27 AS tmpF27,tmpa.F28 AS tmpF27,
+		 tmpa.F29 AS tmpF29,tmpa.F30 AS tmpF30,tmpa.F31 AS tmpF31,tmpa.F32 AS tmpF32,tmpa.F33 AS tmpF33,tmpa.F34 AS tmpF34,tmpa.F35 AS tmpF35,
+		 tmpa.F36 AS tmpF36,tmpa.F37 AS tmpF37,tmpa.F38 AS tmpF38,tmpa.F39 AS tmpF39,tmpa.F40 AS tmpF40,tmpa.F41 AS tmpF41,tmpa.F42 AS tmpF42,
+  		 tmpa.F42 AS tmpF42,tmpa.F43 AS tmpF43,tmpa.F44 AS tmpF44,tmpa.F45 AS tmpF45,tmpa.F46 AS tmpF46
+		 FROM OilGoodsAptitude a
+		 LEFT JOIN OilGoodsAptitudeClass b ON b.Id = a.ClassId
+		 LEFT JOIN tmp_OilGoodsAptitudeClass tmpb ON tmpb.Code = b.Code
+		 LEFT JOIN tmp_OilGoodsAptitude tmpa ON tmpa.ClassId = tmpb.Id`
+	sql += " where (" + having + ")"
+	if asc {
+		sql += ` order by ` + orderby + ` ASC `
+	} else {
+		sql += ` order by ` + orderby + ` DESC `
+	}
+	sql += ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+
+	sqlCount := "SELECT count(*) FROM OilGoodsAptitude a LEFT JOIN OilGoodsAptitudeClass b ON b.Id = a.ClassId LEFT JOIN tmp_OilGoodsAptitudeClass tmpb ON tmpb.Code = b.Code LEFT JOIN tmp_OilGoodsAptitude tmpa ON tmpa.ClassId = tmpb.Id where (" + having + ") "
+
+	//var totalResult TotalResult
+	s.DBE.SQL(sql).Find(entitiesPtr)
+	//s.DBE.SQL(sqlCount).Get(&totalResult)
+	//total = totalResult.Total
+	var resultsSlice []map[string][]byte
+	resultsSlice, _ = s.DBE.Query(sqlCount)
+
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, _ = strconv.ParseInt(string(value), 10, 64)
+			break
+		}
+	}
+
+	return total
+}
+
 func (s *OilGoodsAptitudeService) GetPagingSubEntities(pageIndex, itemsPerPage int64, orderby string,
 	asc bool, entitiesPtr interface{}, having string) (total int64) {
 
@@ -504,5 +545,16 @@ func (s *OilGoodsAptitudeService) GetPagingSubEntities(pageIndex, itemsPerPage i
 	s.DBE.SQL(sqlCount).Get(&totalResult)
 	total = totalResult.Total
 
+	return total
+}
+
+func (s *OilGoodsAptitudeService) GetTableTotal(where string) (total int64) {
+
+	sqlCount := "SELECT count(*) as total FROM OilSupplierCertSub where (" + where + ")"
+
+	var totalResult TotalResult
+	s.DBE.SQL(sqlCount).Get(&totalResult)
+	total = totalResult.Total
+
 	return total
 }

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

@@ -251,6 +251,123 @@ func (this *OilGoodsAptitudeController) GetImportEntityList() {
 	this.ServeJSON()
 }
 
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []goodsaptitude.OilGoodsAptitude
+// @router /comparelist [get]
+func (this *OilGoodsAptitudeController) GetCompareList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Code"
+	asc := true
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	Conditions := this.GetString("Conditions")
+	if Conditions == "1" {
+		// 匹配上
+		where += " and a.GoodsLevel = tmpa.GoodsLevel"
+	} else if Conditions == "2" {
+		// 1变2
+		where += " and a.GoodsLevel < tmpa.GoodsLevel"
+	} else if Conditions == "3" {
+		// 2变1
+		where += " and a.GoodsLevel > tmpa.GoodsLevel"
+	} else if Conditions == "4" {
+		//
+		where += " and a.GoodsLevel != tmpa.GoodsLevel"
+	}
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		} else {
+			asc = false
+		}
+	}
+	Edition := this.GetString("Edition")
+	CreateOn := this.GetString("CreateOn")
+	Code := this.GetString("Code")
+	Name := this.GetString("Name")
+	BigClassName := this.GetString("BigClassName")
+	BigClassCode := this.GetString("BigClassCode")
+	MiddleClassName := this.GetString("MiddleClassName")
+	SmallClassName := this.GetString("SmallClassName")
+	GoodsName := this.GetString("GoodsName")
+	GoodsLevel := this.GetString("GoodsLevel")
+	GoodsDesc := this.GetString("GoodsDesc")
+	Standard := this.GetString("Standard")
+	CompanyType := this.GetString("CompanyType")
+
+	if Edition != "" {
+		where = where + " and b.Edition = '" + Edition + "'"
+	}
+	if Code != "" {
+		where = where + " and Code like '%" + Code + "%'"
+	}
+
+	if Name != "" {
+		where = where + " and Name like '%" + Name + "%'"
+	}
+
+	if BigClassName != "" {
+		where = where + " and Name1 like '%" + BigClassName + "%'"
+	}
+
+	if BigClassCode != "" {
+		where = where + " and Code1 like '%" + BigClassCode + "%'"
+	}
+
+	if MiddleClassName != "" {
+		where = where + " and Name2 like '%" + MiddleClassName + "%'"
+	}
+
+	if SmallClassName != "" {
+		where = where + " and  Name3 like '%" + SmallClassName + "%'"
+	}
+
+	if GoodsName != "" {
+		where = where + " and Name4 like '%" + GoodsName + "%'"
+	}
+
+	if GoodsLevel != "" {
+		where = where + " and GoodsLevel like '%" + GoodsLevel + "%'"
+	}
+
+	if GoodsDesc != "" {
+		where = where + " and GoodsDesc like '%" + GoodsDesc + "%'"
+	}
+
+	if Standard != "" {
+		where = where + " and  Standard '%" + Standard + "%'"
+	}
+
+	if CompanyType != "" {
+		where = where + " and  CompanyType '%" + CompanyType + "%'"
+	}
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
+
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	var list []goodsaptitude.OilGoodsAptitudeTmp
+	total := svc.GetPClassEntities(page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
 // @Title 获取列表2019版本
 // @Description
 // @Success 200 {object}
@@ -1339,6 +1456,10 @@ func (this *OilGoodsAptitudeController) ImportExcel() {
 				where := "  b.SupplierTypeCode='01' and a.Id = " + strconv.Itoa(item.Id)
 				svc.GetPagingTmpCheckedEntities(&list, where)
 				if list != nil {
+					total := svc.GetTableTotal(" SupplierId = " + strconv.Itoa(item.Id))
+					total1 := svc.GetTableTotal(" SubClassId > 0 and SupplierId = " + strconv.Itoa(item.Id))
+					list[0].SubCnt = int(total)
+					list[0].NoSubCnt = int(total1)
 					svc.InsertEntityBytbl("OilSupplierContrast", list[0])
 				}
 			}
@@ -1518,6 +1639,10 @@ func (this *OilGoodsAptitudeController) CreateContrast() {
 		where := "  b.SupplierTypeCode='01' and a.Id = " + strconv.Itoa(item.Id)
 		svc.GetPagingTmpCheckedEntities(&list, where)
 		if list != nil {
+			total := svc.GetTableTotal(" SupplierId = " + strconv.Itoa(item.Id))
+			total1 := svc.GetTableTotal(" SubClassId = 0 and SupplierId = " + strconv.Itoa(item.Id))
+			list[0].SubCnt = int(total)
+			list[0].NoSubCnt = int(total1)
 			svc.InsertEntityBytbl("OilSupplierContrast", list[0])
 		}
 	}

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

@@ -8,6 +8,7 @@ import (
 	. "dashoo.cn/backend/api/controllers"
 	baseparameter "dashoo.cn/business2/parameter"
 	"dashoo.cn/utils"
+	"encoding/json"
 	"fmt"
 	"strconv"
 	"time"
@@ -17,6 +18,66 @@ type OilInvoiceController struct {
 	BaseController
 }
 
+type InvoiceJson struct {
+	Identity               string  	`json:"identity"`
+	Order           InvoiceOrderJson `json:"order"`
+}
+
+type SelectInvoiceJson struct {
+	Identity               string  	`json:"identity"`
+	Fpqqlsh           string `json:"fpqqlsh"`
+}
+
+type InvoiceOrderJson struct {
+	Buyername     string    `json:"buyername"`
+	Phone     string    `json:"phone"`
+	Taxnum     string    `json:"taxnum"`
+	Address     string    `json:"address"`
+	Account     string    `json:"account"`
+	Telephone     string    `json:"telephone"`
+	Orderno     string    `json:"orderno"`
+	Invoicedate     string    `json:"invoicedate"`
+	Clerk     string    `json:"clerk"`
+	Saleaccount     string    `json:"saleaccount"`
+	Salephone     string    `json:"salephone"`
+	Saleaddress     string    `json:"saleaddress"`
+	Saletaxnum     string    `json:"saletaxnum"`
+	Kptype     string    `json:"kptype"`
+	Message     string    `json:"message"`
+	Payee     string    `json:"payee"`
+	Checker     string    `json:"checker"`
+	Tsfs     string    `json:"tsfs"`
+	Email     string    `json:"email"`
+	Qdbz     string    `json:"qdbz"`
+	Qdxmmc     string    `json:"qdxmmc"`
+	Dkbz     string    `json:"dkbz"`
+	Deptid     string    `json:"deptid"`
+	Clerkid     string    `json:"clerkid"`
+	InvoiceLine     string    `json:"invoiceLine"`
+	Cpybz     string    `json:"cpybz"`
+	Detail     []InvoiceDetailJson `json:"detail"`
+}
+
+type InvoiceDetailJson struct {
+	Goodsname     string    `json:"goodsname"`
+	Num     string    `json:"num"`
+	Price     string    `json:"price"`
+	Hsbz     string    `json:"hsbz"`
+	Taxrate     string    `json:"taxrate"`
+	Spec     string    `json:"spec"`
+	Unit     string    `json:"unit"`
+	Spbm     string    `json:"spbm"`
+	Zsbm     string    `json:"zsbm"`
+	Fphxz     string    `json:"fphxz"`
+	Yhzcbs     string    `json:"yhzcbs"`
+	Zzstsgl     string    `json:"zzstsgl"`
+	Lslbs     string    `json:"lslbs"`
+	Kce     string    `json:"kce"`
+	Taxfreeamt     string    `json:"taxfreeamt"`
+	Tax     string    `json:"tax"`
+	Taxamt     string    `json:"taxamt"`
+}
+
 // @Title 获取信息
 // @Description get user by token
 // @Success 200 {object} map[string]interface{}
@@ -57,7 +118,6 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 	session := utils.DBE.NewSession()
 	defer session.Close()
 	err := session.Begin()
-
 	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 	key := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceKey64")
 
@@ -77,8 +137,10 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 	svcp := paymentinfo.GetPaymentService(utils.DBE)
 	where = "p.Id in (" + entity.SrcIds + ")"
 	svcp.GetPaymentinfoList1(where, &paylist)
-	paramsString := ""
+	//paramsString := ""
+	var paramsDetail []InvoiceDetailJson
 	for _, pay := range paylist {
+		var detail InvoiceDetailJson
 		var amount float64
 		var rate1 float64
 		var a float64
@@ -94,6 +156,9 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 		rate := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceRate")
 		//含税
 		israte := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "IsInvoiceRate")
+		//"yhzcbs":"1","zzstsgl":"免税","lslbs":"1"  ----免税
+		//"yhzcbs":1,"zzstsgl":"不征税", "lslbs":2   ----不征税
+		//"yhzcbs":"0","zzstsgl":"","lslbs":3        -------零税率
 		if israte == "" {
 			zzstsgl = ""
 			rate1,_ = strconv.ParseFloat(rate, 64)
@@ -106,6 +171,7 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 			yhzcbs = "1"
 			tax = "0.00"
 			a,_ = strconv.ParseFloat(tax, 64)
+			zzstsgl = "免税"
 			rate = "0.00"
 		}  else if israte == "2" {
 			//不征税
@@ -131,15 +197,66 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 		} else if pay.OilPaymentInfo.PayType == "7" {
 			typeString = "信息变更交费"
 		}
-		paramsString += "{'goodsname':'" + pay.SupplierTypeName + " " + typeString + "','num':'','price':'','hsbz':'1','taxrate':'" + rate + "','spec':'','unit':'','spbm':'10101150101','zsbm':'','fphxz':'0','yhzcbs':'" + yhzcbs + "','zzstsgl':'" + zzstsgl + "','lslbs':'" + israte + "','kce':'','taxfreeamt':" + fmt.Sprintf("%.2f", amount-a) + ",'tax':" + tax + ",'taxamt':" + strconv.Itoa(int(amount)) + "}"
+		//paramsString += "{'goodsname':'" + pay.SupplierTypeName + " " + typeString + "','num':'','price':'','hsbz':'1','taxrate':'" + rate + "','spec':'','unit':'','spbm':'10101150101','zsbm':'','fphxz':'0','yhzcbs':'" + yhzcbs + "','zzstsgl':'" + zzstsgl + "','lslbs':'" + israte + "','kce':'','taxfreeamt':" + fmt.Sprintf("%.2f", amount-a) + ",'tax':" + tax + ",'taxamt':" + strconv.Itoa(int(amount)) + "}"
+		detail.Goodsname = pay.SupplierTypeName + " " + typeString
+		detail.Hsbz = "1"
+		detail.Taxrate = rate
+		detail.Fphxz = "0"
+		detail.Yhzcbs = yhzcbs
+		detail.Zzstsgl = zzstsgl
+		detail.Lslbs = israte
+		detail.Tax = tax
+		detail.Taxamt = strconv.Itoa(int(amount))
+		detail.Taxfreeamt = fmt.Sprintf("%.2f", amount-a)
+		paramsDetail = append(paramsDetail, detail)
 	}
 
 	// 身份认证，在诺诺网备案后，由诺诺网提供，每个企业一个
 	identity := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceIdentity")
-	//params := "{'identity':'" + identity + "','order':{'buyername':'" + entity.SupplierName + "','taxnum':'" + entity.CommercialNo + "','phone':'18354222656','address':'" + entity.Address + "','account':'" + entity.DepositBank + entity.BankAccount + "','telephone':'" + supplierEntity.Telphone + "','orderno':'123" + entity.BankSerialNum + "','invoicedate':'" + time.Now().Format("2006-01-02 15:04:05") + "','clerk':'曲岩','saleaccount':'中国工商银行股份有限公司天津市滨海支行 0302023009104728134','salephone':'022-25922501','saleaddress':'大港油田二号院','saletaxnum':'911200007182589087','kptype':'1','message':'','payee':'曲岩','checker':'曲岩','tsfs':'1','email':'" + entity.Email + "','qdbz':'0','qdxmmc':'','dkbz':'0','deptid':'','clerkid':'','invoiceLine':'p','cpybz':'','detail':[{'goodsname':'苹果','num':'1','price':'1','hsbz':'1','taxrate':'0.13','spec':'','unit':'吨','spbm':'10101150101','zsbm':'','fphxz':'0','yhzcbs':'0','zzstsgl':'','lslbs':'','kce':''}]}}"
-	params := "{'identity':'" + identity + "','order':{'buyername':'" + entity.SupplierName + "','taxnum':'" + entity.CommercialNo + "','phone':'" + supplierEntity.Mobile + "','address':'" + entity.Address + "','account':'" + entity.DepositBank + " " + entity.BankAccount + "','telephone':'" + supplierEntity.Telphone + "','orderno':'dg" + entity.BankSerialNum + "','invoicedate':'" + time.Now().Format("2006-01-02 15:04:05") + "','clerk':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople3") + "','saleaccount':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaleaccount") + "','salephone':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePhone") + "','saleaddress':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceAddress") + "','saletaxnum':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaletaxnum") + "','kptype':'1','message':'','payee':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople1") + "','checker':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople2") + "','tsfs':'1','email':'" + entity.Email + "','qdbz':'0','qdxmmc':'','dkbz':'0','deptid':'','clerkid':'','invoiceLine':'p','cpybz':'','detail':["+paramsString+"]}}"
+	var params InvoiceJson
+	var paramsOrder InvoiceOrderJson
+	params.Identity = identity
+	paramsOrder.Detail = paramsDetail
+	paramsOrder.Buyername = entity.SupplierName
+	paramsOrder.Taxnum = entity.CommercialNo
+	paramsOrder.Phone = supplierEntity.Mobile
+	paramsOrder.Address = entity.Address
+	paramsOrder.Account = entity.DepositBank + " " + entity.BankAccount
+	paramsOrder.Telephone = supplierEntity.Telphone
+	paramsOrder.Orderno = "dg21" + entity.BankSerialNum
+	paramsOrder.Invoicedate = time.Now().Format("2006-01-02 15:04:05")
+	paramsOrder.Clerk = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople3")
+	paramsOrder.Saleaccount = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaleaccount")
+	paramsOrder.Salephone = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePhone")
+	paramsOrder.Saleaddress = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceAddress")
+	paramsOrder.Saletaxnum = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaletaxnum")
+	paramsOrder.Kptype = "1"
+	paramsOrder.Payee = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople1")
+	paramsOrder.Checker = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople2")
+	paramsOrder.Tsfs = "2" //-1,不推送;0,邮箱;1,手机(默认);2,邮箱、手机
+	paramsOrder.Email = entity.Email
+	paramsOrder.Qdbz = "0"
+	paramsOrder.Dkbz = "0"
+	paramsOrder.InvoiceLine = "p"
+	params.Order = paramsOrder
 	var errinfo ErrorInfo
-	invoiceJson := invoice.Post(url, params, key)
+	paramsStr, err := json.Marshal(params)
+	if err != nil {
+		errinfo.Code = -1
+		errinfo.Message = "转json失败！"
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+	//param1 := "{'identity':'" + identity + "','order':{'buyername':'" + entity.SupplierName + "','taxnum':'" + entity.CommercialNo + "','phone':'" + supplierEntity.Mobile +
+	//	"','address':'" + entity.Address + "','account':'" + entity.DepositBank + " " + entity.BankAccount + "','telephone':'" + supplierEntity.Telphone + "','orderno':'dg123" +
+	//	entity.BankSerialNum + "','invoicedate':'" + time.Now().Format("2006-01-02 15:04:05") + "','clerk':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople3") +
+	//	"','saleaccount':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaleaccount") + "','salephone':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePhone") +
+	//	"','saleaddress':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceAddress") + "','saletaxnum':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceSaletaxnum") +
+	//	"','kptype':'1','message':'','payee':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople1") + "','checker':'" + paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoicePeople2") +
+	//	"','tsfs':'1','email':'" + entity.Email + "','qdbz':'0','qdxmmc':'','dkbz':'0','deptid':'','clerkid':'','invoiceLine':'p','cpybz':'','detail':["+paramsString+"]}}"
+
+	fmt.Println(string(paramsStr), "参数")
+	invoiceJson := invoice.Post(url, string(paramsStr), key)
 	fmt.Println(invoiceJson, "诺诺接口返回")
 	if invoiceJson.Status != "0000"{
 		//session.Rollback()
@@ -148,14 +265,24 @@ func (this *OilInvoiceController) UpdateIsInvoice() string {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else if invoiceJson.Status == "0000" && invoiceJson.Fpqqlsh != "" {
+		time.Sleep(time.Second * 5)
+		var sel SelectInvoiceJson
+		key := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceKey64")
+		sel.Identity = paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceIdentity")
+		sel.Fpqqlsh = invoiceJson.Fpqqlsh
+		selS, err := json.Marshal(sel)
+		invoice := invoiceinfo.GetInvoiceService(utils.DBE)
+		url1 := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceLiuShuiUrl")
+		//params := "{'identity':'" + identity + "','fpqqlsh':['" + invoiceJson.Fpqqlsh + "']}"
+		invoiceJson1 := invoice.SerialNumberPost(url1, string(selS), key)
+		fmt.Print(invoiceJson1)
 		// 根据流水号查询结果
-		url := paramSvc.GetBaseparameterMessage("INVOICE", "paramset", "InvoiceLiuShuiUrl")
-		params := "{'identity':'" + identity + "','fpqqlsh':['" + invoiceJson.Fpqqlsh + "']}"
-		invoiceJson1 := invoice.SerialNumberPost(url, params, key)
+		//params := "{'identity':'" + identity + "','fpqqlsh':['" + invoiceJson.Fpqqlsh + "']}"
+		//invoiceJson1 := invoice.SerialNumberPost(url, params, key)
 		if invoiceJson1.Result != "success"{
 			//session.Rollback()
 			errinfo.Code = -1
-			errinfo.Message = "操作失败！" + invoiceJson1.ErrorMsg
+			errinfo.Message = "开票查询失败！" + invoiceJson1.ErrorMsg
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		} else if invoiceJson1.Result == "success" && len(invoiceJson1.InvoiceList) > 0{

src/dashoo.cn/frontend_web/src/api/oilsupplier/goodsaptitude.js

@@ -100,6 +100,13 @@ export default {
       params: params
     })
   },
+  getCompareList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/comparelist?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
   insertGoodsAptitude (myAxios) {
     return myAxios({
       url: '/goodsaptitude/insertgoodsaptitude',

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

@@ -302,7 +302,7 @@
           <span style="float: right;">
           <el-form ref="form" :inline="true" style="margin-top: -10px">
             <el-form-item>
-              <el-button type="primary" size="mini" style="margin-right: 15px" @click="confirmIsInvoice()" v-if="this.formDataInvoice.IsInvoice == '0'">确认</el-button>
+              <el-button type="primary" size="mini" style="margin-right: 15px" @click="confirmIsInvoice()" v-if="this.formDataInvoice.IsInvoice == '0'" :loading="invoiceLoading">确认</el-button>
             </el-form-item>
           </el-form>
         </span>
@@ -523,7 +523,8 @@
         },
         paymentinfoList: [],
         entityListtode: [],
-        entityListdone: []
+        entityListdone: [],
+        invoiceLoading: false
       }
     },
     created () {
@@ -534,6 +535,7 @@
     },
     methods: {
       confirmIsInvoice () {
+        this.invoiceLoading = true
         let params = {
           Id: this.formDataInvoice.Id,
           SrcIds: this.formDataInvoice.SrcIds
@@ -554,6 +556,7 @@
               message: res.data.message
             })
           }
+          this.invoiceLoading = false
         })
       },
       initDatas () {

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

@@ -305,6 +305,8 @@
           </el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="contrastList()">查看对比列表
             </el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="qualificaList()">查看资质对比列表
+            </el-button>
             <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" @click="truncateimport()">清空所有导入
             </el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="confirmImport()">确认更新
@@ -385,6 +387,9 @@
     <el-dialog title="对比列表"  width="95%" top="5vh" :visible.sync="contrastListvisible">
       <tmp-supplier-check v-if="contrastListvisible"></tmp-supplier-check>
     </el-dialog>
+    <el-dialog title="准入范围对比列表"  width="95%" top="5vh" :visible.sync="qualificaListvisible">
+      <tmp-class-check v-if="qualificaListvisible"></tmp-class-check>
+    </el-dialog>
 
     <el-dialog title="高级查询" :visible.sync="importDialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
@@ -476,10 +481,13 @@
   import axios from 'axios'
   import uploadajax from '@/assets/js/uploadajax.js'
   import tmpSupplierCheck from './tmpsuppliercheck'
+  import tmpClassCheck from './tmpclasscheck'
 
   export default {
     components: {
-      tmpSupplierCheck
+      tmpSupplierCheck,
+      tmpClassCheck
+
     },
     computed: {
       ...mapGetters({
@@ -789,6 +797,7 @@
         AuditStepOptions: [],
         showcolumn: [],
         contrastListvisible: false,
+        qualificaListvisible: false,
         ContrastLoading: false,
         contrastsize: 10,
         contrastcurrentPage: 1,
@@ -846,6 +855,10 @@
         this.contrastListvisible = true
         this.showimportvisible = false
       },
+      qualificaList () {
+        this.qualificaListvisible = true
+        this.showimportvisible = false
+      },
       updatasuppiercertsub () {
         // this.$confirm('此操作将更新企业资质, 是否继续?', '提示', {
         //   confirmButtonText: '确定',

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

@@ -0,0 +1,284 @@
+<template>
+  <div>
+    <el-card class="box-card" shadow="never" style="height: calc(100vh - 115px);position:relative">
+      <div slot="header">
+          <span>
+            <i class="icon icon-table2"></i> 准入范围对比表
+          </span>
+        <span style="float: right;">
+
+          </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="筛选条件">
+            <el-select placeholder="请选择" v-model="conditions" style="width: 100%" size="mini">
+              <el-option :key="1" label="匹配正确" :value="1"></el-option>
+              <el-option :key="2" label="1级降2级" :value="2"></el-option>
+              <el-option :key="3" label="2级升1级" :value="3"></el-option>
+<!--              <el-option :key="4" label="差异" :value="4"></el-option>-->
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" @click="importhandleSearch">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-table stripe highlight-current-row :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)"
+                style="width: 100%" @sort-change="orderby" v-loading="loading" >
+
+        <el-table-column v-for="column in tableColumns" :prop="column.prop" sortable :width="column.width"
+                         :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="(column.prop != 'GoodsLevel' && column.prop != 'GoodsDesc' && column.prop != 'Standard' && column.prop != 'CompanyType')">{{ transferStr(scope.row[column.prop]) }}</span>
+            <span v-else-if="(column.prop === 'CompanyType')">物资类</span>
+            <span v-else>{{ (scope.row[column.prop]) }}</span>
+          </template>
+        </el-table-column>
+
+        <!--动态显示的表头-->
+        <template v-for="column in dynamicTableColumns">
+          <el-table-column :prop="column.prop" sortable :width="80"
+                           :key="column.Id" :label="column.label" align="center" v-if="column.IsManuf=='0'" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ transferStr2(scope.row[column.prop]) }}|{{transferStr2(scope.row['tmp'+column.prop])}}
+            </template>
+          </el-table-column>
+        </template>
+
+        <el-table-column label="贸易产品">
+          <template v-for="column in dynamicTableColumns">
+            <el-table-column :prop="column.prop" sortable :width="80"
+                             :key="column.Id" :label="column.label" align="center" v-if="column.IsManuf=='2'" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ transferStr2(scope.row[column.prop]) }}|{{transferStr2(scope.row['tmp'+column.prop])}}
+              </template>
+            </el-table-column>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制造产品">
+          <template v-for="column in dynamicTableColumns">
+            <el-table-column :prop="column.prop" sortable :width="80"
+                             :key="column.Id" :label="column.label" align="center" v-if="column.IsManuf=='1'" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ transferStr(scope.row[column.prop]) }}|{{transferStr2(scope.row['tmp'+column.prop])}}
+              </template>
+            </el-table-column>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+                     :page-sizes="[10, 50, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+                     :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+  import api from '@/api/oilsupplier/goodsaptitude'
+  import setapi from '@/api/oilsupplier/oilclassorgset'
+  export default {
+    name: 'tmpClassCheck',
+    created () {
+      this.initTableHeader()
+      this.initDatas()
+    },
+    data () {
+      return {
+        entityList: [],
+        conditions: 1,
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        loading: false,
+        searchForm: {
+          AccessCardNo: '',
+          SupplierName: '',
+          SupplierTypeCode: '',
+          InFlag: '',
+          LegalPerson: '',
+          ContactName: '',
+          CommercialNo: '',
+          RegCapital1: '',
+          RegCapital2: '',
+          CompanyType: '',
+          Province: '',
+          City: '',
+          Street: '',
+          Address: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkAddress: '',
+          DepositBank: '',
+          BusinessScope: '',
+          OldSupplierName: '',
+          HseTraining: '',
+          // NeedFileType: [],
+          NeedFileType: '',
+          CerSubName: '',
+          FullName: '',
+          CheckUserName: '',
+          CheckUserId: ''
+        },
+        Id: '',
+        SupplierCertId: '',
+        SupplierTypeCode: '',
+        SupplierName: '',
+        searchFormSub: {
+          Code: '',
+          Name: ''
+        },
+        tableColumns: [
+
+          {
+            prop: 'Code',
+            label: '品名编码',
+            width: 120,
+            sort: true
+          },
+
+          {
+            prop: 'Name',
+            label: '品名名称',
+            width: 150,
+            sort: true
+          },
+
+          {
+            prop: 'GoodsLevel',
+            label: '物资级别',
+            width: 110,
+            sort: true
+          },
+
+          {
+            prop: 'GoodsDesc',
+            label: '产品说明',
+            width: 110,
+            sort: true
+          },
+
+          {
+            prop: 'Standard',
+            label: '标准备案',
+            width: 110,
+            sort: true
+          },
+
+          {
+            prop: 'CompanyType',
+            label: '供应商类型',
+            width: 130,
+            sort: true
+          }
+
+        ],
+        dynamicTableColumns: [],
+        CreateOn: [],
+      }
+    },
+
+    methods: {
+      // 列表排序功能
+      orderby (column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleCurrentChange (value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange (value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      transferStr (val) {
+        if (val === '01') {
+          return '物资类'
+        } else if (val === '02') {
+          return '基建类'
+        } else if (val === '03') {
+          return '服务类'
+        } else {
+          return val
+        }
+      },
+      transferStr2 (val) {
+        if (val === '1') {
+          return '是'
+        }
+        if (val === '0') {
+          return ''
+        } else {
+          return val
+        }
+      },
+      importhandleSearch () {
+        this.currentPage = 1
+        // this.importDialogVisible = false
+        this.initDatas()
+      },
+      initDatas () {
+        this.loading = true
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+          Edition: '1',
+          Conditions: this.conditions
+        }
+        let myCreateOn = []
+        // 解析时间
+
+        if (this.CreateOn != null && this.CreateOn.length === 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        api.getCompareList(myCreateOn, params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+          this.loading = false
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      search () {
+        this.getCertSub()
+      },
+      initTableHeader () {
+        setapi.initGoodTableHeader(this.$axios).then(res => {
+          this.dynamicTableColumns = res.data.items
+        })
+      },
+    }
+
+  }
+</script>