Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

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

@@ -373,6 +373,52 @@ func (s *OilGoodsAptitudeService) GetPagingTmpCheckedEntities(entitiesPtr interf
 			min(sub.SubClassId) as MinClassId,
 			COUNT(goods.GoodsLevel < sub.GoodsLevel or null) AS OneTwoCount,
 			COUNT(goods.GoodsLevel > sub.GoodsLevel or null) AS TwoOneCount,
+		CONCAT(
+		   if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) > 0) or (max(goods.F01) is null) or (max(goods.F01) = ''), '', '营业执照,')  , 
+		   if((max(goods.F02)='1' AND LOCATE('F02',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F02) is null) or (max(goods.F02) = ''), '', '企业信用信息截屏,') ,
+		   if((max(goods.F03)='1' AND LOCATE('F03',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F03) is null) or (max(goods.F03) = ''), '', '诚信合规承诺书,') ,
+		   if((max(goods.F04)='1' AND LOCATE('F04',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F04) is null) or (max(goods.F04) = ''), '', '银行开户许可证或基本存款账户信息,') ,
+		   if((max(goods.F05)='1' AND LOCATE('F05',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F05) is null) or (max(goods.F05) = ''), '', '质量管理体系认证证书,') ,
+		   if((max(goods.F06)='1' AND LOCATE('F06',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F06) is null) or (max(goods.F06) = ''), '', '环境管理体系认证证书,') ,
+		   if((max(goods.F07)='1' AND LOCATE('F07',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F07) is null) or (max(goods.F07) = ''), '', '职业健康安全管理体系认证证书,') ,
+		   if((max(goods.F08)='1' AND LOCATE('F08',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F08) is null) or (max(goods.F08) = ''), '', '代理授权证书（代理商）,') ,
+		   if((max(goods.F09)='1' AND LOCATE('F09',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F09) is null) or (max(goods.F09) = ''), '', '安全生产许可证,') ,
+		   if((max(goods.F10)='1' AND LOCATE('F10',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F10) is null) or (max(goods.F10) = ''), '', '特种劳动防护用品生产经营许可证,') ,
+		   if((max(goods.F11)='1' AND LOCATE('F11',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F11) is null) or (max(goods.F11) = ''), '', '辐射安全许可证,') ,
+		   if((max(goods.F12)='1' AND LOCATE('F12',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F12) is null) or (max(goods.F12) = ''), '', '危险化学品经营许可证,') ,
+		   if((max(goods.F13)='1' AND LOCATE('F13',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F13) is null) or (max(goods.F13) = ''), '', '') ,
+		   if((max(goods.F14)='1' AND LOCATE('F14',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F14) is null) or (max(goods.F14) = ''), '', '食品经营许可证,') ,
+		   if((max(goods.F15)='1' AND LOCATE('F15',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F15) is null) or (max(goods.F15) = ''), '', '医疗器械经营许可证,') ,
+		   if((max(goods.F16)='1' AND LOCATE('F16',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F16) is null) or (max(goods.F16) = ''), '', '安全生产许可证,') ,
+		   if((max(goods.F17)='1' AND LOCATE('F17',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F17) is null) or (max(goods.F17) = ''), '', '特种设备制造许可证,') ,
+		   if((max(goods.F18)='1' AND LOCATE('F18',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F18) is null) or (max(goods.F18) = ''), '', '全国工业产品生产许可证,') ,
+		   if((max(goods.F19)='1' AND LOCATE('F19',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F19) is null) or (max(goods.F19) = ''), '', '危险化学品使用许可证,') ,
+		   if((max(goods.F20)='1' AND LOCATE('F20',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F20) is null) or (max(goods.F20) = ''), '', '危险化学品登记证,') ,
+		   if((max(goods.F21)='1' AND LOCATE('F21',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F21) is null) or (max(goods.F21) = ''), '', '危险化学品经营许可证,') ,
+		   if((max(goods.F22)='1' AND LOCATE('F22',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F22) is null) or (max(goods.F22) = ''), '', '化学品危险性鉴别与分类报告,') ,
+		   if((max(goods.F23)='1' AND LOCATE('F23',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F23) is null) or (max(goods.F23) = ''), '', '中国国家强制性产品认证证书,') ,
+		   if((max(goods.F24)='1' AND LOCATE('F24',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F24) is null) or (max(goods.F24) = ''), '', '产品型式认可证书,') ,
+		   if((max(goods.F25)='1' AND LOCATE('F25',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F25) is null) or (max(goods.F25) = ''), '', '食品生产许可证,') ,
+		   if((max(goods.F26)='1' AND LOCATE('F26',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F26) is null) or (max(goods.F26) = ''), '', '制造计量器具许可证,') ,
+		   if((max(goods.F27)='1' AND LOCATE('F27',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F27) is null) or (max(goods.F27) = ''), '', '特种劳动防护用品生产经营许可证,') ,
+		   if((max(goods.F28)='1' AND LOCATE('F28',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F28) is null) or (max(goods.F28) = ''), '', '中油集团公司产品质量认可证书,') ,
+		   if((max(goods.F29)='1' AND LOCATE('F29',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F29) is null) or (max(goods.F29) = ''), '', '辐射安全许可证,') ,
+		   if((max(goods.F30)='1' AND LOCATE('F30',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F30) is null) or (max(goods.F30) = ''), '', '中国船级社型式认可证书,') ,
+		   if((max(goods.F31)='1' AND LOCATE('F31',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F31) is null) or (max(goods.F31) = ''), '', '涉及饮用水卫生安全产品卫生许可批件,') ,
+		   if((max(goods.F32)='1' AND LOCATE('F32',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F32) is null) or (max(goods.F32) = ''), '', '') ,
+		   if((max(goods.F33)='1' AND LOCATE('F33',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F33) is null) or (max(goods.F33) = ''), '', '医疗器械生产许可证,') ,
+		   if((max(goods.F34)='1' AND LOCATE('F34',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F34) is null) or (max(goods.F34) = ''), '', '节能产品认证证书,') ,
+		   if((max(goods.F35)='1' AND LOCATE('F35',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F35) is null) or (max(goods.F35) = ''), '', '预应力件生产许可证,') ,
+		   if((max(goods.F38)='1' AND LOCATE('F38',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F38) is null) or (max(goods.F38) = ''), '', '现场考察报告,') ,
+		   if((max(goods.F39)='1' AND LOCATE('F39',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F39) is null) or (max(goods.F39) = ''), '', '') ,
+		   if((max(goods.F40)='1' AND LOCATE('F40',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F40) is null) or (max(goods.F40) = ''), '', '') ,
+		   if((max(goods.F41)='1' AND LOCATE('F41',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F41) is null) or (max(goods.F41) = ''), '', '') ,
+		   if((max(goods.F42)='1' AND LOCATE('F42',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F42) is null) or (max(goods.F42) = ''), '', '') ,
+		   if((max(goods.F43)='1' AND LOCATE('F43',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F43) is null) or (max(goods.F43) = ''), '', '') ,
+		   if((max(goods.F44)='1' AND LOCATE('F44',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F44) is null) or (max(goods.F44) = ''), '', '') ,
+		   if((max(goods.F45)='1' AND LOCATE('F45',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F45) is null) or (max(goods.F45) = ''), '', '') ,
+		   if((max(goods.F46)='1' AND LOCATE('F46',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F46) is null) or (max(goods.F46) = ''), '', '') 
+		   ) AS ZzName,
 			(
 			((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 
 			(if((max(goods.F36)='1' AND LOCATE('F36',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F36) is null) or (max(goods.F36) = ''), TRUE, FALSE)) or

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -282,11 +282,12 @@ type OilSupplierContrast struct {
 	SubNames           string
 	CertSubCodes           string
 	SubClassIds           string
-	Checked           string   // 0没问题 1缺资质 2准入范围找不到
+	Checked           string   // 0没问题 1缺资质
 	MinClassId           string   // subclassid的最小值
 	OneTwoCount         int   // 1变2
 	TwoOneCount           int   // 2变1
 	IsDelete           int   // 2变1
+	ZzName           string   // 缺少的资质名
 }
 
 //type NeedFileTypeStruct struct {

src/dashoo.cn/backend/api/business/oilsupplier/technologyservice/oiltechnologyserviceService.go

@@ -200,6 +200,58 @@ func (s *OilTechnologyServiceService) GetPagingTmpCheckedEntities(entitiesPtr in
 			a.LinkCity,a.LinkStreet,a.BusinessScope,b.InStyle, b.Id CertId,
 			group_concat(DISTINCT header.Code) AS HeaderCodes,
 			min(sub.SubClassId) as MinClassId,
+		CONCAT(
+		   if((max(goods.F01)='1' AND LOCATE('F01', group_concat(DISTINCT header.Code)) > 0) or (max(goods.F01) is null) or (max(goods.F01) = ''), '', '营业执照,')  , 
+		   if((max(goods.F02)='1' AND LOCATE('F02',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F02) is null) or (max(goods.F02) = ''), '', '企业信用信息截屏,') ,
+		   if((max(goods.F03)='1' AND LOCATE('F03',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F03) is null) or (max(goods.F03) = ''), '', '诚信合规承诺书,') ,
+		   if((max(goods.F04)='1' AND LOCATE('F04',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F04) is null) or (max(goods.F04) = ''), '', '银行开户许可证或基本存款账户信息,') ,
+		   if((max(goods.F05)='1' AND LOCATE('F05',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F05) is null) or (max(goods.F05) = ''), '', '质量管理体系认证证书,') ,
+		   if((max(goods.F06)='1' AND LOCATE('F06',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F06) is null) or (max(goods.F06) = ''), '', '环境管理体系认证证书,') ,
+		   if((max(goods.F07)='1' AND LOCATE('F07',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F07) is null) or (max(goods.F07) = ''), '', '职业健康安全管理体系认证证书,') ,
+		   if((max(goods.F08)='1' AND LOCATE('F08',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F08) is null) or (max(goods.F08) = ''), '', '排污许可证,') ,
+		   if((max(goods.F09)='1' AND LOCATE('F09',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F09) is null) or (max(goods.F09) = ''), '', '安全生产许可证,') ,
+		   if((max(goods.F10)='1' AND LOCATE('F10',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F10) is null) or (max(goods.F10) = ''), '', '危险废弃物经营许可证（危险废弃物处置）,') ,
+		   if((max(goods.F11)='1' AND LOCATE('F11',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F11) is null) or (max(goods.F11) = ''), '', '海洋石油作业安全生产许可证,') ,
+		   if((max(goods.F12)='1' AND LOCATE('F12',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F12) is null) or (max(goods.F12) = ''), '', '辐射安全许可证,') ,
+		   if((max(goods.F13)='1' AND LOCATE('F13',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F13) is null) or (max(goods.F13) = ''), '', '石油工程技术服务企业资质证书,') ,
+		   if((max(goods.F14)='1' AND LOCATE('F14',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F14) is null) or (max(goods.F14) = ''), '', '检验检测机构资质认定证书（气体检测）,') ,
+		   if((max(goods.F15)='1' AND LOCATE('F15',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F15) is null) or (max(goods.F15) = ''), '', '工业清洗企业资质证书,') ,
+		   if((max(goods.F16)='1' AND LOCATE('F16',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F16) is null) or (max(goods.F16) = ''), '', '建设项目环境影响评价资格证书,') ,
+		   if((max(goods.F17)='1' AND LOCATE('F17',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F17) is null) or (max(goods.F17) = ''), '', '消防设施维护保养资质证书,') ,
+		   if((max(goods.F18)='1' AND LOCATE('F18',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F18) is null) or (max(goods.F18) = ''), '', '安全评价机构资质证书,') ,
+		   if((max(goods.F19)='1' AND LOCATE('F19',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F19) is null) or (max(goods.F19) = ''), '', '工程造价咨询企业甲级资质证书,') ,
+		   if((max(goods.F20)='1' AND LOCATE('F20',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F20) is null) or (max(goods.F20) = ''), '', '工程监督资质证书,') ,
+		   if((max(goods.F21)='1' AND LOCATE('F21',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F21) is null) or (max(goods.F21) = ''), '', '计量标准考核证书,') ,
+		   if((max(goods.F22)='1' AND LOCATE('F22',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F22) is null) or (max(goods.F22) = ''), '', '房屋预售资格证,') ,
+		   if((max(goods.F23)='1' AND LOCATE('F23',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F23) is null) or (max(goods.F23) = ''), '', '保安服务许可证,') ,
+		   if((max(goods.F24)='1' AND LOCATE('F24',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F24) is null) or (max(goods.F24) = ''), '', '道路运输经营许可证,') ,
+		   if((max(goods.F25)='1' AND LOCATE('F25',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F25) is null) or (max(goods.F25) = ''), '', '机动车维修经营许可证,') ,
+		   if((max(goods.F26)='1' AND LOCATE('F26',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F26) is null) or (max(goods.F26) = ''), '', '道路危险货物运输许可证,') ,
+		   if((max(goods.F27)='1' AND LOCATE('F27',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F27) is null) or (max(goods.F27) = ''), '', '特种设备安装改造维修许可证,') ,
+		   if((max(goods.F28)='1' AND LOCATE('F28',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F28) is null) or (max(goods.F28) = ''), '', '消防设施检测资质证书,') ,
+		   if((max(goods.F29)='1' AND LOCATE('F29',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F29) is null) or (max(goods.F29) = ''), '', '消防安全评估资质,') ,
+		   if((max(goods.F30)='1' AND LOCATE('F30',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F30) is null) or (max(goods.F30) = ''), '', '印刷经营许可证,') ,
+		   if((max(goods.F31)='1' AND LOCATE('F31',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F31) is null) or (max(goods.F31) = ''), '', '餐饮服务许可证,') ,
+		   if((max(goods.F32)='1' AND LOCATE('F32',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F32) is null) or (max(goods.F32) = ''), '', '劳务派遣经营许可证,') ,
+		   if((max(goods.F33)='1' AND LOCATE('F33',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F33) is null) or (max(goods.F33) = ''), '', '人力资源服务许可证,') ,
+		   if((max(goods.F34)='1' AND LOCATE('F34',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F34) is null) or (max(goods.F34) = ''), '', '国家实验室认可证书,') ,
+		   if((max(goods.F35)='1' AND LOCATE('F35',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F35) is null) or (max(goods.F35) = ''), '', '海洋石油专业设备检验检测机构证书,') ,
+		   if((max(goods.F36)='1' AND LOCATE('F36',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F36) is null) or (max(goods.F36) = ''), '', '安全生产检验检测证书,') ,
+		   if((max(goods.F37)='1' AND LOCATE('F37',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F37) is null) or (max(goods.F37) = ''), '', '液化气钢瓶检验证书,') ,
+		   if((max(goods.F38)='1' AND LOCATE('F38',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F38) is null) or (max(goods.F38) = ''), '', '国家电网承试承装承维修许可证,') ,
+		   if((max(goods.F39)='1' AND LOCATE('F39',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F39) is null) or (max(goods.F39) = ''), '', '建筑企业资质证书,') ,
+		   if((max(goods.F40)='1' AND LOCATE('F40',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F40) is null) or (max(goods.F40) = ''), '', '中油集团监造许可,') ,
+		   if((max(goods.F43)='1' AND LOCATE('F43',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F43) is null) or (max(goods.F43) = ''), '', '物业服务企业资质证书,') ,
+		   if((max(goods.F44)='1' AND LOCATE('F44',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F44) is null) or (max(goods.F44) = ''), '', '全国投资项目在线审批监管平台备案信息,') ,
+		   if((max(goods.F45)='1' AND LOCATE('F45',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F45) is null) or (max(goods.F45) = ''), '', '') ,
+		   if((max(goods.F46)='1' AND LOCATE('F46',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F46) is null) or (max(goods.F46) = ''), '', '') ,
+           if((max(goods.F47)='1' AND LOCATE('F47',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F47) is null) or (max(goods.F47) = ''), '', '') ,
+		   if((max(goods.F48)='1' AND LOCATE('F48',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F48) is null) or (max(goods.F48) = ''), '', '') ,
+		   if((max(goods.F49)='1' AND LOCATE('F49',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F49) is null) or (max(goods.F49) = ''), '', '') ,
+		   if((max(goods.F50)='1' AND LOCATE('F50',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F50) is null) or (max(goods.F50) = ''), '', '') ,
+		   if((max(goods.F51)='1' AND LOCATE('F51',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F51) is null) or (max(goods.F51) = ''), '', '') ,
+		   if((max(goods.F52)='1' AND LOCATE('F52',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F52) is null) or (max(goods.F52) = ''), '', '') 
+		   ) AS ZzName,
 			(
 			((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 
 			(if((max(goods.F41)='1' AND LOCATE('F41',  group_concat(DISTINCT header.Code)) > 0) or (max(goods.F41) is null) or (max(goods.F41) = ''), TRUE, FALSE)) or

src/dashoo.cn/backend/api/business/tmpzcgf/tmpzcgfSession.go

@@ -4,6 +4,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertappend"
 	. "dashoo.cn/backend/api/mydb"
+	"fmt"
 	"github.com/go-xorm/xorm"
 	"math"
 	"strconv"
@@ -278,17 +279,22 @@ func (s *TmpzcgtSession) InsertCertSub() error {
 			total, err = strconv.ParseInt(string(value), 10, 64)
 			break
 		}
-		n := math.Ceil(float64(total) / 5000)
+		n := math.Ceil(float64(total) / 50000)
 
-		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_typecode;")
+		/*s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_typecode;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_code;")
+		s.DBE.Query("SET autocommit=0;")*/
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_code ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_supplierid ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_suppliercertid ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_name ;")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` drop INDEX index_supplierappendid ;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` DISABLE KEYS;")
 		s.DBE.Query("SET unique_checks=0;")
-		s.DBE.Query("SET autocommit=0;")
-
+		fmt.Println("循环总数-"+strconv.Itoa(int(n)))
 		for i:=0; i < int(n); i++ {
-			start := strconv.Itoa(i * 5000)
-			end := strconv.Itoa(5000)
+			start := strconv.Itoa(i * 50000)
+			end := strconv.Itoa(50000)
 			sql := "INSERT INTO `OilSupplierCertSub` (" +
 				"OldId," +
 				"AppendStatus," +
@@ -316,13 +322,17 @@ func (s *TmpzcgtSession) InsertCertSub() error {
 				ORDER BY t.auto_id  +
 				" limit " + start + "," +  end*/
 			_, err = s.DBE.Query(sql)
-			s.DBE.Query("COMMIT;")
+			/*time.Sleep(time.Duration(500)*time.Millisecond)
+			s.DBE.Query("COMMIT;")*/
+			fmt.Println("循环次数-"+strconv.Itoa(i))
+			//time.Sleep(time.Duration(500)*time.Millisecond)
 		}
-		s.DBE.Query("SET autocommit=1;")
+		// s.DBE.Query("SET autocommit=1;")
 		s.DBE.Query("SET unique_checks=1;")
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ENABLE KEYS;")
+		/*
 		//s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_typecode ( `SupplierTypeCode` );")
-		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_code ( `Code` );")
+		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_code ( `Code` );")*/
 	}
 	return err
 }
@@ -352,6 +362,10 @@ func (s *TmpzcgtSession) UpdateCertSub() error {
 	}
 	s.DBE.Query("SET autocommit=1;")
 	s.DBE.Query("alter table OilSupplierCertSub drop index index_oldid ;")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_code ( `Code` );")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_supplierid ( `SupplierId` );")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_suppliercertid ( `SupplierCertId` );")
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_name ( `Name` );")
 	return err
 }
 
@@ -377,7 +391,7 @@ func (s *TmpzcgtSession) UpdateCertSubCaseWhen() error {
 		}
 		n := math.Ceil(float64(total) / 10)
 		s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_oldid ( `OldId` );")
-		s.DBE.Query("SET autocommit=0;")
+		// s.DBE.Query("SET autocommit=0;")
 		for i:=0; i < int(n); i++ {
 			when1 := ""
 			when2 := ""
@@ -396,9 +410,9 @@ func (s *TmpzcgtSession) UpdateCertSubCaseWhen() error {
 				" b.SupplierTypeCode = CASE b.OldId " + when3 + " END " +
 				" where b.OldId <= " + strconv.Itoa(oldId) + " and b.SupplierId = 0 "
 			_, err = s.DBE.Query(sql1)
-			s.DBE.Query("COMMIT;")
+			// s.DBE.Query("COMMIT;")
 		}
-		s.DBE.Query("SET autocommit=1;")
+		// s.DBE.Query("SET autocommit=1;")
 		s.DBE.Query("alter table OilSupplierCertSub drop index index_oldid ;")
 	}
 	return err
@@ -470,7 +484,7 @@ func (s *TmpzcgtSession) InsertOilSupplierCertAppend() error {
 	// " ORDER BY a.`申请日期`, a.`企业名称`, a.`准入类别` "
 	_, err = s.DBE.Query(sql)
 
-	s.DBE.Query("COMMIT;")
+	// s.DBE.Query("COMMIT;")
 	s.DBE.Query("SET unique_checks=1;")
 
 	// s.DBE.Query("ALTER TABLE `T_增项` drop INDEX index_import;")
@@ -480,7 +494,7 @@ func (s *TmpzcgtSession) InsertOilSupplierCertAppend() error {
 
 func (s *TmpzcgtSession) InsertOilInfoChange() error {
 	s.DBE.Query("SET unique_checks=0;")
-	s.DBE.Query("SET autocommit=0;")
+	// s.DBE.Query("SET autocommit=0;")
 	sql := "INSERT INTO OilInfoChange (Status,AccessCardNo,SupplierName,OldSupplierName,SupplierTypeName,SupplierTypeCode,OilCertificateNo,Grade,OperType,Country,MaunAgent,ConstructTeam,CommercialNo,OrganCode,CountryTaxNo,LocalTaxNo, " +
 		"Address,ZipCode,QualitySystemCert,ProductQualityCert,MaunLicense,QualifCert,QualifCertLevel,SafetyLicense,TechServiceLic,TJInNotify, " +
 		"SpecIndustryCert,LegalPerson,CategoryCode,CategoryName,RegCapital,Currency,ContactName,CompanyType,DepositBank,BankAccount,EMail, " +
@@ -493,9 +507,9 @@ func (s *TmpzcgtSession) InsertOilInfoChange() error {
 		"开户银行 AS DepositBank, 银行账号 AS BankAccount, 电子邮箱 AS EMail, 银行信用等级 AS BankCreditRating, 移动电话 AS Mobile, 固定电话 AS Telphone, 传真 AS Fax, 公司电话 AS CompanyTel, QQ号码 AS QQ, 公司网址 AS CompanyUrl, " +
 		"申请变更原因及内容 AS Remark, 审核日期 as  CreateOn, 录入员 as CreateBy,ID AS HouseNo from T_变更信息 "
 	_, err := s.DBE.Query(sql)
-	s.DBE.Query("commit;")
+	// s.DBE.Query("commit;")
 	s.DBE.Query("SET unique_checks=1;")
-	s.DBE.Query("SET autocommit=1;")
+	// s.DBE.Query("SET autocommit=1;")
 	return err
 }
 
@@ -565,7 +579,6 @@ func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 		"b.SupplierCertId = IFNULL(a.`SupplierCertId`, 0), " +
 		"b.SupplierCertAppendId = IFNULL(a.`Id`, 0) " +
 		"where b.Type = '3' and (b.SupplierId is null or b.SupplierId = 0)"*/
-
 	svc := suppliercertappend.GetOilSupplierCertAppendService(s.DBE)
 	var certAppendList []suppliercertappend.OilSupplierCertAppend
 	svc.GetEntitysByWhere("OilSupplierCertAppend", "", &certAppendList)
@@ -583,12 +596,13 @@ func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 			}
 		}
 		code := strings.TrimRight(appendCodeString, "or")
-		sql := "UPDATE OilSupplierCertSub a SET a.ModifiedOn = '2020-12-11 18:07:07', a.SupplierCertAppendId=" + strconv.Itoa(certAppend.Id) +
+		sql := "UPDATE OilSupplierCertSub a SET a.SupplierCertAppendId=" + strconv.Itoa(certAppend.Id) +
 			", a.`Type`=3 WHERE a.SupplierCertId=" + strconv.Itoa(certAppend.SupplierCertId) +
 			" AND"  + code + ") and a.SupplierCertAppendId=0"
 		_, err = s.DBE.Query(sql)
 		s.DBE.Query("commit;")
 	}
+	s.DBE.Query("ALTER TABLE `OilSupplierCertSub` ADD INDEX index_supplierappendid ( `SupplierAppendId` );")
 	s.DBE.Query("SET unique_checks=1;")
 	s.DBE.Query("SET autocommit=1;")
 	return err
@@ -597,19 +611,19 @@ func (s *TmpzcgtSession) UpdateOilSupplierCertAppendSub() error {
 // 导入资质名称
 func (s *TmpzcgtSession) InsertFileName() error {
 	s.DBE.Query("SET unique_checks=0;")
-	s.DBE.Query("SET autocommit=0;")
-	sql := "INSERT INTO `OilSupplierFile` (SupplierId, SupplierCertSubId, Remark, NeedFileType, OtherRemark, SupplierTypeCode,CreateBy) " +
-		"SELECT 0 AS SupplierId, 0 AS SupplierCertSubId, z.企业名称 AS Remark ,f.类别 AS NeedFileType, f.说明 AS OtherRemark, " +
-		"( CASE 准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' else '000' END ) SupplierTypeCode, " +
+	// s.DBE.Query("SET autocommit=0;")
+	sql := "INSERT INTO `OilSupplierFile` (SupplierId, SupplierCertSubId, FileUrl, Remark, NeedFileType, OtherRemark, SupplierTypeCode,CreateBy) " +
+		"SELECT 0 AS SupplierId, 0 AS SupplierCertSubId, concat('/upfile/gfzl_2014/', f.ID_GF, '-' , f.类别编号, IFNULL(f.文件类型, ''), '|', f.类别, IFNULL(f.文件类型, '')) AS FileUrl, z.企业名称 AS Remark ,f.类别 AS NeedFileType, f.说明 AS OtherRemark, " +
+		"( CASE z.准入类别 WHEN '物资类' THEN '01' WHEN '基建类' THEN '02' WHEN '服务类' THEN '03' WHEN '技术服务类' THEN '03' else '000' END ) SupplierTypeCode, " +
 		"'导入' AS CreateBy " +
 		"FROM `T_供方资料_V2014` f " +
 		"LEFT JOIN `T_资格预审表` z ON (f.ID_GF = z.ID) " +
-		"WHERE z.企业名称 IS NOT NULL "
+		"WHERE z.企业名称 IS NOT NULL"
 	_, err := s.DBE.Query(sql)
 
-	s.DBE.Query("commit;")
+	// s.DBE.Query("commit;")
 	s.DBE.Query("SET unique_checks=1;")
-	s.DBE.Query("SET autocommit=1;")
+	// s.DBE.Query("SET autocommit=1;")
 	return err
 }
 

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

@@ -2458,7 +2458,7 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
-	Remark := this.GetString("Remark")
+	Conditions := this.GetString("Conditions")
 	IsDelete := this.GetString("IsDelete")
 	CreateOn := this.GetString("CreateOn")
 	CreateUserId := this.GetString("CreateUserId")
@@ -2491,8 +2491,12 @@ func (this *OilGoodsAptitudeController) GetCompareTmpSupplier() {
 		where = where + " and Name like '%" + Name + "%'"
 	}
 
-	if Remark != "" {
-		where = where + " and Remark like '%" + Remark + "%'"
+	if Conditions == "2"{
+		where = where + " and MinClassId = '0'"
+	} else if Conditions == "3"{
+		where = where + " and Checked = '0'"
+	} else if Conditions == "4"{
+		where = where + " and Checked = '1"
 	}
 
 	if IsDelete != "" {

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

@@ -1720,7 +1720,7 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
-	Remark := this.GetString("Remark")
+	Conditions := this.GetString("Conditions")
 	IsDelete := this.GetString("IsDelete")
 	CreateOn := this.GetString("CreateOn")
 	CreateUserId := this.GetString("CreateUserId")
@@ -1753,8 +1753,12 @@ func (this *OilTechnologyServiceController) GetCompareTmpSupplier() {
 		where = where + " and Name like '%" + Name + "%'"
 	}
 
-	if Remark != "" {
-		where = where + " and Remark like '%" + Remark + "%'"
+	if Conditions == "2"{
+		where = where + " and MinClassId = '0'"
+	} else if Conditions == "3"{
+		where = where + " and Checked = '0'"
+	} else if Conditions == "4"{
+		where = where + " and Checked = '1"
 	}
 
 	if IsDelete != "" {

src/dashoo.cn/backend/api/controllers/tmpzcgf/tmpzcgf.go

@@ -779,6 +779,12 @@ func (this *TmpzcgfController) ClearAll() {
 	sql = "truncate table OilQualChangeDetail"
 	svc.DBE.Query(sql)
 
+	sql = "truncate table OilAppendChangeDetail"
+	svc.DBE.Query(sql)
+
+	sql = "truncate table OilAnnualChangeDetail"
+	svc.DBE.Query(sql)
+
 	sql = "truncate table OilQualChangeMain"
 	svc.DBE.Query(sql)
 
@@ -917,6 +923,7 @@ func (this *TmpzcgfController) InsertSubAll() {
 		this.InsertCertSub() // 准入
 		this.UpdateOilSupplierCertSub()
 		this.UpdateCertSubclassID()
+		this.UpdateOilSupplierCertAppendSub()
 		var certsub suppliercertsub.OilSupplierCertSub
 		certsub.Remark = ""
 		certsub.ModifiedBy = ""

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

@@ -9,18 +9,18 @@
         </div>
         <div style="float: right;">
           <router-link :to="'/login'">
-            <el-button type="info" size="small" round>登录系统</el-button>
+            <el-button type="primary" size="small" round>登录系统</el-button>
           </router-link>
         </div>
       </div>
     </sticky>
 
-    <div style="background-color: white;">
+    <div style="background-color: white; width: 60%; margin: 0 auto;">
 
         <el-table :data="noticeList"
-                  border
                   size="mini"
-                  style="width: 1500px;margin-right: auto;  margin-left: auto;">
+                  stripe
+                  highlight-current-row>
           <el-table-column prop="Name"
                             align="center"
                             label="通知">
@@ -32,52 +32,42 @@
           </el-table-column>
           <el-table-column prop="CreateOn"
                             label="发布时间"
+                           align="center"
                             width="141">
-            <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
+            <template slot-scope="scope">{{ jsTImeHandle(scope.row.CreateOn+'') }}</template>
           </el-table-column>
           <el-table-column width="80">
-            <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strnew(scope.row.CreateOn+'') }}</span></template>
+            <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strNew(scope.row.CreateOn+'') }}</span></template>
           </el-table-column>
         </el-table>
     </div>
-
-    <div>
-      <footer class="login-footer1">
-        <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
-          ©企管法规处 版权所有
-        </div>
-      </footer>
-    </div>
-
   </div>
 </template>
 
 <script>
-
   import Vue from 'vue'
   import Component from 'class-component'
   import Sticky from '@/components/Sticky'
-  import axios from 'axios'
 
   @Component({
     data () {
-       var check = (rule, value, callback) => {
+      let check = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入验证码'));
+          callback(new Error('请输入验证码'))
         } else {
-          this.isPass=false
+          this.isPass = false
         }
-      };
+      }
       return {
         activeIndex: '1',
         isVisual: false,
-        isCodePass:true,
-        isPass:true,
+        isCodePass: true,
+        isPass: true,
         noticeList: [], // 文档列表
         formData: {
-          UserName:'',
-          Telephone: '', //用户手机号
-          yzCode: '', //验证码
+          UserName: '',
+          Telephone: '', // 用户手机号
+          yzCode: '', // 验证码
           UserPass: '',
           UserPass2: ''
         },
@@ -100,7 +90,7 @@
               message: '请确认密码',
               trigger: 'change'
             }
-          ],
+          ]
         }
       }
     },
@@ -145,7 +135,7 @@
         return 'http://' + retUrl
       },
       // 格式化时间
-      jstimehandle (val) {
+      jsTImeHandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -157,12 +147,12 @@
           return val.substring(0, 10)
         }
       },
