物资检验所数据录入界面，方钻杆，钻铤

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

@@ -0,0 +1,49 @@
+package limsdrillcollar
+
+import "time"
+
+type LimsReportDrillCollar struct {
+	Id                int       `xorm:"not null pk autoincr 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)"`
+	MajorAxis         float64   `xorm:"comment('管体外径长轴') DECIMAL(10,2)"`
+	ShortAxis         float64   `xorm:"comment('管体外径短轴') DECIMAL(10,2)"`
+	OutDiaDif         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)"`
+	DRG               float64   `xorm:"comment('DRG') DECIMAL(10,2)"`
+	WallDif1          string    `xorm:"comment('壁厚差t大1') DECIMAL(10,2)"`
+	WallDif2          string    `xorm:"comment('壁厚差t大2') DECIMAL(10,2)"`
+	WallDif3          string    `xorm:"comment('壁厚差t大3') DECIMAL(10,2)"`
+	ExDiameterM1      string    `xorm:"comment('壁厚差t小1') DECIMAL(10,2)"`
+	ExDiameterM2      string    `xorm:"comment('壁厚差t小2') DECIMAL(10,2)"`
+	ExDiameterM3      string    `xorm:"comment('壁厚差t小3') DECIMAL(10,2)"`
+	WallDifference1   string    `xorm:"comment('壁厚差△1') DECIMAL(10,2)"`
+	WallDifference2   string    `xorm:"comment('壁厚差△2') DECIMAL(10,2)"`
+	WallDifference3   string    `xorm:"comment('壁厚差△3') DECIMAL(10,2)"`
+	InterDiameter     float64   `xorm:"comment('管体内径') DECIMAL(10,2)"`
+	TubeLength        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/limsdrillcollar/limsdrillcollarService.go

@@ -0,0 +1,16 @@
+package limsdrillcollar
+
+import (
+	"github.com/go-xorm/xorm"
+	. "dashoo.cn/backend/api/mydb"
+)
+
+type LimsDrillCollarService struct {
+	MyServiceBase
+}
+
+func GetLimsDrillCollarService(xormEngine *xorm.Engine) *LimsDrillCollarService {
+	s := new(LimsDrillCollarService)
+	s.DBE = xormEngine
+	return s
+}

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

@@ -0,0 +1,41 @@
+package limspetroleumpipe
+
+import "time"
+
+type LimsPetroleUmPipe struct {
+	Id                int       `xorm:"not null pk autoincr 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)"`
+	DepthToleranceOut float64   `xorm:"comment('齿高公差外螺纹') DECIMAL(10,2)"`
+	DepthToleranceIn  float64   `xorm:"comment('齿高公差内螺纹') DECIMAL(10,2)"`
+	EdgeWidth         float64   `xorm:"comment('对边宽') DECIMAL(10,2)"`
+	DiagonalWidth     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)"`
+	WallThickness     float64   `xorm:"comment('壁厚') DECIMAL(10,2)"`
+	JointInDiameter   float64   `xorm:"comment('接头内径') DECIMAL(10,2)"`
+	ExDiameterF       float64   `xorm:"comment('接头外径公端') DECIMAL(10,2)"`
+	ExDiameterM       float64   `xorm:"comment('接头外径母端') DECIMAL(10,2)"`
+	TubeLength        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/limspetroleumpipe/limspetroleumpipeService.go

@@ -0,0 +1,16 @@
+package limspetroleumpipe
+
+import (
+	"github.com/go-xorm/xorm"
+	. "dashoo.cn/backend/api/mydb"
+)
+
+type LimsPetroleUmPipeService struct {
+	MyServiceBase
+}
+
+func GetLimsPetroleUmPipeService(xormEngine *xorm.Engine) *LimsPetroleUmPipeService {
+	s := new(LimsPetroleUmPipeService)
+	s.DBE = xormEngine
+	return s
+}

src/dashoo.cn/backend/api/controllers/base.go

@@ -229,29 +229,32 @@ var (
 	LimsReportSignName                       string = "LimsReportSign"              //报告签发
 	LimsReportHistoryName                    string = "LimsReportHistory"           //报告历史
 	LimsCustomerpositionName                 string = "LimsCustomerPosition"
-	LimsPressureLeakName                     string = "LimsPressureLeak"              //阻火器压力损失表
-	LimsSpecifyStandardName                  string = "LimsSpecifyStandard"           //Lims规格型号标准
-	BaseUserName                             string = "Base_User"                     //用户表
-	UserQualificationName                    string = "UserQualification"             //用户资质表
-	LimsInstrumentGroup                      string = "LimsInstrumentGroup"           // 检测仪器关联
-	LimsReportAlertorName                    string = "LimsReportAlertor"             // 计量站报警器
-	LimsReportAlertorCertificateName         string = "LimsReportAlertorCertificate"  // 计量站报警器  证书编号表
-	LimsReportAlertorDeviationName           string = "LimsReportAlertorDeviation"    // 计量站报警器 示值误差及响应时间表
-	LimsReportAlertorOtherName               string = "LimsReportAlertorOther"        // 计量站报警器 干扰误差
-	LimsReportAlertorRepeatName              string = "LimsReportAlertorRepeat"       // 计量站报警器  重复性
-	LimsReportAlertorShiftName               string = "LimsReportAlertorShift"        // 计量站报警器 漂移
-	LimsReportAlertorValueName               string = "LimsReportAlertorValue"        // 计量站报警器 报警误差/报警功能及报警动作值
+	LimsPressureLeakName                     string = "LimsPressureLeak"               //阻火器压力损失表
+	LimsSpecifyStandardName                  string = "LimsSpecifyStandard"            //Lims规格型号标准
+	BaseUserName                             string = "Base_User"                      //用户表
+	UserQualificationName                    string = "UserQualification"              //用户资质表
+	LimsInstrumentGroup                      string = "LimsInstrumentGroup"            // 检测仪器关联
+	LimsReportAlertorName                    string = "LimsReportAlertor"              // 计量站报警器
+	LimsReportAlertorCertificateName         string = "LimsReportAlertorCertificate"   // 计量站报警器  证书编号表
+	LimsReportAlertorDeviationName           string = "LimsReportAlertorDeviation"     // 计量站报警器 示值误差及响应时间表
+	LimsReportAlertorOtherName               string = "LimsReportAlertorOther"         // 计量站报警器 干扰误差
+	LimsReportAlertorRepeatName              string = "LimsReportAlertorRepeat"        // 计量站报警器  重复性
+	LimsReportAlertorShiftName               string = "LimsReportAlertorShift"         // 计量站报警器 漂移
+	LimsReportAlertorValueName               string = "LimsReportAlertorValue"         // 计量站报警器 报警误差/报警功能及报警动作值
 	LimsReportLiquidTransportationName       string = "LimsReportLiquidTransportation" //离心泵机组液体输送系统节能监测原始记录
-	LimsReportAlertorResponseTimeName        string = "LimsReportAlertorResponseTime" // 计量站报警器  响应时间
-	LimsReportPistonPumpUnitName             string = "LimsReportPistonPumpUnit" //柱塞泵机组液体输送系统节能监测原始记录
-	LimsReportMotorName                      string = "LimsReportMotor" // 电动机节能监测原始记录
-	LimsReportElecPumpWellName               string = "LimsReportElecPumpWell" // 电泵井节能监测原始数据记录表
-	LimsReportScrewPumpName                  string = "LimsReportScrewPump" //  螺杆泵节能监测原始数据记录表
-	LimsReportSpecialFieldName               string = "LimsReportSpecialField" // 油田专用变压器运行数据现场测试记录
-	LimsReportHeatingFurnaceName             string = "LimsReportHeatingFurnace" // 加 热 炉 节 能 监 测 原 始 记 录 表
-	LimsHeatingFurnaceItemsName              string = "LimsHeatingFurnaceItems" // 加 热 炉 节 能 -- 从表
-	LimsPipeDrillPipeName                    string = "LimsPipeDrillPipe" //  石油专用管材钻杆检验记录
-	OilAuditSettingName                      string = "Base_OilAuditSetting" // 单位审批步骤自定义配置
+	LimsReportAlertorResponseTimeName        string = "LimsReportAlertorResponseTime"  // 计量站报警器  响应时间
+	LimsReportPistonPumpUnitName             string = "LimsReportPistonPumpUnit"       //柱塞泵机组液体输送系统节能监测原始记录
+	LimsReportMotorName                      string = "LimsReportMotor"                // 电动机节能监测原始记录
+	LimsReportElecPumpWellName               string = "LimsReportElecPumpWell"         // 电泵井节能监测原始数据记录表
+	LimsReportScrewPumpName                  string = "LimsReportScrewPump"            //  螺杆泵节能监测原始数据记录表
+	LimsReportSpecialFieldName               string = "LimsReportSpecialField"         // 油田专用变压器运行数据现场测试记录
+	LimsReportHeatingFurnaceName             string = "LimsReportHeatingFurnace"       // 加 热 炉 节 能 监 测 原 始 记 录 表
+	LimsHeatingFurnaceItemsName              string = "LimsHeatingFurnaceItems"        // 加 热 炉 节 能 -- 从表
+	LimsPipeDrillPipeName                    string = "LimsPipeDrillPipe"              //  石油专用管材钻杆检验记录
+	OilAuditSettingName                      string = "Base_OilAuditSetting"           // 单位审批步骤自定义配置
+	LimsReportDrillCollarName                string = "LimsReportDrillCollar"          //  石油专用管材方钻杆检验记录
+	LimsPetroleUmPipeName                    string = "LimsReportPetroleumPipe"              //  石油专用管材钻铤检验记录
+
 )
 
 //分页信息及数据

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

@@ -0,0 +1,490 @@
+package limswzjys
+
+import (
+	"dashoo.cn/backend/api/business/baseUser"
+	"dashoo.cn/backend/api/business/limsdrillcollar"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business/userRole"
+	"dashoo.cn/utils"
+	"encoding/json"
+	"strings"
+	"time"
+)
+
+type LimsReportDrillCollarController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []limsdrillcollar.LimsReportDrillCollar
+// @router /list [get]
+func (this *LimsReportDrillCollarController) GetEntityList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	Id := this.GetString("Id")
+	Product := this.GetString("Product")
+	Specifications := this.GetString("Specifications")
+	SamplingBase := this.GetString("SamplingBase")
+	SampleQuantity := this.GetString("SampleQuantity")
+	SampleNumber := this.GetString("SampleNumber")
+	CloseDistanceOut := this.GetString("CloseDistanceOut")
+	CloseDistanceIn := this.GetString("CloseDistanceIn")
+	TaperToleranceOut := this.GetString("TaperToleranceOut")
+	TaperToleranceIn := this.GetString("TaperToleranceIn")
+	PitchToleranceOut := this.GetString("PitchToleranceOut")
+	PitchToleranceIn := this.GetString("PitchToleranceIn")
+	ShoulderSurface := this.GetString("ShoulderSurface")
+	EndFace := this.GetString("EndFace")
+	TubeDiameter := this.GetString("TubeDiameter")
+	LPC := this.GetString("LPC")
+	DF := this.GetString("DF")
+	QC := this.GetString("QC")
+	LB := this.GetString("LB")
+	LPB := this.GetString("LPB")
+	WallDif := this.GetString("WallDif")
+	TubeLength := this.GetString("TubeLength")
+	InnerDiameter := this.GetString("InnerDiameter")
+	WallThickness := this.GetString("WallThickness")
+	JointDiameterM := this.GetString("JointDiameterM")
+	JointDiameterF := this.GetString("JointDiameterF")
+	WallDifF := this.GetString("WallDifF")
+	WallDifM := this.GetString("WallDifM")
+	OuterDiameterF := this.GetString("OuterDiameterF")
+	OuterDiameterM := this.GetString("OuterDiameterM")
+	Appearance := this.GetString("Appearance")
+	Inspector := this.GetString("Inspector")
+	Audit := this.GetString("Audit")
+	InspectionDate := this.GetString("InspectionDate")
+	Remark := this.GetString("Remark")
+	CreateUserId := this.GetString("CreateUserId")
+	CreateOn := this.GetString("CreateOn")
+	CreateBy := this.GetString("CreateBy")
+	ModifiedOn := this.GetString("ModifiedOn")
+	ModifiedUserId := this.GetString("ModifiedUserId")
+	ModifiedBy := this.GetString("ModifiedBy")
+
+	if Id != "" {
+		where = where + " and Id like '%" + Id + "%'"
+	}
+
+
+	if Product != "" {
+		where = where + " and Product like '%" + Product + "%'"
+	}
+
+
+	if Specifications != "" {
+		where = where + " and Specifications like '%" + Specifications + "%'"
+	}
+
+
+	if SamplingBase != "" {
+		where = where + " and SamplingBase like '%" + SamplingBase + "%'"
+	}
+
+
+	if SampleQuantity != "" {
+		where = where + " and SampleQuantity like '%" + SampleQuantity + "%'"
+	}
+
+
+	if SampleNumber != "" {
+		where = where + " and SampleNumber like '%" + SampleNumber + "%'"
+	}
+
+
+	if CloseDistanceOut != "" {
+		where = where + " and CloseDistanceOut like '%" + CloseDistanceOut + "%'"
+	}
+
+
+	if CloseDistanceIn != "" {
+		where = where + " and CloseDistanceIn like '%" + CloseDistanceIn + "%'"
+	}
+
+
+	if TaperToleranceOut != "" {
+		where = where + " and TaperToleranceOut like '%" + TaperToleranceOut + "%'"
+	}
+
+
+	if TaperToleranceIn != "" {
+		where = where + " and TaperToleranceIn like '%" + TaperToleranceIn + "%'"
+	}
+
+
+	if PitchToleranceOut != "" {
+		where = where + " and PitchToleranceOut like '%" + PitchToleranceOut + "%'"
+	}
+
+
+	if PitchToleranceIn != "" {
+		where = where + " and PitchToleranceIn like '%" + PitchToleranceIn + "%'"
+	}
+
+
+	if ShoulderSurface != "" {
+		where = where + " and ShoulderSurface like '%" + ShoulderSurface + "%'"
+	}
+
+
+	if EndFace != "" {
+		where = where + " and EndFace like '%" + EndFace + "%'"
+	}
+
+
+	if TubeDiameter != "" {
+		where = where + " and TubeDiameter like '%" + TubeDiameter + "%'"
+	}
+
+
+	if DF != "" {
+		where = where + " and DF like '%" + DF + "%'"
+	}
+
+
+	if QC != "" {
+		where = where + " and QC like '%" + QC + "%'"
+	}
+
+
+	if LB != "" {
+		where = where + " and DRG like '%" + LB + "%'"
+	}
+
+
+	if LPC != "" {
+		where = where + " and LPC like '%" + LPC + "%'"
+	}
+
+	if LPB != "" {
+		where = where + " and LPB like '%" + LPB + "%'"
+	}
+
+	if WallDif != "" {
+		where = where + " and WallDif like '%" + WallDif + "%'"
+	}
+
+	if TubeLength != "" {
+		where = where + " and TubeLength like '%" + TubeLength + "%'"
+	}
+
+
+	if InnerDiameter != "" {
+		where = where + " and InnerDiameter like '%" + InnerDiameter + "%'"
+	}
+
+
+	if WallThickness != "" {
+		where = where + " and WallThickness like '%" + WallThickness + "%'"
+	}
+
+
+	if JointDiameterM != "" {
+		where = where + " and JointDiameterM like '%" + JointDiameterM + "%'"
+	}
+
+
+	if JointDiameterF != "" {
+		where = where + " and JointDiameterF like '%" + JointDiameterF + "%'"
+	}
+
+
+	if WallDifF != "" {
+		where = where + " and WallDifF like '%" + WallDifF + "%'"
+	}
+
+
+	if WallDifM != "" {
+		where = where + " and WallDifM like '%" + WallDifM + "%'"
+	}
+
+
+	if OuterDiameterF != "" {
+		where = where + " and OuterDiameterF like '%" + OuterDiameterF + "%'"
+	}
+
+
+	if OuterDiameterM != "" {
+		where = where + " and OuterDiameterM like '%" + OuterDiameterM + "%'"
+	}
+
+
+	if Appearance != "" {
+		where = where + " and Appearance like '%" + Appearance + "%'"
+	}
+
+
+	if Inspector != "" {
+		where = where + " and Inspector like '%" + Inspector + "%'"
+	}
+
+
+	if Audit != "" {
+		where = where + " and Audit like '%" + Audit + "%'"
+	}
+
+
+	if InspectionDate != "" {
+		where = where + " and InspectionDate like '%" + InspectionDate + "%'"
+	}
+
+
+	if Remark != "" {
+		where = where + " and Remark like '%" + Remark + "%'"
+	}
+
+
+	if CreateUserId != "" {
+		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
+	}
+
+
+	if CreateOn != "" {
+		where = where + " and CreateOn like '%" + CreateOn + "%'"
+	}
+
+
+	if CreateBy != "" {
+		where = where + " and CreateBy like '%" + CreateBy + "%'"
+	}
+
+
+	if ModifiedOn != "" {
+		where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
+	}
+
+
+	if ModifiedUserId != "" {
+		where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
+	}
+
+
+	if ModifiedBy != "" {
+		where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
+	}
+
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
+
+	svc := limsdrillcollar.GetLimsDrillCollarService(utils.DBE)
+	var list []limsdrillcollar.LimsReportDrillCollar
+	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取字典列表
+// @Description get user by token
+// @Success 200 {object} map[string]interface{}
+// @router /dictlist [get]
+func (this *LimsReportDrillCollarController) GetDictList() {
+	dictList := make(map[string]interface{})
+	//dictSvc := items.GetItemsService(utils.DBE)
+	userSvc := baseUser.GetBaseUserService(utils.DBE)
+	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
+	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", this.User.AccCode)
+	var userEntity userRole.Base_User
+	userSvc.GetEntityById(this.User.Id, &userEntity)
+	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
+
+	//var dictCustomer []svccustomer.Customer
+	//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
+	//dictList["EntrustCorp"] = &dictCustomer
+
+	var datainfo DataInfo
+	datainfo.Items = dictList
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} limsdrillcollar.LimsReportDrillCollar
+// @router /get/:id [get]
+func (this *LimsReportDrillCollarController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+
+	var model limsdrillcollar.LimsReportDrillCollar
+	svc := limsdrillcollar.GetLimsDrillCollarService(utils.DBE)
+	svc.GetEntityByIdBytbl(this.User.AccCode+LimsReportDrillCollarName, Id, &model)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
+// @Title 添加
+// @Description 新增
+// @Param 	body body limsdrillcollar.LimsReportDrillCollar
+// @Success	200	{object} controllers.Request
+// @router /add [post]
+func (this *LimsReportDrillCollarController) AddEntity() {
+	var model limsdrillcollar.LimsReportDrillCollar
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := limsdrillcollar.GetLimsDrillCollarService(utils.DBE)
+
+	json.Unmarshal(jsonBlob, &model)
+	model.CreateOn = time.Now()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsReportDrillCollarName, &model)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 修改实体
+// @Description 修改实体
+// @Param 	body body limsdrillcollar.LimsReportDrillCollar
+// @Success	200	{object} controllers.Request
+// @router /update/:id [post]
+func (this *LimsReportDrillCollarController) UpdateEntity() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model limsdrillcollar.LimsReportDrillCollar
+	svc := limsdrillcollar.GetLimsDrillCollarService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+
+		"Id",
+		"Product",
+		"Specifications",
+		"SamplingBase",
+		"SampleQuantity",
+		"SampleNumber",
+		"CloseDistanceOut",
+		"CloseDistanceIn",
+		"TaperToleranceOut",
+		"TaperToleranceIn",
+		"PitchToleranceOut",
+		"PitchToleranceIn",
+		"ShoulderSurface",
+		"EndFace",
+		"TubeDiameter",
+		"DF",
+		"QC",
+		"LPB",
+		"LPC",
+		"LB",
+		"WallDif",
+		"TubeLength",
+		"InnerDiameter",
+		"WallThickness",
+		"JointDiameterM",
+		"JointDiameterF",
+		"WallDifF",
+		"WallDifM",
+		"OuterDiameterF",
+		"OuterDiameterM",
+		"Appearance",
+		"Inspector",
+		"Audit",
+		"InspectionDate",
+		"Remark",
+		"CreateUserId",
+		"CreateOn",
+		"CreateBy",
+		"ModifiedOn",
+		"ModifiedUserId",
+		"ModifiedBy",
+	}
+	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsReportDrillCollarName, id, &model, cols)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 删除单条信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /delete/:Id [delete]
+func (this *LimsReportDrillCollarController) DeleteEntity() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var model limsdrillcollar.LimsReportDrillCollar
+	var entityempty limsdrillcollar.LimsReportDrillCollar
+	svc := limsdrillcollar.GetLimsDrillCollarService(utils.DBE)
+	opdesc := "删除-" + Id
+	err := svc.DeleteOperationAndWriteLogBytbl(this.User.AccCode+LimsReportDrillCollarName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "钻井日报")
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+ 

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

@@ -0,0 +1,442 @@
+package limswzjys
+
+import (
+	"dashoo.cn/backend/api/business/limspetroleumpipe"
+	"dashoo.cn/business/userRole"
+	"dashoo.cn/backend/api/business/baseUser"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+	"encoding/json"
+	"strings"
+	"time"
+)
+
+type LimsPetroleUmPipeController struct {
+	BaseController
+}
+
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []limspetroleumpipe.LimsPetroleUmPipe
+// @router /list [get]
+func (this *LimsPetroleUmPipeController) GetEntityList() {
+
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	Id := this.GetString("Id")
+	Product := this.GetString("Product")
+	Specifications := this.GetString("Specifications")
+	SamplingBase := this.GetString("SamplingBase")
+	SampleQuantity := this.GetString("SampleQuantity")
+	SampleNumber := this.GetString("SampleNumber")
+	CloseDistanceOut := this.GetString("CloseDistanceOut")
+	CloseDistanceIn := this.GetString("CloseDistanceIn")
+	TaperToleranceOut := this.GetString("TaperToleranceOut")
+	TaperToleranceIn := this.GetString("TaperToleranceIn")
+	PitchToleranceOut := this.GetString("PitchToleranceOut")
+	DepthToleranceOut := this.GetString("DepthToleranceOut")
+	DepthToleranceIn := this.GetString("DepthToleranceIn")
+	EdgeWidth := this.GetString("EdgeWidth")
+	DiagonalWidth := this.GetString("DiagonalWidth")
+	LPC := this.GetString("LPC")
+	DF := this.GetString("DF")
+	QC := this.GetString("QC")
+	WallThickness := this.GetString("WallThickness")
+	JointInDiameter := this.GetString("JointInDiameter")
+	ExDiameterF := this.GetString("ExDiameterF")
+	ExDiameterM := this.GetString("ExDiameterM")
+	TubeLength := this.GetString("TubeLength")
+	Appearance := this.GetString("Appearance")
+	Inspector := this.GetString("Inspector")
+	Audit := this.GetString("Audit")
+	InspectionDate := this.GetString("InspectionDate")
+	Remark := this.GetString("Remark")
+	CreateUserId := this.GetString("CreateUserId")
+	CreateOn := this.GetString("CreateOn")
+	CreateBy := this.GetString("CreateBy")
+	ModifiedOn := this.GetString("ModifiedOn")
+	ModifiedUserId := this.GetString("ModifiedUserId")
+	ModifiedBy := this.GetString("ModifiedBy")
+
+	if Id != "" {
+		where = where + " and Id like '%" + Id + "%'"
+	}
+
+
+	if Product != "" {
+		where = where + " and Product like '%" + Product + "%'"
+	}
+
+
+	if Specifications != "" {
+		where = where + " and Specifications like '%" + Specifications + "%'"
+	}
+
+
+	if SamplingBase != "" {
+		where = where + " and SamplingBase like '%" + SamplingBase + "%'"
+	}
+
+
+	if SampleQuantity != "" {
+		where = where + " and SampleQuantity like '%" + SampleQuantity + "%'"
+	}
+
+
+	if SampleNumber != "" {
+		where = where + " and SampleNumber like '%" + SampleNumber + "%'"
+	}
+
+
+	if CloseDistanceOut != "" {
+		where = where + " and CloseDistanceOut like '%" + CloseDistanceOut + "%'"
+	}
+
+
+	if CloseDistanceIn != "" {
+		where = where + " and CloseDistanceIn like '%" + CloseDistanceIn + "%'"
+	}
+
+
+	if TaperToleranceOut != "" {
+		where = where + " and TaperToleranceOut like '%" + TaperToleranceOut + "%'"
+	}
+
+
+	if TaperToleranceIn != "" {
+		where = where + " and TaperToleranceIn like '%" + TaperToleranceIn + "%'"
+	}
+
+
+	if PitchToleranceOut != "" {
+		where = where + " and PitchToleranceOut like '%" + PitchToleranceOut + "%'"
+	}
+
+
+	if DepthToleranceOut != "" {
+		where = where + " and DepthToleranceOut like '%" + DepthToleranceOut + "%'"
+	}
+
+
+	if DepthToleranceIn != "" {
+		where = where + " and DepthToleranceIn like '%" + DepthToleranceIn + "%'"
+	}
+
+
+	if EdgeWidth != "" {
+		where = where + " and EdgeWidth like '%" + EdgeWidth + "%'"
+	}
+
+
+	if DiagonalWidth != "" {
+		where = where + " and DiagonalWidth like '%" + DiagonalWidth + "%'"
+	}
+
+
+	if DF != "" {
+		where = where + " and DF like '%" + DF + "%'"
+	}
+
+
+	if QC != "" {
+		where = where + " and QC like '%" + QC + "%'"
+	}
+
+
+	if LPC != "" {
+		where = where + " and LPC like '%" + LPC + "%'"
+	}
+
+	if JointInDiameter != "" {
+		where = where + " and JointInDiameter like '%" + JointInDiameter + "%'"
+	}
+
+	if ExDiameterF != "" {
+		where = where + " and ExDiameterF like '%" + ExDiameterF + "%'"
+	}
+
+	if TubeLength != "" {
+		where = where + " and TubeLength like '%" + TubeLength + "%'"
+	}
+
+
+	if ExDiameterM != "" {
+		where = where + " and ExDiameterM like '%" + ExDiameterM + "%'"
+	}
+
+
+	if WallThickness != "" {
+		where = where + " and WallThickness like '%" + WallThickness + "%'"
+	}
+
+
+	if Appearance != "" {
+		where = where + " and Appearance like '%" + Appearance + "%'"
+	}
+
+
+	if Inspector != "" {
+		where = where + " and Inspector like '%" + Inspector + "%'"
+	}
+
+
+	if Audit != "" {
+		where = where + " and Audit like '%" + Audit + "%'"
+	}
+
+
+	if InspectionDate != "" {
+		where = where + " and InspectionDate like '%" + InspectionDate + "%'"
+	}
+
+
+	if Remark != "" {
+		where = where + " and Remark like '%" + Remark + "%'"
+	}
+
+
+	if CreateUserId != "" {
+		where = where + " and CreateUserId like '%" + CreateUserId + "%'"
+	}
+
+
+	if CreateOn != "" {
+		where = where + " and CreateOn like '%" + CreateOn + "%'"
+	}
+
+
+	if CreateBy != "" {
+		where = where + " and CreateBy like '%" + CreateBy + "%'"
+	}
+
+
+	if ModifiedOn != "" {
+		where = where + " and ModifiedOn like '%" + ModifiedOn + "%'"
+	}
+
+
+	if ModifiedUserId != "" {
+		where = where + " and ModifiedUserId like '%" + ModifiedUserId + "%'"
+	}
+
+
+	if ModifiedBy != "" {
+		where = where + " and ModifiedBy like '%" + ModifiedBy + "%'"
+	}
+
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
+
+	svc := limspetroleumpipe.GetLimsPetroleUmPipeService(utils.DBE)
+	var list []limspetroleumpipe.LimsPetroleUmPipe
+	total := svc.GetPagingEntitiesWithOrderBytbl(this.User.AccCode, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取字典列表
+// @Description get user by token
+// @Success 200 {object} map[string]interface{}
+// @router /dictlist [get]
+func (this *LimsPetroleUmPipeController) GetDictList() {
+	dictList := make(map[string]interface{})
+	//dictSvc := items.GetItemsService(utils.DBE)
+	userSvc := baseUser.GetBaseUserService(utils.DBE)
+	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
+	//dictList["WellNo"] = dictSvc.GetKeyValueItems("WellNo", this.User.AccCode)
+	var userEntity userRole.Base_User
+	userSvc.GetEntityById(this.User.Id, &userEntity)
+	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
+
+	//var dictCustomer []svccustomer.Customer
+	//customerSvc.GetEntitysByWhere(this.User.AccCode + CustomerName, "", &dictCustomer)
+	//dictList["EntrustCorp"] = &dictCustomer
+
+	var datainfo DataInfo
+	datainfo.Items = dictList
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object} limspetroleumpipe.LimsPetroleUmPipe
+// @router /get/:id [get]
+func (this *LimsPetroleUmPipeController) GetEntity() {
+	Id := this.Ctx.Input.Param(":id")
+
+	var model limspetroleumpipe.LimsPetroleUmPipe
+	svc := limspetroleumpipe.GetLimsPetroleUmPipeService(utils.DBE)
+	svc.GetEntityByIdBytbl(this.User.AccCode+LimsPetroleUmPipeName, Id, &model)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
+// @Title 添加
+// @Description 新增
+// @Param 	body body limspetroleumpipe.LimsPetroleUmPipe
+// @Success	200	{object} controllers.Request
+// @router /add [post]
+func (this *LimsPetroleUmPipeController) AddEntity() {
+	var model limspetroleumpipe.LimsPetroleUmPipe
+	var jsonBlob = this.Ctx.Input.RequestBody
+	svc := limspetroleumpipe.GetLimsPetroleUmPipeService(utils.DBE)
+
+	json.Unmarshal(jsonBlob, &model)
+	model.CreateOn = time.Now()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	_, err := svc.InsertEntityBytbl(this.User.AccCode+LimsPetroleUmPipeName, &model)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		//新增
+		errinfo.Message = "添加成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 修改实体
+// @Description 修改实体
+// @Param 	body body limspetroleumpipe.LimsPetroleUmPipe
+// @Success	200	{object} controllers.Request
+// @router /update/:id [post]
+func (this *LimsPetroleUmPipeController) UpdateEntity() {
+	id := this.Ctx.Input.Param(":id")
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model limspetroleumpipe.LimsPetroleUmPipe
+	svc := limspetroleumpipe.GetLimsPetroleUmPipeService(utils.DBE)
+
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+
+		"Id",
+		"Product",
+		"Specifications",
+		"SamplingBase",
+		"SampleQuantity",
+		"SampleNumber",
+		"CloseDistanceOut",
+		"CloseDistanceIn",
+		"TaperToleranceOut",
+		"TaperToleranceIn",
+		"PitchToleranceOut",
+		"PitchToleranceIn",
+		"DepthToleranceOut",
+		"DepthToleranceIn",
+		"EdgeWidth",
+		"DF",
+		"QC",
+		"DiagonalWidth",
+		"LPC",
+		"WallThickness",
+		"JointInDiameter",
+		"ExDiameterF",
+		"ExDiameterM",
+		"TubeLength",
+		"Appearance",
+		"Inspector",
+		"Audit",
+		"InspectionDate",
+		"Remark",
+		"CreateUserId",
+		"CreateOn",
+		"CreateBy",
+		"ModifiedOn",
+		"ModifiedUserId",
+		"ModifiedBy",
+	}
+	err := svc.UpdateEntityBytbl(this.User.AccCode+LimsPetroleUmPipeName, id, &model, cols)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+// @Title 删除单条信息
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /delete/:Id [delete]
+func (this *LimsPetroleUmPipeController) DeleteEntity() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	var model limspetroleumpipe.LimsPetroleUmPipe
+	var entityempty limspetroleumpipe.LimsPetroleUmPipe
+	svc := limspetroleumpipe.GetLimsPetroleUmPipeService(utils.DBE)
+	opdesc := "删除-" + Id
+	err := svc.DeleteOperationAndWriteLogBytbl(this.User.AccCode+LimsPetroleUmPipeName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, this.User.AccCode, "钻井日报")
+	if err == nil {
+		errinfo.Message = "删除成功"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "删除失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
+ 

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

@@ -1,4 +1,4 @@
-package lims
+package limswzjys
 
 import (
 	"dashoo.cn/business/userRole"

src/dashoo.cn/backend/api/routers/router.go

@@ -11,6 +11,7 @@ import (
 	"dashoo.cn/backend/api/controllers/instrument"
 	"dashoo.cn/backend/api/controllers/lims"
 	"dashoo.cn/backend/api/controllers/limsmetering"
+	"dashoo.cn/backend/api/controllers/limswzjys"
 	"dashoo.cn/backend/api/controllers/logs"
 	"dashoo.cn/backend/api/controllers/material"
 	"dashoo.cn/backend/api/controllers/setting"
@@ -532,9 +533,21 @@ func init() {
 		// 石油专用管材钻杆检验记录
 		beego.NSNamespace("/limspipedrillpipe",
 			beego.NSInclude(
-				&lims.LimsPipeDrillPipeController{},
+				&limswzjys.LimsPipeDrillPipeController{},
 			),
 		),
+			),
+		),
+		// 石油专用管材方钻杆检验记录
+		beego.NSNamespace("/limspetroleumpipe",
+			beego.NSInclude(
+				&limswzjys.LimsPetroleUmPipeController{},
+			),
+		),
+		// 石油专用管材钻铤检验记录
+		beego.NSNamespace("/limsdrillcollar",
+			beego.NSInclude(
+				&limswzjys.LimsReportDrillCollarController{},
 	)
 	beego.AddNamespace(ns)
 }

src/dashoo.cn/frontend_web/src/api/wzjys/limsdrillcollar.js

@@ -0,0 +1,41 @@
+export default {
+  getList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/limsdrillcollar/list?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  getDictList (myAxios) {
+    return myAxios({
+      url: '/limsdrillcollar/dictlist/',
+      method: 'GET'
+    })
+  },
+  getEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/limsdrillcollar/get/' + entityId,
+      method: 'GET'
+    })
+  },
+  addEntity (formData, myAxios) {
+    return myAxios({
+      url: '/limsdrillcollar/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/limsdrillcollar/update/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/limsdrillcollar/delete/' + entityId,
+      method: 'delete'
+    })
+  }
+}

src/dashoo.cn/frontend_web/src/api/wzjys/limspetroleumpipe.js

@@ -0,0 +1,41 @@
+export default {
+  getList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/limspetroleumpipe/list?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  getDictList (myAxios) {
+    return myAxios({
+      url: '/limspetroleumpipe/dictlist/',
+      method: 'GET'
+    })
+  },
+  getEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/limspetroleumpipe/get/' + entityId,
+      method: 'GET'
+    })
+  },
+  addEntity (formData, myAxios) {
+    return myAxios({
+      url: '/limspetroleumpipe/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  updateEntity (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/limspetroleumpipe/update/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
+  deleteEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/limspetroleumpipe/delete/' + entityId,
+      method: 'delete'
+    })
+  }
+}

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

