待办事件-增项申请-参数返回

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

@@ -1163,6 +1163,7 @@ func (this *AnnualAuditController) UpdateIsStorage() {
 	srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
 
 	AuditRemark := ""
+	fmt.Println("审批入库传入状态：", status)
 	if status == "1" {
 		AuditRemark = "审批通过已入库。"
 	} else {

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

@@ -1061,6 +1061,7 @@ func (this *OilSupplierCertController) UpdateIsStorage() {
 	srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
 
 	AuditRemark := ""
+	fmt.Println("审批入库传入状态：", status)
 	if status == "1" {
 		AuditRemark = "审批通过已入库。"
 	} else {

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

@@ -1101,6 +1101,7 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
 	srv.UpdateEntityByIdCols(SupplierId, &supplierEntity, srvCols)
 
 	AuditRemark := ""
+	fmt.Println("审批入库传入状态：", status)
 	if status == "1" {
 		AuditRemark = "审批通过已入库。"
 	} else {

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

@@ -88,9 +88,14 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			where := " 1=1 "
 			where = where + " and b.Id = '" + id + "'"
 			var todo todolist.TodoList
+			var certAppend suppliercertappend.OilSupplierCertAppend
 			svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 			has :=svcapp.GetTodoEntitie(OilSupplierName, OilSupplierCertAppendName,  &todo, where)
+			svcapp.GetEntityById(id, &certAppend)
 			if has {
+				todo.Id = certAppend.Id
+				todo.SupplierId = strconv.Itoa(certAppend.SupplierId)
+				todo.CertId = strconv.Itoa(certAppend.SupplierCertId)
 				todo.Type = todolist.CERTAPPEND
 				todo.TaskName = item.TaskName
 				todo.UserName = this.User.Realname

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

@@ -588,7 +588,7 @@
           // 待入库状态时直接跳转单独的入库审批页面,.信息变更入库不需要区分类型, 直接审批。
           if (val.SupplierTypeCode === '01') {
             SupplierType = 'goodsedit'
-          } else if (val.SupplierTypeCode === '2') {
+          } else if (val.SupplierTypeCode === '02') {
             SupplierType = 'basisedit'
           } else {
             SupplierType = 'techedit'

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

@@ -760,6 +760,7 @@
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
+            console.log('流程审批的参数', this.entrydetail)
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {