工作流

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -80,19 +80,11 @@ type MultiOrgAuditVM struct {
 }
 
 const (
-	//供方准入流程图
-	OIL_SUPPLIER_APPLY string = "oil_supplier_apply_1"
 
-	//一级物资供方准入流程图
-	OIL_FIRST_SUPPLIER_APPLY string = "oil_first_supplier_apply"
-	//二级物资供方准入流程图
-	OIL_SECOND_SUPPLIER_APPLY string = "oil_second_supplier_apply"
-
-	//企业用户准入流程图
-	OIL_ENUSER_SUPPLIER_APPLY string = "oil_enuser_supplier_apply"
-
-	//企业用户一级物资准入流程图
+	//企业用户 2 一级物资准入流程图  4 战略合作准入 6外部市场准入
 	OIL_FIRST_ENUSER_SUPPLIER_APPLY string = "oil_first_enuser_supplier_apply"
+	//企业用户准入流程图 1评审准入 5内部多元准入
+	OIL_ENUSER_SUPPLIER_APPLY string = "oil_enuser_supplier_apply"
 	//企业用户二级物资准入流程图
 	OIL_SECOND_ENUSER_SUPPLIER_APPLY string = "oil_second_enuser_supplier_apply"
 
@@ -103,10 +95,10 @@ const (
 	//企业用户增项流程图
 	OIL_ENUSER_APPEND_APPLY string = "oil_enuser_append_apply"
 
-	//一级物资供方增项流程图
-	OIL_FIRST_APPEND_APPLY string = "oil_first_append_apply"
-	//二级物资供方准入流程图
-	OIL_SECOND_APPEND_APPLY string = "oil_second_append_apply"
+	//信息变更流程图
+	OIL_INFO_CHANGE string = "oil_info_change"
+	//年审流程图
+	OIL_AUDIT_APPLY string = "oil_audit_apply"
 
 	// 分办
 	SUB_OFFICE_WZ string = "SUB_OFFICE_WZ"
@@ -127,14 +119,6 @@ const (
 	// 企业法规处审核
 	PROF_REGULATION string = "PROF_REGULATION"
 
-	//年审流程图
-	OIL_AUDIT_APPLY string = "oil_audit_apply"
-	//供方增项流程图
-	OIL_APPEND_APPLY string = "oil_append_apply"
-	//信息变更流程图
-	OIL_INFO_CHANGE string = "oil_info_change"
-	//资质变更流程图
-	OIL_QUAL_CHANGE string = "oil_qual_change"
 )
 
 type TableDetailData struct {

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

@@ -152,7 +152,7 @@ func (this *QualChangeController) GetMyTaskEntityList() {
 	}
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
-	certIdList := actisvc.GetMyTasks(workflow.OIL_QUAL_CHANGE, this.User.Id)
+	certIdList := actisvc.GetMyTasks(workflow.OIL_INFO_CHANGE, this.User.Id)
 	appendIdarr := strings.Split(certIdList, ",")
 	for i, item := range appendIdarr {
 		idx := strings.Index(item, "-")
@@ -581,11 +581,11 @@ func (this *QualChangeController) AuditEntity() {
 	if qualmain.WorkFlowId == "0" || len(qualmain.WorkFlowId) <= 0 {
 		//启动工作流
 		businessKey = utils.ToStr(qualmain.Id) + "-" + strconv.Itoa(qualmain.AuditIndex)
-		processInstanceId = svcActiviti.StartProcess(workflow.OIL_QUAL_CHANGE, businessKey, this.User.Id)
+		processInstanceId = svcActiviti.StartProcess(workflow.OIL_INFO_CHANGE, businessKey, this.User.Id)
 	}
 
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_QUAL_CHANGE
+	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
@@ -726,7 +726,7 @@ func (this *QualChangeController) QualAudit() {
 	}
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_QUAL_CHANGE
+	ActiComplete.ProcessKey = workflow.OIL_INFO_CHANGE
 	ActiComplete.BusinessKey = qualmodel.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id

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

@@ -683,25 +683,10 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 			actisvc := workflow.GetActivitiService(utils.DBE)
 			//找出待办任务===准入
 			var certIdList string
-			ids := actisvc.GetAllMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+			ids := actisvc.GetAllMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
 			if len(strings.Trim(ids, ",")) > 0 {
 				certIdList += strings.Trim(ids, ",")+ ","
 			}
-			ids = actisvc.GetAllMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id)
-			if len(strings.Trim(ids, ",")) > 0 {
-				certIdList += strings.Trim(ids, ",")+ ","
-			}
-
-			ids = actisvc.GetAllMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id)
-			if len(strings.Trim(ids, ",")) > 0 {
-				certIdList += strings.Trim(ids, ",")+ ","
-			}
-
-			ids = actisvc.GetAllMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
-			if len(strings.Trim(ids, ",")) > 0 {
-				certIdList += strings.Trim(ids, ",")+ ","
-			}
-
 			ids = actisvc.GetAllMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id)
 			if len(strings.Trim(ids, ",")) > 0 {
 				certIdList += strings.Trim(ids, ",")+ ","
@@ -712,6 +697,21 @@ func (this *OilSupplierController) GetJZPSJoinCertEntityList() {
 				certIdList += strings.Trim(ids, ",")+ ","
 			}
 
+			//ids = actisvc.GetAllMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
+			//if len(strings.Trim(ids, ",")) > 0 {
+			//	certIdList += strings.Trim(ids, ",")+ ","
+			//}
+			//
+			//ids = actisvc.GetAllMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id)
+			//if len(strings.Trim(ids, ",")) > 0 {
+			//	certIdList += strings.Trim(ids, ",")+ ","
+			//}
+			//
+			//ids = actisvc.GetAllMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id)
+			//if len(strings.Trim(ids, ",")) > 0 {
+			//	certIdList += strings.Trim(ids, ",")+ ","
+			//}
+
 			certIdList = strings.Trim(certIdList, ",")
 			certIdarr := strings.Split(certIdList, ",")
 			for i, item := range certIdarr {
@@ -1201,29 +1201,32 @@ func (this *OilSupplierController) GetMyTaskEntityList() {
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
 	var certIdList string
-	if actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = actisvc.GetMyTasks(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id))
-		certIdList = certIdList + ","
-	}
-	if actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id))
+	str := actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
+	if str != "" {
+		certIdList = str
 		certIdList = certIdList + ","
 	}
-	if actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
+	str = actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id)
+	if str != "" {
+		certIdList = fmt.Sprintf("%s %s", certIdList, str)
 		certIdList = certIdList + ","
 	}
