工作流测试通过、

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

@@ -1,7 +1,10 @@
 package supplier
 
 import (
+	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/utils"
+	"fmt"
 	"github.com/go-xorm/xorm"
 )
 
@@ -14,3 +17,13 @@ func GetOilSupplierService(xormEngine *xorm.Engine) *OilSupplierService {
 	s.DBE = xormEngine
 	return s
 }
+
+//关联委托方信息获取任务详情
+func (s *OilSupplierService) StartAudit() {
+	//启动数据录入工作流
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	processInstanceId := svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, "4", "1")
+	fmt.Println(processInstanceId)
+	svcActiviti.TaskComplete(workflow.OIL_SUPPLIER_APPLY, "4", "org_1,org_2", "1", "1", "no")
+	return
+}

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

@@ -41,12 +41,6 @@ type AposeVM struct {
 }
 
 const (
-	//特检站数据录入
-	TJZ_DATA_KEY string = "tjz_data_apply"
-	//特检站报告
-	TJZ_PROCESS_KEY string = "tjz_report_assign"
-	//宇信数据录入
-	YX_DATA_KEY string = "yx_data_apply"
-	//宇信报告
-	YX_PROCESS_KEY string = "yx_report_assign"
+	//供方准入、增项业务流程图
+	OIL_SUPPLIER_APPLY string = "oil_supplier_apply"
 )

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

@@ -1175,3 +1175,15 @@ func (this *OilSupplierController) DeleteEntity() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 启动工作流
+// @Description 启动工作流
+// @Param 	body body supplier.OilSupplier
+// @Success	200	{object} controllers.Request
+// @router /workflow/:id [post]
+func (this *OilSupplierController) StartAudit() {
+	//测试多实例工作流
+	svcFlow := supplier.GetOilSupplierService(utils.DBE)
+	svcFlow.StartAudit()
+}
+

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

@@ -0,0 +1,57 @@
+package workflow
+
+import (
+	"dashoo.cn/backend/api/business/workflow"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/permission"
+	"dashoo.cn/business2/userRole"
+	"dashoo.cn/utils"
+)
+
+// 动作接口说明
+type WorkflowController struct {
+	BaseController
+}
+
+
+// @Title get
+// @Description get workflow by token
+// @Success 200 {object} historicTasks
+// @router /historytask [get]
+func (this *WorkflowController) GetHistoricTask() {
+	businessKey := this.GetString("business")
+	processKey := this.GetString("process")
+	processInstanceId := this.GetString("instance")
+
+	var historicTasks []workflow.ActiHistoricTask
+	svcActiviti := workflow.GetActivitiService(utils.DBE)
+	historicTasks = svcActiviti.GetHistoricTasks(processKey, businessKey, processInstanceId)
+
+	var datainfo DataInfo
+	datainfo.Items = historicTasks
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取所有用户
+// @Description get user by token
+// @Success 200 {object} models.User
+// @router /userlist [get]
+func (this *WorkflowController) UserList() {
+	keyword := this.GetString("keyword")
+	svc := permission.GetPermissionService(utils.DBE)
+	var users []userRole.Base_User
+
+	where := "IsVisible=1 and AccCode='" + this.User.AccCode + "' "
+	if keyword != "" {
+		where = where + " and Realname like '%" + keyword + "%'"
+	}
+	total := svc.GetPagingEntitiesWithOrder(1, 1000, "Id", false, &users, where)
+
+	var datainfo DataInfo
+	datainfo.Items = users
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+

src/dashoo.cn/backend/api/routers/router.go

@@ -8,6 +8,7 @@ import (
 	"dashoo.cn/backend/api/controllers/casbin"
 	"dashoo.cn/backend/api/controllers/document"
 	"dashoo.cn/backend/api/controllers/oilsupplier"
+	"dashoo.cn/backend/api/controllers/workflow"
 
 	//	"dashoo.cn/backend/api/controllers/equipment"
 	//	"dashoo.cn/backend/api/controllers/instrument"
@@ -201,6 +202,12 @@ func init() {
 				&controllers.UploadController{},
 			),
 		),
+		//工作流
+		beego.NSNamespace("/workflow",
+			beego.NSInclude(
+				&workflow.WorkflowController{},
+			),
+		),
 		//以下是供方管理信息系统
 		beego.NSNamespace("/busisbuild",
 			beego.NSInclude(

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -26,8 +26,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="margin-top:-160px;">
-      <img :src="baseurl + 'limsdataentry/historyimg/' + entryinfo.instance " v-if="entryinfo.instance" style="width:850px">
+    <div style="margin-top:10px;">
+      <img :src="baseurl + 'limsdataentry/historyimg/' + entryinfo.instance " v-if="entryinfo.instance">
     </div>
   </div>
 </template>
@@ -54,17 +54,7 @@
         session: 'session'
       })
     },
-    watch: {
-      visible(val) {
-        this.selfVisible = val
-        if (this.visible) {
-          this.getHistoryTask()
-        }
-      },
-      selfVisible(val) {
-        this.$emit('update:visible', val)
-      },
-    },
+
     data() {
       return {
         baseurl: process.env.baseURL,
@@ -84,10 +74,11 @@
           business: _this.entryinfo.business,
           instance: _this.entryinfo.instance,
         }
-        this.$axios.get('limsdataentry/historytask', {
+        this.$axios.get('workflow/historytask', {
           params
         })
           .then(res => {
+              debugger
             _this.historyTask = res.data.items
           })
           .catch(err => {
@@ -120,10 +111,12 @@
       },
       getuserlist() {
         let _this = this
-        _this.$axios.get('limsindex/userlist', {})
+        _this.$axios.get('workflow/userlist', {})
           .then(res => {
             // response
             _this.userlist = res.data.items
+
+            this.getHistoryTask()
           })
           .catch(err => {
             // handle error

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

@@ -649,9 +649,9 @@
 
         },
         entrydetail: {
-          process: '',
-          business: '',
-          instance: '',
+          process: 'oil_supplier_apply',
+          business: '4',
+          instance: '145001',
         },
 
         tableColumns: [