校核

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

@@ -32,8 +32,8 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s := new(ActivitiService)
 	s.DBE = xormEngine
 	//s.BaseUrl = "http://123.56.168.26:8080/activiti-rest/service"
-	//s.BaseUrl = "http://192.168.0.165:8081/api/acti"
-	s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
+	s.BaseUrl = "http://192.168.0.166:8081/api/acti"
+	//s.BaseUrl = "http://47.92.212.59:8080/acti-api/api/acti"
 	//s.BaseUrl = "http://192.168.0.171:8081/api/acti"
 	s.AposeUrl = "http://47.92.212.59:8080/acti-api/api/apose"
 	//s.OriginUrl = "http://192.168.0.166:8081/api"

src/dashoo.cn/backend/api/controllers/lims/limsdataentry.go

@@ -2610,7 +2610,7 @@ func (this *LimsDataEntryController) GetUserListByJHRole() {
 	//case "100000169":
 	//	users = svc.GetUserByRole("10000195", this.User.AccCode)
 	case "100000168":
-		users = svc.GetUserByRole("10000201", this.User.AccCode)
+		users = svc.GetUserByRole("10000209", this.User.AccCode)
 	default:
 		rsvc.GetAuditStepRoleEntity(OilAuditSettingName,this.User.DepartmentId,workflow.JN_JIAOHE, &RoleSet)
 		users = svc.GetUserByRole(strconv.Itoa(RoleSet.RoleId), this.User.AccCode)
@@ -2744,12 +2744,12 @@ func (this *LimsDataEntryController) CheckSubmit() {
 					return
 				}
 			case "100000168":
-				users = svc.GetUserByRole("10000202", this.User.AccCode)
+				users = svc.GetUserByRole("10000210", this.User.AccCode)
 				for _, tmpUser := range users {
 					userIds += strconv.FormatInt(tmpUser.Id, 10) + ","
 				}
 				userIds = strings.Trim(userIds, ",")
-				receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
+				receiveVal = svcActiviti.TaskComplete(workflow.JL_DATA_KEY, strconv.Itoa(dataother.DataEntryId), userIds, this.User.Id, "1", dataother.AuditorRemark)
 				if receiveVal == "true" {
 					err := svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, list[0].Id, entityempty, cols)
 					err = svc.UpdateEntityBytbl(this.User.AccCode+LimsTaskBalanceName, list[0].TaskId, balanceempty, balancecols)

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorcarbondetect/_opera/operation.vue

@@ -656,6 +656,7 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -722,6 +723,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorfhgasdetect/_opera/operation.vue

@@ -687,6 +687,7 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -761,6 +762,21 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+            console.log("----this.acceptUsers-----",this.acceptUsers)
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,

src/dashoo.cn/frontend_web/src/pages/lims/reportalertorkrgasdetect/_opera/operation.vue

@@ -679,6 +679,7 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -753,6 +754,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,

src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer1carbonredgas/_opera/operation.vue

@@ -681,6 +681,7 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -767,6 +768,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,

src/dashoo.cn/frontend_web/src/pages/lims/reportanalyzer2carbonredgas/_opera/operation.vue

@@ -659,6 +659,7 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -738,6 +739,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorHSgas/_opera/operation.vue

@@ -680,6 +680,7 @@
       this.formData.EId = this.queryParams.EId
       console.log("--this.$route.query.tbid--",this.formData.TaskBalanceId)
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -750,6 +751,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       discountHeaderStyle1({
         row,
         column,

src/dashoo.cn/frontend_web/src/pages/lims/reportdetectorelectoxygen/_opera/operation.vue

@@ -624,6 +624,7 @@
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
       this.initDatas();
+      this.getUsersByRole()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -689,6 +690,20 @@
           });
         }
       },
+      // 获取校核人列表
+      getUsersByRole() {
+        // request
+        this.$axios.get('/limsdataentry/getuserlistbyjhrole/', {})
+          .then(res => {
+            if (res.data instanceof Array && res.data.length > 0) {
+              this.acceptUsers = res.data
+            }
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.wellNoOptions = res.data.items['WellNo']