-	if actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
+	str = actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id)
+	if str != "" {
+		certIdList = fmt.Sprintf("%s %s", certIdList, str)
 		certIdList = certIdList + ","
 	}
-	if actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
-		certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
-	}
+	//if actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+	//	certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id))
+	//	certIdList = certIdList + ","
+	//}
+	//if actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+	//	certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, this.User.Id))
+	//	certIdList = certIdList + ","
+	//}
+	//if actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id) != "" {
+	//	certIdList = fmt.Sprintf("%s %s", certIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, this.User.Id))
+	//}
 	certIdList = strings.Trim(certIdList, ",")
 	certIdarr := strings.Split(certIdList, ",")
 	for i, item := range certIdarr {

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

@@ -648,30 +648,45 @@ func (this *OilSupplierCertController) AuditEntity() {
 
 	processInstanceId := ""
 	businessKey := ""
+	result := strconv.Itoa(this.User.IsCompanyUser)
 	if supplierCertEntity.WorkflowId == "0" || len(supplierCertEntity.WorkflowId) <= 0 {
 		//启动工作流
 		businessKey = certId + "-" +  strconv.Itoa(supplierCertEntity.AuditIndex)
-		if this.User.IsCompanyUser == 1 {
-			if supplierCertEntity.InStyle == "2" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
-			} else if supplierCertEntity.InStyle == "3" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
-			} else if supplierCertEntity.InStyle == "6" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
-			} else {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
-			}
-		}else if this.User.IsCompanyUser == 0 {
-			if supplierCertEntity.InStyle == "2" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
-			} else if supplierCertEntity.InStyle == "3" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_SUPPLIER_APPLY, businessKey, this.User.Id)
-			} else if supplierCertEntity.InStyle == "6" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
-			} else {
-				processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, "1")
-			}
+		// 1 评审准入  2 一级物资备案准入  3  二级物资备案准入  4 战略合作准入  5 内部多元准入  6 外部市场准入
+		if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+			processInstanceId = svcActiviti.StartProcess2(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, result)
+		} else if supplierCertEntity.InStyle == "3" {
+			processInstanceId = svcActiviti.StartProcess2(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, result)
+		} else if supplierCertEntity.InStyle == "1" || supplierCertEntity.InStyle == "5" {
+			processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, result)
 		}