@@ -861,7 +861,21 @@
           // 石油专用管材钻杆检验记录
           case 'DAYT.PipeDrillPipe.Detail':
             this.$router.push({
-              path: '/lims/reportpipedrillpipe/datalist',
+              path: '/lims/wzjys/reportpipedrillpipe/datalist',
+              query: queryParams
+            })
+            break
+            // 石油专用管材方钻杆检验记录
+          case 'DAYT.PetroleumPipe.Detail':
+            this.$router.push({
+              path: '/lims/wzjys/reportpetroleumpipe/datalist',
+              query: queryParams
+            })
+            break
+            // 石油专用管材钻铤检验记录
+          case 'DAYT.DrillCollar.Detail':
+            this.$router.push({
+              path: '/lims/wzjys/reportdrillcollar/datalist',
               query: queryParams
             })
             break

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

@@ -0,0 +1,754 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/lims/wzjys/reportdrillcollar' }">石油专用管材钻铤检验记录</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 石油专用管材钻铤检验记录
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"
+            v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
+          <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
+
+          <router-link v-if="this.sign == '1'" :to="'/lims/dataentry/tacktodo'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else-if="this.sign == '2'" :to="'/lims/dataentry'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else-if="this.sign == '3'" :to="'/lims/dataentry/alltask'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else :to="'/lims/dataentry'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -7px">
+          <el-form-item label="样品编号">
+            <!--<el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
+            <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
+            <el-input size="mini" v-model="searchForm.SampleNumber" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!--<data-main :DataEntryId="DataEntryId + ''" :EId="EId + ''" :DataDocId="DataDocId+''" :TaskBalanceId="TaskBalanceId+''"-->
+      <!--:DataStatus="DataStatus" @init-data-main="initDatas"></data-main>-->
+
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>数据录入</span>
+        </div>
+        <el-form label-width="120px" ref="formDataMain" :model="formDataMain">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="产品名称" prop="Product" :rules="{ required: true, message: '产品名称不能为空！'}">
+                <el-input v-model="formDataMain.Product" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="规格型号">
+                <el-input v-model="formDataMain.Spec" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="抽样基数" prop="SamplingBase" :rules="[{ type: 'number', message: '必须为数字值'}]">
+                <el-input v-model.number="formDataMain.SamplingBase" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量" prop="SampleQty" :rules="[{ type: 'number', message: '必须为数字值'}]">
+                <el-input v-model.number="formDataMain.SampleQty" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="外观检验" prop="Appearance">
+                <el-input v-model="formDataMain.Appearance" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检验日期" prop="InspectionDate">
+                <el-date-picker v-model="formDataMain.InspectionDate" type="date" placeholder="选择日期"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input type="textarea" v-model="formDataMain.MRemark" placeholder="请输入" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" align="center">
+              <el-button type="primary" size="mini" @click="saveMainInfo"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">保存</el-button>
+              <el-button type="primary" size="mini" @click="getDataHistory"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">选择历史记录</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+      <el-card>
+        <el-table :data="entityList" border height="calc(100vh - 250px)" highlight-current-row style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="190"
+            align="center" fixed>
+            <template slot-scope="scope">
+              <el-button type="primary" plain size="mini" title="编辑" @click="EditEntity(scope.row)">编辑</el-button>
+              <el-popover placement="top" title="提示">
+                <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
+                </el-alert>
+                <br />
+                <div style="text-align: right; margin: 0">
+                  <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+                </div>
+                <el-button slot="reference" type="primary" plain size="mini" title="删除" style="margin-left:3px">
+                  删除
+                </el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column prop="SampleNumber" sortable min-width="110" 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.SampleNumber" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="紧密距（mm）" align="center">
+            <el-table-column prop="CloseDistanceOut" sortable min-width="90" 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.CloseDistanceOut" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="CloseDistanceIn" sortable min-width="90" 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.CloseDistanceIn" style="width: 100%"></el-input>
+              </template>
+            </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"
+              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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="TaperToleranceIn" sortable min-width="100" 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>
+              </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"
+              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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="PitchToleranceIn" sortable min-width="100" 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>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column prop="ShoulderSurface" label="螺纹轴线(mm)" align="center">
+            <el-table-column prop="EndFace" sortable min-width="150" 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.ShoulderSurface" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="EndFace" sortable min-width="150" 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.EndFace" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column sortable min-width="160" label="管体外径（mm）" align="center" show-overflow-tooltip>
+            <el-table-column prop="MajorAxis" sortable min-width="150" 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.MajorAxis" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ShortAxis" sortable min-width="150" 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.ShortAxis" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column prop="OutDiaDif" sortable min-width="130" 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.OutDiaDif" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="DF" sortable min-width="120" label="DF（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.DF" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="QC" sortable min-width="125" label="QC（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.QC" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="DRG" sortable min-width="140" label="DRG（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.DRG" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="LPC" sortable min-width="130" label="LPC（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.LPC" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column sortable min-width="350" label="壁厚（mm）" align="center" show-overflow-tooltip>
+            <el-table-column prop="WallDif1" sortable min-width="100" label="t大" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.WallDif1" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ExDiameterM1" sortable min-width="100" label="t小" align="center"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.ExDiameterM1" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="WallDifference1" sortable min-width="100" 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.WallDifference1" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="WallDif2" sortable min-width="100" label="t大" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.WallDif2" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ExDiameterM2" sortable min-width="100" label="t小" align="center"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.ExDiameterM2" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="WallDifference2" sortable min-width="100" 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.WallDifference2" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="WallDif3" sortable min-width="100" label="t大" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.WallDif3" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ExDiameterM3" sortable min-width="100" label="t小" align="center"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.ExDiameterM3" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="WallDifference3" sortable min-width="100" 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.WallDifference3" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column prop="InterDiameter" sortable min-width="160" 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.InterDiameter" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="TubeLength" sortable min-width="150" label="管体长度（m）" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.TubeLength" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="样品编号">
+              <el-input size="mini" v-model="searchForm.SampleNumber" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="紧密距外螺纹" label-width="120px">
+              <el-input size="mini" v-model="searchForm.CloseDistanceOut" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="紧密距内螺纹" label-width="120px">
+              <el-input size="mini" v-model="searchForm.CloseDistanceIn" style="width:100%" 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.TaperToleranceOut" style="width:100%" 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>
+            </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>
+            </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>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="螺纹轴线与台肩面垂直度" label-width="170px">
+              <el-input size="mini" v-model="searchForm.ShoulderSurface" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="螺纹轴线与端面垂直度" label-width="170px">
+              <el-input size="mini" v-model="searchForm.EndFace" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="管体外径长轴" label-width="120px">
+              <el-input size="mini" v-model="searchForm.MajorAxis" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="管体外径短轴" label-width="120px">
+              <el-input size="mini" v-model="searchForm.ShortAxis" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="外径差" label-width="120px">
+              <el-input size="mini" v-model="searchForm.OutDiaDif" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="LPC">
+              <el-input size="mini" v-model="searchForm.LPC" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="DF">
+              <el-input size="mini" v-model="searchForm.DF" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="QC">
+              <el-input size="mini" v-model="searchForm.QC" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="DRG">
+              <el-input size="mini" v-model="searchForm.DRG" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="管体长度">
+              <el-input size="mini" v-model="searchForm.TubeLength" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="管体内径">
+              <el-input size="mini" v-model="searchForm.InterDiameter" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外观检验">
+              <el-input size="mini" v-model="searchForm.Appearance" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+    <data-opera ref="DataoperaCompoment" :DataEntryId="DataEntryId+''" :TaskBalanceId="TaskBalanceId+''" :EId="EId+''"
+      @init-data="initDatas"></data-opera>
+
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/wzjys/limsdrillcollar'
+  import DataOpera from './operation.vue'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'limsdrillcollar',
+    components: {
+      DataOpera
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        activeName: '1',
+        DataStatus: 0,
+        // 列表数据
+        entityList: [],
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        formDataMain: {
+          Product: '',
+          Spec: '',
+          SamplingBase: '',
+          SampleQty: '',
+          Appearance: '',
+          InspectionDate: new Date(),
+          MRemark: ''
+        },
+        // 查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        // 查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          Product: '',
+          Specifications: '',
+          SamplingBase: '',
+          SampleQuantity: '',
+          SampleNumber: '',
+          CloseDistanceOut: '',
+          CloseDistanceIn: '',
+          TaperToleranceOut: '',
+          TaperToleranceIn: '',
+          PitchToleranceOut: '',
+          PitchToleranceIn: '',
+          ShoulderSurface: '',
+          EndFace: '',
+          TubeDiameter: '',
+          DF: '',
+          QC: '',
+          DRG: '',
+          LPC: '',
+          WallDif: '',
+          TubeLength: '',
+          InnerDiameter: '',
+          WallThickness: '',
+          JointDiameterM: '',
+          JointDiameterF: '',
+          WallDifF: '',
+          WallDifM: '',
+          OuterDiameterF: '',
+          OuterDiameterM: '',
+          Appearance: '',
+          Inspector: '',
+          Audit: '',
+          InspectionDate:'',
+          Remark: '',
+          CreateUserId: '',
+          CreateOn: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+        }
+      }
+    },
+    created() {
+      this.EId = this.$route.query.eid
+      this.TaskBalanceId = this.$route.query.tbid
+      this.DataEntryId = this.$route.query.deid
+      this.DataStatus = 0 // parseInt(this.$route.query.datastatus)
+      this.DataDocId = this.$route.query.datadocId
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.getDataEntry()
+      this.initDatas()
+      // this.getDictOptions()
+    },
+    methods: {
+      saveMainInfo() {
+        this.$refs['formDataMain'].validate((valid) => {
+          if (valid) {
+            console.log("------------this.main",this.formDataMain)
+            this.$axios.post('/limsdataentry/updateEntity/' + this.DataEntryId, this.formDataMain).then(res => {
+              if (res.data.code === 0) {
+                this.getDataEntry()
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                })
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                })
+              }
+            }).catch(error => {
+              console.log(error)
+            })
+          }
+        })
+      },
+      getDataEntry() {
+        this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
+          this.formDataMain = res.data
+          // this.params.Id = res.data.Id
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      getDataHistory() {
+
+      },
+      initDatas() {
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop
+        }
+        let myCreateOn = []
+        // 解析时间
+        // if (this.CreateOn.length === 2) {
+        //   this.CreateOn[1].setHours(23)
+        //   this.CreateOn[1].setMinutes(59)
+        //   this.CreateOn[1].setSeconds(59)
+        //   myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+        //   myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        // }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      addDataEntity() {
+        // 刷新子列表
+        this.$refs['DataoperaCompoment'].resetFormData()
+        this.$refs['DataoperaCompoment'].dialogVisible = true
+      },
+
+      setProoFreadShow() {
+
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
+        }
+      },
+      // 列表排序功能
+      orderby(column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      EditEntity(row) {
+        this.$refs['DataoperaCompoment'].subListEditEntity(row.Id)
+        this.$refs['DataoperaCompoment'].dialogVisible = true
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,371 @@
+<template>
+  <div>
+    <el-dialog title="漏电保护信息" :visible.sync="dialogVisible" width="80%">
+      <el-card class="box-card">
+        <div slot="header">
+          <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>
+            <el-col :span="6">
+              <el-form-item label="样品编号">
+                <el-input v-model="formData.SampleNumber" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="紧密距外螺纹" label-width="120px">
+                <el-input v-model="formData.CloseDistanceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="紧密距内螺纹" label-width="120px">
+                <el-input v-model="formData.CloseDistanceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="锥度公差外螺纹" label-width="140px">
+                <el-input v-model="formData.TaperToleranceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="锥度公差内螺纹" label-width="140px">
+                <el-input v-model="formData.TaperToleranceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺距公差外螺纹" label-width="140px">
+                <el-input v-model="formData.PitchToleranceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺距公差内螺纹" label-width="140px">
+                <el-input v-model="formData.PitchToleranceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺纹轴线与台肩面垂直度" label-width="170px">
+                <el-input v-model="formData.ShoulderSurface" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺纹轴线与端面垂直度" label-width="170px">
+                <el-input v-model="formData.EndFace" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="管体外径长轴" label-width="120px">
+                <el-input v-model="formData.MajorAxis" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="管体外径短轴" label-width="120px">
+                <el-input v-model="formData.ShortAxis" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="外径差" label-width="120px">
+                <el-input v-model="formData.OutDiaDif" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="LPC">
+                <el-input v-model="formData.LPC" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="DF">
+                <el-input v-model="formData.DF" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="QC">
+                <el-input v-model="formData.QC" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="DRG">
+                <el-input v-model="formData.DRG" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="管体长度">
+                <el-input v-model="formData.TubeLength" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="管体内径">
+                <el-input v-model="formData.InterDiameter" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="外观检验">
+                <el-input v-model="formData.Appearance" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+
+            <el-col :span="24">
+              <el-form-item :span="24" style="text-align: center;">
+                <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                  {{ this.saveBtnName }}</el-button>
+                <el-checkbox style="margin-left: 10px;" v-model="continueInsertChecked" label="连续新增？" size="small"
+                  @change="continueInsertChange"></el-checkbox>
+                <el-button type="plain" size="small" @click="resetFormData"><i class="el-icon-refresh"></i> 重置
+                </el-button>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+      </el-card>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/wzjys/limsdrillcollar'
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'limsdrillcollarEdit',
+    props: {
+      EId: String,
+      TaskBalanceId: String,
+      DataEntryId: String
+    },
+
+    data() {
+      return {
+        saveBtnName: '新增',
+        continueInsertChecked: false,
+        dialogVisible: false,
+        serviceId: '',
+        historyData: {},
+        formData: {
+          Id: '',
+          Product: '',
+          Specifications: '',
+          SamplingBase: '',
+          SampleQuantity: '',
+          SampleNumber: '',
+          CloseDistanceOut: '',
+          CloseDistanceIn: '',
+          TaperToleranceOut: '',
+          TaperToleranceIn: '',
+          PitchToleranceOut: '',
+          PitchToleranceIn: '',
+          ShoulderSurface: '',
+          EndFace: '',
+          TubeDiameter: '',
+          DF: '',
+          QC: '',
+          DRG: '',
+          LPC: '',
+          WallDif: '',
+          TubeLength: '',
+          InnerDiameter: '',
+          WallThickness: '',
+          JointDiameterM: '',
+          JointDiameterF: '',
+          WallDifF: '',
+          WallDifM: '',
+          OuterDiameterF: '',
+          OuterDiameterM: '',
+          Appearance: '',
+          Inspector: '',
+          Audit: '',
+          InspectionDate:'',
+          CreateUserId: '',
+          CreateOn: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+        }
+      }
+    },
+    created() {
+      this.getDictOptions()
+
+      if (this.serviceId > 0) {
+        this.formData.Id = this.serviceId
+        this.initDatas()
+      } else {
+        this.formData.Id = 0
+        this.formData.EId = this.EId
+        this.formData.TaskBalanceId = this.TaskBalanceId
+        this.formData.DataEntryId = this.DataEntryId
+        // this.getEntrustInfo(this.EId)
+      }
+      // 初始值备份
+      Object.assign(this.historyData, this.formData)
+    },
+    methods: {
+      initDatas() {
+        if (this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            console.log('initDatas')
+            this.formData = res.data
+            this.$emit('init-data')
+            if (this.continueInsertChecked) {
+              this.continueInsertChange()
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      resetFormData() {
+        Object.assign(this.formData, this.historyData)
+        this.saveBtnName = '新增'
+        this.formData.Id = 0
+        this.formData.EId = this.EId
+        this.formData.TaskBalanceId = this.TaskBalanceId
+        this.formData.DataEntryId = this.DataEntryId
+      },
+      subListEditEntity(entityId) {
+        this.serviceId = entityId
+        this.formData.Id = this.serviceId
+        this.saveBtnName = '修改' // 修改
+        this.continueInsertChecked = false
+        this.initDatas()
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      // 保存信息
+      saveEntity() {
+        console.log(this.formData, '===========')
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            if (!this.formData.Id) {
+              this.addEntity()
+            } else {
+              this.updateEntity()
+            }
+          } else {
+            return false
+          }
+        })
+      },
+      addEntity() {
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item
+            this.saveBtnName = '修改'
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      continueInsertChange() {
+        this.formData.Id = 0
+        this.saveBtnName = '新增'
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,705 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/lims/wzjys/reportpetroleumpipe' }">石油专用管材方钻杆检验记录</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 石油专用管材方钻杆检验记录
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"
+            v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
+          <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
+
+          <router-link v-if="this.sign == '1'" :to="'/lims/dataentry/tacktodo'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else-if="this.sign == '2'" :to="'/lims/dataentry'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else-if="this.sign == '3'" :to="'/lims/dataentry/alltask'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+          <router-link v-else :to="'/lims/dataentry'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -7px">
+          <el-form-item label="样品编号">
+            <!--<el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
+            <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
+            <el-input size="mini" v-model="searchForm.SampleNumber" style="width:100%" placeholder="请输入"></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!--<data-main :DataEntryId="DataEntryId + ''" :EId="EId + ''" :DataDocId="DataDocId+''" :TaskBalanceId="TaskBalanceId+''"-->
+      <!--:DataStatus="DataStatus" @init-data-main="initDatas"></data-main>-->
+
+      <el-card>
+        <div slot="header" class="clearfix">
+          <span>数据录入</span>
+        </div>
+        <el-form label-width="120px" ref="formDataMain" :model="formDataMain">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="产品名称" prop="Product" :rules="{ required: true, message: '产品名称不能为空！'}">
+                <el-input v-model="formDataMain.Product" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="规格型号">
+                <el-input v-model="formDataMain.Spec" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="抽样基数" prop="SamplingBase" :rules="[{ type: 'number', message: '必须为数字值'}]">
+                <el-input v-model.number="formDataMain.SamplingBase" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品数量" prop="SampleQty" :rules="[{ type: 'number', message: '必须为数字值'}]">
+                <el-input v-model.number="formDataMain.SampleQty" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="外观检验" prop="Appearance">
+                <el-input v-model="formDataMain.Appearance" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检验日期" prop="InspectionDate">
+                <el-date-picker v-model="formDataMain.InspectionDate" type="date" placeholder="选择日期"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input type="textarea" v-model="formDataMain.MRemark" placeholder="请输入" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" align="center">
+              <el-button type="primary" size="mini" @click="saveMainInfo"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">保存</el-button>
+              <el-button type="primary" size="mini" @click="getDataHistory"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">选择历史记录</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-card>
+      <el-card>
+        <el-table :data="entityList" border height="calc(100vh - 250px)" highlight-current-row style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="190"
+            align="center" fixed>
+            <template slot-scope="scope">
+              <el-button type="primary" plain size="mini" title="编辑" @click="EditEntity(scope.row)">编辑</el-button>
+              <el-popover placement="top" title="提示">
+                <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
+                </el-alert>
+                <br />
+                <div style="text-align: right; margin: 0">
+                  <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+                </div>
+                <el-button slot="reference" type="primary" plain size="mini" title="删除" style="margin-left:3px">
+                  删除
+                </el-button>
+              </el-popover>
+            </template>
+          </el-table-column>
+          <el-table-column prop="SampleNumber" sortable min-width="110" 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.SampleNumber" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="紧密距（mm）" align="center">
+            <el-table-column prop="CloseDistanceOut" sortable min-width="90" 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.CloseDistanceOut" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="CloseDistanceIn" sortable min-width="90" 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.CloseDistanceIn" style="width: 100%"></el-input>
+              </template>
+            </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"
+              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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="TaperToleranceIn" sortable min-width="100" 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>
+              </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"
+              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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="PitchToleranceIn" sortable min-width="100" 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>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column label="齿高公差·10-3（in）" align="center">
+            <el-table-column prop="DepthToleranceOut" sortable min-width="100" 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.DepthToleranceOut" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="DepthToleranceIn" sortable min-width="100" 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.DepthToleranceIn" style="width: 100%"></el-input>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column prop="EdgeWidth" sortable min-width="130" 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.EdgeWidth" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="DiagonalWidth" sortable min-width="130" 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.DiagonalWidth" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="LPC" sortable min-width="120" label="LPC（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.LPC" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="DF" sortable min-width="120" label="DF（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.DF" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="QC" sortable min-width="125" label="QC（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.QC" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="WallThickness" sortable min-width="150" 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>
+            </template>
+          </el-table-column>
+          <el-table-column prop="JointInDiameter" sortable min-width="160" 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.JointInDiameter" style="width: 100%"></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"
+              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>
+              </template>
+            </el-table-column>
+            <el-table-column prop="JointDiameterF" sortable min-width="100" 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>
+              </template>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column prop="TubeLength" sortable min-width="150" label="管体长度（m）" align="center"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.TubeLength" style="width: 100%"></el-input>
+            </template>
+          </el-table-column>
+
+        </el-table>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
+        </el-pagination>
+      </el-card>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="advancedsearchForm" label-width="110px">
+        <el-row>
+
+          <el-col :span="12">
+            <el-form-item label="样品编号">
+              <el-input size="mini" v-model="searchForm.SampleNumber" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="紧密距外螺纹" label-width="120px">
+              <el-input size="mini" v-model="searchForm.CloseDistanceOut" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="紧密距内螺纹" label-width="120px">
+              <el-input size="mini" v-model="searchForm.CloseDistanceIn" style="width:100%" 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.TaperToleranceOut" style="width:100%" 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>
+            </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>
+            </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>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="齿高公差外螺纹" label-width="170px">
+              <el-input size="mini" v-model="searchForm.DepthToleranceOut" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="齿高公差内螺纹" label-width="170px">
+              <el-input size="mini" v-model="searchForm.DepthToleranceIn" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="对边宽" label-width="120px">
+              <el-input size="mini" v-model="searchForm.EdgeWidth" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="对角宽" label-width="120px">
+              <el-input size="mini" v-model="searchForm.DiagonalWidth" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="LPC">
+              <el-input size="mini" v-model="searchForm.LPC" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="DF">
+              <el-input size="mini" v-model="searchForm.DF" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="QC">
+              <el-input size="mini" v-model="searchForm.QC" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="壁厚">
+              <el-input size="mini" v-model="searchForm.WallThickness" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="接头内径">
+              <el-input size="mini" v-model="searchForm.JointInDiameter" style="width:100%" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="接头外径公端" label-width="130px">
+              <el-input size="mini" v-model="searchForm.ExDiameterF" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="接头外径母端" label-width="130px">
+              <el-input size="mini" v-model="searchForm.ExDiameterM" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="管体长度">
+              <el-input size="mini" v-model="searchForm.TubeLength" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="外观检验">
+              <el-input size="mini" v-model="searchForm.Appearance" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+      </span>
+    </el-dialog>
+
+    <data-opera ref="DataoperaCompoment" :DataEntryId="DataEntryId+''" :TaskBalanceId="TaskBalanceId+''" :EId="EId+''"
+      @init-data="initDatas"></data-opera>
+
+  </div>
+</template>
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/wzjys/limspetroleumpipe'
+  import DataOpera from './operation.vue'
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'limspetroleumpipe',
+    components: {
+      DataOpera
+    },
+    data() {
+      return {
+        dialogVisible: false,
+        activeName: '1',
+        DataStatus: 0,
+        // 列表数据
+        entityList: [],
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        // 列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        formDataMain: {
+          Product: '',
+          Spec: '',
+          SamplingBase: '',
+          SampleQty: '',
+          Appearance: '',
+          InspectionDate: new Date(),
+          MRemark: ''
+        },
+        // 查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        // 查询项
+        searchFormReset: {},
+        searchForm: {
+          Id: '',
+          Product: '',
+          Specifications: '',
+          SamplingBase: '',
+          SampleQuantity: '',
+          SampleNumber: '',
+          CloseDistanceOut: '',
+          CloseDistanceIn: '',
+          TaperToleranceOut: '',
+          TaperToleranceIn: '',
+          PitchToleranceOut: '',
+          PitchToleranceIn: '',
+          DepthToleranceOut:'',
+          DepthToleranceIn:'',
+          EdgeWidth:'',
+          DiagonalWidth: '',
+          DF: '',
+          QC: '',
+          LPC: '',
+          WallThickness: '',
+          JointInDiameter: '',
+          ExDiameterF: '',
+          ExDiameterM: '',
+          TubeLength: '',
+          Appearance: '',
+          Inspector: '',
+          Audit: '',
+          InspectionDate:'',
+          Remark: '',
+          CreateUserId: '',
+          CreateOn: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+        }
+      }
+    },
+    created() {
+      this.EId = this.$route.query.eid
+      this.TaskBalanceId = this.$route.query.tbid
+      this.DataEntryId = this.$route.query.deid
+      this.DataStatus = 0 // parseInt(this.$route.query.datastatus)
+      this.DataDocId = this.$route.query.datadocId
+      this.sign = this.$route.query.sign
+      this.ischeck = this.$route.query.ischeck
+      // 查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      // 查询列表
+      this.getDataEntry()
+      this.initDatas()
+      // this.getDictOptions()
+    },
+    methods: {
+      saveMainInfo() {
+        this.$refs['formDataMain'].validate((valid) => {
+          if (valid) {
+            this.$axios.post('/limsdataentry/updateEntity/' + this.DataEntryId, this.formDataMain).then(res => {
+              if (res.data.code === 0) {
+                this.getDataEntry()
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                })
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                })
+              }
+            }).catch(error => {
+              console.log(error)
+            })
+          }
+        })
+      },
+      getDataEntry() {
+        this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
+          this.formDataMain = res.data
+          // this.params.Id = res.data.Id
+        }).catch(error => {
+          console.log(error)
+        })
+      },
+      getDataHistory() {
+
+      },
+      initDatas() {
+        // 分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop
+        }
+        let myCreateOn = []
+        // 解析时间
+        // if (this.CreateOn.length === 2) {
+        //   this.CreateOn[1].setHours(23)
+        //   this.CreateOn[1].setMinutes(59)
+        //   this.CreateOn[1].setSeconds(59)
+        //   myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+        //   myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        // }
+        // 查询条件
+        Object.assign(params, this.searchForm)
+        // 访问接口
+        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+          this.entityList = res.data.items
+          this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      addDataEntity() {
+        // 刷新子列表
+        this.$refs['DataoperaCompoment'].resetFormData()
+        this.$refs['DataoperaCompoment'].dialogVisible = true
+      },
+
+      setProoFreadShow() {
+
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command === 'search') {
+          this.dialogVisible = true
+        } else if (command === 'clear') {
+          this.clearSearch()
+        }
+      },
+      // 列表排序功能
+      orderby(column) {
+        if (column.order === 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order === 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        row.deleteConfirmFlag = false
+        api.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      EditEntity(row) {
+        this.$refs['DataoperaCompoment'].subListEditEntity(row.Id)
+        this.$refs['DataoperaCompoment'].dialogVisible = true
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,372 @@
+<template>
+  <div>
+    <el-dialog title="漏电保护信息" :visible.sync="dialogVisible" width="80%">
+      <el-card class="box-card">
+        <div slot="header">
+          <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/reportpetroleumpipe/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>
+            <el-col :span="6">
+              <el-form-item label="样品编号">
+                <el-input v-model="formData.SampleNumber" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="紧密距外螺纹" label-width="120px">
+                <el-input v-model="formData.CloseDistanceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="紧密距内螺纹" label-width="120px">
+                <el-input v-model="formData.CloseDistanceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="锥度公差外螺纹" label-width="140px">
+                <el-input v-model="formData.TaperToleranceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="锥度公差内螺纹" label-width="140px">
+                <el-input v-model="formData.TaperToleranceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺距公差外螺纹" label-width="140px">
+                <el-input v-model="formData.PitchToleranceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="螺距公差内螺纹" label-width="140px">
+                <el-input v-model="formData.PitchToleranceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="齿高公差外螺纹" label-width="170px">
+                <el-input v-model="formData.DepthToleranceOut" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="齿高公差内螺纹" label-width="170px">
+                <el-input v-model="formData.DepthToleranceIn" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="对边宽" label-width="120px">
+                <el-input v-model="formData.EdgeWidth" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="对角宽" label-width="120px">
+                <el-input v-model="formData.DiagonalWidth" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="LPC">
+                <el-input v-model="formData.LPC" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="DF">
+                <el-input v-model="formData.DF" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="QC">
+                <el-input v-model="formData.QC" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="壁厚">
+                <el-input v-model="formData.WallThickness" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="接头内径">
+                <el-input v-model="formData.JointInDiameter" style="width:100%" placeholder="请输入">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="接头外径公端" label-width="130px">
+                <el-input v-model="formData.ExDiameterF" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="接头外径母端" label-width="130px">
+                <el-input v-model="formData.ExDiameterM" style="width:100%" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="管体长度">
+                <el-input v-model="formData.TubeLength" style="width:100%" placeholder="请输入"></el-input>
+                </el-form-item>
+            </el-col>
+
+
+            <el-col :span="24">
+              <el-form-item :span="24" style="text-align: center;">
+                <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                  {{ this.saveBtnName }}</el-button>
+                <el-checkbox style="margin-left: 10px;" v-model="continueInsertChecked" label="连续新增？" size="small"
+                  @change="continueInsertChange"></el-checkbox>
+                <el-button type="plain" size="small" @click="resetFormData"><i class="el-icon-refresh"></i> 重置
+                </el-button>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+      </el-card>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/wzjys/limspetroleumpipe'
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'limspetroleumpipeEdit',
+    props: {
+      EId: String,
+      TaskBalanceId: String,
+      DataEntryId: String
+    },
+
+    data() {
+      return {
+        saveBtnName: '新增',
+        continueInsertChecked: false,
+        dialogVisible: false,
+        serviceId: '',
+        historyData: {},
+        formData: {
+          Id: '',
+          Product: '',
+          Specifications: '',
+          SamplingBase: '',
+          SampleQuantity: '',
+          SampleNumber: '',
+          CloseDistanceOut: '',
+          CloseDistanceIn: '',
+          TaperToleranceOut: '',
+          TaperToleranceIn: '',
+          PitchToleranceOut: '',
+          PitchToleranceIn: '',
+          DepthToleranceOut:'',
+          DepthToleranceIn:'',
+          EdgeWidth:'',
+          DiagonalWidth: '',
+          DF: '',
+          QC: '',
+          LPC: '',
+          WallThickness: '',
+          JointInDiameter: '',
+          ExDiameterF: '',
+          ExDiameterM: '',
+          TubeLength: '',
+          Appearance: '',
+          Inspector: '',
+          Audit: '',
+          InspectionDate:'',
+          Remark: '',
+          CreateUserId: '',
+          CreateOn: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: ''
+        }
+      }
+    },
+    created() {
+      this.getDictOptions()
+
+      if (this.serviceId > 0) {
+        this.formData.Id = this.serviceId
+        this.initDatas()
+      } else {
+        this.formData.Id = 0
+        this.formData.EId = this.EId
+        this.formData.TaskBalanceId = this.TaskBalanceId
+        this.formData.DataEntryId = this.DataEntryId
+        // this.getEntrustInfo(this.EId)
+      }
+      // 初始值备份
+      Object.assign(this.historyData, this.formData)
+    },
+    methods: {
+      initDatas() {
+        if (this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            console.log('initDatas')
+            this.formData = res.data
+            this.$emit('init-data')
+            if (this.continueInsertChecked) {
+              this.continueInsertChange()
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      resetFormData() {
+        Object.assign(this.formData, this.historyData)
+        this.saveBtnName = '新增'
+        this.formData.Id = 0
+        this.formData.EId = this.EId
+        this.formData.TaskBalanceId = this.TaskBalanceId
+        this.formData.DataEntryId = this.DataEntryId
+      },
+      subListEditEntity(entityId) {
+        this.serviceId = entityId
+        this.formData.Id = this.serviceId
+        this.saveBtnName = '修改' // 修改
+        this.continueInsertChecked = false
+        this.initDatas()
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      // 保存信息
+      saveEntity() {
+        console.log(this.formData, '===========')
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            if (!this.formData.Id) {
+              this.addEntity()
+            } else {
+              this.updateEntity()
+            }
+          } else {
+            return false
+          }
+        })
+      },
+      addEntity() {
+        console.log("-------this.formdata",this.formData)
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item
+            this.saveBtnName = '修改'
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            // 保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      continueInsertChange() {
+        this.formData.Id = 0
+        this.saveBtnName = '新增'
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      }
+    }
+  }
+
+</script>
+
+<style lang="scss">
+
+</style>

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

@@ -2,27 +2,29 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/lims/limspipedrillpipe' }">石油专用管材钻杆检验记录</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/lims/wzjys/limspipedrillpipe' }">石油专用管材钻杆检验记录</el-breadcrumb-item>
     </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
+    <el-card class="box-card">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 石油专用管材钻杆检验记录
         </span>
         <span style="float: right;">
           <el-button type="primary" size="mini" v-if="this.ischeck===1" @click="jiaoheshowdialog">校核</el-button>
-          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="setProoFreadShow">提交校核</el-button>
-          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
+          <el-button type="primary" size="mini" v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3"
+            @click="setProoFreadShow">提交校核</el-button>
+          <el-button type="plain" size="mini" style="margin-left:10px; margin-top: -4px;"
+            v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" @click="addDataEntity">添加明细</el-button>
           <!--<el-button type="plain" @click="searchCommand('search')" size="mini"-->
           <!--style="margin-left:10px; margin-top: -4px;">查询</el-button>-->
 
           <router-link v-if="this.sign == '1'" :to="'/lims/dataentry/tacktodo'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
-           <router-link v-else-if="this.sign == '2'" :to="'/lims/dataentry'">
+          <router-link v-else-if="this.sign == '2'" :to="'/lims/dataentry'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
-           <router-link v-else-if="this.sign == '3'" :to="'/lims/dataentry/alltask'">
+          <router-link v-else-if="this.sign == '3'" :to="'/lims/dataentry/alltask'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
           <router-link v-else :to="'/lims/dataentry'">
@@ -32,7 +34,7 @@
         <el-form ref="form" :inline="true" style="float: right; margin-top: -7px">
           <el-form-item label="样品编号">
             <!--<el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"-->
-                            <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
+            <!--start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>-->
             <el-input size="mini" v-model="searchForm.SampleNumber" style="width:100%" placeholder="请输入"></el-input>
           </el-form-item>
 
@@ -49,7 +51,7 @@
       </div>
 
       <!--<data-main :DataEntryId="DataEntryId + ''" :EId="EId + ''" :DataDocId="DataDocId+''" :TaskBalanceId="TaskBalanceId+''"-->
-                 <!--:DataStatus="DataStatus" @init-data-main="initDatas"></data-main>-->
+      <!--:DataStatus="DataStatus" @init-data-main="initDatas"></data-main>-->
 
       <el-card>
         <div slot="header" class="clearfix">
@@ -59,58 +61,68 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="产品名称" prop="Product" :rules="{ required: true, message: '产品名称不能为空！'}">
-                <el-input v-model="formDataMain.Product" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model="formDataMain.Product" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="规格型号">
-                <el-input v-model="formDataMain.Spec" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model="formDataMain.Spec" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="抽样基数" prop="SamplingBase" :rules="[{ type: 'number', message: '必须为数字值'}]">
-                <el-input v-model.number="formDataMain.SamplingBase" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model.number="formDataMain.SamplingBase" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="样品数量" prop="SampleQty" :rules="[{ type: 'number', message: '必须为数字值'}]">
-                <el-input v-model="formDataMain.SampleQty" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model.number="formDataMain.SampleQty" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="外观检验" prop="Appearance">
-                <el-input v-model="formDataMain.Appearance" placeholder="请输入" style="width: 100%" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-input v-model="formDataMain.Appearance" placeholder="请输入" style="width: 100%"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="检验日期" prop="InspectionDate">
-                <el-date-picker v-model="formDataMain.InspectionDate" type="date"
-                  placeholder="选择日期" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
+                <el-date-picker v-model="formDataMain.InspectionDate" type="date" placeholder="选择日期"
+                  :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
-                <el-input type="textarea" v-model="formDataMain.MRemark" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="textarea" v-model="formDataMain.MRemark" placeholder="请输入" style="width: 100%">
+                </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" align="center">
-              <el-button type="primary" size="mini" @click="saveMainInfo" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">保存</el-button>
-              <el-button type="primary" size="mini" @click="getDataHistory" :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">选择历史记录</el-button>
+              <el-button type="primary" size="mini" @click="saveMainInfo"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">保存</el-button>
+              <el-button type="primary" size="mini" @click="getDataHistory"
+                :disabled="DataStatus　!=　0 &&　DataStatus　!=　5 &&　DataStatus　!=　3">选择历史记录</el-button>
             </el-col>
           </el-row>
         </el-form>
       </el-card>
       <el-card>
-        <el-table :data="entityList" border height="calc(100vh - 250px)" highlight-current-row style="width: 100%" @sort-change="orderby">
-          <el-table-column  v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="190" align="center" fixed>
+        <el-table :data="entityList" border height="calc(100vh - 250px)" highlight-current-row style="width: 100%"
+          @sort-change="orderby">
+          <el-table-column v-if="this.DataStatus==0||this.DataStatus==5||this.DataStatus==3" label="操作" min-width="190"
+            align="center" fixed>
             <template slot-scope="scope">
-              <el-button type="primary" plain size="mini" title="编辑"  @click="EditEntity(scope.row)">编辑</el-button>
+              <el-button type="primary" plain size="mini" title="编辑" @click="EditEntity(scope.row)">编辑</el-button>
               <el-popover placement="top" title="提示">
                 <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
                 </el-alert>
@@ -124,168 +136,185 @@
               </el-popover>
             </template>
           </el-table-column>
-          <el-table-column prop="SampleNumber" sortable min-width="110" label="样品编号" align="center" show-overflow-tooltip>
+          <el-table-column prop="SampleNumber" sortable min-width="110" 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.SampleNumber"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.SampleNumber" style="width: 100%"></el-input>
             </template>
           </el-table-column>
-          <el-table-column  label="紧密距（mm）" align="center">
-            <el-table-column prop="CloseDistanceOut" sortable min-width="90" label="外螺纹" align="center" show-overflow-tooltip>
+          <el-table-column label="紧密距（mm）" align="center">
+            <el-table-column prop="CloseDistanceOut" sortable min-width="90" 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.CloseDistanceOut"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.CloseDistanceOut" style="width: 100%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="CloseDistanceIn" sortable min-width="90" label="内螺纹" align="center" show-overflow-tooltip>
+            <el-table-column prop="CloseDistanceIn" sortable min-width="90" 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.CloseDistanceIn"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.CloseDistanceIn" style="width: 100%"></el-input>
               </template>
             </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" show-overflow-tooltip>
+            <el-table-column prop="TaperToleranceOut" sortable min-width="100" 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>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.TaperToleranceOut" style="width: 100%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="TaperToleranceIn" sortable min-width="100" label="内螺纹" align="center" show-overflow-tooltip>
+            <el-table-column prop="TaperToleranceIn" sortable min-width="100" 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>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.TaperToleranceIn" style="width: 100%"></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" show-overflow-tooltip>
+            <el-table-column prop="PitchToleranceOut" sortable min-width="100" 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>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.PitchToleranceOut" style="width: 100%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="PitchToleranceIn" sortable min-width="100" label="内螺纹" align="center" show-overflow-tooltip>
+            <el-table-column prop="PitchToleranceIn" sortable min-width="100" 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>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.PitchToleranceIn" style="width: 100%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
           <el-table-column prop="ShoulderSurface" label="螺纹轴线(mm)" align="center">
             <el-table-column sortable min-width="150" 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.ShoulderSurface"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.ShoulderSurface" style="width: 100%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="EndFace" sortable min-width="150" label="与端面垂直度" align="center" show-overflow-tooltip>
+            <el-table-column prop="EndFace" sortable min-width="150" 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.EndFace"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.EndFace" style="width: 100%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
-          <el-table-column prop="TubeDiameter" sortable min-width="160" label="管体外径（mm）" align="center" show-overflow-tooltip>
+          <el-table-column prop="TubeDiameter" sortable min-width="160" 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>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.TubeDiameter" style="width: 100%"></el-input>
             </template>
           </el-table-column>
           <el-table-column prop="LPC" sortable min-width="130" label="LPC（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.LPC"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.LPC" style="width: 100%"></el-input>
             </template>
           </el-table-column>
           <el-table-column prop="DF" sortable min-width="120" label="DF（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.DF"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.DF" style="width: 100%"></el-input>
             </template>
           </el-table-column>
           <el-table-column prop="QC" sortable min-width="125" label="QC（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.QC"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.QC" style="width: 100%"></el-input>
             </template>
           </el-table-column>
           <el-table-column prop="LPB" sortable min-width="140" label="LPB（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.LPB"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.LPB" style="width: 100%"></el-input>
             </template>
           </el-table-column>
           <el-table-column prop="LB" sortable min-width="120" label="LB(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.LB"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.LB" style="width: 100%"></el-input>
             </template>
           </el-table-column>
-          <el-table-column prop="TubeLength" sortable min-width="150" label="管体长度（m）" align="center" show-overflow-tooltip>
+          <el-table-column prop="TubeLength" sortable min-width="150" label="管体长度（m）" align="center"
+            show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3" v-model="scope.row.TubeLength"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.TubeLength" style="width: 100%"></el-input>
             </template>
           </el-table-column>
-          <el-table-column prop="InnerDiameter" sortable min-width="160" label="接头内径（mm）" align="center" show-overflow-tooltip>
+          <el-table-column prop="InnerDiameter" sortable min-width="160" 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.InnerDiameter"
-                        style="width: 100%"></el-input>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                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" show-overflow-tooltip>
+          <el-table-column prop="WallThickness" sortable min-width="130" 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>
+              <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                v-model="scope.row.WallThickness" style="width: 100%"></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" show-overflow-tooltip>
+            <el-table-column prop="JointDiameterM" sortable min-width="100" 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>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.JointDiameterM" style="width: 100%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="JointDiameterF" sortable min-width="100" label="母端" align="center" show-overflow-tooltip>
+            <el-table-column prop="JointDiameterF" sortable min-width="100" 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>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.JointDiameterF" style="width: 100%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
           <el-table-column label="焊接不同轴度（mm）" align="center">
             <el-table-column prop="WallDifF" sortable min-width="100" 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.WallDifF"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.WallDifF" style="width: 100%"></el-input>
               </template>
             </el-table-column>
             <el-table-column prop="WallDifM" sortable min-width="100" 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.WallDifM"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.WallDifM" style="width: 100%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
           <el-table-column label="外径偏心度（mm）" align="center">
-            <el-table-column prop="OuterDiameterF" sortable min-width="100" label="公端" align="center" show-overflow-tooltip>
+            <el-table-column prop="OuterDiameterF" sortable min-width="100" 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.OuterDiameterF"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.OuterDiameterF" style="width: 100%"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="OuterDiameterM" sortable min-width="100" label="母端" align="center" show-overflow-tooltip>
+            <el-table-column prop="OuterDiameterM" sortable min-width="100" 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.OuterDiameterM"
-                          style="width: 100%"></el-input>
+                <el-input size="small" :disabled="DataStatus != 0 && DataStatus!=5 && DataStatus!=3"
+                  v-model="scope.row.OuterDiameterM" style="width: 100%"></el-input>
               </template>
             </el-table-column>
           </el-table-column>
 
         </el-table>
         <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                       :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
         </el-pagination>
       </el-card>
     </el-card>
@@ -302,43 +331,50 @@
 
           <el-col :span="12">
             <el-form-item label="紧密距外螺纹" label-width="120px">
-              <el-input size="mini" v-model="searchForm.CloseDistanceOut" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.CloseDistanceOut" style="width:100%" placeholder="请输入">
+              </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="紧密距内螺纹" label-width="120px">
-              <el-input size="mini" v-model="searchForm.CloseDistanceIn" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.CloseDistanceIn" style="width:100%" 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.TaperToleranceOut" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.TaperToleranceOut" style="width:100%" 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>
+              <el-input size="mini" v-model="searchForm.TaperToleranceIn" style="width:100%" 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>
+              <el-input size="mini" v-model="searchForm.PitchToleranceOut" style="width:100%" 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>
+              <el-input size="mini" v-model="searchForm.PitchToleranceIn" style="width:100%" placeholder="请输入">
+              </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="螺纹轴线与台肩面垂直度" label-width="170px">
-              <el-input size="mini" v-model="searchForm.ShoulderSurface" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.ShoulderSurface" style="width:100%" placeholder="请输入">
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -452,13 +488,16 @@
       </span>
     </el-dialog>
 
-    <data-opera ref="DataoperaCompoment" :DataEntryId="DataEntryId+''" :TaskBalanceId="TaskBalanceId+''" :EId="EId+''"  @init-data="initDatas"></data-opera>
+    <data-opera ref="DataoperaCompoment" :DataEntryId="DataEntryId+''" :TaskBalanceId="TaskBalanceId+''" :EId="EId+''"
+      @init-data="initDatas"></data-opera>
 
   </div>
 </template>
 <script>
-  import { mapGetters } from 'vuex'
-  import api from '@/api/lims/limspipedrillpipe'
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/wzjys/limspipedrillpipe'
   import DataOpera from './operation.vue'
 
   export default {
@@ -471,7 +510,7 @@
     components: {
       DataOpera
     },
-    data () {
+    data() {
       return {
         dialogVisible: false,
         activeName: '1',
@@ -544,7 +583,7 @@
         }
       }
     },
-    created () {
+    created() {
       this.EId = this.$route.query.eid
       this.TaskBalanceId = this.$route.query.tbid
       this.DataEntryId = this.$route.query.deid
@@ -560,7 +599,7 @@
       // this.getDictOptions()
     },
     methods: {
-      saveMainInfo () {
+      saveMainInfo() {
         this.$refs['formDataMain'].validate((valid) => {
           if (valid) {
             this.$axios.post('/limsdataentry/updateEntity/' + this.DataEntryId, this.formDataMain).then(res => {
@@ -582,7 +621,7 @@
           }
         })
       },
-      getDataEntry () {
+      getDataEntry() {
         this.$axios.get('/limsdataentry/getdataentry/' + this.DataEntryId).then(res => {
           this.formDataMain = res.data
           // this.params.Id = res.data.Id
@@ -590,10 +629,10 @@
           console.log(error)
         })
       },
-      getDataHistory () {
+      getDataHistory() {
 
       },
-      initDatas () {
+      initDatas() {
         // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
@@ -620,17 +659,17 @@
           console.error(err)
         })
       },
-      addDataEntity () {
+      addDataEntity() {
         // 刷新子列表
         this.$refs['DataoperaCompoment'].resetFormData()
         this.$refs['DataoperaCompoment'].dialogVisible = true
       },
 
-      setProoFreadShow () {
+      setProoFreadShow() {
 
       },
 
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
 
         }).catch(err => {
@@ -638,7 +677,7 @@
         })
       },
 
-      searchCommand (command) {
+      searchCommand(command) {
         if (command === 'search') {
           this.dialogVisible = true
         } else if (command === 'clear') {
@@ -646,7 +685,7 @@
         }
       },
       // 列表排序功能
-      orderby (column) {
+      orderby(column) {
         if (column.order === 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order === 'descending') {
@@ -655,27 +694,27 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch () {
+      clearSearch() {
         Object.assign(this.searchForm, this.searchFormReset)
         // this.searchForm = this.searchFormReset;
         this.CreateOn = ''
         this.initDatas()
       },
-      handleSearch () {
+      handleSearch() {
         this.currentPage = 1
         this.dialogVisible = false
         this.initDatas()
       },
-      handleCurrentChange (value) {
+      handleCurrentChange(value) {
         this.currentPage = value
         this.initDatas()
       },
-      handleSizeChange (value) {
+      handleSizeChange(value) {
         this.size = value
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity (row) {
+      deleteEntity(row) {
         row.deleteConfirmFlag = false
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -694,12 +733,12 @@
           console.error(err)
         })
       },
-      EditEntity (row) {
+      EditEntity(row) {
         this.$refs['DataoperaCompoment'].subListEditEntity(row.Id)
         this.$refs['DataoperaCompoment'].dialogVisible = true
       },
 
-      jstimehandle (val) {
+      jstimehandle(val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -712,7 +751,7 @@
         }
       },
 
-      formatDateTime (date) {
+      formatDateTime(date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -725,9 +764,9 @@
       }
     }
   }
+
 </script>
 
 <style lang="scss">
 
 </style>
-

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

@@ -1,14 +1,11 @@
 <template>
   <div>
     <!--<el-breadcrumb class="heading">-->
-      <!--<el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>-->
-      <!--<el-breadcrumb-item :to="{ path: '/lims/s5ovelimspipedrillpipe' }">石油专用管材钻杆检验记录</el-breadcrumb-item>-->
-      <!--<el-breadcrumb-item>编辑</el-breadcrumb-item>-->
+    <!--<el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>-->
+    <!--<el-breadcrumb-item :to="{ path: '/lims/s5ovelimspipedrillpipe' }">石油专用管材钻杆检验记录</el-breadcrumb-item>-->
+    <!--<el-breadcrumb-item>编辑</el-breadcrumb-item>-->
     <!--</el-breadcrumb>-->
-    <el-dialog
-      title="漏电保护信息"
-      :visible.sync="dialogVisible"
-      width="80%">
+    <el-dialog title="漏电保护信息" :visible.sync="dialogVisible" width="80%">
       <el-card class="box-card">
         <div slot="header">
           <span>
@@ -16,7 +13,7 @@
           </span>
           <span style="float: right;">
             <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-            <router-link :to="'/lims/reportpipedrillpipe/datalist'">
+            <router-link :to="'/lims/wzjys/reportpipedrillpipe/datalist'">
               <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
             </router-link>
           </span>
@@ -25,153 +22,179 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="样品编号">
-                <el-input v-model="formData.SampleNumber" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input v-model="formData.SampleNumber" 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.CloseDistanceOut" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.CloseDistanceOut" 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.CloseDistanceIn" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.CloseDistanceIn" 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.TaperToleranceOut" placeholder="请输入"  style="width: 100%"></el-input>
+                <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-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-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-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>
+                <el-input type="number" step="0.01" v-model.number="formData.ShoulderSurface" placeholder="请输入"
+                  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-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>
+                <el-input type="number" step="0.01" v-model.number="formData.TubeDiameter" placeholder="请输入"
+                  style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="LPC">
-                <el-input type="number" step="0.01" v-model.number="formData.LPC" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.LPC" placeholder="请输入" style="width: 100%">
+                </el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="DF">
-                <el-input type="number" step="0.01" v-model.number="formData.DF" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.DF" placeholder="请输入" style="width: 100%">
+                </el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="QC">
-                <el-input type="number" step="0.01" v-model.number="formData.QC" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.QC" placeholder="请输入" style="width: 100%">
+                </el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="LPB">
-                <el-input type="number" step="0.01" v-model.number="formData.LPB" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.LPB" placeholder="请输入" style="width: 100%">
+                </el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="6">
               <el-form-item label="LB">
-                <el-input type="number" step="0.01" v-model.number="formData.LB" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.LB" 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.TubeLength" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.TubeLength" 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.InnerDiameter" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.InnerDiameter" 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.WallThickness" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.WallThickness" 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-input type="number" step="0.01" v-model.number="formData.JointDiameterM" 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-input type="number" step="0.01" v-model.number="formData.JointDiameterF" 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-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="焊接不同轴度母端" label-width="130px">
-                <el-input type="number" step="0.01" v-model.number="formData.WallDifM" placeholder="请输入"  style="width: 100%"></el-input>
+                <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="外径偏心度公端" label-width="130px">
-                <el-input type="number" step="0.01" v-model.number="formData.OuterDiameterF" placeholder="请输入"  style="width: 100%"></el-input>
+                <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.OuterDiameterM" placeholder="请输入"  style="width: 100%"></el-input>
+                <el-input type="number" step="0.01" v-model.number="formData.OuterDiameterM" placeholder="请输入"
+                  style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item :span="24" style="text-align: center;">
-                <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i> {{ this.saveBtnName }}</el-button>
-                <el-checkbox style="margin-left: 10px;" v-model="continueInsertChecked" label="连续新增？" size="small" @change="continueInsertChange"></el-checkbox>
-                <el-button type="plain" size="small" @click="resetFormData"><i class="el-icon-refresh"></i> 重置</el-button>
+                <el-button type="primary" size="small" @click="saveEntity"><i class="el-icon-circle-check"></i>
+                  {{ this.saveBtnName }}</el-button>
+                <el-checkbox style="margin-left: 10px;" v-model="continueInsertChecked" label="连续新增？" size="small"
+                  @change="continueInsertChange"></el-checkbox>
+                <el-button type="plain" size="small" @click="resetFormData"><i class="el-icon-refresh"></i> 重置
+                </el-button>
               </el-form-item>
             </el-col>
 
@@ -186,7 +209,7 @@
   import {
     mapGetters
   } from 'vuex'
-  import api from '@/api/lims/limspipedrillpipe'
+  import api from '@/api/wzjys/limspipedrillpipe'
   export default {
     computed: {
       ...mapGetters({
@@ -200,7 +223,7 @@
       DataEntryId: String
     },
 
-    data () {
+    data() {
       return {
         saveBtnName: '新增',
         continueInsertChecked: false,
@@ -225,9 +248,8 @@
           TubeDiameter: '',
           DF: '',
           QC: '',
-          LPB: '',
+          DRG: '',
           LPC: '',
-          LB: '',
           WallDif: '',
           TubeLength: '',
           InnerDiameter: '',
@@ -252,7 +274,7 @@
         }
       }
     },
-    created () {
+    created() {
       this.getDictOptions()
 
       if (this.serviceId > 0) {
@@ -269,7 +291,7 @@
       Object.assign(this.historyData, this.formData)
     },
     methods: {
-      initDatas () {
+      initDatas() {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             console.log('initDatas')
@@ -283,7 +305,7 @@
           })
         }
       },
-      resetFormData () {
+      resetFormData() {
         Object.assign(this.formData, this.historyData)
         this.saveBtnName = '新增'
         this.formData.Id = 0
@@ -291,7 +313,7 @@
         this.formData.TaskBalanceId = this.TaskBalanceId
         this.formData.DataEntryId = this.DataEntryId
       },
-      subListEditEntity (entityId) {
+      subListEditEntity(entityId) {
         this.serviceId = entityId
         this.formData.Id = this.serviceId
         this.saveBtnName = '修改' // 修改
@@ -299,7 +321,7 @@
         this.initDatas()
       },
 
-      getDictOptions () {
+      getDictOptions() {
         api.getDictList(this.$axios).then(res => {
 
         }).catch(err => {
@@ -308,7 +330,7 @@
       },
 
       // 保存信息
-      saveEntity () {
+      saveEntity() {
         console.log(this.formData, '===========')
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
@@ -322,7 +344,7 @@
           }
         })
       },
-      addEntity () {
+      addEntity() {
         api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -343,7 +365,7 @@
           console.error(err)
         })
       },
-      updateEntity () {
+      updateEntity() {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
@@ -362,11 +384,11 @@
           console.error(err)
         })
       },
-      continueInsertChange () {
+      continueInsertChange() {
         this.formData.Id = 0
         this.saveBtnName = '新增'
       },
-      jstimehandle (val) {
+      jstimehandle(val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -379,7 +401,7 @@
         }
       },
 
-      formatDateTime (date) {
+      formatDateTime(date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -392,6 +414,7 @@
       }
     }
   }
+
 </script>
 
 <style lang="scss">