离心泵提交校核

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -252,9 +252,9 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 		case "100000151":
 			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 		case "100000168":
-			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+			processInstanceId = svcActiviti.StartProcess(workflow.JL_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 		case "100000169":
-			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
+			processInstanceId = svcActiviti.StartProcess(workflow.JN_DATA_KEY, strconv.Itoa(dataentryentity.Id), ConUserIdList[i])
 		}
 		dataentryentity.DocKey=processInstanceId
 		err = this.UpdateEntityBytbl(AccCode+LimsDateEntryName, dataentryentity.Id, &dataentryentity, []string{"DocKey"})

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

@@ -57,6 +57,8 @@ const (
 	YX_PROCESS_KEY string = "yx_report_assign"
 	//计量数据录入
 	JL_DATA_KEY string = "jl_data_apply"
+	// 节能
+	JN_DATA_KEY string = "jn_data_apply"
 )
 
 type TableDetailData struct {

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

@@ -2646,7 +2646,7 @@ func (this *LimsDataEntryController) CheckSubmit() {
 		case "100000168":
 			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
 		case "100000169":
-			processInstanceId = svcActiviti.StartProcess(workflow.YX_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
+			processInstanceId = svcActiviti.StartProcess(workflow.JN_DATA_KEY, strconv.Itoa(dataentrymodel.Id), utils.ToStr(this.User.Id))
 		}
 		if processInstanceId == "" {
 			errinfo.Message = "工作流异常，请联系管理员！"
@@ -2771,7 +2771,7 @@ func (this *LimsDataEntryController) CheckSubmit() {
 					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.JN_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)
@@ -2821,9 +2821,9 @@ func (this *LimsDataEntryController) CheckSubmit() {
 				case "100000151":
 					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
 				case "100000168":
-					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
+					receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
 				case "100000169":
-					receiveVal = svcActiviti.TaskComplete(workflow.YX_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
+					receiveVal = svcActiviti.TaskComplete(workflow.JN_DATA_KEY, strconv.Itoa(dataother.DataEntryId), strconv.Itoa(dataother.AuditorUserId), this.User.Id, "0", dataother.AuditorRemark)
 				}
 				fmt.Println(receiveVal)
 				var errinfo ErrorInfo

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

@@ -31,7 +31,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="被测单位" label-width="120px">
-              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model.trim="formData.TestDepart" placeholder="请输入" style="width: 100%"
+                        :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -730,28 +731,12 @@
         this.jiaoheForm.DataEntryId = this.queryParams.DataEntryId
         this.jiaoheshow = true
       },
-      // 提交校核
-      makesure () {
-        console.log(this.formData.Id, '====')
-        if (!this.formData.Id || this.formData.Id < 0) {
-          this.$message.warning('没有保存，不能提交！')
-          return
-        }
-        this.$confirm('确定提交校核！', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        })
-          .then(() => {
-            this.ProoFreadShow = false
-            this.checkstatus()
-          })
-          .catch(() => {})
-      },
       checkstatus () {
+        console.log('2')
         this.shenhesubmitForm.SuccessStatus = 1
-        this.shenhesubmitForm.DataEntryId = parseInt(this.queryParams.DataEntryId)
+        this.shenhesubmitForm.DataEntryId = parseInt(this.DataEntryId)
         let params = this.shenhesubmitForm
+        console.log('+-=-=-=-=-=')
         this.$axios.put('/limsdataentry/checksubmit/', params)
           .then(res => {
             // response
@@ -775,6 +760,25 @@
             console.error(err)
           })
       },
+      // 提交校核
+      makesure () {
+        console.log(this.formData.Id, '====')
+        if (!this.formData.Id || this.formData.Id < 0) {
+          this.$message.warning('没有保存，不能提交！')
+          return
+        }
+        this.$confirm('确定提交校核！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            this.ProoFreadShow = false
+            console.log('1')
+            this.checkstatus()
+          })
+          .catch(() => {})
+      },
       jiaohecheckstatus () {
         let params = this.jiaoheForm
         this.$axios.put('/limsdataentry/jiaohe/', params)