+		//if this.User.IsCompanyUser == 1 { // 企业用户
+		//	// 1 评审准入  2 一级物资备案准入  3  二级物资备案准入  4 战略合作准入  5 内部多元准入  6 外部市场准入
+		//	if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	} else if supplierCertEntity.InStyle == "3" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	} else if supplierCertEntity.InStyle == "1" || supplierCertEntity.InStyle == "5" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	}
+		//}else if this.User.IsCompanyUser == 0 {
+		//	//if supplierCertEntity.InStyle == "2" {
+		//	//	processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	//} else if supplierCertEntity.InStyle == "3" {
+		//	//	processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	//} else if supplierCertEntity.InStyle == "6" {
+		//	//	processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	//} else {
+		//	//	processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	//}
+		//	if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	} else if supplierCertEntity.InStyle == "3" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	} else if supplierCertEntity.InStyle == "1" || supplierCertEntity.InStyle == "5" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
+		//	}
+		//}
 
 	} else {
 		processInstanceId = supplierCertEntity.WorkflowId
@@ -683,32 +698,35 @@ func (this *OilSupplierCertController) AuditEntity() {
 	//}
 	//userIds = strings.Trim(userIds, ",")
 	var ActiComplete workflow.ActiCompleteVM
-	if this.User.IsCompanyUser == 1 {
-		if supplierCertEntity.InStyle == "2" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY
-		} else if supplierCertEntity.InStyle == "3" {
-			ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY
-		} else if supplierCertEntity.InStyle == "6" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY
-		} else {
-			ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
-		}
-	}else if this.User.IsCompanyUser == 0 {
-		if supplierCertEntity.InStyle == "2" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
-		} else if supplierCertEntity.InStyle == "3" {
-			ActiComplete.ProcessKey = workflow.OIL_SECOND_SUPPLIER_APPLY
-		} else if supplierCertEntity.InStyle == "6" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
-		} else {
-			ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
-		}
+	if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+		ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY
+	} else if supplierCertEntity.InStyle == "3" {
+		ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY
+	} else if supplierCertEntity.InStyle == "1" || supplierCertEntity.InStyle == "5" {
+		ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 	}
+	//if this.User.IsCompanyUser == 1 {
+	//	if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+	//		ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY
+	//	} else if supplierCertEntity.InStyle == "3" {
+	//		ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY
+	//	} else if supplierCertEntity.InStyle == "1" || supplierCertEntity.InStyle == "5" {
+	//		ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
+	//	}
+	//}else if this.User.IsCompanyUser == 0 {
+	//	if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+	//		ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
+	//	} else if supplierCertEntity.InStyle == "3" {
+	//		ActiComplete.ProcessKey = workflow.OIL_SECOND_SUPPLIER_APPLY
+	//	} else if supplierCertEntity.InStyle == "1" || supplierCertEntity.InStyle == "5" {
+	//		ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
+	//	}
+	//}
 
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
-	ActiComplete.Result = "1"
+	ActiComplete.Result = result
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -797,7 +815,7 @@ func (this *OilSupplierCertController) AuditEntityadmission() {
 	}()
 	//取出审批列表
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	certSrv.SubmitOrgAudit(certId, workflow.OIL_SUPPLIER_APPLY, workflow.PROF_AUDIT, this.User.Id, "1", "提交给专业科室审核", OilSupplierCertSubName, OilClassOrgSettingName, "", "")
+	certSrv.SubmitOrgAudit(certId, workflow.OIL_ENUSER_SUPPLIER_APPLY, workflow.PROF_AUDIT, this.User.Id, "1", "提交给专业科室审核", OilSupplierCertSubName, OilClassOrgSettingName, "", "")
 	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, supplierCertEntity)
@@ -897,7 +915,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		var setting auditsetting.Base_OilAuditSetting
 		usvc := userRole.GetUserService(utils.DBE)
 
-		if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "6"{
+		if supplierCertEntity.InStyle == "3"{
 			status = suppliercert.CENT_AUDIT_STATUS
 			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
 			usvc.GetEntity(&setting, where)
@@ -911,7 +929,10 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 				where := "Id in (" + uids + ")" + " and UnitId=" + topid
 				usvc.GetEntities(&userlist, where)
 			}
-		} else {
+		} else if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "4" || supplierCertEntity.InStyle == "6" {
+			status = suppliercert.STOREING_STATUS
+			step = 3
+		}  else {
 			status = suppliercert.THIRD_TRIAL_STATUS
 			where := "AuditStepCode='" + workflow.PROF_RECE + "'"
 			svc.GetEntity(&setting, where)
@@ -935,8 +956,8 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		}
 		userIds = strings.Trim(userIds, ",")
 
