计量数据录入修改

src/dashoo.cn/backend/api/controllers/limsmetering/limsreportben.go

@@ -154,25 +154,21 @@ func (this *LimsReportBenController) AddEntity() {
 	svc := limsreportben.GetLimsReportBenSessionService(sessions)
 	dataentrymodel.Instrument1 = model.BenMainform.Instrument1
 	dataentrymodel.DetectBasis = model.BenMainform.DetectBasis
-	dataentrymodel.PositionCheck = model.BenMainform.PositionCheck
-	dataentrymodel.CustomerName = model.BenMainform.CustomerName
 	dataentrymodel.Temperature = model.BenMainform.Temperature
 	dataentrymodel.StandardDesc = model.BenMainform.StandardDesc
 	dataentrymodel.ModifiedOn = time.Now()
 	dataentrymodel.ModifiedBy = this.User.Realname
 	dataentrymodel.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 	dataentrycols := []string{
-		"CustomerName",
 		"StandardDesc",
 		"Instrument1",
-		"PositionCheck",
 		"Temperature",
 		"DetectBasis",
 		"ModifiedOn",
 		"ModifiedBy",
 		"ModifiedUserId",
 	}
-	err = svc.UpdateEntityBytbl(this.User.AccCode+LimsDateEntryName, model.BenMainform.DataEntryId, &dataentrymodel, dataentrycols)
+	err = svc.UpdateEntityBywheretbl(this.User.AccCode+LimsDateEntryName, &dataentrymodel, dataentrycols, "Id = "+ utils.ToStr(model.BenMainform.DataEntryId))
 	almodel.MeterRange = model.BenMainform.MeterRange
 	almodel.MeasurementRange = model.BenMainform.MeasurementRange
 	almodel.FaceCheck = model.BenMainform.FaceCheck
@@ -187,8 +183,8 @@ func (this *LimsReportBenController) AddEntity() {
 	almodel.AlarmConcentration = model.BenMainform.AlarmConcentration
 	almodel.InstrumentLevel = model.BenMainform.InstrumentLevel
 	almodel.DielecStrength = model.BenMainform.DielecStrength
-	almodel.EId = model.EId
-	almodel.TaskBalanceId = model.TaskBalanceId
+	almodel.EId = model.BenMainform.EId
+	almodel.TaskBalanceId = model.BenMainform.TaskBalanceId
 	almodel.DataEntryId = dataentrymodel.Id
 	almodel.CreateOn = time.Now()
 	almodel.CreateBy = this.User.Realname
@@ -207,8 +203,8 @@ func (this *LimsReportBenController) AddEntity() {
 			cerentity.EffectDate = model.CertiArrayList[i].EffectDate
 			cerentity.InstrumentNo = model.CertiArrayList[i].InstrumentNo
 			cerentity.StanDevice = model.CertiArrayList[i].StanDevice
-			cerentity.EId = model.EId
-			cerentity.TaskBalanceId = model.TaskBalanceId
+			cerentity.EId = model.BenMainform.EId
+			cerentity.TaskBalanceId = model.BenMainform.TaskBalanceId
 			cerentity.DataEntryId = dataentrymodel.Id
 			cerentity.CreateOn = time.Now()
 			cerentity.CreateBy = this.User.Realname
@@ -226,8 +222,8 @@ func (this *LimsReportBenController) AddEntity() {
 	cerentity2.EffectDate = model.EffectDate
 	cerentity2.InstrumentNo = model.InstrumentNo
 	cerentity2.StanDevice = model.StanDevice
-	cerentity2.EId = model.EId
-	cerentity2.TaskBalanceId = model.TaskBalanceId
+	cerentity2.EId = model.BenMainform.EId
+	cerentity2.TaskBalanceId = model.BenMainform.TaskBalanceId
 	cerentity2.DataEntryId = dataentrymodel.Id
 	cerentity2.CreateOn = time.Now()
 	cerentity2.CreateBy = this.User.Realname
@@ -245,8 +241,8 @@ func (this *LimsReportBenController) AddEntity() {
 			avalentity.Value2 = model.AlertValArrayList[i].Value2
 			avalentity.Value3 = model.AlertValArrayList[i].Value3
 			avalentity.ActionValue = model.AlertValArrayList[i].ActionValue
-			avalentity.EId = model.EId
-			avalentity.TaskBalanceId = model.TaskBalanceId
+			avalentity.EId = model.BenMainform.EId
+			avalentity.TaskBalanceId = model.BenMainform.TaskBalanceId
 			avalentity.DataEntryId = dataentrymodel.Id
 			avalentity.CreateOn = time.Now()
 			avalentity.CreateBy = this.User.Realname
@@ -267,8 +263,8 @@ func (this *LimsReportBenController) AddEntity() {
 			devientity.Value3 = model.DeviationArrayList[i].Value3
 			devientity.AvgValue, _ = strconv.ParseFloat(model.DeviationArrayList[i].AvgValue, 64)
 			devientity.Deviation = model.DeviationArrayList[i].Deviation
-			devientity.EId = model.EId
-			devientity.TaskBalanceId = model.TaskBalanceId
+			devientity.EId = model.BenMainform.EId
+			devientity.TaskBalanceId = model.BenMainform.TaskBalanceId
 			devientity.DataEntryId = dataentrymodel.Id
 			devientity.CreateOn = time.Now()
 			devientity.CreateBy = this.User.Realname
@@ -286,8 +282,8 @@ func (this *LimsReportBenController) AddEntity() {
 	reponseentity.Value2 = model.ResponTimeArrayList[0].Value2
 	reponseentity.Value3 = model.ResponTimeArrayList[0].Value3
 	reponseentity.Deviation = model.ResponTimeArrayList[0].Deviation
-	reponseentity.EId = model.EId
-	reponseentity.TaskBalanceId = model.TaskBalanceId
+	reponseentity.EId = model.BenMainform.EId
+	reponseentity.TaskBalanceId = model.BenMainform.TaskBalanceId
 	reponseentity.DataEntryId = dataentrymodel.Id
 	reponseentity.CreateOn = time.Now()
 	reponseentity.CreateBy = this.User.Realname
@@ -307,8 +303,8 @@ func (this *LimsReportBenController) AddEntity() {
 	repeatentity.Value6 = model.RepeatArrayList[0].Value6
 	repeatentity.AvgValue, _ = strconv.ParseFloat(model.RepeatArrayList[0].AvgValue, 64)
 	repeatentity.RepeatValue = model.RepeatArrayList[0].RepeatValue
-	repeatentity.EId = model.EId
-	repeatentity.TaskBalanceId = model.TaskBalanceId
+	repeatentity.EId = model.BenMainform.EId
+	repeatentity.TaskBalanceId = model.BenMainform.TaskBalanceId
 	repeatentity.DataEntryId = dataentrymodel.Id
 	repeatentity.CreateOn = time.Now()
 	repeatentity.CreateBy = this.User.Realname
@@ -331,8 +327,8 @@ func (this *LimsReportBenController) AddEntity() {
 			shiftentity.Value6 = model.ShiftArrayList[i].Value6
 			shiftentity.ZeroValue = model.ShiftArrayList[i].ZeroValue
 			shiftentity.ShowValue = model.ShiftArrayList[i].ShowValue
-			shiftentity.EId = model.EId
-			shiftentity.TaskBalanceId = model.TaskBalanceId
+			shiftentity.EId = model.BenMainform.EId
+			shiftentity.TaskBalanceId = model.BenMainform.TaskBalanceId
 			shiftentity.DataEntryId = dataentrymodel.Id
 			shiftentity.CreateOn = time.Now()
 			shiftentity.CreateBy = this.User.Realname
@@ -474,6 +470,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 					cerentity.CreateOn = time.Now()
 					cerentity.CreateBy = this.User.Realname
 					cerentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+					cerentity.EId = model.BenMainform.EId
+					cerentity.TaskBalanceId = model.BenMainform.TaskBalanceId
+					cerentity.DataEntryId = dataentrymodel.Id
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity)
 				}
 			}
@@ -510,6 +509,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 			cerentity2.CreateOn = time.Now()
 			cerentity2.CreateBy = this.User.Realname
 			cerentity2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			cerentity2.EId = model.BenMainform.EId
+			cerentity2.TaskBalanceId = model.BenMainform.TaskBalanceId
+			cerentity2.DataEntryId = dataentrymodel.Id
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorCertificateName, &cerentity2)
 		}
 	}
@@ -544,6 +546,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 					avalentity.CreateOn = time.Now()
 					avalentity.CreateBy = this.User.Realname
 					avalentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+					avalentity.EId = model.BenMainform.EId
+					avalentity.TaskBalanceId = model.BenMainform.TaskBalanceId
+					avalentity.DataEntryId = dataentrymodel.Id
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorValueName, &avalentity)
 				}
 			}
