物资修改

src/dashoo.cn/backend/api/business/codecsequence/codecsequenceService.go

@@ -421,6 +421,30 @@ func (s *CodecSequenceService)GetDetailHSSequence(accCode string) string{
 	return seqStr
 }
 
+//石油专用管材钻杆检验记录
+func (s *CodecSequenceService)GetDetailPipeDrillPipeSequence(accCode string) string{
+	seqName := "PipeDrillPipeTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J物Q2.4-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//方钻杆检测记录
+func (s *CodecSequenceService)GetDetailPetroleumPipeSequence(accCode string) string{
+	seqName := "PetroleumPipeTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J物Q2.6-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
+//钻铤检测记录
+func (s *CodecSequenceService)GetDetailDrillCollarSequence(accCode string) string{
+	seqName := "DrillCollarTest"
+	sequence := s.GetSequenceByName(accCode, seqName)
+	seqStr := "J物Q2.3-" + fmt.Sprintf("%03s", strconv.Itoa(sequence))
+	return seqStr
+}
+
 //电动机报表
 func (s *CodecSequenceService)GetReportMotor(accCode string) string{
 	seqName := "MotorReport"

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

@@ -222,6 +222,15 @@ func (this *LimsBalanceService) CreateDataentry(AccCode string, UserNames string
 	case limsdoctemplate.DAYT_REPORTDETECTORHSGAS_DETAIL:
 		//硫化氢气体检测仪检定记录
 		seqStr = codecSvc.GetDetailHSSequence(AccCode)
+	case limsdoctemplate.DAYT_PIPEDRILLPIPE_DETAIL:
+		//石油专用管材钻杆检验记录
+		seqStr = codecSvc.GetDetailPipeDrillPipeSequence(AccCode)
+	case limsdoctemplate.DAYT_PETROLEUMPIPE_DETAIL:
+		//方钻杆检测记录
+		seqStr = codecSvc.GetDetailPetroleumPipeSequence(AccCode)
+	case limsdoctemplate.DAYT_DRILLCOLLAR_DETAIL:
+		//钻铤检测记录
+		seqStr = codecSvc.GetDetailDrillCollarSequence(AccCode)
 	}
 	//根据分配人员创建多条数据录入记录
 	ConUserIdList := strings.Split(balancedata.ConUserId, ",")

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

@@ -92,7 +92,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice" v-model="formData.InstrumentNo" clearable placeholder="请选择"
+                @change="chooseCertify" style="width: 100%">
+                <el-option v-for="item in StanDeviceoptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -131,7 +136,12 @@
       <el-form label-width="100px" ref="certificateForm" :model="formCertificateData">
         <el-col :span="8">
           <el-form-item label="标准器名称:">
-            <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select ref="refDevice2" v-model="formCertificateData.InstrumentNo" clearable placeholder="请选择"
+              @change="chooseCertify2" style="width: 100%">
+              <el-option v-for="item in StanDeviceoptions2" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+            <!-- <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -207,26 +217,26 @@
         <el-table-column align="center" label="实测报警值（%LEL）">
           <el-table-column align="center" label="" prop="Value1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column prop="ActionValue" align="center" label="报警动作值（%LEL）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini">
             </el-input>
           </template>
         </el-table-column>
@@ -240,39 +250,39 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="Deviation" label="示值误差（%FS）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
@@ -286,32 +296,32 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6  mol/mol)" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="时间" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
@@ -326,57 +336,57 @@
       <el-table :data="RepeatData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value4" label="4">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value4"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value4"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value5" label="5">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value5"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value5"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value6" label="6">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value6"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value6"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini">
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini">
               </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="RepeatValue" label="重复性（%）" width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
@@ -392,55 +402,55 @@
         </el-table-column>
         <el-table-column prop="value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="1h   （10min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="2h   （20min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="3h   （30min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value4" align="center" label="4h   （40min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value5" align="center" label="5h   （50min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value5" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value6" align="center" label="6h   （60min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value6" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（%FS）" width="135">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%FS）" width="135">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini">
+            <el-input type="number" step="0.1" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini">
             </el-input>
           </template>
         </el-table-column>
@@ -495,6 +505,9 @@
       return {
         ProoFreadShow: false,
         acceptUsers: [],
+        DeviceList: [],
+        StanDeviceoptions: [],
+        StanDeviceoptions2: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
@@ -518,7 +531,7 @@
           MeterRange: '',
           DataEntryCode: '',
           MeasurementRange: '',
-          DetectBasis: '',
+          DetectBasis: 'JJG 693-2011《 可燃气体检测报警器》',
           FaceCheck: '',
           FlagCheck: '',
           ElectrifyCheck: '',
@@ -531,7 +544,7 @@
           TestDepartId: 0,
           Instrument1: '',
           Temperature: '',
-          StandardDesc: '',
+          StandardDesc: '可燃气体检测报警器检定装置',
           StanDevice: '',
           RelativeHumanity: '',
           ManuCompany: '',
@@ -735,8 +748,9 @@
       this.formData.EId = this.queryParams.EId
       this.sign = this.$route.query.sign
       //this.serviceId = this.$route.params.opera;
-      this.initDatas();
+      this.initDatas()
       this.getUsersByRole()
+      this.getdevice()
       //this.getDictOptions();
       // console.log(this.serviceId);
       // if (this.serviceId != 'add' && this.serviceId > 0) {
@@ -753,6 +767,8 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》'
+            this.formData.StandardDesc = '可燃气体检测报警器检定装置'
             if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
               this.formData.CheckDate = new Date();
             }
@@ -772,7 +788,9 @@
               this.formCertificateData.CerNum = res.data.ceritem[3].CerNum
               this.formCertificateData.Uncertainty = res.data.ceritem[3].Uncertainty
               this.formCertificateData.EffectDate = res.data.ceritem[3].EffectDate
+              this.formCertificateData.InstrumentNo = res.data.ceritem[3].StanDevice
               this.formData.StanDevice = res.data.ceritem[0].StanDevice
+              this.formData.InstrumentNo = res.data.ceritem[0].StanDevice
             }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
@@ -810,16 +828,7 @@
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i].ValueType = res.data.shiftitem[i].ValueType;
-                this.ShiftData[i].Value0 = res.data.shiftitem[i].Value0;
-                this.ShiftData[i].Value1 = res.data.shiftitem[i].Value1;
-                this.ShiftData[i].Value2 = res.data.shiftitem[i].Value2;
-                this.ShiftData[i].Value3 = res.data.shiftitem[i].Value3;
-                this.ShiftData[i].Value4 = res.data.shiftitem[i].Value4;
-                this.ShiftData[i].Value5 = res.data.shiftitem[i].Value5;
-                this.ShiftData[i].Value6 = res.data.shiftitem[i].Value6;
-                this.ShiftData[i].ZeroValue = res.data.shiftitem[i].ZeroValue;
-                this.ShiftData[i].ShowValue = res.data.shiftitem[i].ShowValue;
+                this.ShiftData[i] = res.data.shiftitem[i];
               }
             }
           }).catch(err => {
@@ -827,6 +836,81 @@
           });
         }
       },
