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

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -237,12 +237,12 @@ func (s *OilSupplierCertService) IsSupplierCertCanSubmit(supplierId, supplierCer
 		needList = append(needList, needFile)
 	}
 
-	if supplierCertEntity.InStyle == "4" {
-		var needFile supplierfile.FileList
-		//战略合作协议扫描件
-		needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-		needList = append(needList, needFile)
-	}
+	//if supplierCertEntity.InStyle == "4" {
+	//	var needFile supplierfile.FileList
+	//	//战略合作协议扫描件
+	//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+	//	needList = append(needList, needFile)
+	//}
 
 	for _, needHeader := range needList {
 		if ( supplierEntity.CredentialFlag == "1" ||  supplierEntity.CredentialFlag == "2") &&

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

@@ -2647,12 +2647,12 @@ func (this *OilSupplierController) CheckSupplierFile() {
 			needList = filesvc.GetTechNeedFileListNew(ids.Id)
 		}
 
-		if cert.InStyle == "4" {
-			var needFile supplierfile.FileList
-			//战略合作协议扫描件
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if cert.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	//战略合作协议扫描件
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 
 		if cert.InStyle == "6" {
 			var needFile supplierfile.FileList
@@ -2776,12 +2776,13 @@ func (this *OilSupplierController) CheckSupplierFileNew(){
 		needList = filesvc.GetTechNeedFileListNew(ids.Id)
 	}
 
-	if cert.InStyle == "4" {
-		var needFile supplierfile.FileList
-		//战略合作协议扫描件
-		needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-		needList = append(needList, needFile)
-	}
+	//2021-02-04企管法规处去掉这一限制
+	//if cert.InStyle == "4" {
+	//	var needFile supplierfile.FileList
+	//	//战略合作协议扫描件
+	//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+	//	needList = append(needList, needFile)
+	//}
 
 	if cert.InStyle == "6" {
 		var needFile supplierfile.FileList

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

@@ -697,12 +697,12 @@ func (this *OilSupplierCertAppendSubController) UpdateManufacturerAppend() {
 			}
 		}
 		needList = filesvc.GetGoodsNeedFileList(strconv.Itoa(subClassId), "1")
-		if supplierCertModel.InStyle == "4" {
-			var needFile supplierfile.FileList
-			//战略合作协议扫描件
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if supplierCertModel.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	//战略合作协议扫描件
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 
 		var list []supplierfile.OilSupplierFile
 		where := "SupplierTypeCode in (01,000) and IsManuf in ('0','1') and SupplierId =" + strconv.Itoa(supplierId)
@@ -824,12 +824,12 @@ func (this *OilSupplierCertAppendSubController) UpdateManufacturerAppend() {
 			}
 		}
 		needList = filesvc.GetGoodsNeedFileList(strconv.Itoa(subClassId), "2")
-		if supplierCertModel.InStyle == "4" {
-			var needFile supplierfile.FileList
-			//战略合作协议扫描件
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if supplierCertModel.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	//战略合作协议扫描件
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 
 		var list []supplierfile.OilSupplierFile
 		where := "SupplierTypeCode in (01,000) and IsManuf in ('0','2') and SupplierId =" + strconv.Itoa(supplierId)

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

@@ -393,12 +393,12 @@ func (this *OilSupplierCertSubController) CheckCertSubLost() {
 		needList := filesvc.GetGoodsNeedFileList(dataother.CheckList[n].Id, strconv.Itoa(datamain.IsManufacturer)) // 需要的资质
 		//三证合一或五证合一不需要的字段
 		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
-		if supplierCertModel.InStyle == "4" {
-			var needFile supplierfile.FileList
-			//战略合作协议扫描件
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if supplierCertModel.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	//战略合作协议扫描件
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 		if datamain.IsManufacturer == 1 { //制造商
 			var needFile supplierfile.FileList
 			// 中油集团公司产品质量认可证书
@@ -511,12 +511,12 @@ func (this *OilSupplierCertSubController) AddGoodsByFilter() {
 			needList := filesvc.GetGoodsNeedFileList(dataother.CheckList[n].Id, strconv.Itoa(datamain.IsManufacturer)) // 需要的资质
 			//三证合一或五证合一不需要的字段
 			mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
-			if supplierCertModel.InStyle == "4" {
-				var needFile supplierfile.FileList
-				//战略合作协议扫描件
-				needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-				needList = append(needList, needFile)
-			}
+			//if supplierCertModel.InStyle == "4" {
+			//	var needFile supplierfile.FileList
+			//	//战略合作协议扫描件
+			//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+			//	needList = append(needList, needFile)
+			//}
 			if datamain.IsManufacturer == 1 { //制造商
 				var needFile supplierfile.FileList
 				// 中油集团公司产品质量认可证书
@@ -627,11 +627,11 @@ func (this *OilSupplierCertSubController) CheckTechCertLost() {
 		filesvc := supplierfile.GetSupplierfileService(utils.DBE)
 		needList := filesvc.GetTechNeedFileList(strconv.Itoa(dataother.CheckList[n].Id))
 
-		if supplierCertModel.InStyle == "4" {
-			var needFile supplierfile.FileList
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if supplierCertModel.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 
 		var fileist []supplierfile.OilSupplierFile
 		where := "SupplierTypeCode in ('03','000') and SupplierId = '" + strconv.Itoa(dataother.SupplierId) + "'"
@@ -810,11 +810,11 @@ func (this *OilSupplierCertSubController) CheckBasisBusinessLost() {
 
 	needList = filesvc.GetBasicNeedFileList(strconv.Itoa(model.SubClassId))
 
-	if supplierCertModel.InStyle == "4" {
-		var needFile supplierfile.FileList
-		needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-		needList = append(needList, needFile)
-	}
+	//if supplierCertModel.InStyle == "4" {
+	//	var needFile supplierfile.FileList
+	//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+	//	needList = append(needList, needFile)
+	//}
 
 	if err == nil {
 		var list []supplierfile.OilSupplierFile
@@ -1222,12 +1222,12 @@ func setManufacturerHandler(manufacturerChangeDTO suppliercertsub.ManufacturerCh
 		needList := filesvc.GetGoodsNeedFileList(strconv.Itoa(certSubId), strconv.Itoa(IsManufacturer)) // 需要的资质
 		//三证合一或五证合一不需要的字段
 		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
-		if certEntity.InStyle == "4" {
-			var needFile supplierfile.FileList
-			//战略合作协议扫描件
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if certEntity.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	//战略合作协议扫描件
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 		if certSubEntity.IsManufacturer == 1 { //制造商
 			var needFile supplierfile.FileList
 			// 中油集团公司产品质量认可证书
@@ -1389,12 +1389,12 @@ func (this *OilSupplierCertSubController) CheckSubFile() {
 
 		//三证合一或五证合一不需要的字段
 		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
-		if supplierCertModel.InStyle == "4" {
-			var needFile supplierfile.FileList
-			//战略合作协议扫描件
-			needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
-			needList = append(needList, needFile)
-		}
+		//if supplierCertModel.InStyle == "4" {
+		//	var needFile supplierfile.FileList
+		//	//战略合作协议扫描件
+		//	needFile.FileName = paramSvc.GetBaseparameterMessage("GFGL", "paramset", "CooperationFile")
+		//	needList = append(needList, needFile)
+		//}
 		if supplierCertModel.InStyle == "6" {
 			var needFile supplierfile.FileList
 			//招标中标结果

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -2960,7 +2960,7 @@ import Viewer from 'v-viewer'
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 检查是否缺少资质
                 let fileType = {
@@ -2979,7 +2979,7 @@ import Viewer from 'v-viewer'
                       type: 'warning',
                       message: res.data.message
                     })
-                    resolve(false)
+                    return resolve(false)
                   }
                   this.saveLoading = false
                 })
@@ -2990,7 +2990,7 @@ import Viewer from 'v-viewer'
             return true
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -2917,14 +2917,16 @@
               message: '中石油准入证编号不能为空！'
             })
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
-          if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
+          console.log(this.InStyle, this.formData.MgrUnit.indexOf('大庆油田'), '大庆油田')
+          if (this.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
             this.$message({
               type: 'warning',
               message: '中石油准入证编号不能为空！'
             })
-            return
+            this.saveLoading = false
+            return resolve(false)
           }
           if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
             this.$message({
@@ -2932,7 +2934,7 @@
               message: '二级物资准入不能选择大港油田分公司！'
             })
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
           if (valid1 && valid2) {
             api.checkBack(this.formData.BankAccount, this.formData.Id, this.$axios).then(res => {
@@ -2942,7 +2944,7 @@
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 检查是否缺少资质
                 let fileType = {
@@ -2963,18 +2965,18 @@
                       message: res.data.message
                     })
                     this.saveLoading = false
-                    resolve(false)
+                    return resolve(false)
                   }
                 })
               }
             }).catch(err => {
               this.saveLoading = false
-              resolve(false)
+              return resolve(false)
               console.error(err)
             })
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -2929,7 +2929,7 @@ import Viewer from 'v-viewer'
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 检查是否缺少资质
                 let fileType = {
@@ -2948,7 +2948,7 @@ import Viewer from 'v-viewer'
                       type: 'warning',
                       message: res.data.message
                     })
-                    resolve(false)
+                    return resolve(false)
                   }
                   this.saveLoading = false
                 })
@@ -2959,7 +2959,7 @@ import Viewer from 'v-viewer'
             return true
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -2587,7 +2587,7 @@
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 供应商类型变更时检查是否缺少资质
                 let fileType = {
@@ -2604,18 +2604,18 @@
                       message: res.data.message
                     })
                     this.saveLoading = false
-                    resolve(false)
+                    return resolve(false)
                   }
                 })
               }
             }).catch(err => {
               this.saveLoading = false
               console.error(err)
-              resolve(false)
+              return resolve(false)
             })
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -1603,13 +1603,6 @@ export default {
         })
         return
       }
-      if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
-        this.$message({
-          type: 'warning',
-          message: '中石油准入证编号不能为空！'
-        })
-        return
-      }
       if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
         this.$message({
           type: 'warning',