@@ -582,6 +587,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 					devientity.CreateOn = time.Now()
 					devientity.CreateBy = this.User.Realname
 					devientity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+					devientity.EId = model.BenMainform.EId
+					devientity.TaskBalanceId = model.BenMainform.TaskBalanceId
+					devientity.DataEntryId = dataentrymodel.Id
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorDeviationName, &devientity)
 				}
 			}
@@ -618,6 +626,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 				reponseentity.CreateOn = time.Now()
 				reponseentity.CreateBy = this.User.Realname
 				reponseentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				reponseentity.EId = model.BenMainform.EId
+				reponseentity.TaskBalanceId = model.BenMainform.TaskBalanceId
+				reponseentity.DataEntryId = dataentrymodel.Id
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorResponseTimeName, &reponseentity)
 			}
 		}
@@ -660,6 +671,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 				repeatentity.CreateOn = time.Now()
 				repeatentity.CreateBy = this.User.Realname
 				repeatentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				repeatentity.EId = model.BenMainform.EId
+				repeatentity.TaskBalanceId = model.BenMainform.TaskBalanceId
+				repeatentity.DataEntryId = dataentrymodel.Id
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorRepeatName, &repeatentity)
 			}
 		}
@@ -704,6 +718,9 @@ func (this *LimsReportBenController) UpdateEntity() {
 					shiftentity.CreateOn = time.Now()
 					shiftentity.CreateBy = this.User.Realname
 					shiftentity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+					shiftentity.EId = model.BenMainform.EId
+					shiftentity.TaskBalanceId = model.BenMainform.TaskBalanceId
+					shiftentity.DataEntryId = dataentrymodel.Id
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+LimsReportAlertorShiftName, &shiftentity)
 				}
 			}

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/alltask.vue