-      strnew (val) {
+      strNew (val) {
         try {
-          let b = this.jstimehandle(val).split('-')
+          let b = this.jsTImeHandle(val).split('-')
           let date = new Date(b[0], b[1], b[2])
-          let newdate = new Date()
-          if ((newdate - date) / (1000 * 60 * 60 * 24) < 30) {
+          let newDate = new Date()
+          if ((newDate - date) / (1000 * 60 * 60 * 24) < 30) {
             return '新'
           } else {
             return ''
@@ -178,11 +168,10 @@
 
   })
   export default class Register extends Vue {
-    layout() {
+    layout () {
       return 'empty'
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -9,75 +9,66 @@
         </div>
         <div style="float: right;">
           <router-link :to="'/login'">
-            <el-button type="info" size="small" round>登录系统</el-button>
+            <el-button type="primary" size="small" round>登录系统</el-button>
           </router-link>
         </div>
       </div>
     </sticky>
 
-    <div style="background-color: white;">
-
-        <el-table :data="fileList"
-                  border
-                  size="mini"
-                  style="width: 1500px;margin-right: auto;  margin-left: auto;">
-          <el-table-column prop="Name"
-                            align="center"
-                            label="资料下载">
-            <template slot-scope="scope">
-              <el-link :href="getDownloadFile(scope.row.FileURL)"
-                        target="_blank"
-                        type="primary">{{ scope.row.Name }}</el-link>
-            </template>
-          </el-table-column>
-          <el-table-column prop="CreateOn"
-                            label="发布时间"
-                            width="141">
-            <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
-          </el-table-column>
-          <el-table-column width="80">
-            <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strnew(scope.row.CreateOn+'') }}</span></template>
-          </el-table-column>
-        </el-table>
+    <div style="background-color: white; width: 60%; margin: 0 auto; ">
+      <el-table :data="fileList"
+                stripe
+                highlight-current-row
+                size="mini">
+        <el-table-column prop="Name"
+                         align="center"
+                         label="资料下载">
+          <template slot-scope="scope">
+            <el-link :href="getDownloadFile(scope.row.FileURL)"
+                     target="_blank"
+                     type="primary">{{ scope.row.Name }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="CreateOn"
+                         label="发布时间"
+                         align="center"
+                         width="141">
+          <template slot-scope="scope">{{ jsTImeHandle(scope.row.CreateOn+'') }}</template>
+        </el-table-column>
+        <el-table-column width="80">
+          <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strNew(scope.row.CreateOn+'') }}</span></template>
+        </el-table-column>
+      </el-table>
     </div>
 
-    <div>
-      <footer class="login-footer1">
-        <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
-          ©企管法规处 版权所有
-        </div>
-      </footer>
-    </div>
 
   </div>
 </template>
 
 <script>
-
   import Vue from 'vue'
   import Component from 'class-component'
   import Sticky from '@/components/Sticky'
-  import axios from 'axios'
 
   @Component({
     data () {
-       var check = (rule, value, callback) => {
+      let check = (rule, value, callback) => {
         if (value === '') {
-          callback(new Error('请输入验证码'));
+          callback(new Error('请输入验证码'))
         } else {
-          this.isPass=false
+          this.isPass = false
         }
-      };
+      }
       return {
         activeIndex: '1',
         isVisual: false,
-        isCodePass:true,
-        isPass:true,
+        isCodePass: true,
+        isPass: true,
         fileList: [], // 文档列表
         formData: {
-          UserName:'',
-          Telephone: '', //用户手机号
-          yzCode: '', //验证码
+          UserName: '',
+          Telephone: '', // 用户手机号
+          yzCode: '', // 验证码
           UserPass: '',
           UserPass2: ''
         },
@@ -100,7 +91,7 @@
               message: '请确认密码',
               trigger: 'change'
             }
-          ],
+          ]
         }
       }
     },
@@ -146,7 +137,7 @@
         return 'http://' + retUrl
       },
       // 格式化时间
