三证合一判断

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

@@ -1560,6 +1560,15 @@ func (this *OilGoodsAptitudeController) UpdataSuppierCertSub() {
 		wheresup := "SupplierId = " + strconv.Itoa(suppliercert.SupplierId) + " and SupplierTypeCode='01' AND Type IN ('1', '3')"
 		supsvc.GetEntities(&supplierCertSubList, wheresup)
 		fmt.Println(len(supplierCertSubList))
+
+		mergerCertSkipField := ""
+		if supplier.CredentialFlag == "1" || supplier.CredentialFlag == "2" {
+			paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+			//三证合一或五证合一不需要的字段
+			mergerCertSkipField = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
+		}
+
+
 		// 准入项
 		//for idx, supplierCertSub := range supplierCertSubList {
 
@@ -1577,6 +1586,11 @@ func (this *OilGoodsAptitudeController) UpdataSuppierCertSub() {
 					decCode = ""
 					goodsAptitudeNameArr := this.GetGoodsAptitudeName(strconv.Itoa(goodsaptitudeClass.Id), strconv.Itoa(supplierCertSub.IsManufacturer))
 					for _, val := range goodsAptitudeNameArr {
+
+						if strings.Contains(mergerCertSkipField, val) {
+							break
+						}
+
 						var supplierFile supplierfile.OilSupplierFile
 						where := "SupplierId=" + strconv.Itoa(suppliercert.SupplierId) + " and NeedFileType='" + val + "'" + " and SupplierTypeCode IN ('000', '01')"
 						has := supsvc.GetEntityByWhere(OilSupplierFileName, where, &supplierFile)

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

@@ -844,7 +844,6 @@
         }).then(() => {
           api.insertGoodsAptitude(this.$axios).then(res => {
             this.showimportvisible = false
-            console.log(res)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',