@@ -795,6 +795,62 @@
               query: queryParams
             })
             break
+            //苯气检测报警器检定记录
+          case 'DAYT.ReportAlertorBenDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorbendetect/operation',
+              query: queryParams
+            })
+            break
+            //一氧化碳检测报警器检定记录
+          case 'DAYT.ReportAlertorCarbonDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorcarbondetect/operation',
+              query: queryParams
+            })
+            break
+            //复合气体检测报警器检定记录
+          case 'DAYT.ReportAlertorFHGasDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorfhgasdetect/operation',
+              query: queryParams
+            })
+            break
+            //可燃气体检测报警器检定记录
+          case 'DAYT.ReportAlertorKRGasDetect.Detail':
+            this.$router.push({
+              path: '/lims/reportalertorkrgasdetect/operation',
+              query: queryParams
+            })
+            break
+            //一氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer1CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer1carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //二氧化碳红外气体分析器检定记录
+          case 'DAYT.ReportAnalyzer2CarbonRedGas.Detail':
+            this.$router.push({
+              path: '/lims/reportanalyzer2carbonredgas/operation',
+              query: queryParams
+            })
+            break
+            //电化学氧测定仪检定记录
+          case 'DAYT.ReportDetectorElectOxygen.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorelectoxygen/operation',
+              query: queryParams
+            })
+            break
+            //硫化氢气体检测仪检定记录
+          case 'DAYT.ReportDetectorHSGas.Detail':
+            this.$router.push({
+              path: '/lims/reportdetectorHSgas/operation',
+              query: queryParams
+            })
+            break
           default:
             this.$message.warning('无模板类型相匹配，请重试');
         }

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

@@ -906,9 +906,9 @@
             })
             break
             //硫化氢气体检测仪检定记录
-          case 'DAYT.ReportDetectorHCGas.Detail':
+          case 'DAYT.ReportDetectorHSGas.Detail':
             this.$router.push({
-              path: '/lims/reportdetectorHCgas/operation',
+              path: '/lims/reportdetectorHSgas/operation',
               query: queryParams
             })
             break

src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -872,9 +872,9 @@
             })
             break
             //硫化氢气体检测仪检定记录
-          case 'DAYT.ReportDetectorHCGas.Detail':
+          case 'DAYT.ReportDetectorHSGas.Detail':
             this.$router.push({
-              path: '/lims/reportdetectorHCgas/operation',
+              path: '/lims/reportdetectorHSgas/operation',
               query: queryParams
             })
             break

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

@@ -11,21 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -47,7 +45,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -666,6 +664,8 @@
       this.queryParams.DataEntryId = this.$route.query.deid
       this.DataStatus = this.$route.query.datastatus
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.sign = this.$route.query.sign
       //this.serviceId = this.$route.params.opera;
       this.initDatas();
@@ -680,8 +680,8 @@
     },
     methods: {
       initDatas() {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
+        if (this.formData.DataEntryId) {
+          api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
             if (res.data.alvalitem != null) {
@@ -816,7 +816,6 @@
           row.AvgValue = '0'
         }
       },
-
       //保存信息
       saveEntity() {
         console.log("------this.formData.Id----", this.formData.Id)
@@ -849,7 +848,8 @@
             }
           }
         }