-		step = 2
-		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
+		//step = 2
+		//backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 
 	} else if supplierCertEntity.Status == suppliercert.THIRD_TRIAL_STATUS {
 		userIds = auditer
@@ -1005,13 +1026,6 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					var Amount float64
 					asvc := oilcostmanage.GetOilCostManageService(utils.DBE)
 					Amount = asvc.GetAmount("ZHUNRU",supplierCertEntity.SupplierTypeCode)
-					//if supplierCertEntity.SupplierTypeCode == suppliercert.DOOGS_TYPECODE {
-					//	Amount = 6000
-					//} else if supplierCertEntity.SupplierTypeCode == suppliercert.BASIS_TYPECODE {
-					//	Amount = 7000
-					//} else if supplierCertEntity.SupplierTypeCode == suppliercert.TECH_TYPECODE {
-					//	Amount = 8000
-					//}
 					var payinfo paymentinfo.OilPaymentInfo
 					payinfo.SupplierId = supplierCertEntity.SupplierId
 					payinfo.SrcId = supplierCertEntity.Id
@@ -1066,15 +1080,6 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 						"Step",
 					}
 					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
-				//} else {
-				//	supplierCertEntity.Status = status
-				//	supplierCertEntity.Step = step
-				//	cols := []string{
-				//		"Status",
-				//		"Step",
-				//	}
-				//	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
-				//}
 			} else {
 				supplierCertEntity.Status = status
 				supplierCertEntity.Step = step

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

@@ -442,16 +442,19 @@ func (this *OilSupplierCertAppendController) GetMyTaskEntityList() {
 	//找出待办任务
 	actisvc := workflow.GetActivitiService(utils.DBE)
 	var appendIdList string
-	if actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id) != "" {
-		appendIdList = actisvc.GetMyTasks(workflow.OIL_APPEND_APPLY, this.User.Id)
+	str := actisvc.GetMyTasks(workflow.OIL_ENUSER_APPEND_APPLY, this.User.Id)
+	if str != "" {
+		appendIdList = str
 		appendIdList = appendIdList + ","
 	}
-	if actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id) != "" {
-		appendIdList = fmt.Sprintf("%s %s", appendIdList, actisvc.GetMyTasks(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id))
+	str = actisvc.GetMyTasks(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, this.User.Id)
+	if str != "" {
+		appendIdList = fmt.Sprintf("%s %s", appendIdList, str)
 		appendIdList = appendIdList + ","
 	}
-	if actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id) != "" {
-		appendIdList = fmt.Sprintf("%s %s", appendIdList, actisvc.GetMyTasks(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id))
+	str = actisvc.GetMyTasks(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, this.User.Id)
+	if str != "" {
+		appendIdList = fmt.Sprintf("%s %s", appendIdList, str)
 		appendIdList = appendIdList + ","
 	}
 	appendIdList = strings.Trim(appendIdList, ",")
@@ -526,61 +529,76 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	processInstanceId := ""
 	businessKey := ""
+	result := strconv.Itoa(this.User.IsCompanyUser)
 	if supplierCertAppendEntity.WorkFlowId == "0" || len(supplierCertAppendEntity.WorkFlowId) <= 0 {
 		//启动工作流
 		businessKey = certappendId + "-" +  strconv.Itoa(supplierCertAppendEntity.AuditIndex)
-		if this.User.IsCompanyUser == 1 {
-			if supplierCertAppendEntity.InStyle == "2" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
-			} else if supplierCertAppendEntity.InStyle == "3" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
-			} else if supplierCertAppendEntity.InStyle == "6" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
-			} else {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
-			}
-		}else if this.User.IsCompanyUser == 0 {
-			if supplierCertAppendEntity.InStyle == "2" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
-			}else if  supplierCertAppendEntity.InStyle == "3" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_APPEND_APPLY, businessKey, this.User.Id)
-			}else if  supplierCertAppendEntity.InStyle == "6" {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
-			}else {
-				processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
-			}
+		if supplierCertAppendEntity.InStyle == "2" || supplierCertAppendEntity.InStyle == "4" || supplierCertAppendEntity.InStyle == "6" {
+			processInstanceId = svcActiviti.StartProcess2(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id, result)
+		} else if supplierCertAppendEntity.InStyle == "3" {
+			processInstanceId = svcActiviti.StartProcess2(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, businessKey, this.User.Id, result)
+		} else if supplierCertAppendEntity.InStyle == "1" || supplierCertAppendEntity.InStyle == "5" {
+			processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id, result)
 		}
+		//if this.User.IsCompanyUser == 1 {
+		//	if supplierCertAppendEntity.InStyle == "2" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+		//	} else if supplierCertAppendEntity.InStyle == "3" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+		//	} else if supplierCertAppendEntity.InStyle == "6" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+		//	} else {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+		//	}
+		//}else if this.User.IsCompanyUser == 0 {
+		//	if supplierCertAppendEntity.InStyle == "2" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
+		//	}else if  supplierCertAppendEntity.InStyle == "3" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_APPEND_APPLY, businessKey, this.User.Id)
+		//	}else if  supplierCertAppendEntity.InStyle == "6" {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
+		//	}else {
+		//		processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+		//	}
+		//}
 
 
 	}
 	var ActiComplete workflow.ActiCompleteVM