+      getdevice() {
+        let _this = this
+        _this.$axios.get('/instrument/initlistdata', {})
+          .then(function (response) {
+            console.log("jkkfddf", response.data.items)
+            _this.DeviceList = response.data.items
+            console.log("-_this._this.DeviceList------", _this.DeviceList)
+            if (!_this.DeviceList) {
+              return false
+            }
+            for (var i = 0; i < _this.DeviceList.length; i++) {
+              let devicelist = _this.DeviceList[i]
+              instapi.getList(_this.DeviceList[i].Id, "", _this.$axios).then(res => {
+                if (res.data.currentItemCount === 1) {
+                  _this.StanDeviceoptions2.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                } else {
+                  _this.StanDeviceoptions.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                }
+              }).catch(err => {
+                console.error(err)
+              })
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+      chooseCertify2(value) {
+        let _this = this
+        let obj = {};
+        obj = this.StanDeviceoptions2.find((item) => {
+          return item.id === value;
+        });
+        this.formCertificateData.StanDevice = obj.name
+        let instrumentno = value
+        //访问接口
+        instapi.getList(instrumentno, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          this.formCertificateData.CerNum = this.certificateDataform[0].CerNum
+          this.formCertificateData.Uncertainty = this.certificateDataform[0].Uncertainty
+          this.formCertificateData.StandVal = this.certificateDataform[0].StandVal
+          this.formCertificateData.EffectDate = this.certificateDataform[0].EffectDate
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseCertify(value) {
+        let obj = {};
+        obj = this.StanDeviceoptions.find((item) => {
+          return item.id === value;
+        });
+        this.formData.StanDevice = obj.name
+        console.log(obj.name);
+        let _this = this
+        _this.InstrumentNo = value
+        //访问接口
+        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          for (var i = 0; i < this.certificateDataform.length; i++) {
+            this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
+            this.certificateData[i].Uncertainty = this.certificateDataform[i].Uncertainty
+            this.certificateData[i].StandVal = this.certificateDataform[i].StandVal
+            this.certificateData[i].EffectDate = this.certificateDataform[i].EffectDate
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取校核人列表
       getUsersByRole() {
         // request

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

@@ -21,12 +21,14 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="编码:">
-              <el-input v-model="formData.DataEntryCode" placeholder="请输入" style="width: 100%" :disabled="true"></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%" :disabled="true"></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">
@@ -53,7 +55,8 @@
           </el-col>
           <el-col :span="16">
             <el-form-item label="送检单位:">
-              <el-input v-model="formData.CustomerName" placeholder="请输入" style="width: 100%" :disabled="true"></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">
@@ -88,7 +91,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice" v-model="formData.InstrumentNo" clearable placeholder="请选择"
+                @change="chooseCertify" style="width: 100%">
+                <el-option v-for="item in StanDeviceoptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -127,7 +135,12 @@
       <el-form label-width="100px" ref="certificateForm" :model="formCertificateData">
         <el-col :span="8">
           <el-form-item label="标准器名称:">
-            <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select ref="refDevice2" v-model="formCertificateData.InstrumentNo" clearable placeholder="请选择"
+              @change="chooseCertify2" style="width: 100%">
+              <el-option v-for="item in StanDeviceoptions2" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+            <!-- <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -147,8 +160,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="有效期至:">
-            <el-date-picker style="width: 100%" v-model="formCertificateData.EffectDate" type="date" format="yyyy 年 MM 月 dd 日"
-              placeholder="请选择">
+            <el-date-picker style="width: 100%" v-model="formCertificateData.EffectDate" type="date"
+              format="yyyy 年 MM 月 dd 日" placeholder="请选择">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -194,42 +207,46 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6 mol/mol）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini" :disabled="true"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"
+              :disabled="true"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（×10-6 mol/mol）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini" :disabled="true"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"
+                :disabled="true"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="DeviationRelative" label="绝对误差（×10-6 mol/mol）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.DeviationRelative" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.DeviationRelative" style="width: 100%"
+              size="mini" :disabled="true"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="DeviationAbs" label="相对误差 （%）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.DeviationAbs" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.DeviationAbs" style="width: 100%" size="mini" :disabled="true">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -244,28 +261,33 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6  mol/mol)" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="时间" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini">
+              </el-input>
             </template>
           </el-table-column>
         </el-table-column>
@@ -281,55 +303,58 @@
       <el-table :data="RepeatData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini" :disabled="true">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value4" label="4">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value4"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value4"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value5" label="5">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value5"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value5"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value6" label="6">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value6"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value6"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini" :disabled="true">
+              </el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="RepeatValue" label="重复性（%）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini" :disabled="true">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -346,43 +371,51 @@
         </el-table-column>
         <el-table-column prop="value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="1h   （15min）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="2h   （30min）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="3h   （45min）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value4" align="center" label="4h   （60min）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（×10-6 mol/mol）" min-width="170">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%）" min-width="130">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini">
+            </el-input>
           </template>
         </el-table-column>
       </el-table>
       <template>
         <div style="text-align: center; margin-top: 15px;">
-          <el-button type="primary" size="small" @click="saveEntity" :disabled="DataStatus != 0 && DataStatus != 5&& DataStatus!=3"><i class="el-icon-circle-check"></i>
+          <el-button type="primary" size="small" @click="saveEntity"
+            :disabled="DataStatus != 0 && DataStatus != 5&& DataStatus!=3"><i class="el-icon-circle-check"></i>
             保存
           </el-button>
         </div>
@@ -418,6 +451,7 @@
     mapGetters
   } from 'vuex'
   import api from '@/api/meter/reportalertorcarbon'
+  import instapi from '@/api/system/instrument'
   export default {
     computed: {
       ...mapGetters({
@@ -429,6 +463,9 @@
     data() {
       return {
         ProoFreadShow: false,
+        DeviceList: [],
+        StanDeviceoptions: [],
+        StanDeviceoptions2: [],
         acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
@@ -453,7 +490,7 @@
           MeterRange: '',
           DataEntryCode: '',
           MeasurementRange: '',
-          DetectBasis: '',
+          DetectBasis: 'JJG 915-2008《一氧化碳检测报警器》检定规程',
           FaceCheck: '',
           FlagCheck: '',
           ElectrifyCheck: '',
@@ -466,7 +503,7 @@
           TestDepartId: 0,
           Instrument1: '',
           Temperature: '',
-          StandardDesc: '',
+          StandardDesc: '一氧化碳检测报警器检定装置',
           StanDevice: '',
           RelativeHumanity: '',
           ManuCompany: '',
@@ -557,7 +594,7 @@
         //示值误差及响应时间
         deviationData: [{
           Id: 0,
-          GasValue: '',
+          GasValue: 55,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -567,7 +604,7 @@
           Deviation: '0'
         }, {
           Id: 0,
-          GasValue: '',
+          GasValue: 302,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -577,7 +614,7 @@
           Deviation: '0'
         }, {
           Id: 0,
-          GasValue: '',
+          GasValue: 693,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -604,21 +641,9 @@
           Deviation: ''
         }],
         //重复性
-        RepeatForm: {
-          Id: 0,
-          GasValue: '',
-          Value1: '',
-          Value2: '',
-          Value3: '',
-          Value4: '',
-          Value5: '',
-          Value6: '',
-          AvgValue: '',
-          RepeatValue: ''
-        },
         RepeatData: [{
           Id: 0,
-          GasValue: '',
+          GasValue: 693,
           Value1: '',
           Value2: '',
           Value3: '',
@@ -632,7 +657,7 @@
         ShiftData: [{
           Id: 0,
           ValueType: '零点示值',
-          value0: '',
+          Value0: '',
           Value1: '',
           Value2: '',
           Value3: '',
@@ -670,8 +695,9 @@
       this.formData.DataEntryId = this.queryParams.DataEntryId
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
-      this.initDatas();
+      this.initDatas()
       this.getUsersByRole()
+      this.getdevice()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -682,12 +708,14 @@
     },
     methods: {
       initDatas() {
-         console.log("------re3s------", this.formData)
+        console.log("------re3s------", this.formData)
         if (this.formData.DataEntryId) {
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
-            if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
+            this.formData.DetectBasis = 'JJG 915-2008《一氧化碳检测报警器》检定规程'
+            this.formData.StandardDesc = '一氧化碳检测报警器检定装置'
+            if (this.formData.CheckDate == "0001-01-01T00:00:00Z") {
               this.formData.CheckDate = new Date();
             }
             if (res.data.ceritem != null) {
@@ -717,8 +745,9 @@
                 this.deviationData[i].Value3 = res.data.deviitem[i].Value3;
                 this.deviationData[i].AvgValue = res.data.deviitem[i].AvgValue + "";
                 this.deviationData[i].DeviationAbs = res.data.deviitem[i].DeviationAbs;
-                this.deviationData[i].DeviationRelative = res.data.deviitem[i].DeviationRelative;
-                this.deviationData[i].Deviation = res.data.deviitem[i].Deviation;
+                this.formCertificateData.InstrumentNo = res.data.ceritem[3].StanDevice
+                this.formData.StanDevice = res.data.ceritem[0].StanDevice
+                this.formData.InstrumentNo = res.data.ceritem[0].StanDevice
               }
             }
             if (res.data.responitem != null) {
@@ -735,16 +764,7 @@
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i].ValueType = res.data.shiftitem[i].ValueType;
-                this.ShiftData[i].value0 = res.data.shiftitem[i].value0;
-                this.ShiftData[i].Value1 = res.data.shiftitem[i].Value1;
-                this.ShiftData[i].Value2 = res.data.shiftitem[i].Value2;
-                this.ShiftData[i].Value3 = res.data.shiftitem[i].Value3;
-                this.ShiftData[i].Value4 = res.data.shiftitem[i].Value4;
-                this.ShiftData[i].Value5 = res.data.shiftitem[i].Value5;
-                this.ShiftData[i].Value6 = res.data.shiftitem[i].Value6;
-                this.ShiftData[i].ZeroValue = res.data.shiftitem[i].ZeroValue;
-                this.ShiftData[i].ShowValue = res.data.shiftitem[i].ShowValue;
+                this.ShiftData[i] = res.data.shiftitem[i]
               }
             }
           }).catch(err => {
@@ -752,6 +772,83 @@
           });
         }
       },
+      getdevice() {
+        let _this = this
+        _this.$axios.get('/instrument/initlistdata', {})
+          .then(function (response) {
+            console.log("jkkfddf", response.data.items)
+            _this.DeviceList = response.data.items
+            console.log("-_this._this.DeviceList------", _this.DeviceList)
+            if (!_this.DeviceList) {
+              return false
+            }
+            for (var i = 0; i < _this.DeviceList.length; i++) {
+              let devicelist = _this.DeviceList[i]
+              instapi.getList(_this.DeviceList[i].Id, "", _this.$axios).then(res => {
+                if (res.data.currentItemCount === 1) {
+                  _this.StanDeviceoptions2.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                } else {
+                  _this.StanDeviceoptions.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                }
+              }).catch(err => {
+                console.error(err)
+              })
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+      chooseCertify2(value) {
+        let _this = this
+        let obj = {};
+        obj = this.StanDeviceoptions2.find((item) => {
+          return item.id === value;
+        });
+        this.formCertificateData.StanDevice = obj.name
+        this.formCertificateData.InstrumentNo = value
+        let instrumentno = value
+        //访问接口
+        instapi.getList(instrumentno, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          this.formCertificateData.CerNum = this.certificateDataform[0].CerNum
+          this.formCertificateData.Uncertainty = this.certificateDataform[0].Uncertainty
+          this.formCertificateData.StandVal = this.certificateDataform[0].StandVal
+          this.formCertificateData.EffectDate = this.certificateDataform[0].EffectDate
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseCertify(value) {
+        let obj = {};
+        obj = this.StanDeviceoptions.find((item) => {
+          return item.id === value;
+        });
+        this.formData.StanDevice = obj.name
+        this.formData.InstrumentNo = value
+        console.log(obj.name);
+        let _this = this
+        _this.InstrumentNo = value
+        //访问接口
+        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          for (var i = 0; i < this.certificateDataform.length; i++) {
+            this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
+            this.certificateData[i].Uncertainty = this.certificateDataform[i].Uncertainty
+            this.certificateData[i].StandVal = this.certificateDataform[i].StandVal
+            this.certificateData[i].EffectDate = this.certificateDataform[i].EffectDate
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取校核人列表
       getUsersByRole() {
         // request
@@ -803,10 +900,15 @@
           sum = sum + parseInt(row.Value3)
         }
         if (divisor !== 0) {
-          row.AvgValue = (sum / divisor).toFixed(2)
+          row.AvgValue = (sum / divisor).toFixed(1)
         } else {
           row.AvgValue = '0'
         }
+        if (row.AvgValue !== '' && parseInt(row.AvgValue) !== 0) {
+          row.DeviationAbs = Number((row.AvgValue - row.GasValue).toFixed(1))
+        } else {
+          row.DeviationAbs = 0
+        }
       },
       getRepeValueAvg(row) {
         var divisor = 0
@@ -836,13 +938,32 @@
           sum = sum + parseInt(row.Value6)
         }
         if (divisor !== 0) {
-          row.AvgValue = (sum / divisor).toFixed(2)
+          row.AvgValue = (sum / divisor).toFixed(1)
         } else {
           row.AvgValue = '0'
         }
+        if (row.AvgValue !== '' && parseInt(row.AvgValue) !== 0 &&
+          row.Value1 !== '' && parseInt(row.Value1) !== 0 &&
+          row.Value2 !== '' && parseInt(row.Value2) !== 0 &&
+          row.Value3 !== '' && parseInt(row.Value3) !== 0 &&
+          row.Value4 !== '' && parseInt(row.Value4) !== 0 &&
+          row.Value5 !== '' && parseInt(row.Value5) !== 0 &&
+          row.Value6 !== '' && parseInt(row.Value6) !== 0) {
+          var v1 = (row.AvgValue - row.Value1).toFixed(1)
+          var v2 = (row.AvgValue - row.Value2).toFixed(1)
+          var v3 = (row.AvgValue - row.Value3).toFixed(1)
+          var v4 = (row.AvgValue - row.Value4).toFixed(1)
+          var v5 = (row.AvgValue - row.Value5).toFixed(1)
+          var v6 = (row.AvgValue - row.Value6).toFixed(1)
+          var sumsq = v1 * v1 + v2 * v2 + v3 * v3 + v4 * v4 + v5 * v5 + v6 * v6
+          var sqthen = Math.sqrt(sumsq / 5)
+          row.RepeatValue = Number((sqthen / row.AvgValue * 100).toFixed(1))
+        } else {
+          row.RepeatValue = 0
+        }
       },
       setProoFreadShow() {
-          this.ProoFreadShow = true
+        this.ProoFreadShow = true
       },
       // 提交校核
       makesure() {
@@ -860,7 +981,7 @@
       },
       // 添加运行记录
       addRunRecord() {
-        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId,).then(res => {
+        this.$axios.post('/limsZuhq/addRunRecord/' + this.formData.DataEntryId, ).then(res => {
 
         }).catch(error => {
           console.log(error)
@@ -913,28 +1034,9 @@
       addEntityMain() {
         console.log("-------this.formdata---", this.formData)
         for (var i = 0; i < this.certificateData.length; i++) {
+          this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           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)
-        // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
-        // this.responseTimeData.Value1 = parseInt(this.responseTimeData.Value1)
-        // this.responseTimeData.Value2 = parseInt(this.responseTimeData.Value2)
-        // this.responseTimeData.Value3 = parseInt(this.responseTimeData.Value3)
-        // this.responseTimeData.Deviation = parseInt(this.responseTimeData.Deviation)
-        // this.RepeatData.GasValue = parseInt(this.RepeatData.GasValue)
-        // this.RepeatData.RepeatValue = parseInt(this.RepeatData.RepeatValue)
-        // this.ShiftData.Value1 = parseInt(this.ShiftData.Value1)
-        // this.ShiftData.Value2 = parseInt(this.ShiftData.Value2)
-        // this.ShiftData.Value3 = parseInt(this.ShiftData.Value3)
-        // this.ShiftData.Value4 = parseInt(this.ShiftData.Value4)
-        // this.ShiftData.Value5 = parseInt(this.ShiftData.Value5)
-        // this.ShiftData.Value6 = parseInt(this.ShiftData.Value6)
-        // this.ShiftData.ZeroValue = parseInt(this.ShiftData.ZeroValue)
-        // this.ShiftData.ShowValue = parseInt(this.ShiftData.ShowValue)
         let allform = {
           BenMainform: this.formData,
           CertiArrayList: this.certificateData, //添加证书数据
@@ -969,25 +1071,9 @@
       updateEntity() {
         console.log("------updatethis.formData.Id----", this.formData.Id)
         for (var i = 0; i < this.certificateData.length; i++) {
+          this.certificateData[i].InstrumentNo = this.formData.InstrumentNo
           this.certificateData[i].StanDevice = this.formData.StanDevice
         }
-        // this.deviationData.GasValue = parseInt(this.deviationData.GasValue)
-        // this.deviationData.Deviation = parseInt(this.deviationData.Deviation)
-        // this.responseTimeData.GasValue = parseInt(this.responseTimeData.GasValue)
-        // this.responseTimeData.Value1 = parseInt(this.responseTimeData.Value1)
-        // this.responseTimeData.Value2 = parseInt(this.responseTimeData.Value2)
-        // this.responseTimeData.Value3 = parseInt(this.responseTimeData.Value3)
-        // this.responseTimeData.Deviation = parseInt(this.responseTimeData.Deviation)
-        // this.RepeatData.GasValue = parseInt(this.RepeatData.GasValue)
-        // this.RepeatData.RepeatValue = parseInt(this.RepeatData.RepeatValue)
-        // this.ShiftData.Value1 = parseInt(this.ShiftData.Value1)
-        // this.ShiftData.Value2 = parseInt(this.ShiftData.Value2)
-        // this.ShiftData.Value3 = parseInt(this.ShiftData.Value3)
-        // this.ShiftData.Value4 = parseInt(this.ShiftData.Value4)
-        // this.ShiftData.Value5 = parseInt(this.ShiftData.Value5)
-        // this.ShiftData.Value6 = parseInt(this.ShiftData.Value6)
-        // this.ShiftData.ZeroValue = parseInt(this.ShiftData.ZeroValue)
-        // this.ShiftData.ShowValue = parseInt(this.ShiftData.ShowValue)
         let allform = {
           BenMainform: this.formData,
           CertiArrayList: this.certificateData, //添加证书数据
@@ -997,6 +1083,7 @@
           ShiftArrayList: this.ShiftData, //添加漂移数据
         }
         allform = Object.assign(allform, this.formCertificateData)
+        console.log("-----allform-----",allform)
         api.updateEntity(this.formData.DataEntryId, allform, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

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

@@ -87,7 +87,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice" v-model="formData.InstrumentNo" clearable placeholder="请选择"
+                @change="chooseCertify" style="width: 100%">
+                <el-option v-for="item in StanDeviceoptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -126,7 +131,12 @@
       <el-form label-width="100px" ref="certificateForm" :model="formCertificateData">
         <el-col :span="8">
           <el-form-item label="标准器名称:">
-            <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+            <el-select ref="refDevice2" v-model="formCertificateData.InstrumentNo" clearable placeholder="请选择"
+              @change="chooseCertify2" style="width: 100%">
+              <el-option v-for="item in StanDeviceoptions2" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+            <!-- <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -197,23 +207,23 @@
         <el-table-column align="center" label="实测报警值（%LEL）">
           <el-table-column align="center" label="" prop="Value1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" label="" prop="Value3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column prop="ActionValue" align="center" label="报警动作值（%LEL）" min-width="90">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ActionValue" style="width: 160px" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -226,37 +236,37 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3"
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="Deviation" label="示值误差（%FS）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -269,28 +279,28 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6  mol/mol)" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="时间" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
@@ -304,55 +314,55 @@
       <el-table :data="RepeatData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（%LEL）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="仪器示值（%LEL）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value4" label="4">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value4"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value4"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value5" label="5">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value5"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value5"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value6" label="6">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value6"
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value6"
                 style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="RepeatValue" label="重复性（%）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -367,47 +377,47 @@
         </el-table-column>
         <el-table-column prop="value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="1h   （10min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="2h   （20min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="3h   （30min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value4" align="center" label="4h   （40min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value5" align="center" label="5h   （50min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value6" align="center" label="6h   （60min）" min-width="80">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（%FS）" min-width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%FS）" min-width="150">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -461,6 +471,9 @@
       return {
         ProoFreadShow: false,
         acceptUsers: [],
+        DeviceList: [],
+        StanDeviceoptions: [],
+        StanDeviceoptions2: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
@@ -484,7 +497,7 @@
           MeterRange: '',
           DataEntryCode: '',
           MeasurementRange: '',
-          DetectBasis: '',
+          DetectBasis: 'JJG 693-2011《 可燃气体检测报警器》',
           FaceCheck: '',
           FlagCheck: '',
           ElectrifyCheck: '',
@@ -497,7 +510,7 @@
           TestDepartId: 0,
           Instrument1: '',
           Temperature: '',
-          StandardDesc: '',
+          StandardDesc: '可燃气体检测报警器检定装置',
           StanDevice: '',
           RelativeHumanity: '',
           ManuCompany: '',
@@ -701,8 +714,9 @@
       this.formData.DataEntryId = this.queryParams.DataEntryId
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
-      this.initDatas();
+      this.initDatas()
       this.getUsersByRole()
+      this.getdevice()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -717,6 +731,8 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------res------", res.data)
             this.formData = res.data.mainitem;
+            this.formData.DetectBasis = 'JJG 693-2011《 可燃气体检测报警器》'
+            this.formData.StandardDesc = '可燃气体检测报警器检定装置'
             if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
               this.formData.CheckDate = new Date();
             }
@@ -736,7 +752,9 @@
               this.formCertificateData.CerNum = res.data.ceritem[3].CerNum
               this.formCertificateData.Uncertainty = res.data.ceritem[3].Uncertainty
               this.formCertificateData.EffectDate = res.data.ceritem[3].EffectDate
+              this.formCertificateData.InstrumentNo = res.data.ceritem[3].StanDevice
               this.formData.StanDevice = res.data.ceritem[0].StanDevice
+              this.formData.InstrumentNo = res.data.ceritem[0].StanDevice
             }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
@@ -774,16 +792,7 @@
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i].ValueType = res.data.shiftitem[i].ValueType;
-                this.ShiftData[i].value0 = res.data.shiftitem[i].value0;
-                this.ShiftData[i].Value1 = res.data.shiftitem[i].Value1;
-                this.ShiftData[i].Value2 = res.data.shiftitem[i].Value2;
-                this.ShiftData[i].Value3 = res.data.shiftitem[i].Value3;
-                this.ShiftData[i].Value4 = res.data.shiftitem[i].Value4;
-                this.ShiftData[i].Value5 = res.data.shiftitem[i].Value5;
-                this.ShiftData[i].Value6 = res.data.shiftitem[i].Value6;
-                this.ShiftData[i].ZeroValue = res.data.shiftitem[i].ZeroValue;
-                this.ShiftData[i].ShowValue = res.data.shiftitem[i].ShowValue;
+                this.ShiftData[i] = res.data.shiftitem[i];
               }
             }
           }).catch(err => {
@@ -791,6 +800,81 @@
           });
         }
       },
+      getdevice() {
+        let _this = this
+        _this.$axios.get('/instrument/initlistdata', {})
+          .then(function (response) {
+            console.log("jkkfddf", response.data.items)
+            _this.DeviceList = response.data.items
+            console.log("-_this._this.DeviceList------", _this.DeviceList)
+            if (!_this.DeviceList) {
+              return false
+            }
+            for (var i = 0; i < _this.DeviceList.length; i++) {
+              let devicelist = _this.DeviceList[i]
+              instapi.getList(_this.DeviceList[i].Id, "", _this.$axios).then(res => {
+                if (res.data.currentItemCount === 1) {
+                  _this.StanDeviceoptions2.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                } else {
+                  _this.StanDeviceoptions.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                }
+              }).catch(err => {
+                console.error(err)
+              })
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+      chooseCertify2(value) {
+        let _this = this
+        let obj = {};
+        obj = this.StanDeviceoptions2.find((item) => {
+          return item.id === value;
+        });
+        this.formCertificateData.StanDevice = obj.name
+        let instrumentno = value
+        //访问接口
+        instapi.getList(instrumentno, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          this.formCertificateData.CerNum = this.certificateDataform[0].CerNum
+          this.formCertificateData.Uncertainty = this.certificateDataform[0].Uncertainty
+          this.formCertificateData.StandVal = this.certificateDataform[0].StandVal
+          this.formCertificateData.EffectDate = this.certificateDataform[0].EffectDate
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseCertify(value) {
+        let obj = {};
+        obj = this.StanDeviceoptions.find((item) => {
+          return item.id === value;
+        });
+        this.formData.StanDevice = obj.name
+        console.log(obj.name);
+        let _this = this
+        _this.InstrumentNo = value
+        //访问接口
+        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          for (var i = 0; i < this.certificateDataform.length; i++) {
+            this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
+            this.certificateData[i].Uncertainty = this.certificateDataform[i].Uncertainty
+            this.certificateData[i].StandVal = this.certificateDataform[i].StandVal
+            this.certificateData[i].EffectDate = this.certificateDataform[i].EffectDate
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取校核人列表
       getUsersByRole() {
         // request

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

@@ -92,7 +92,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice" v-model="formData.InstrumentNo" clearable placeholder="请选择"
+                @change="chooseCertify" style="width: 100%">
+                <el-option v-for="item in StanDeviceoptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -131,7 +136,12 @@
         <el-form label-width="100px" ref="certificateForm" :model="formCertificateData">
           <el-col :span="8">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice2" v-model="formCertificateData.InstrumentNo" clearable placeholder="请选择"
+              @change="chooseCertify2" style="width: 100%">
+              <el-option v-for="item in StanDeviceoptions2" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+              <!-- <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -188,34 +198,34 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6 mol/mol）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（×10-6mol/mol）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="Deviation" label="示值引用误差  (%FS)" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -228,28 +238,28 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6  mol/mol)" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="时间" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
@@ -263,49 +273,49 @@
       <el-table :data="RepeatData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值（×10-6 mol/mol）" width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值（×10-6mol/mol）" min-width="180">
           <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value4" label="4">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value5" label="5">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value5" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value6" label="6">
             <template slot-scope="scope">
-              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getRepeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value6" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="RepeatValue" label="重复性（%）" min-width="180">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.RepeatValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -320,37 +330,37 @@
         </el-table-column>
        <el-table-column prop="value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="Value1" align="center" label="2h   （15min）" min-width="90">
          <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="4h   （30min）" min-width="90">
        <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="6h   （45min）" min-width="90">
          <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value4" align="center" label="8h   （60min）" min-width="90">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.Value4" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（×10-6 mol/mol）" min-width="170">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%）" min-width="130">
          <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.trim="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.trim="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -365,27 +375,27 @@
         </el-table-column>
         <el-table-column prop="value0" align="center" label="C0">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="C1" min-width="90">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="C2" min-width="90">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="C3" min-width="90">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="OtherValue" label="干扰误差(%FS)" min-width="130">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.OtherValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.OtherValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -439,6 +449,9 @@
       return {
         ProoFreadShow: false,
         acceptUsers: [],
+        DeviceList: [],
+        StanDeviceoptions: [],
+        StanDeviceoptions2: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
@@ -462,7 +475,7 @@
           MeterRange: '',
           DataEntryCode: '',
           MeasurementRange: '',
-          DetectBasis: '',
+          DetectBasis: 'JJG 635-2011《一氧化碳/二氧化碳红外气体分析器》检定规程',
           FaceCheck: '',
           FlagCheck: '',
           ElectrifyCheck: '',
@@ -475,7 +488,7 @@
           TestDepartId: 0,
           Instrument1: '',
           Temperature: '',
-          StandardDesc: '',
+          StandardDesc: '一氧化碳/二氧化碳红外气体分析器检定装置',
           StanDevice: '',
           RelativeHumanity: '',
           ManuCompany: '',
@@ -697,8 +710,9 @@
       this.formData.DataEntryId = this.queryParams.DataEntryId
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
-      this.initDatas();
+      this.initDatas()
       this.getUsersByRole()
+      this.getdevice()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -713,6 +727,8 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------resco------", res.data)
             this.formData = res.data.mainitem;
+            this.formData.DetectBasis = 'JJG 635-2011《一氧化碳/二氧化碳红外气体分析器》检定规程'
+            this.formData.StandardDesc = '一氧化碳/二氧化碳红外气体分析器检定装置'
             if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
               this.formData.CheckDate = new Date();
             }
@@ -732,7 +748,9 @@
               this.formCertificateData.CerNum = res.data.ceritem[3].CerNum
               this.formCertificateData.Uncertainty = res.data.ceritem[3].Uncertainty
               this.formCertificateData.EffectDate = res.data.ceritem[3].EffectDate
+              this.formCertificateData.InstrumentNo = res.data.ceritem[3].StanDevice
               this.formData.StanDevice = res.data.ceritem[0].StanDevice
+              this.formData.InstrumentNo = res.data.ceritem[0].StanDevice
             }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
@@ -770,16 +788,7 @@
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i].ValueType = res.data.shiftitem[i].ValueType;
-                this.ShiftData[i].value0 = res.data.shiftitem[i].value0;
-                this.ShiftData[i].Value1 = res.data.shiftitem[i].Value1;
-                this.ShiftData[i].Value2 = res.data.shiftitem[i].Value2;
-                this.ShiftData[i].Value3 = res.data.shiftitem[i].Value3;
-                this.ShiftData[i].Value4 = res.data.shiftitem[i].Value4;
-                this.ShiftData[i].Value5 = res.data.shiftitem[i].Value5;
-                this.ShiftData[i].Value6 = res.data.shiftitem[i].Value6;
-                this.ShiftData[i].ZeroValue = res.data.shiftitem[i].ZeroValue;
-                this.ShiftData[i].ShowValue = res.data.shiftitem[i].ShowValue;
+                this.ShiftData[i] = res.data.shiftitem[i];
               }
             }
             if (res.data.otheritem != null) {
@@ -792,6 +801,81 @@
           });
         }
       },
+      getdevice() {
+        let _this = this
+        _this.$axios.get('/instrument/initlistdata', {})
+          .then(function (response) {
+            console.log("jkkfddf", response.data.items)
+            _this.DeviceList = response.data.items
+            console.log("-_this._this.DeviceList------", _this.DeviceList)
+            if (!_this.DeviceList) {
+              return false
+            }
+            for (var i = 0; i < _this.DeviceList.length; i++) {
+              let devicelist = _this.DeviceList[i]
+              instapi.getList(_this.DeviceList[i].Id, "", _this.$axios).then(res => {
+                if (res.data.currentItemCount === 1) {
+                  _this.StanDeviceoptions2.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                } else {
+                  _this.StanDeviceoptions.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                }
+              }).catch(err => {
+                console.error(err)
+              })
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+      chooseCertify2(value) {
+        let _this = this
+        let obj = {};
+        obj = this.StanDeviceoptions2.find((item) => {
+          return item.id === value;
+        });
+        this.formCertificateData.StanDevice = obj.name
+        let instrumentno = value
+        //访问接口
+        instapi.getList(instrumentno, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          this.formCertificateData.CerNum = this.certificateDataform[0].CerNum
+          this.formCertificateData.Uncertainty = this.certificateDataform[0].Uncertainty
+          this.formCertificateData.StandVal = this.certificateDataform[0].StandVal
+          this.formCertificateData.EffectDate = this.certificateDataform[0].EffectDate
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseCertify(value) {
+        let obj = {};
+        obj = this.StanDeviceoptions.find((item) => {
+          return item.id === value;
+        });
+        this.formData.StanDevice = obj.name
+        console.log(obj.name);
+        let _this = this
+        _this.InstrumentNo = value
+        //访问接口
+        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          for (var i = 0; i < this.certificateDataform.length; i++) {
+            this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
+            this.certificateData[i].Uncertainty = this.certificateDataform[i].Uncertainty
+            this.certificateData[i].StandVal = this.certificateDataform[i].StandVal
+            this.certificateData[i].EffectDate = this.certificateDataform[i].EffectDate
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取校核人列表
       getUsersByRole() {
         // request

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

@@ -92,7 +92,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice" v-model="formData.InstrumentNo" clearable placeholder="请选择"
+                @change="chooseCertify" style="width: 100%">
+                <el-option v-for="item in StanDeviceoptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <!-- <el-input v-model="formData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -131,7 +136,12 @@
         <el-form label-width="100px" ref="certificateForm" :model="formCertificateData">
           <el-col :span="8">
             <el-form-item label="标准器名称:">
-              <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input>
+              <el-select ref="refDevice2" v-model="formCertificateData.InstrumentNo" clearable placeholder="请选择"
+              @change="chooseCertify2" style="width: 100%">
+              <el-option v-for="item in StanDeviceoptions2" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+              <!-- <el-input v-model="formCertificateData.StanDevice" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -188,34 +198,34 @@
       <el-table :data="deviationData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值(%)" width="180">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="仪器示值(%)" min-width="180">
            <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input @blur="getDeValueAvg(scope.row)" type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="AvgValue" label="平均值">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.AvgValue" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column align="center" prop="Deviation" label="示值引用误差  (%FS)" min-width="180">
          <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -228,28 +238,28 @@
       <el-table :data="responseTimeData" border style="width: 100%">
         <el-table-column align="center" prop="GasValue" label="标准气体浓度值(%)" width="180">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.GasValue" style="width: 100%" size="mini"></el-input>
           </template>
        </el-table-column>
         <el-table-column align="center" label="时间(S)" min-width="180">
            <el-table-column align="center" prop="Value1" label="1">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value2" label="2">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Value3" label="3">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="Deviation" label="响应时间">
             <template slot-scope="scope">
-              <el-input type="number" step="0.01" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
+              <el-input type="number" step="0.1" v-model.number="scope.row.Deviation" style="width: 100%" size="mini"></el-input>
             </template>
           </el-table-column>
         </el-table-column>
@@ -320,37 +330,37 @@
         </el-table-column>
          <el-table-column prop="Value0" align="center" label="0">
           <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="Value1" align="center" label="2h   （15min）" min-width="90">
          <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="Value2" align="center" label="4h   （30min）" min-width="90">
        <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="Value3" align="center" label="6h   （45min）" min-width="90">
          <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="Value4" align="center" label="8h   （60min）" min-width="90">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value4" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ZeroValue" label="零点漂移（%FS）" min-width="170">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ZeroValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="ShowValue" label="量程漂移（%FS）" min-width="130">
         <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.ShowValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -365,27 +375,27 @@
         </el-table-column>
         <el-table-column prop="Value0" align="center" label="C0">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value0" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value1" align="center" label="C1" min-width="90">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value1" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value2" align="center" label="C2" min-width="90">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value2" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column prop="value3" align="center" label="C3" min-width="90">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.Value3" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="OtherValue" label="干扰误差(%FS)" min-width="130">
            <template slot-scope="scope">
-            <el-input type="number" step="0.01" v-model.number="scope.row.OtherValue" style="width: 100%" size="mini"></el-input>
+            <el-input type="number" step="0.1" v-model.number="scope.row.OtherValue" style="width: 100%" size="mini"></el-input>
           </template>
         </el-table-column>
       </el-table>
@@ -439,6 +449,9 @@
       return {
         ProoFreadShow: false,
         acceptUsers: [],
+        DeviceList: [],
+        StanDeviceoptions: [],
+        StanDeviceoptions2: [],
         serviceId: '',
         DataStatus: '0',
         sign: '2',
@@ -462,7 +475,7 @@
           MeterRange: '',
           DataEntryCode: '',
           MeasurementRange: '',
-          DetectBasis: '',
+          DetectBasis: 'JJG 635-2011《一氧化碳/二氧化碳红外气体分析器》检定规程',
           FaceCheck: '',
           FlagCheck: '',
           ElectrifyCheck: '',
@@ -475,7 +488,7 @@
           TestDepartId: 0,
           Instrument1: '',
           Temperature: '',
-          StandardDesc: '',
+          StandardDesc: '一氧化碳/二氧化碳红外气体分析器检定装置',
           StanDevice: '',
           RelativeHumanity: '',
           ManuCompany: '',
@@ -673,8 +686,9 @@
       this.formData.DataEntryId = this.queryParams.DataEntryId
       this.formData.TaskBalanceId = this.queryParams.TaskBalanceId
       this.formData.EId = this.queryParams.EId
-      this.initDatas();
+      this.initDatas()
       this.getUsersByRole()
+      this.getdevice()
       //this.getDictOptions();
       // if (this.serviceId != 'add' && this.serviceId > 0) {
       //   this.formData.Id = this.serviceId;
@@ -689,6 +703,8 @@
           api.getEntity(this.formData.DataEntryId, this.$axios).then(res => {
             console.log("------resco2------", res.data)
             this.formData = res.data.mainitem;
+            this.formData.DetectBasis = 'JJG 635-2011《一氧化碳/二氧化碳红外气体分析器》检定规程'
+            this.formData.StandardDesc = '一氧化碳/二氧化碳红外气体分析器检定装置'
             if (this.formData.CheckDate == "0001-01-01T00:00:00Z"){
               this.formData.CheckDate = new Date();
             }
@@ -708,7 +724,9 @@
               this.formCertificateData.CerNum = res.data.ceritem[3].CerNum
               this.formCertificateData.Uncertainty = res.data.ceritem[3].Uncertainty
               this.formCertificateData.EffectDate = res.data.ceritem[3].EffectDate
-             this.formData.StanDevice = res.data.ceritem[0].StanDevice
+              this.formCertificateData.InstrumentNo = res.data.ceritem[3].StanDevice
+              this.formData.StanDevice = res.data.ceritem[0].StanDevice
+              this.formData.InstrumentNo = res.data.ceritem[0].StanDevice
             }
             if (res.data.alvalitem != null) {
               for (var i = 0; i < res.data.alvalitem.length; i++) {
@@ -746,16 +764,7 @@
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i].ValueType = res.data.shiftitem[i].ValueType;
-                this.ShiftData[i].value0 = res.data.shiftitem[i].value0;
-                this.ShiftData[i].Value1 = res.data.shiftitem[i].Value1;
-                this.ShiftData[i].Value2 = res.data.shiftitem[i].Value2;
-                this.ShiftData[i].Value3 = res.data.shiftitem[i].Value3;
-                this.ShiftData[i].Value4 = res.data.shiftitem[i].Value4;
-                this.ShiftData[i].Value5 = res.data.shiftitem[i].Value5;
-                this.ShiftData[i].Value6 = res.data.shiftitem[i].Value6;
-                this.ShiftData[i].ZeroValue = res.data.shiftitem[i].ZeroValue;
-                this.ShiftData[i].ShowValue = res.data.shiftitem[i].ShowValue;
+                this.ShiftData[i] = res.data.shiftitem[i];
               }
             }
             if (res.data.otheritem != null) {
@@ -768,6 +777,81 @@
           });
         }
       },
+      getdevice() {
+        let _this = this
+        _this.$axios.get('/instrument/initlistdata', {})
+          .then(function (response) {
+            console.log("jkkfddf", response.data.items)
+            _this.DeviceList = response.data.items
+            console.log("-_this._this.DeviceList------", _this.DeviceList)
+            if (!_this.DeviceList) {
+              return false
+            }
+            for (var i = 0; i < _this.DeviceList.length; i++) {
+              let devicelist = _this.DeviceList[i]
+              instapi.getList(_this.DeviceList[i].Id, "", _this.$axios).then(res => {
+                if (res.data.currentItemCount === 1) {
+                  _this.StanDeviceoptions2.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                } else {
+                  _this.StanDeviceoptions.push({
+                    id: devicelist.Id,
+                    name: devicelist.Name,
+                  })
+                }
+              }).catch(err => {
+                console.error(err)
+              })
+            }
+          })
+          .catch(function (error) {
+            console.log(error)
+          })
+      },
+      chooseCertify2(value) {
+        let _this = this
+        let obj = {};
+        obj = this.StanDeviceoptions2.find((item) => {
+          return item.id === value;
+        });
+        this.formCertificateData.StanDevice = obj.name
+        let instrumentno = value
+        //访问接口
+        instapi.getList(instrumentno, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          this.formCertificateData.CerNum = this.certificateDataform[0].CerNum
+          this.formCertificateData.Uncertainty = this.certificateDataform[0].Uncertainty
+          this.formCertificateData.StandVal = this.certificateDataform[0].StandVal
+          this.formCertificateData.EffectDate = this.certificateDataform[0].EffectDate
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      chooseCertify(value) {
+        let obj = {};
+        obj = this.StanDeviceoptions.find((item) => {
+          return item.id === value;
+        });
+        this.formData.StanDevice = obj.name
+        console.log(obj.name);
+        let _this = this
+        _this.InstrumentNo = value
+        //访问接口
+        instapi.getList(_this.InstrumentNo, "", this.$axios).then(res => {
+          this.certificateDataform = res.data.items
+          for (var i = 0; i < this.certificateDataform.length; i++) {
+            this.certificateData[i].CerNum = this.certificateDataform[i].CerNum
+            this.certificateData[i].Uncertainty = this.certificateDataform[i].Uncertainty
+            this.certificateData[i].StandVal = this.certificateDataform[i].StandVal
+            this.certificateData[i].EffectDate = this.certificateDataform[i].EffectDate
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       // 获取校核人列表
       getUsersByRole() {
         // request

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

@@ -408,6 +408,9 @@
     data() {
       return {
         ProoFreadShow: false,
+        DeviceList: [],
+        StanDeviceoptions: [],
+        StanDeviceoptions2: [],
         acceptUsers: [],
         serviceId: '',
         DataStatus: '0',
@@ -705,16 +708,7 @@
             }
             if (res.data.shiftitem != null) {
               for (var i = 0; i < res.data.shiftitem.length; i++) {
-                this.ShiftData[i].Id = res.data.shiftitem[i].Id;
-                this.ShiftData[i].Value0 = res.data.shiftitem[i].Value0;
-                this.ShiftData[i].Value1 = res.data.shiftitem[i].Value1;
-                this.ShiftData[i].Value2 = res.data.shiftitem[i].Value2;
-                this.ShiftData[i].Value3 = res.data.shiftitem[i].Value3;
-                this.ShiftData[i].Value4 = res.data.shiftitem[i].Value4;
-                this.ShiftData[i].Value5 = res.data.shiftitem[i].Value5;
-                this.ShiftData[i].Value6 = res.data.shiftitem[i].Value6;
-                this.ShiftData[i].ZeroValue = res.data.shiftitem[i].ZeroValue;
-                this.ShiftData[i].ShowValue = res.data.shiftitem[i].ShowValue;
+                this.ShiftData[i] = res.data.shiftitem[i];
               }
             }
           }).catch(err => {

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportdrillcollar/_opera/operation.vue

@@ -6,12 +6,6 @@
           <span>
             <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/wzjys/reportdrillcollar/datalist'">
-              <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-            </router-link>
-          </span>
         </div>
         <el-form label-width="110px" ref="EntityForm" :model="formData">
           <el-row>

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpetroleumpipe/_opera/datalist.vue

@@ -270,18 +270,22 @@
             </template>
           </el-table-column>
           <el-table-column label="接头外径（mm）" align="center">
-            <el-table-column prop="JointDiameterM" sortable min-width="100" label="公端" align="center"
+            <el-table-column prop="JointDiameterM" sortable min-width="200" label="公端" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  type="number" step="0.01" v-model.number="scope.row.ExDiameterF" style="width: 100%"></el-input>
+                  type="number" step="0.01" v-model.number="scope.row.ExDiameterF1" style="width: 50%"></el-input>
+                   <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  type="number" step="0.01" v-model.number="scope.row.ExDiameterF2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="JointDiameterF" sortable min-width="100" label="母端" align="center"
+            <el-table-column prop="JointDiameterF" sortable min-width="200" label="母端" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  type="number" step="0.01" v-model.number="scope.row.ExDiameterM" style="width: 100%"></el-input>
+                  type="number" step="0.01" v-model.number="scope.row.ExDiameterM1" style="width: 50%"></el-input>
+                  <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  type="number" step="0.01" v-model.number="scope.row.ExDiameterM2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
@@ -572,6 +576,10 @@
           JointInDiameter: '',
           ExDiameterF: '',
           ExDiameterM: '',
+          ExDiameterF1: '',
+          ExDiameterF2: '',
+          ExDiameterM1: '',
+          ExDiameterM2: '',
           TubeLength: '',
           Appearance: '',
           Inspector: '',

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpipedrillpipe/_opera/datalist.vue

@@ -218,9 +218,9 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                type="number" step="0.01" v-model.number="scope.row.TubeDiameter" style="width: 50%"></el-input>
+                type="number" step="0.01" v-model.number="scope.row.TubeDiameter1" style="width: 50%"></el-input>
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                        type="number" step="0.01" v-model.number="scope.row.TubeDiameter" style="width: 50%"></el-input>
+                        type="number" step="0.01" v-model.number="scope.row.TubeDiameter2" style="width: 50%"></el-input>
             </template>
           </el-table-column>
           <el-table-column prop="LPC" sortable min-width="130" label="LPC（mm）" align="center" show-overflow-tooltip>
@@ -271,11 +271,11 @@
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                type="number" step="0.01" v-model.number="scope.row.WallThickness" style="width: 33%"></el-input>
+                type="number" step="0.01" v-model.number="scope.row.WallThickness1" style="width: 33%"></el-input>
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                        type="number" step="0.01" v-model.number="scope.row.WallThickness" style="width: 33%"></el-input>
+                        type="number" step="0.01" v-model.number="scope.row.WallThickness2" style="width: 33%"></el-input>
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                        type="number" step="0.01" v-model.number="scope.row.WallThickness" style="width: 34%"></el-input>
+                        type="number" step="0.01" v-model.number="scope.row.WallThickness3" style="width: 34%"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="接头外径（mm）" align="center">
@@ -412,8 +412,8 @@
 
           <el-col :span="12">
             <el-form-item label="管体外径" label-width="170px">
-              <el-input size="mini" v-model="searchForm.TubeDiameter" style="width:50%" placeholder="请输入"></el-input>
-              <el-input size="mini" v-model="searchForm.TubeDiameter" style="width:50%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.TubeDiameter1" style="width:50%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.TubeDiameter2" style="width:50%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
@@ -641,6 +641,8 @@
           ShoulderSurface: '',
           EndFace: '',
           TubeDiameter: '',
+          TubeDiameter1: '',
+          TubeDiameter2: '',
           DF: '',
           QC: '',
           DRG: '',
@@ -649,6 +651,9 @@
           TubeLength: '',
           InnerDiameter: '',
           WallThickness: '',
+          WallThickness1: '',
+          WallThickness2: '',
+          WallThickness3: '',
           JointDiameterM: '',
           JointDiameterF: '',
           WallDifF: '',

src/dashoo.cn/frontend_web/src/pages/lims/wzjys/reportpipedrillpipe/_opera/operation.vue

@@ -11,12 +11,12 @@
           <span>
             <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/wzjys/reportpipedrillpipe/datalist'">
+          <!-- <span style="float: right;"> -->
+            <!-- <el-button type="primary" size="mini" @click="saveEntity">保存</el-button> -->
+            <!-- <router-link :to="'/lims/wzjys/reportpipedrillpipe/datalist'">
               <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-            </router-link>
-          </span>
+            </router-link> -->
+          <!-- </span> -->
         </div>
         <el-form label-width="110px" ref="EntityForm" :model="formData">
           <el-row>