-
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.alerValData.ActionValue = parseInt(this.alerValData.ActionValue)
         // this.alerValData.Value1 = parseInt(this.alerValData.Value1)
         // this.alerValData.Value2 = parseInt(this.alerValData.Value2)
@@ -982,6 +982,10 @@
           console.error(err)
         });
       },
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
 
       jstimehandle(val) {
         if (val === '') {

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

@@ -11,22 +11,20 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <!-- <el-button type="primary" size="mini" @click="saveEntity">保存</el-button> -->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +44,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -373,7 +371,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <!-- </el-collapse-item> -->
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -609,6 +613,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -770,6 +776,8 @@
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
         // this.deviationData.DeviationAbs = parseInt(this.deviationData.DeviationAbs)
         // this.deviationData.DeviationRelative = parseInt(this.deviationData.DeviationRelative)
@@ -869,7 +877,10 @@
           console.error(err)
         });
       },
-
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -11,22 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +43,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -405,6 +402,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -640,6 +644,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -820,6 +826,8 @@
             }
           }
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.alerValData.ActionValue = parseInt(this.alerValData.ActionValue)
         // this.alerValData.Value1 = parseInt(this.alerValData.Value1)
         // this.alerValData.Value2 = parseInt(this.alerValData.Value2)
@@ -948,7 +956,10 @@
           console.error(err)
         });
       },
-
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -11,22 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +43,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -397,6 +394,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -632,6 +636,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -812,6 +818,8 @@
             }
           }
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.alerValData.ActionValue = parseInt(this.alerValData.ActionValue)
         // this.alerValData.Value1 = parseInt(this.alerValData.Value1)
         // this.alerValData.Value2 = parseInt(this.alerValData.Value2)
@@ -939,6 +947,10 @@
           console.error(err)
         });
       },
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
 
       jstimehandle(val) {
         if (val === '') {

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

@@ -11,22 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +43,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -383,6 +380,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -634,6 +638,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -809,6 +815,8 @@
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
         // this.deviationData.Deviation = parseInt(this.deviationData.Deviation)
         // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
@@ -921,6 +929,10 @@
           console.error(err)
         });
       },
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
 
       jstimehandle(val) {
         if (val === '') {

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

@@ -11,22 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+         <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
        <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +43,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -383,6 +380,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -630,6 +634,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -805,6 +811,8 @@
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
         // this.deviationData.Deviation = parseInt(this.deviationData.Deviation)
         // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
@@ -917,6 +925,10 @@
           console.error(err)
         });
       },
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
 
       jstimehandle(val) {
         if (val === '') {

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

@@ -11,22 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +43,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -402,6 +399,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -632,6 +636,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -799,6 +805,8 @@
             this.certificateData[i].StanDevice = this.formData.StanDevice
           }
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue + ""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.alerValData.AllowValue = parseInt(this.alerValData.AllowValue)
         // this.alerValData.MaxValue = parseInt(this.alerValData.MaxValue)
         // this.alerValData.Value1 = parseInt(this.alerValData.Value1)
@@ -923,6 +931,10 @@
           console.error(err)
         });
       },
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
 
       jstimehandle(val) {
         if (val === '') {

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

@@ -11,22 +11,19 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/lims/dataentry'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="backFunc">返回</el-button>
         </span>
       </div>
       <el-form label-width="100px" ref="formData" :model="formData">
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="检定地点:">
-              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.PositionCheck" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -46,7 +43,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%"></el-input>
+              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -342,6 +339,13 @@
           </template>
         </el-table-column>
       </el-table>
+      <template>
+        <div style="text-align: center; margin-top: 15px;">
+          <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+            保存
+          </el-button>
+        </div>
+      </template>
     </el-card>
   </div>
 </template>
@@ -577,6 +581,8 @@
       this.sign = this.$route.query.sign
       // this.serviceId = this.$route.params.opera;
       this.formData.DataEntryId = this.queryParams.DataEntryId
+      this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
+      this.formData.EId = this.queryParams.EId
       this.initDatas();
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -726,6 +732,8 @@
         for (var i = 0; i < this.certificateData.length; i++) {
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
+        this.deviationData.AvgValue = this.deviationData.AvgValue+""
+        this.RepeatData.AvgValue = this.RepeatData.AvgValue + ""
         // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
         // this.deviationData.Deviation = parseInt(this.deviationData.Deviation)
         // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
@@ -822,6 +830,10 @@
           console.error(err)
         });
       },
+      // 返回
+      backFunc() {
+        this.$router.go(-1)
+      },
 
       jstimehandle(val) {
         if (val === '') {