-      jstimehandle (val) {
+      jsTImeHandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -158,12 +149,12 @@
           return val.substring(0, 10)
         }
       },
-      strnew (val) {
+      strNew (val) {
         try {
-          let b = this.jstimehandle(val).split('-')
+          let b = this.jsTImeHandle(val).split('-')
           let date = new Date(b[0], b[1], b[2])
-          let newdate = new Date()
-          if ((newdate - date) / (1000 * 60 * 60 * 24) < 30) {
+          let newDate = new Date()
+          if ((newDate - date) / (1000 * 60 * 60 * 24) < 30) {
             return '新'
           } else {
             return ''
@@ -179,11 +170,10 @@
 
   })
   export default class Register extends Vue {
-    layout() {
+    layout () {
       return 'empty'
     }
   }
-
 </script>
 
 <style lang="scss">
@@ -202,8 +192,9 @@
   .home-wrapper{
     margin:0px auto;
     width: 1004px;
-    flex-direction: column;
+    left: -502;
     margin-bottom: 45px;
+    flex-direction: column;
     background-color: white;
     overflow: auto;
   }

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

@@ -6,6 +6,14 @@
           <i class="icon icon-table2"></i> 企业对比表
         </span>
         <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:15px;top:10.5px" >
+          <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="有差异" :value="2"></el-option>
+              <el-option :key="3" label="缺少资质" :value="3"></el-option>
+              <el-option :key="4" label="正常" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="准入编码">
             <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
           </el-form-item>
@@ -162,6 +170,7 @@
         dialogVisibleCertsSub: false,
         certsubListLoading: false,
         loadingExcel: false,
+        conditions: 1,
         searchForm: {
           AccessCardNo: '',
           SupplierName: '',
@@ -372,6 +381,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          Conditions: this.conditions,
           Edition: '1'
         }
         let myCreateOn = []

src/dashoo.cn/frontend_web/src/pages/oilsupplier/technologyservice/tmpsuppliercheck.vue

@@ -6,6 +6,14 @@
           <i class="icon icon-table2"></i> 企业对比表
         </span>
         <el-form :model="searchForm" ref="searchformRef" :inline="true" style="float: right;position:absolute;right:15px;top:10.5px" >
+          <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="有差异" :value="2"></el-option>
+              <el-option :key="3" label="缺少资质" :value="3"></el-option>
+              <el-option :key="4" label="正常" :value="4"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="准入编码">
             <el-input size="mini" v-model="searchForm.AccessCardNo" placeholder="请输入内容"></el-input>
           </el-form-item>
@@ -151,6 +159,7 @@
         // 分页参数
         size: 10,
         currentPage: 1,
+        conditions: 1,
         currentItemCount: 0,
         // 列表排序
         Column: {
@@ -366,6 +375,7 @@
           _size: this.size,
           Order: this.Column.Order,
           Prop: this.Column.Prop,
+          Conditions: this.conditions,
           Edition: '1'
         }
         let myCreateOn = []

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

@@ -9,7 +9,7 @@
         </div>
         <div style="float: right;">
           <router-link :to="'/login'">
-            <el-button type="info" size="small" round>登录系统</el-button>
+            <el-button type="primary" size="small" round>登录系统</el-button>
           </router-link>
         </div>
       </div>
@@ -17,7 +17,7 @@
 
     <div style="background-color: white;">
       <div class="top-wrapper">
-        <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
+        <el-menu :default-active="activeIndex" @select="handleSelect" mode="horizontal">
           <el-menu-item index="1" style="font-size: large;">
             <span>密码找回</span>
           </el-menu-item>
@@ -64,45 +64,34 @@
         </div>
       </el-card>
     </div>
-
-    <div>
-      <footer class="login-footer1">
-        <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
-          ©企管法规处 版权所有
-        </div>
-      </footer>
-    </div>
-
   </div>
 </template>
 
 <script>
-
   import Vue from 'vue'
   import Component from 'class-component'
   import Sticky from '@/components/Sticky'
-  import axios from 'axios'
 
   @Component({
     data () {
-       var check = (rule, value, callback) => {
+      let check = (rule, value, callback) => {
         if (value === '') {
           callback(new Error('请输入验证码'));
         } else {
-          this.isPass=false
+          this.isPass = false
         }
-      };
+      }
       return {
         activeIndex: '1',
         isVisual: false,
-        isCodePass:true,
-        isPass:true,
+        isCodePass: true,
+        isPass: true,
         captcha: '获取验证码',
 
         formData: {
-          UserName:'',
-          Telephone: '', //用户手机号
-          yzCode: '', //验证码
+          UserName: '',
+          Telephone: '', // 用户手机号
+          yzCode: '', // 验证码
           UserPass: '',
           UserPass2: ''
         },

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

@@ -9,7 +9,7 @@
         </div>
         <div style="float: right;">
           <router-link :to="'/login'">
-            <el-button type="info" size="small" round>登录系统</el-button>
+            <el-button type="primary" size="small" round>登录系统</el-button>
           </router-link>
         </div>
       </div>
@@ -28,8 +28,8 @@
       </div>
 
       <el-card>
-        <div class="home-wrapper" v-if="activeIndex==1">
-            <el-form label-width="135px" ref="RegisterFormData" :model="formData" :rules="rules">
+        <div class="home-wrapper" v-if="activeIndex === '1'">
+            <el-form label-width="135px" ref="RegisterFormData" :model="formData" :rules="rules" v-loading="isLoading">
               <el-row>
                 <el-col :span="24">
                   <el-form-item label="公司名称" label-width="150px" style="width: 100%" prop="SupplierName">
@@ -151,11 +151,11 @@
                 <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
               </el-row>
               <el-row style="margin-left: 50%; margin-top: 10px; margin-bottom: 20px;">
-                <el-button type="primary" @click="register" style="width: 30%" v-if="isShow" :loading="isLoading">立即注册</el-button>
+                <el-button type="primary" @click="register" style="width: 30%" :loading="isLoading">立即注册</el-button>
               </el-row>
             </el-form>
 
-            <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
+            <choose-auditor ref="chooseAuditor" @close="setAuditor" @hideChooseAuditer="chooseAuditorVisible=false"
               :visible="chooseAuditorVisible">
             </choose-auditor>
         </div>
@@ -163,13 +163,13 @@
 
     </div>
 
-    <div>
+    <!--<div>
       <footer class="login-footer1">
         <div class="foot-wrapper" style="height: 30px; background-color: transparent; color:#A9A9A9; padding-top: 10px; text-align: right">
           ©企管法规处 版权所有
         </div>
       </footer>
-    </div>
+    </div>-->
 
   </div>
 </template>
@@ -179,7 +179,6 @@
   import Component from 'class-component'
   import Sticky from '@/components/Sticky'
   import axios from 'axios'
-  import api from '@/api/oilsupplier/supplier'
   import uploadajax from '../assets/js/uploadajax.js'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor2'
 
@@ -487,7 +486,7 @@
     },
 
     created () {
-      this.GetorgOptions()
+      this.GetOrgOptions()
     },
     components: {
       Sticky,
@@ -549,7 +548,7 @@
           console.error(err)
         })
       },
-      GetorgOptions () {
+      GetOrgOptions () {
         let _this = this
         this.$axios.get('/register/orgloginlist').then(res => {
           _this.orgOptions = res.data.items
@@ -573,7 +572,7 @@
         _this.$refs['chooseAuditor'].getorgtreelist()
         _this.chooseAuditorVisible = true
       },
-      setAuditer (val, name) { // val:用户Id， name:用户名
+      setAuditor (val, name) { // val:用户Id， name:用户名
         let _this = this
         _this.formData.CheckUserId = parseInt(val)
         _this.formData.CheckUserName = name
@@ -622,9 +621,8 @@
                   })
                   _this.$router.push('/login') // 跳转到登录页
                 } else {
-                  _this.isShow = true
                   _this.isLoading = false
-                  console.log(response.data.message, '爱妃')
+                  console.log(response.data.message, '工作流异常日志')
                   var message = response.data.message
                   if (!message) {
                     message = '工作流异常，请联系管理员！'
@@ -635,7 +633,6 @@
                 }
               })
               .catch(function (error) {
-                _this.isShow = true
                 _this.isLoading = false
                 console.log(error)
               })
@@ -667,14 +664,14 @@
         if (!isLt10m) {
           this.$message.error('上传照片大小不能超过 10MB!')
         }
-        return isIMAGE1 || isIMAGE2 || isIMAGE3 && isLt10m
+        return (isIMAGE1 || isIMAGE2 || isIMAGE3) && isLt10m
       },
 
       // 判断是否上传成功
       checkSuccess (uploadFiles) {
         for (let i = 0; i < uploadFiles.length; i++) {
           console.log(uploadFiles[i])
-          if (uploadFiles[i].status != 'success') {
+          if (uploadFiles[i].status !== 'success') {
             return false
           }
         }