钻杆数据录入页面跳转

src/dashoo.cn/backend/api/business/limspetroleumpipe/limspetroleumpipeService.go

@@ -98,39 +98,39 @@ func (s *LimsPetroleUmPipeService) DocDataToExcel(entrustMainEntity limsdataentr
 
 
 		for ; startIdx < (len(dataentrylist)); startIdx++ {
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "A"+strconv.Itoa(11+step), dataentrylist[i].SampleNumber)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "B"+strconv.Itoa(11+step), dataentrylist[i].CloseDistanceOut)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "C"+strconv.Itoa(11+step), dataentrylist[i].CloseDistanceIn)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "D"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceOut1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "E"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceOut2	)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "F"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceIn1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "G"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceIn2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "H"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceOut1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "I"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceOut2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "J"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceIn1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "K"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceIn2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "L"+strconv.Itoa(11+step), dataentrylist[i].DepthToleranceOut1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "M"+strconv.Itoa(11+step), dataentrylist[i].DepthToleranceOut2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "N"+strconv.Itoa(11+step), dataentrylist[i].DepthToleranceIn1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "O"+strconv.Itoa(11+step), dataentrylist[i].DepthToleranceIn2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "A"+strconv.Itoa(11+step), dataentrylist[startIdx].SampleNumber)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "B"+strconv.Itoa(11+step), dataentrylist[startIdx].CloseDistanceOut)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "C"+strconv.Itoa(11+step), dataentrylist[startIdx].CloseDistanceIn)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "D"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceOut1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "E"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceOut2	)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "F"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceIn1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "G"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceIn2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "H"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceOut1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "I"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceOut2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "J"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceIn1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "K"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceIn2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "L"+strconv.Itoa(11+step), dataentrylist[startIdx].DepthToleranceOut1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "M"+strconv.Itoa(11+step), dataentrylist[startIdx].DepthToleranceOut2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "N"+strconv.Itoa(11+step), dataentrylist[startIdx].DepthToleranceIn1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "O"+strconv.Itoa(11+step), dataentrylist[startIdx].DepthToleranceIn2)
 
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "A"+strconv.Itoa(11+step), dataentrylist[i].SampleNumber)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "C"+strconv.Itoa(11+step), dataentrylist[i].EdgeWidth)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "D"+strconv.Itoa(11+step), dataentrylist[i].DiagonalWidth)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "E"+strconv.Itoa(11+step), dataentrylist[i].LPC)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "F"+strconv.Itoa(11+step), dataentrylist[i].DF)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "G"+strconv.Itoa(11+step), dataentrylist[i].QC)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "H"+strconv.Itoa(11+step), dataentrylist[i].WallThickness1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "I"+strconv.Itoa(11+step), dataentrylist[i].WallThickness2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "I"+strconv.Itoa(11+step), dataentrylist[i].WallThickness3)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "A"+strconv.Itoa(11+step), dataentrylist[startIdx].SampleNumber)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "C"+strconv.Itoa(11+step), dataentrylist[startIdx].EdgeWidth)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "D"+strconv.Itoa(11+step), dataentrylist[startIdx].DiagonalWidth)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "E"+strconv.Itoa(11+step), dataentrylist[startIdx].LPC)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "F"+strconv.Itoa(11+step), dataentrylist[startIdx].DF)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "G"+strconv.Itoa(11+step), dataentrylist[startIdx].QC)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "H"+strconv.Itoa(11+step), dataentrylist[startIdx].WallThickness1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "I"+strconv.Itoa(11+step), dataentrylist[startIdx].WallThickness2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "I"+strconv.Itoa(11+step), dataentrylist[startIdx].WallThickness3)
 
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "A"+strconv.Itoa(11+step), dataentrylist[i].SampleNumber)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "B"+strconv.Itoa(11+step), dataentrylist[i].JointInDiameter)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "C"+strconv.Itoa(11+step), dataentrylist[i].ExDiameterF1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "D"+strconv.Itoa(11+step), dataentrylist[i].ExDiameterF2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "E"+strconv.Itoa(11+step), dataentrylist[i].ExDiameterM1)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "F"+strconv.Itoa(11+step), dataentrylist[i].ExDiameterM2)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "G"+strconv.Itoa(11+step), dataentrylist[i].TubeLength)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "A"+strconv.Itoa(11+step), dataentrylist[startIdx].SampleNumber)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "B"+strconv.Itoa(11+step), dataentrylist[startIdx].JointInDiameter)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "C"+strconv.Itoa(11+step), dataentrylist[startIdx].ExDiameterF1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "D"+strconv.Itoa(11+step), dataentrylist[startIdx].ExDiameterF2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "E"+strconv.Itoa(11+step), dataentrylist[startIdx].ExDiameterM1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "F"+strconv.Itoa(11+step), dataentrylist[startIdx].ExDiameterM2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "G"+strconv.Itoa(11+step), dataentrylist[startIdx].TubeLength)
 
 			step+=2
 			if (startIdx+1)%excelrow == 0 {

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

@@ -3,48 +3,57 @@ package limspipedrillpipe
 import "time"
 
 type LimsPipeDrillPipe struct {
-	Id                int       `xorm:"not null pk autoincr INT(10)"`
-	EId               int       `xorm:" INT(10)"`
-	TaskBalanceId     int       `xorm:" INT(10)"`
-	DataEntryId       int       `xorm:" INT(10)"`
-	Product           string    `xorm:"comment('产品名称') VARCHAR(50)"`
-	Specifications    string    `xorm:"comment('规格型号') VARCHAR(50)"`
-	SamplingBase      int       `xorm:"comment('抽样基数') INT(10)"`
-	SampleQuantity    int       `xorm:"comment('样品数量') INT(10)"`
-	SampleNumber      string    `xorm:"comment('样品编号') VARCHAR(50)"`
-	CloseDistanceOut  float64   `xorm:"comment('紧密距外螺纹') DECIMAL(10,2)"`
-	CloseDistanceIn   float64   `xorm:"comment('紧密距内螺纹') DECIMAL(10,2)"`
-	TaperToleranceOut float64   `xorm:"comment('锥度公差外螺纹') DECIMAL(10,2)"`
-	TaperToleranceIn  float64   `xorm:"comment('锥度公差内螺纹') DECIMAL(10,2)"`
-	PitchToleranceOut float64   `xorm:"comment('螺距公差外螺纹') DECIMAL(10,2)"`
-	PitchToleranceIn  float64   `xorm:"comment('螺距公差内螺纹') DECIMAL(10,2)"`
-	ShoulderSurface   float64   `xorm:"comment('螺纹轴线与台肩面垂直度') DECIMAL(10,2)"`
-	EndFace           float64   `xorm:"comment('螺纹轴线与端面垂直度') DECIMAL(10,2)"`
-	TubeDiameter      float64   `xorm:"comment('管体外径') DECIMAL(10,2)"`
-	LPC               float64   `xorm:"comment('LPC') DECIMAL(10,2)"`
-	DF                float64   `xorm:"comment('DF') DECIMAL(10,2)"`
-	QC                float64   `xorm:"comment('QC') DECIMAL(10,2)"`
-	LPB               float64   `xorm:"comment('LPB') DECIMAL(10,2)"`
-	LB                float64   `xorm:"comment('LB') DECIMAL(10,2)"`
-	WallDif           float64   `xorm:"comment('LB') DECIMAL(10,2)"`
+	Id                 int       `xorm:"not null pk autoincr INT(10)"`
+	EId                int       `xorm:" INT(10)"`
+	TaskBalanceId      int       `xorm:" INT(10)"`
+	DataEntryId        int       `xorm:" INT(10)"`
+	Product            string    `xorm:"comment('产品名称') VARCHAR(50)"`
+	Specifications     string    `xorm:"comment('规格型号') VARCHAR(50)"`
+	SamplingBase       int       `xorm:"comment('抽样基数') INT(10)"`
+	SampleQuantity     int       `xorm:"comment('样品数量') INT(10)"`
+	SampleNumber       string    `xorm:"comment('样品编号') VARCHAR(50)"`
+	CloseDistanceOut   float64   `xorm:"comment('紧密距外螺纹') DECIMAL(10,2)"`
+	CloseDistanceIn    float64   `xorm:"comment('紧密距内螺纹') DECIMAL(10,2)"`
+	TaperToleranceOut1 float64   `xorm:"comment('锥度公差外螺纹') DECIMAL(10,2)"`
+	TaperToleranceOut2 float64   `xorm:"comment('锥度公差外螺纹') DECIMAL(10,2)"`
+	TaperToleranceIn1  float64   `xorm:"comment('锥度公差内螺纹') DECIMAL(10,2)"`
+	TaperToleranceIn2  float64   `xorm:"comment('锥度公差内螺纹') DECIMAL(10,2)"`
+	PitchToleranceOut1 float64   `xorm:"comment('螺距公差外螺纹') DECIMAL(10,2)"`
+	PitchToleranceOut2 float64   `xorm:"comment('螺距公差外螺纹') DECIMAL(10,2)"`
+	PitchToleranceIn1  float64   `xorm:"comment('螺距公差内螺纹') DECIMAL(10,2)"`
+	PitchToleranceIn2  float64   `xorm:"comment('螺距公差内螺纹') DECIMAL(10,2)"`
+	ShoulderSurface    float64   `xorm:"comment('螺纹轴线与台肩面垂直度') DECIMAL(10,2)"`
+	EndFace            float64   `xorm:"comment('螺纹轴线与端面垂直度') DECIMAL(10,2)"`
+	TubeDiameter1       float64   `xorm:"comment('管体外径') DECIMAL(10,2)"`
+	TubeDiameter2       float64   `xorm:"comment('管体外径') DECIMAL(10,2)"`
+	LPC                float64   `xorm:"comment('LPC') DECIMAL(10,2)"`
+	DF                 float64   `xorm:"comment('DF') DECIMAL(10,2)"`
+	QC                 float64   `xorm:"comment('QC') DECIMAL(10,2)"`
+	LPB                float64   `xorm:"comment('LPB') DECIMAL(10,2)"`
+	LB                 float64   `xorm:"comment('LB') DECIMAL(10,2)"`
+	WallDif            float64   `xorm:"comment('LB') DECIMAL(10,2)"`
 	TubeLength        float64   `xorm:"comment('管体长度') DECIMAL(10,2)"`
-	InnerDiameter     float64   `xorm:"comment('接头内径') DECIMAL(10,2)"`
-	WallThickness     float64   `xorm:"comment('壁厚') DECIMAL(10,2)"`
-	JointDiameterM    float64   `xorm:"comment('接头外径公端') DECIMAL(10,2)"`
-	JointDiameterF    float64   `xorm:"comment('接头外径母端') DECIMAL(10,2)"`
-	WallDifF          float64   `xorm:"comment('焊接不同轴度公端') DECIMAL(10,2)"`
-	WallDifM          float64   `xorm:"comment('焊接不同轴度母端') DECIMAL(10,2)"`
-	OuterDiameterF    float64   `xorm:"comment('外径偏心度公端') DECIMAL(10,2)"`
-	OuterDiameterM    float64   `xorm:"comment('外径偏心度母端') DECIMAL(10,2)"`
-	Appearance        string    `xorm:"comment('外观检验') VARCHAR(255)"`
-	Inspector         string    `xorm:"comment('检验员') VARCHAR(50)"`
-	Audit             string    `xorm:"comment('审核') VARCHAR(255)"`
-	InspectionDate    time.Time `xorm:"comment('检验日期') DATETIME"`
-	Remark            string    `xorm:"comment('备注') VARCHAR(255)"`
-	CreateUserId      int       `xorm:"INT(11)"`
-	CreateOn          time.Time `xorm:"DATETIME"`
-	CreateBy          string    `xorm:"VARCHAR(50)"`
-	ModifiedOn        time.Time `xorm:"DATETIME"`
-	ModifiedUserId    int       `xorm:"INT(11)"`
-	ModifiedBy        string    `xorm:"VARCHAR(50)"`
+	InnerDiameter      float64   `xorm:"comment('接头内径') DECIMAL(10,2)"`
+	WallThickness1     float64   `xorm:"comment('壁厚') DECIMAL(10,2)"`
+	WallThickness2     float64   `xorm:"comment('壁厚') DECIMAL(10,2)"`
+	WallThickness3     float64   `xorm:"comment('壁厚') DECIMAL(10,2)"`
+	JointDiameterM1    float64   `xorm:"comment('接头外径公端') DECIMAL(10,2)"`
+	JointDiameterM2    float64   `xorm:"comment('接头外径公端') DECIMAL(10,2)"`
+	JointDiameterF1    float64   `xorm:"comment('接头外径母端') DECIMAL(10,2)"`
+	JointDiameterF2    float64   `xorm:"comment('接头外径母端') DECIMAL(10,2)"`
+	WallDifF           float64   `xorm:"comment('焊接不同轴度公端') DECIMAL(10,2)"`
+	WallDifM           float64   `xorm:"comment('焊接不同轴度母端') DECIMAL(10,2)"`
+	OuterDiameterF     float64   `xorm:"comment('外径偏心度公端') DECIMAL(10,2)"`
+	OuterDiameterM     float64   `xorm:"comment('外径偏心度母端') DECIMAL(10,2)"`
+	Appearance         string    `xorm:"comment('外观检验') VARCHAR(255)"`
+	Inspector          string    `xorm:"comment('检验员') VARCHAR(50)"`
+	Audit              string    `xorm:"comment('审核') VARCHAR(255)"`
+	InspectionDate     time.Time `xorm:"comment('检验日期') DATETIME"`
+	Remark             string    `xorm:"comment('备注') VARCHAR(255)"`
+	CreateUserId       int       `xorm:"INT(11)"`
+	CreateOn           time.Time `xorm:"DATETIME"`
+	CreateBy           string    `xorm:"VARCHAR(50)"`
+	ModifiedOn         time.Time `xorm:"DATETIME"`
+	ModifiedUserId     int       `xorm:"INT(11)"`
+	ModifiedBy         string    `xorm:"VARCHAR(50)"`
 }

src/dashoo.cn/backend/api/business/limspipedrillpipe/limspipedrillpipeService.go

@@ -98,43 +98,43 @@ func (s *LimsPipeDrillPipeService) DocDataToExcel(entrustMainEntity limsdataentr
 
 
 		for ; startIdx < (len(dataentrylist)); startIdx++ {
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "A"+strconv.Itoa(11+step), dataentrylist[i].SampleNumber)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "B"+strconv.Itoa(11+step), dataentrylist[i].CloseDistanceOut)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "C"+strconv.Itoa(11+step), dataentrylist[i].CloseDistanceIn)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "D"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceOut)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "E"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceOut)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "F"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceIn)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "G"+strconv.Itoa(11+step), dataentrylist[i].TaperToleranceIn)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "H"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceOut)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "I"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceOut)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "J"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceIn)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "K"+strconv.Itoa(11+step), dataentrylist[i].PitchToleranceIn)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "L"+strconv.Itoa(11+step), dataentrylist[i].ShoulderSurface)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "N"+strconv.Itoa(11+step), dataentrylist[i].EndFace)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "A"+strconv.Itoa(11+step), dataentrylist[startIdx].SampleNumber)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "B"+strconv.Itoa(11+step), dataentrylist[startIdx].CloseDistanceOut)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "C"+strconv.Itoa(11+step), dataentrylist[startIdx].CloseDistanceIn)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "D"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceOut1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "E"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceOut2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "F"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceIn1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "G"+strconv.Itoa(11+step), dataentrylist[startIdx].TaperToleranceIn2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "H"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceOut1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "I"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceOut2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "J"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceIn1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "K"+strconv.Itoa(11+step), dataentrylist[startIdx].PitchToleranceIn2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "L"+strconv.Itoa(11+step), dataentrylist[startIdx].ShoulderSurface)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx1), "N"+strconv.Itoa(11+step), dataentrylist[startIdx].EndFace)
 
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "A"+strconv.Itoa(11+step), dataentrylist[i].SampleNumber)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "B"+strconv.Itoa(11+step), dataentrylist[i].TubeDiameter)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "C"+strconv.Itoa(11+step), dataentrylist[i].TubeDiameter)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "D"+strconv.Itoa(11+step), dataentrylist[i].LPC)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "E"+strconv.Itoa(11+step), dataentrylist[i].DF)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "F"+strconv.Itoa(11+step), dataentrylist[i].QC)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "G"+strconv.Itoa(11+step), dataentrylist[i].LPB)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "H"+strconv.Itoa(11+step), dataentrylist[i].LB)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "I"+strconv.Itoa(11+step), dataentrylist[i].TubeLength)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "A"+strconv.Itoa(11+step), dataentrylist[startIdx].SampleNumber)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "B"+strconv.Itoa(11+step), dataentrylist[startIdx].TubeDiameter1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "C"+strconv.Itoa(11+step), dataentrylist[startIdx].TubeDiameter2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "D"+strconv.Itoa(11+step), dataentrylist[startIdx].LPC)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "E"+strconv.Itoa(11+step), dataentrylist[startIdx].DF)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "F"+strconv.Itoa(11+step), dataentrylist[startIdx].QC)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "G"+strconv.Itoa(11+step), dataentrylist[startIdx].LPB)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "H"+strconv.Itoa(11+step), dataentrylist[startIdx].LB)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx2), "I"+strconv.Itoa(11+step), dataentrylist[startIdx].TubeLength)
 
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "A"+strconv.Itoa(11+step), dataentrylist[i].SampleNumber)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "B"+strconv.Itoa(11+step), dataentrylist[i].InnerDiameter)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "C"+strconv.Itoa(11+step), dataentrylist[i].WallThickness)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "D"+strconv.Itoa(11+step), dataentrylist[i].WallThickness)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "E"+strconv.Itoa(11+step), dataentrylist[i].WallThickness)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "F"+strconv.Itoa(11+step), dataentrylist[i].JointDiameterM)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "G"+strconv.Itoa(11+step), dataentrylist[i].JointDiameterM)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "H"+strconv.Itoa(11+step), dataentrylist[i].JointDiameterF)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "I"+strconv.Itoa(11+step), dataentrylist[i].JointDiameterF)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "J"+strconv.Itoa(11+step), dataentrylist[i].WallDifF)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "K"+strconv.Itoa(11+step), dataentrylist[i].WallDifM)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "L"+strconv.Itoa(11+step), dataentrylist[i].OuterDiameterF)
-			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "M"+strconv.Itoa(11+step), dataentrylist[i].OuterDiameterM)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "A"+strconv.Itoa(11+step), dataentrylist[startIdx].SampleNumber)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "B"+strconv.Itoa(11+step), dataentrylist[startIdx].InnerDiameter)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "C"+strconv.Itoa(11+step), dataentrylist[startIdx].WallThickness1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "D"+strconv.Itoa(11+step), dataentrylist[startIdx].WallThickness2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "E"+strconv.Itoa(11+step), dataentrylist[startIdx].WallThickness3)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "F"+strconv.Itoa(11+step), dataentrylist[startIdx].JointDiameterM1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "G"+strconv.Itoa(11+step), dataentrylist[startIdx].JointDiameterM2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "H"+strconv.Itoa(11+step), dataentrylist[startIdx].JointDiameterF1)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "I"+strconv.Itoa(11+step), dataentrylist[startIdx].JointDiameterF2)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "J"+strconv.Itoa(11+step), dataentrylist[startIdx].WallDifF)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "K"+strconv.Itoa(11+step), dataentrylist[startIdx].WallDifM)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "L"+strconv.Itoa(11+step), dataentrylist[startIdx].OuterDiameterF)
+			xlsx.SetCellValue("Sheet"+strconv.Itoa(sheetIdx3), "M"+strconv.Itoa(11+step), dataentrylist[startIdx].OuterDiameterM)
 			step+=2
 			if (startIdx+1)%excelrow == 0 {
 				sheetIdx1 = sheetIdx1 + 3

src/dashoo.cn/backend/api/controllers/limswzjys/limspipedrillpipe.go

@@ -424,12 +424,17 @@ func (this *LimsPipeDrillPipeController) UpdateEntity() {
 		"CloseDistanceOut",
 		"CloseDistanceIn",
 		"TaperToleranceOut",
+		"TaperToleranceOut",
+		"TaperToleranceIn",
 		"TaperToleranceIn",
 		"PitchToleranceOut",
+		"PitchToleranceOut",
+		"PitchToleranceIn",
 		"PitchToleranceIn",
 		"ShoulderSurface",
 		"EndFace",
-		"TubeDiameter",
+		"TubeDiameter1",
+		"TubeDiameter2",
 		"DF",
 		"QC",
 		"LPB",
@@ -438,9 +443,13 @@ func (this *LimsPipeDrillPipeController) UpdateEntity() {
 		"WallDif",
 		"TubeLength",
 		"InnerDiameter",
-		"WallThickness",
-		"JointDiameterM",
-		"JointDiameterF",
+		"WallThickness1",
+		"WallThickness2",
+		"WallThickness3",
+		"JointDiameterM1",
+		"JointDiameterM2",
+		"JointDiameterF1",
+		"JointDiameterF2",
 		"WallDifF",
 		"WallDifM",
 		"OuterDiameterF",

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

@@ -160,34 +160,42 @@
             </el-table-column>
           </el-table-column>
           <el-table-column label="锥度公差·10-3（in/in）" align="center">
-            <el-table-column prop="TaperToleranceOut" sortable min-width="100" label="外螺纹" align="center"
+            <el-table-column prop="TaperToleranceOut" sortable min-width="170" label="外螺纹" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  v-model="scope.row.TaperToleranceOut" style="width: 100%"></el-input>
+                  v-model="scope.row.TaperToleranceOut1" style="width: 50%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                          v-model="scope.row.TaperToleranceOut2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="TaperToleranceIn" sortable min-width="100" label="内螺纹" align="center"
+            <el-table-column prop="TaperToleranceIn" sortable min-width="170" label="内螺纹" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  v-model="scope.row.TaperToleranceIn" style="width: 100%"></el-input>
+                  v-model="scope.row.TaperToleranceIn1" style="width: 50%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                          v-model="scope.row.TaperToleranceIn2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
           <el-table-column label="螺距公差·10-3（in/in）" align="center">
-            <el-table-column prop="PitchToleranceOut" sortable min-width="100" label="外螺纹" align="center"
+            <el-table-column prop="PitchToleranceOut" sortable min-width="170" label="外螺纹" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  v-model="scope.row.PitchToleranceOut" style="width: 100%"></el-input>
+                  v-model="scope.row.PitchToleranceOut1" style="width: 50%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                          v-model="scope.row.PitchToleranceOut2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="PitchToleranceIn" sortable min-width="100" label="内螺纹" align="center"
+            <el-table-column prop="PitchToleranceIn" sortable min-width="170" label="内螺纹" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  v-model="scope.row.PitchToleranceIn" style="width: 100%"></el-input>
+                  v-model="scope.row.PitchToleranceIn1" style="width: 50%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                          v-model="scope.row.PitchToleranceIn2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
@@ -206,11 +214,13 @@
               </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column prop="TubeDiameter" sortable min-width="160" label="管体外径（mm）" align="center"
+          <el-table-column prop="TubeDiameter" sortable min-width="170" label="管体外径（mm）" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                v-model="scope.row.TubeDiameter" style="width: 100%"></el-input>
+                v-model="scope.row.TubeDiameter" style="width: 50%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                        v-model="scope.row.TubeDiameter" 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>
@@ -257,26 +267,34 @@
                 v-model="scope.row.InnerDiameter" style="width: 100%"></el-input>
             </template>
           </el-table-column>
-          <el-table-column prop="WallThickness" sortable min-width="130" label="壁厚（mm）" align="center"
+          <el-table-column prop="WallThickness" sortable min-width="210" label="壁厚（mm）" align="center"
             show-overflow-tooltip>
             <template slot-scope="scope">
               <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                v-model="scope.row.WallThickness" style="width: 100%"></el-input>
+                v-model="scope.row.WallThickness" style="width: 33%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                        v-model="scope.row.WallThickness" style="width: 33%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                        v-model="scope.row.WallThickness" style="width: 34%"></el-input>
             </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="170" label="公端" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  v-model="scope.row.JointDiameterM" style="width: 100%"></el-input>
+                  v-model="scope.row.JointDiameterM1" style="width: 50%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                          v-model="scope.row.JointDiameterM2" 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="170" label="母端" align="center"
               show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
-                  v-model="scope.row.JointDiameterF" style="width: 100%"></el-input>
+                  v-model="scope.row.JointDiameterF1" style="width: 50%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                          v-model="scope.row.JointDiameterF2" style="width: 50%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
@@ -345,28 +363,36 @@
 
           <el-col :span="12">
             <el-form-item label="锥度公差外螺纹" label-width="140px">
-              <el-input size="mini" v-model="searchForm.TaperToleranceOut" style="width:100%" placeholder="请输入">
+              <el-input size="mini" v-model="searchForm.TaperToleranceOut1" style="width:50%" placeholder="请输入">
+              </el-input>
+              <el-input size="mini" v-model="searchForm.TaperToleranceOut2" style="width:50%" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="锥度公差内螺纹" label-width="140px">
-              <el-input size="mini" v-model="searchForm.TaperToleranceIn" style="width:100%" placeholder="请输入">
+              <el-input size="mini" v-model="searchForm.TaperToleranceIn1" style="width:50%" placeholder="请输入">
+              </el-input>
+              <el-input size="mini" v-model="searchForm.TaperToleranceIn2" style="width:50%" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="螺距公差外螺纹" label-width="140px">
-              <el-input size="mini" v-model="searchForm.PitchToleranceOut" style="width:100%" placeholder="请输入">
+              <el-input size="mini" v-model="searchForm.PitchToleranceOut1" style="width:50%" placeholder="请输入">
+              </el-input>
+              <el-input size="mini" v-model="searchForm.PitchToleranceOut2" style="width:50%" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="螺距公差内螺纹" label-width="140px">
-              <el-input size="mini" v-model="searchForm.PitchToleranceIn" style="width:100%" placeholder="请输入">
+              <el-input size="mini" v-model="searchForm.PitchToleranceIn1" style="width:50%" placeholder="请输入">
+              </el-input>
+              <el-input size="mini" v-model="searchForm.PitchToleranceIn2" style="width:50%" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
@@ -385,8 +411,9 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="管体外径" label-width="120px">
-              <el-input size="mini" v-model="searchForm.TubeDiameter" style="width:100%" placeholder="请输入"></el-input>
+            <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-form-item>
           </el-col>
 
@@ -434,7 +461,9 @@
 
           <el-col :span="12">
             <el-form-item label="壁厚">
-              <el-input size="mini" v-model="searchForm.WallThickness" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.WallThickness" style="width:33%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.WallThickness" style="width:33%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.WallThickness" style="width:34%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
@@ -465,6 +494,7 @@
           <el-col :span="12">
             <el-form-item label="外径偏心度公端" label-width="130px">
               <el-input size="mini" v-model="searchForm.OuterDiameterF" style="width:100%" placeholder="请输入"></el-input>
+
             </el-form-item>
           </el-col>
 
@@ -687,6 +717,9 @@
       getDataEntry () {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
           this.formDataMain = res.data
+          if (!this.formDataMain.InspectionDate || this.formDataMain.InspectionDate.indexOf('0001-01-01') !== -1) {
+            this.formDataMain.InspectionDate = new Date()
+          }
           // this.params.Id = res.data.Id
         }).catch(error => {
           console.log(error)

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

@@ -40,52 +40,17 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="6">
-              <el-form-item label="锥度公差外螺纹" label-width="120px">
-                <el-input type="number" step="0.01" v-model.number="formData.TaperToleranceOut" placeholder="请输入"
-                  style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="锥度公差内螺纹">
-                <el-input type="number" step="0.01" v-model.number="formData.TaperToleranceIn" placeholder="请输入"
-                  style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="螺距公差外螺纹" label-width="120px">
-                <el-input type="number" step="0.01" v-model.number="formData.PitchToleranceOut" placeholder="请输入"
-                  style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="螺距公差内螺纹" label-width="120px">
-                <el-input type="number" step="0.01" v-model.number="formData.PitchToleranceIn" placeholder="请输入"
-                  style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
             <el-col :span="6">
               <el-form-item label="螺纹轴线与台肩面垂直度" label-width="170px">
                 <el-input type="number" step="0.01" v-model.number="formData.ShoulderSurface" placeholder="请输入"
-                  style="width: 100%"></el-input>
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="螺纹轴线与端面垂直度" label-width="160px">
                 <el-input type="number" step="0.01" v-model.number="formData.EndFace" placeholder="请输入"
-                  style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="6">
-              <el-form-item label="管体外径">
-                <el-input type="number" step="0.01" v-model.number="formData.TubeDiameter" placeholder="请输入"
-                  style="width: 100%"></el-input>
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
@@ -127,63 +92,120 @@
             <el-col :span="6">
               <el-form-item label="管体长度">
                 <el-input type="number" step="0.01" v-model.number="formData.TubeLength" placeholder="请输入"
-                  style="width: 100%"></el-input>
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="接头内径">
                 <el-input type="number" step="0.01" v-model.number="formData.InnerDiameter" placeholder="请输入"
-                  style="width: 100%"></el-input>
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="壁厚">
-                <el-input type="number" step="0.01" v-model.number="formData.WallThickness" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="焊接不同轴度公端" label-width="130px">
+                <el-input type="number" step="0.01" v-model.number="formData.WallDifF" placeholder="请输入"
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="接头外径公端">
-                <el-input type="number" step="0.01" v-model.number="formData.JointDiameterM" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="焊接不同轴度母端" label-width="130px">
+                <el-input type="number" step="0.01" v-model.number="formData.WallDifM" placeholder="请输入"
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="接头外径母端">
-                <el-input type="number" step="0.01" v-model.number="formData.JointDiameterF" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="外径偏心度公端" label-width="130px">
+                <el-input type="number" step="0.01" v-model.number="formData.OuterDiameterF" placeholder="请输入"
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="焊接不同轴度公端" label-width="130px">
-                <el-input type="number" step="0.01" v-model.number="formData.WallDifF" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="外径偏心度母端" label-width="130px">
+                <el-input type="number" step="0.01" v-model.number="formData.OuterDiameterM" placeholder="请输入"
+                          style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
+          </el-row>
+        </el-form>
+        <el-form label-width="110px" ref="EntityFormtop" label-position="top" :model="formData">
+          <el-row :gutter="10">
             <el-col :span="6">
-              <el-form-item label="焊接不同轴度母端" label-width="130px">
-                <el-input type="number" step="0.01" v-model.number="formData.WallDifM" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="锥度公差外螺纹" label-width="120px">
+                <el-input type="number" step="0.01" v-model.number="formData.TaperToleranceOut1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TaperToleranceOut2" placeholder="请输入"
+                          style="width: 50%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="外径偏心度公端" label-width="130px">
-                <el-input type="number" step="0.01" v-model.number="formData.OuterDiameterF" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="锥度公差内螺纹">
+                <el-input type="number" step="0.01" v-model.number="formData.TaperToleranceIn1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TaperToleranceIn2" placeholder="请输入"
+                          style="width: 50%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
-              <el-form-item label="外径偏心度母端" label-width="130px">
-                <el-input type="number" step="0.01" v-model.number="formData.OuterDiameterM" placeholder="请输入"
-                  style="width: 100%"></el-input>
+              <el-form-item label="螺距公差外螺纹" label-width="120px">
+                <el-input type="number" step="0.01" v-model.number="formData.PitchToleranceOut1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PitchToleranceOut2" placeholder="请输入"
+                          style="width: 50%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺距公差内螺纹" label-width="120px">
+                <el-input type="number" step="0.01" v-model.number="formData.PitchToleranceIn1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.PitchToleranceIn2" placeholder="请输入"
+                          style="width: 50%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="管体外径">
+                <el-input type="number" step="0.01" v-model.number="formData.TubeDiameter1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TubeDiameter2" placeholder="请输入"
+                          style="width: 50%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="壁厚">
+                <el-input type="number" step="0.01" v-model.number="formData.WallThickness1" placeholder="请输入"
+                  style="width: 33%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.WallThickness2" placeholder="请输入"
+                          style="width: 33%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.WallThickness3" placeholder="请输入"
+                          style="width: 34%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="接头外径公端">
+                <el-input type="number" step="0.01" v-model.number="formData.JointDiameterM1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.JointDiameterM2" placeholder="请输入"
+                          style="width: 50%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="接头外径母端">
+                <el-input type="number" step="0.01" v-model.number="formData.JointDiameterF1" placeholder="请输入"
+                  style="width: 50%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.JointDiameterF2" placeholder="请输入"
+                          style="width: 50%"></el-input>
               </el-form-item>
             </el-col>
 
@@ -242,13 +264,18 @@
           SampleNumber: '',
           CloseDistanceOut: '',
           CloseDistanceIn: '',
-          TaperToleranceOut: '',
-          TaperToleranceIn: '',
-          PitchToleranceOut: '',
-          PitchToleranceIn: '',
+          TaperToleranceOut1: '',
+          TaperToleranceOut2: '',
+          TaperToleranceIn1: '',
+          TaperToleranceIn2: '',
+          PitchToleranceOut1: '',
+          PitchToleranceOut2: '',
+          PitchToleranceIn1: '',
+          PitchToleranceIn2: '',
           ShoulderSurface: '',
           EndFace: '',
-          TubeDiameter: '',
+          TubeDiameter1: '',
+          TubeDiameter2: '',
           DF: '',
           QC: '',
           DRG: '',
@@ -256,9 +283,13 @@
           WallDif: '',
           TubeLength: '',
           InnerDiameter: '',
-          WallThickness: '',
-          JointDiameterM: '',
-          JointDiameterF: '',
+          WallThickness1: '',
+          WallThickness2: '',
+          WallThickness3: '',
+          JointDiameterM1: '',
+          JointDiameterM2: '',
+          JointDiameterF1: '',
+          JointDiameterF2: '',
           WallDifF: '',
           WallDifM: '',
           OuterDiameterF: '',