-	if this.User.IsCompanyUser == 1 {
-		if supplierCertAppendEntity.InStyle == "2" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
-		} else if supplierCertAppendEntity.InStyle == "3" {
-			ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_APPEND_APPLY
-		} else if supplierCertAppendEntity.InStyle == "6" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
-		} else {
-			ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
-		}
-	}else if this.User.IsCompanyUser == 0 {
-		if supplierCertAppendEntity.InStyle == "2" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
-		}else if  supplierCertAppendEntity.InStyle == "3" {
-			ActiComplete.ProcessKey = workflow.OIL_SECOND_APPEND_APPLY
-		}else if  supplierCertAppendEntity.InStyle == "6" {
-			ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
-		}else{
-			ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
-		}
+	if supplierCertAppendEntity.InStyle == "2" || supplierCertAppendEntity.InStyle == "4" || supplierCertAppendEntity.InStyle == "6" {
+		ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
+	} else if supplierCertAppendEntity.InStyle == "3" {
+		ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_APPEND_APPLY
+	} else if supplierCertAppendEntity.InStyle == "1" || supplierCertAppendEntity.InStyle == "5" {
+		ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
 	}
+	//if this.User.IsCompanyUser == 1 {
+	//	if supplierCertAppendEntity.InStyle == "2" {
+	//		ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
+	//	} else if supplierCertAppendEntity.InStyle == "3" {
+	//		ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_APPEND_APPLY
+	//	} else if supplierCertAppendEntity.InStyle == "6" {
+	//		ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
+	//	} else {
+	//		ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
+	//	}
+	//}else if this.User.IsCompanyUser == 0 {
+	//	if supplierCertAppendEntity.InStyle == "2" {
+	//		ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
+	//	}else if  supplierCertAppendEntity.InStyle == "3" {
+	//		ActiComplete.ProcessKey = workflow.OIL_SECOND_APPEND_APPLY
+	//	}else if  supplierCertAppendEntity.InStyle == "6" {
+	//		ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
+	//	}else{
+	//		ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
+	//	}
+	//}
 
 
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
-	ActiComplete.Result = "1"
+	ActiComplete.Result = result
 	ActiComplete.Remarks = AuditRemark
 	ActiComplete.CallbackUrl = ""
 	receiveVal := svcActiviti.TaskComplete(ActiComplete)
@@ -590,7 +608,7 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 			var audithistoryentity audithistory.Base_AuditHistory
 			audithistoryentity.EntityId, _ = strconv.Atoi(certappendId)
 			audithistoryentity.WorkflowId = historworkflowid
-			audithistoryentity.Process = workflow.OIL_APPEND_APPLY
+			audithistoryentity.Process = workflow.OIL_ENUSER_APPEND_APPLY
 			audithistoryentity.BusinessKey = businessKey
 			audithistoryentity.Type = supplierCertAppendEntity.AppendType
 			audithistoryentity.BackStep = supplierCertAppendEntity.Status
@@ -704,10 +722,12 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	} else if supplierCertAppendEntity.Status == suppliercert.SECOND_TRIAL_STATUS {
 		svc := organize.GetOrganizeService(utils.DBE)
 		unitId := svc.GetMyUnitDepartmentId(strconv.Itoa(supplierCertAppendEntity.ThirdAudit))
+		step = 2
+		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 		var userlist []userRole.Base_User
 		var setting auditsetting.Base_OilAuditSetting
 		usvc := userRole.GetUserService(utils.DBE)
-		if supplierCertAppendEntity.InStyle == "2"  || supplierCertAppendEntity.InStyle == "6" {
+		if supplierCertAppendEntity.InStyle == "3" {
 			status = suppliercert.CENT_AUDIT_STATUS
 			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
 			usvc.GetEntity(&setting, where)
@@ -721,6 +741,10 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 				where := "Id in (" + uids + ")" + " and UnitId=" + topid
 				usvc.GetEntities(&userlist, where)
 			}
+		} else if supplierCertAppendEntity.InStyle == "2" || supplierCertAppendEntity.InStyle == "4" || supplierCertAppendEntity.InStyle == "6" {
+			step = 2
+			status = suppliercert.ALL_PASE_STATUS
+			backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
 		} else {
 			status = suppliercert.THIRD_TRIAL_STATUS
 			where := "AuditStepCode='" + workflow.PROF_RECE + "'"
@@ -739,8 +763,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 			userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
 		}
 		userIds = strings.Trim(userIds, ",")
-		step = 2
-		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
+
 	} else if supplierCertAppendEntity.Status == suppliercert.THIRD_TRIAL_STATUS {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PROF_AUDIT_STATUS

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

@@ -50,60 +50,60 @@ func (this *TodoListController) GetMyTaskEntityList() {
 
 		where = where + " and b.Id = "
 
-		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereadd := where + id
-				has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
-				if has {
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-				fmt.Println("1")
-			}
-		}
-
-		//一级物资供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereadd := where + id
-				has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
-				if has {
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
-
-		//二级物资供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereadd := where + id
-				has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
-				fmt.Println("2")
-				if has {
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereadd := where + id
+		//		has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
+		//		if has {
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//		fmt.Println("1")
+		//	}
+		//}
+		//
+		////一级物资供方准入流程图
+		//myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereadd := where + id
+		//		has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
+		//		if has {
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
+		//
+		////二级物资供方准入流程图
+		//myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereadd := where + id
+		//		has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
+		//		fmt.Println("2")
+		//		if has {
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//
+		//	}
+		//}
 
 		//企业用户准入流程图
 		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
@@ -175,59 +175,59 @@ func (this *TodoListController) GetMyTaskEntityList() {
 		where += " and b.Id ="
 		svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 		//供方增项流程图
-		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_APPEND_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereapp := where + id
-				has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
-				if has {
-					todo.Type = todolist.CERTAPPEND
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_APPEND_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereapp := where + id
+		//		has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
+		//		if has {
+		//			todo.Type = todolist.CERTAPPEND
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
 
 		//一级物资供方增项流程图
-		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereapp := where + id
-				has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
-				if has {
-					todo.Type = todolist.CERTAPPEND
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereapp := where + id
+		//		has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
+		//		if has {
+		//			todo.Type = todolist.CERTAPPEND
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
 
 		//二级物资供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereapp := where + id
-				has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
-				if has {
-					todo.Type = todolist.CERTAPPEND
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereapp := where + id
+		//		has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
+		//		if has {
+		//			todo.Type = todolist.CERTAPPEND
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
 
 		//企业用户增项流程图
 		myTasksRetWithTimes = actisvc.GetMyTasksWithTime(workflow.OIL_ENUSER_APPEND_APPLY, this.User.Id)
@@ -464,61 +464,61 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		where = where + " and b.Id = "
 		//已办任务===准入
 		//供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereadd := where + id
-				has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
-				if has {
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-				fmt.Println("1")
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_SUPPLIER_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereadd := where + id
+		//		has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
+		//		if has {
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//		fmt.Println("1")
+		//	}
+		//}
 
 		//一级物资供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereadd := where + id
-				has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
-				if has {
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
-
-		//二级物资供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereadd := where + id
-				has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
-				fmt.Println("2")
-				if has {
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_FIRST_SUPPLIER_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereadd := where + id
+		//		has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
+		//		if has {
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
+		//
+		////二级物资供方准入流程图
+		//myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_SECOND_SUPPLIER_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereadd := where + id
+		//		has := svc.GetMyTodoEntitie(OilSupplierName, OilSupplierCertName,  &todo, whereadd)
+		//		fmt.Println("2")
+		//		if has {
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//
+		//	}
+		//}
 
 		//企业用户准入流程图
 		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_ENUSER_SUPPLIER_APPLY, this.User.Id)
@@ -591,61 +591,61 @@ func (this *TodoListController) GetMyTaskFinishedList() {
 		where += " and b.Id ="
 		svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 		//供方增项流程图
-		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_APPEND_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereapp := where + id
-				has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
-				if has {
-					todo.Type = todolist.CERTAPPEND
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
-
-		//一级物资供方增项流程图
-		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereapp := where + id
-				has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
-				if has {
-					todo.Type = todolist.CERTAPPEND
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
-
-		//二级物资供方准入流程图
-		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id)
-		for _,item := range myTasksRetWithTimes {
-			//var entity []supplier.OilSupplierView
-			var todo todolist.TodoList
-			idx := strings.Index(item.BusinessKey, "-")
-			if idx >= 0 {
-				id := strings.Split(item.BusinessKey, "-")[0]
-				whereapp := where + id
-				has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
-				if has {
-					todo.Type = todolist.CERTAPPEND
-					todo.UserName = this.User.Realname
-					todo.CreateTime = item.CreateTime
-					todolists = append(todolists, todo)
-				}
-			}
-		}
+		//myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_APPEND_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereapp := where + id
+		//		has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
+		//		if has {
+		//			todo.Type = todolist.CERTAPPEND
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
+		//
+		////一级物资供方增项流程图
+		//myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_FIRST_APPEND_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereapp := where + id
+		//		has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
+		//		if has {
+		//			todo.Type = todolist.CERTAPPEND
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
+		//
+		////二级物资供方准入流程图
+		//myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_SECOND_APPEND_APPLY, this.User.Id)
+		//for _,item := range myTasksRetWithTimes {
+		//	//var entity []supplier.OilSupplierView
+		//	var todo todolist.TodoList
+		//	idx := strings.Index(item.BusinessKey, "-")
+		//	if idx >= 0 {
+		//		id := strings.Split(item.BusinessKey, "-")[0]
+		//		whereapp := where + id
+		//		has := svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, whereapp)
+		//		if has {
+		//			todo.Type = todolist.CERTAPPEND
+		//			todo.UserName = this.User.Realname
+		//			todo.CreateTime = item.CreateTime
+		//			todolists = append(todolists, todo)
+		//		}
+		//	}
+		//}
 
 		//企业用户增项流程图
 		myTasksRetWithTimes = actisvc.GetMyFinishedTasksWithTime(workflow.OIL_ENUSER_APPEND_APPLY, this.User.Id)

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -170,7 +170,7 @@ module.exports = {
     'pages/oilsupplier/infochangech/*.*',
     'pages/oilsupplier/supplier/*.*',
     'pages/oilsupplier/supplierappend/*.*',
-    'pages/oilsupplier/supplieraudit/*.*',
+    // 'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
     'pages/oilsupplier/supplierfile/*.*',
 

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

@@ -667,6 +667,29 @@
       </span>
       <br>
     </el-dialog>
+    <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
+      <el-form ref="searchForm" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办人员">
+              <el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">
+                <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="说明">
+              <el-input v-model="auditform.AuditRemark" type="textarea" placeholder="请输入说明内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="SubpEntity">确定</el-button>
+      </span>
+    </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
     <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
@@ -1223,6 +1246,11 @@
       this.getAccessCardNo()
     },
     methods: {
+      chooseAuditorShowFen () {
+        console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
+        this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisibleFen = true
+      },
       initDatas() {
         this.getMainInfo()
         let params = {

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

@@ -1181,7 +1181,7 @@ export default {
           this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
-          if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+          if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
             this.allowpre = false
           }
         }).catch(err => {
@@ -1529,7 +1529,7 @@ export default {
         })
         return
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
         if (this.selectDept === 0 || this.selectDept == '') {
           this.$message({
             type: 'warning',
@@ -1538,7 +1538,7 @@ export default {
           return
         }
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
         if (this.userOptions == null || this.userOptions.length === 0) {
           this.$message({
             type: 'warning',

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

@@ -1228,7 +1228,7 @@ export default {
               this.certId,
               this.formDataCert.InStyle
             )
-            if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+            if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
               this.allowpre = false
             }
           })
@@ -1628,7 +1628,7 @@ export default {
         })
         return
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
         if (this.selectDept === 0 || this.selectDept == '') {
           this.$message({
             type: 'warning',
@@ -1637,7 +1637,7 @@ export default {
           return
         }
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
         if (this.userOptions == null || this.userOptions.length === 0) {
           this.$message({
             type: 'warning',

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

@@ -1178,7 +1178,7 @@ export default {
           this.$refs['techList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
             .formDataCert.InStyle)
-          if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+          if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
             this.allowpre = false
           }
         }).catch(err => {
@@ -1529,7 +1529,7 @@ export default {
         })
         return
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
         if (this.selectDept === 0 || this.selectDept == '') {
           this.$message({
             type: 'warning',
@@ -1538,7 +1538,7 @@ export default {
           return
         }
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
         if (this.userOptions == null || this.userOptions.length === 0) {
           this.$message({
             type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -852,19 +852,20 @@ import fileapi from '@/api/oilsupplier/supplierfile'
         return fullUrl
       },
       commitaudit () {
-        if (this.subfileList && this.subfileList.length > 0) {
-          for (var i = 0; i < this.subfileList.length; i++) {
-            if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-              this.$message({
-                type: 'warning',
-                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-              })
-              return
-            }
-          }
-        } else {
-          this.AuditdialogShow = true
-        }
+        this.AuditdialogShow = true
+        // if (this.subfileList && this.subfileList.length > 0) {
+        //   for (var i = 0; i < this.subfileList.length; i++) {
+        //     if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
+        //       this.$message({
+        //         type: 'warning',
+        //         message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+        //       })
+        //       return
+        //     }
+        //   }
+        // } else {
+        //   this.AuditdialogShow = true
+        // }
       },
       commitfenban () {
         this.ComAuditdialogShow = true
@@ -1089,7 +1090,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
           this.entrydetail.business = _this.Id
           this.entrydetail.instance = this.formData.WorkFlowId
           this.entrydetail.Status = this.formData.Status
-          if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+          if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
             this.allowpre = false
           }
           this.getFileList()
@@ -1361,7 +1362,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
           })
           return
         }
-        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6' || this.formData.InStyle == '4') {
           if (this.majorDept.length === 0) {
             this.$message({
               type: 'warning',
@@ -1370,7 +1371,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
             return
           }
         }
-        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6' || this.formData.InStyle == '4') {
           if (this.userOptions == null || this.userOptions.length === 0) {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -787,19 +787,20 @@ import uploadajax from '@/assets/js//uploadajax.js'
       },
 
       commitaudit () {
-        if (this.subfileList && this.subfileList.length > 0) {
-          for (var i = 0; i < this.subfileList.length; i++) {
-            if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-              this.$message({
-                type: 'warning',
-                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-              })
-              return
-            }
-          }
-        } else {
-          this.AuditdialogShow = true
-        }
+        this.AuditdialogShow = true
+        // if (this.subfileList && this.subfileList.length > 0) {
+        //   for (var i = 0; i < this.subfileList.length; i++) {
+        //     if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
+        //       this.$message({
+        //         type: 'warning',
+        //         message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+        //       })
+        //       return
+        //     }
+        //   }
+        // } else {
+        //   this.AuditdialogShow = true
+        // }
       },
       commitfenban () {
         this.ComAuditdialogShow = true
@@ -860,7 +861,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
           this.entrydetail.business = _this.Id
           this.entrydetail.instance = this.formData.WorkFlowId
           this.entrydetail.Status = this.formData.Status
-          if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+          if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
             this.allowpre = false
           }
           this.getFileList()
@@ -1453,7 +1454,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
           })
           return
         }
-        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6' || this.formData.InStyle == '4') {
           if (this.majorDept.length === 0) {
             this.$message({
               type: 'warning',
@@ -1462,7 +1463,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
             return
           }
         }
-        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6' || this.formData.InStyle == '4') {
           if (this.userOptions == null || this.userOptions.length === 0) {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -788,7 +788,7 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
           this.entrydetail.business = _this.Id
           this.entrydetail.instance = this.formData.WorkFlowId
           this.entrydetail.Status = this.formData.Status
-          if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+          if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
             this.allowpre = false
           }
           this.getFileList()
@@ -827,19 +827,20 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
       },
 
       commitaudit () {
-        if (this.subfileList && this.subfileList.length > 0) {
-          for (var i = 0; i < this.subfileList.length; i++) {
-            if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-              this.$message({
-                type: 'warning',
-                message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-              })
-              return
-            }
-          }
-        } else {
-          this.AuditdialogShow = true
-        }
+        this.AuditdialogShow = true
+        // if (this.subfileList && this.subfileList.length > 0) {
+        //   for (var i = 0; i < this.subfileList.length; i++) {
+        //     if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
+        //       this.$message({
+        //         type: 'warning',
+        //         message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
+        //       })
+        //       return
+        //     }
+        //   }
+        // } else {
+        //   this.AuditdialogShow = true
+        // }
       },
       commitfenban () {
         this.ComAuditdialogShow = true
@@ -1311,7 +1312,7 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
           })
           return
         }
-        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6' || this.formData.InStyle == '4') {
           if (this.majorDept.length === 0) {
             this.$message({
               type: 'warning',
@@ -1320,7 +1321,7 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
             return
           }
         }
-        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6' || this.formData.InStyle == '4') {
           if (this.userOptions == null || this.userOptions.length === 0) {
             this.$message({
               type: 'warning',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -300,7 +300,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
                 <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
@@ -931,21 +931,25 @@
               })
               return
             }
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人！'
-              })
-              return
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
             }
           }
           if (this.formData.Status == '10') {
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人！'
-              })
-              return
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
             }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {

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

@@ -311,7 +311,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
                 <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
               <!--</el-cascader>-->
@@ -952,21 +952,25 @@
               })
               return
             }
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人！'
-              })
-              return
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
             }
           }
           if (this.formData.Status == '10') {
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人！'
-              })
-              return
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
             }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '5' && this.formData.Status !== '10') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -298,7 +298,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="业务处室">
+            <el-form-item label="业务处室" v-if="inStyle != '2' && inStyle != '4' && inStyle != '6' ">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
                 <!--style="width: 100%" v-model="majorDept" placeholder="请选择业务处室">-->
               <!--</el-cascader>-->
@@ -937,21 +937,25 @@
               })
               return
             }
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人！'
-              })
-              return
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
             }
           }
           if (this.formData.Status == '10') {
-            if (this.userOptions == null || this.userOptions.length === 0) {
-              this.$message({
-                type: 'warning',
-                message: '该专业科室未配置接收人！'
-              })
-              return
+            if (this.inStyle != '2' && this.inStyle != '4' && this.inStyle != '6') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
             }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {