蜜蜂所打印

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

@@ -114,6 +114,109 @@ type SamplesFileInfoList struct {
 	ModifiedOn        time.Time `xorm:"DATETIME updated"`
 }
 
+type AnimalSamplesFileInfoList struct {
+	MId               int       `xorm:"<- not null pk autoincr INT(11)"`
+	AccCode           string    `xorm:"VARCHAR(10)"`
+	Name              string    `xorm:"VARCHAR(100)"`
+	SampleCode        string    `xorm:"VARCHAR(100)"` //样本编码
+	SampleType        int       `xorm:"INT(10)"`      //样本类型
+	SampleTypeName    string    `xorm:"VARCHAR(100)"`
+	SamplingOrgan     string    `xorm:"VARCHAR(50)"`
+	SamplingOrganName string    `xorm:"VARCHAR(50)"`
+	SamplingSite      string    `xorm:"VARCHAR(50)"`
+	SamplingSiteName  string    `xorm:"VARCHAR(50)"`
+	FamilyState       int       `xorm:"INT(10)"`     //是否含有家系
+	SourceId          int       `xorm:"INT(10)"`     //样本来源
+	SourceIdCard      string    `xorm:"VARCHAR(50)"` //样本源身份证号原Zbackup11
+	SourceName        string    `xorm:"VARCHAR(50)"` //样本源姓名原Zbackup12
+	ReceiveDate       time.Time `form:"ReceiveDate,2006-1-2 15:4:5"`
+	GroupId           string    `xorm:"VARCHAR(200)"`
+	GroupName         string    `xorm:"VARCHAR(500)"`
+	ZBack11           string    `xorm:"VARCHAR(256)"`
+	ZBack12           string    `xorm:"VARCHAR(256)"`
+	ZBack13           string    `xorm:"VARCHAR(256)"`
+	ZBack14           string    `xorm:"VARCHAR(256)"`
+	ZBack15           string    `xorm:"VARCHAR(256)"`
+	ZBack16           string    `xorm:"VARCHAR(256)"`
+	ZBack17           string    `xorm:"VARCHAR(256)"`
+	ZBack18           string    `xorm:"VARCHAR(256)"`
+	ZBack19           string    `xorm:"VARCHAR(256)"`
+	ZBack20           string    `xorm:"VARCHAR(256)"`
+	ZBack21           string    `xorm:"VARCHAR(256)"`
+	ZBack22           string    `xorm:"VARCHAR(256)"`
+	ZBack23           string    `xorm:"VARCHAR(256)"`
+	ZBack24           string    `xorm:"VARCHAR(256)"`
+	ZBack25           string    `xorm:"VARCHAR(256)"`
+	ZBack26           string    `xorm:"VARCHAR(256)"`
+	ZBack27           string    `xorm:"VARCHAR(256)"`
+	ZBack28           string    `xorm:"VARCHAR(256)"`
+	ZBack29           string    `xorm:"VARCHAR(256)"`
+	ZBack30           string    `xorm:"VARCHAR(256)"`
+	ZBack31           string    `xorm:"VARCHAR(256)"`
+	ZBack32           string    `xorm:"VARCHAR(256)"`
+	ZBack33           string    `xorm:"VARCHAR(256)"`
+	ZBack34           string    `xorm:"VARCHAR(256)"`
+	ZBack35           string    `xorm:"VARCHAR(256)"`
+	ZBack36           string    `xorm:"VARCHAR(256)"`
+	ZBack37           string    `xorm:"VARCHAR(256)"`
+	ZBack38           string    `xorm:"VARCHAR(256)"`
+	ZBack39           string    `xorm:"VARCHAR(256)"`
+	ZBack40           string    `xorm:"VARCHAR(256)"`
+	ZBack41           string    `xorm:"VARCHAR(256)"`
+	ZBack42           string    `xorm:"VARCHAR(256)"`
+	ZBack43           string    `xorm:"VARCHAR(256)"`
+	ZBack44           string    `xorm:"VARCHAR(256)"`
+	ZBack45           string    `xorm:"VARCHAR(256)"`
+	ZBack46           string    `xorm:"VARCHAR(256)"`
+	ZBack47           string    `xorm:"VARCHAR(256)"`
+	ZBack48           string    `xorm:"VARCHAR(256)"`
+	ZBack49           string    `xorm:"VARCHAR(256)"`
+	ZBack50           string    `xorm:"VARCHAR(256)"`
+	ZBack51           string    `xorm:"VARCHAR(256)"`
+	ZBack52           string    `xorm:"VARCHAR(256)"`
+	ZBack53           string    `xorm:"VARCHAR(256)"`
+	ZBack54           string    `xorm:"VARCHAR(256)"`
+	ZBack55           string    `xorm:"VARCHAR(256)"`
+	ZBack56           string    `xorm:"VARCHAR(256)"`
+	ZBack57           string    `xorm:"VARCHAR(256)"`
+	ZBack58           string    `xorm:"VARCHAR(256)"`
+	ZBack59           string    `xorm:"VARCHAR(256)"`
+	ZBack60           string    `xorm:"VARCHAR(256)"`
+	Id                int
+	BarCode           string    `xorm:"VARCHAR(100)"` //样本条码
+	InnerCode         string    `xorm:"VARCHAR(100)"` //内部编码
+	DeletionStateCode int       `xorm:"INT(10)"`      //是否删除 0未删除 1删除
+	InitCapacity      float32   `xorm:"FLOAT"`        //初始容量
+	Capacity          float32   `xorm:"FLOAT"`        //当前容量
+	FreezingNum       int       `xorm:"INT(10)"`      //冻融次数
+	Unit              string    `xorm:"VARCHAR(50)"`
+	ValidityDate      time.Time `form:"ValidityDate,2006-1-2 15:4:5"`
+	ParentBarCode     string    `xorm:"VARCHAR(50)"`
+	IType             int       `xorm:"INT(10)"` //样本属性 1分装子样本 2提取子样本
+	Remark            string    `xorm:"TEXT"`
+	Genus             string    `xorm:"VARCHAR(50)"`
+	GenusName         string    `xorm:"VARCHAR(50)"`
+	ProvinceName      string    `xorm:"VARCHAR(50)"`
+	CityName          string    `xorm:"VARCHAR(50)"`
+	StreetName        string    `xorm:"VARCHAR(50)"`
+	Address           string    `xorm:"VARCHAR(50)"`
+	AddressName       string    `xorm:"VARCHAR(50)"`
+	SourceInner       string    `xorm:"VARCHAR(50)"`
+	Amount            int       `xorm:"INT(10)"`
+	SourceUni         string    `xorm:"VARCHAR(50)"`
+	Longitude         string    `xorm:"VARCHAR(50)"`
+	Latitude          string    `xorm:"VARCHAR(50)"`
+	Altitude          string    `xorm:"VARCHAR(50)"`
+	SurveyDate        time.Time
+	ProjectName       string    `xorm:"VARCHAR(50)"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(255)"`
+	CreateOn          time.Time `xorm:"DATETIME created"`
+	ModifiedUserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(255)"`
+	ModifiedOn        time.Time `xorm:"DATETIME updated"`
+}
+
 type SamplesFileShow struct {
 	MId               int       `xorm:"<- not null pk autoincr INT(11)"`
 	AccCode           string    `xorm:"VARCHAR(10)"`
@@ -204,6 +307,114 @@ type SamplesFileShow struct {
 	ModifiedOn        time.Time `xorm:"DATETIME updated"`
 }
 
+type AnimalSamplesFileShow struct {
+	MId               int       `xorm:"<- not null pk autoincr INT(11)"`
+	AccCode           string    `xorm:"VARCHAR(10)"`
+	Name              string    `xorm:"VARCHAR(100)"`
+	SampleCode        string    `xorm:"VARCHAR(100)"` //样本编码
+	SampleType        int       `xorm:"INT(10)"`      //样本类型
+	SampleTypeName    string    `xorm:"VARCHAR(100)"`
+	SamplingOrgan     string    `xorm:"VARCHAR(50)"`
+	SamplingOrganName string    `xorm:"VARCHAR(50)"`
+	SamplingSite      string    `xorm:"VARCHAR(50)"`
+	SamplingSiteName  string    `xorm:"VARCHAR(50)"`
+	SourceId          int       `xorm:"INT(10)"`     //样本来源
+	SourceIdCard      string    `xorm:"VARCHAR(50)"` //样本源身份证号原Zbackup11
+	SourceName        string    `xorm:"VARCHAR(50)"` //样本源姓名原Zbackup12
+	ReceiveDate       time.Time `form:"ReceiveDate,2006-1-2 15:4:5"`
+	ZBack11           string    `xorm:"VARCHAR(256)"`
+	ZBack12           string    `xorm:"VARCHAR(256)"`
+	ZBack13           string    `xorm:"VARCHAR(256)"`
+	ZBack14           string    `xorm:"VARCHAR(256)"`
+	ZBack15           string    `xorm:"VARCHAR(256)"`
+	ZBack16           string    `xorm:"VARCHAR(256)"`
+	ZBack17           string    `xorm:"VARCHAR(256)"`
+	ZBack18           string    `xorm:"VARCHAR(256)"`
+	ZBack19           string    `xorm:"VARCHAR(256)"`
+	ZBack20           string    `xorm:"VARCHAR(256)"`
+	ZBack21           string    `xorm:"VARCHAR(256)"`
+	ZBack22           string    `xorm:"VARCHAR(256)"`
+	ZBack23           string    `xorm:"VARCHAR(256)"`
+	ZBack24           string    `xorm:"VARCHAR(256)"`
+	ZBack25           string    `xorm:"VARCHAR(256)"`
+	ZBack26           string    `xorm:"VARCHAR(256)"`
+	ZBack27           string    `xorm:"VARCHAR(256)"`
+	ZBack28           string    `xorm:"VARCHAR(256)"`
+	ZBack29           string    `xorm:"VARCHAR(256)"`
+	ZBack30           string    `xorm:"VARCHAR(256)"`
+	ZBack31           string    `xorm:"VARCHAR(256)"`
+	ZBack32           string    `xorm:"VARCHAR(256)"`
+	ZBack33           string    `xorm:"VARCHAR(256)"`
+	ZBack34           string    `xorm:"VARCHAR(256)"`
+	ZBack35           string    `xorm:"VARCHAR(256)"`
+	ZBack36           string    `xorm:"VARCHAR(256)"`
+	ZBack37           string    `xorm:"VARCHAR(256)"`
+	ZBack38           string    `xorm:"VARCHAR(256)"`
+	ZBack39           string    `xorm:"VARCHAR(256)"`
+	ZBack40           string    `xorm:"VARCHAR(256)"`
+	ZBack41           string    `xorm:"VARCHAR(256)"`
+	ZBack42           string    `xorm:"VARCHAR(256)"`
+	ZBack43           string    `xorm:"VARCHAR(256)"`
+	ZBack44           string    `xorm:"VARCHAR(256)"`
+	ZBack45           string    `xorm:"VARCHAR(256)"`
+	ZBack46           string    `xorm:"VARCHAR(256)"`
+	ZBack47           string    `xorm:"VARCHAR(256)"`
+	ZBack48           string    `xorm:"VARCHAR(256)"`
+	ZBack49           string    `xorm:"VARCHAR(256)"`
+	ZBack50           string    `xorm:"VARCHAR(256)"`
+	ZBack51           string    `xorm:"VARCHAR(256)"`
+	ZBack52           string    `xorm:"VARCHAR(256)"`
+	ZBack53           string    `xorm:"VARCHAR(256)"`
+	ZBack54           string    `xorm:"VARCHAR(256)"`
+	ZBack55           string    `xorm:"VARCHAR(256)"`
+	ZBack56           string    `xorm:"VARCHAR(256)"`
+	ZBack57           string    `xorm:"VARCHAR(256)"`
+	ZBack58           string    `xorm:"VARCHAR(256)"`
+	ZBack59           string    `xorm:"VARCHAR(256)"`
+	ZBack60           string    `xorm:"VARCHAR(256)"`
+	Id                int
+	BarCode           string    `xorm:"VARCHAR(100)"` //样本条码
+	InnerCode         string    `xorm:"VARCHAR(100)"` //内部编码
+	IState            int       `xorm:"INT(10)"`      //状态  状态  1设备中样本  2预录入 3标签打印预录入 4待复存保留位置  5待复存不保留位置
+	EquipmentId       int       `xorm:"INT(10)"`
+	ShelfId           int       `xorm:"INT(10)"`
+	BoxId             int       `xorm:"INT(10)"`
+	Position          string    `xorm:"VARCHAR(50)"` //位置 冻存盒的 X代表第几列 Y代表第几行  X;
+	DeletionStateCode int       `xorm:"INT(10)"`     //是否删除 0未删除 1删除
+	InitCapacity      float32   `xorm:"FLOAT"`       //初始容量
+	Capacity          float32   `xorm:"FLOAT"`       //当前容量
+	FreezingNum       int       `xorm:"INT(10)"`     //冻融次数
+	Unit              string    `xorm:"VARCHAR(50)"`
+	ValidityDate      time.Time `form:"ValidityDate,2006-1-2 15:4:5"`
+	ParentBarCode     string    `xorm:"VARCHAR(50)"`
+	IType             int       `xorm:"INT(10)"` //样本属性 1分装子样本 2提取子样本
+	Remark            string    `xorm:"TEXT"`
+	Genus             string    `xorm:"VARCHAR(50)"`
+	GenusName         string    `xorm:"VARCHAR(50)"`
+	ProvinceName      string    `xorm:"VARCHAR(50)"`
+	CityName          string    `xorm:"VARCHAR(50)"`
+	StreetName        string    `xorm:"VARCHAR(50)"`
+	Address           string    `xorm:"VARCHAR(50)"`
+	AddressName       string    `xorm:"VARCHAR(50)"`
+	SourceInner       string    `xorm:"VARCHAR(50)"`
+	Amount            int       `xorm:"INT(10)"`
+	SourceUni         string    `xorm:"VARCHAR(50)"`
+	Longitude         string    `xorm:"VARCHAR(50)"`
+	Latitude          string    `xorm:"VARCHAR(50)"`
+	Altitude          string    `xorm:"VARCHAR(50)"`
+	SurveyDate        time.Time
+	ProjectName       string    `xorm:"VARCHAR(50)"`
+	BeeKeepers        string    `xorm:"VARCHAR(256)"`
+	TakeAway          string    `xorm:"VARCHAR(256)"`
+	AllbarCode        string    `xorm:"VARCHAR(256)"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(255)"`
+	CreateOn          time.Time `xorm:"DATETIME created"`
+	ModifiedUserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(255)"`
+	ModifiedOn        time.Time `xorm:"DATETIME updated"`
+}
+
 //自定义搜索模板
 type SamplesSearchTemplate struct {
 	Id       int    `xorm:"<- not null pk autoincr INT(11)"`

src/dashoo.cn/backend/api/business/samplesfileinfo/samplesfileinfoService.go

@@ -60,7 +60,7 @@ func (s *SamplesFileInfoService) GetPagingEntitiesWithOrderSearch(acccode string
 	return total, List
 }
 
-func (s *SamplesFileInfoService) GetPagingEntitiesWithTb(acccode string, pageIndex, itemsPerPage int64, tbldonor, order, where string) (int64, []SamplesFileInfoList) {
+func (s *SamplesFileInfoService) GetPagingEntitiesWithTb(acccode string, pageIndex, itemsPerPage int64, tbldonor, order, where string) (int64, []AnimalSamplesFileInfoList) {
 	var err error
 	var total int64
 	if order != "" {
@@ -77,13 +77,13 @@ func (s *SamplesFileInfoService) GetPagingEntitiesWithTb(acccode string, pageInd
 	sqlCount := " select count(*) from " + tbldetail + " a  left join " + tblmain + " b on a.SampleCode = b.SampleCode left join " + tbldonor + " c on b.SourceId = c.Id left join " + groupdetail + " d on d.SampleId = a.Id where " + where
 	var sql string
 
-	sql = ` select a.*,b.* from ` + tbldetail + ` a 
+	sql = ` select a.*,b.*,c.Genus,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.SurveyDate,d.GroupId,d.GroupName from ` + tbldetail + ` a 
 	left join ` + tblmain + ` b on a.SampleCode = b.SampleCode  
 	left join ` + tbldonor + ` c on b.SourceId = c.Id  
 	left join ` + groupdetail + ` d on d.SampleId = a.Id  
 	where ` + where + order + `
 		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
-	List := make([]SamplesFileInfoList, 0)
+	List := make([]AnimalSamplesFileInfoList, 0)
 	utils.DBE.Sql(sql).Find(&List)
 	resultsSlice, err := s.DBE.Query(sqlCount)
 	LogError(err)
@@ -134,6 +134,23 @@ func (s *SamplesFileInfoService) QuerySampleList(acccode string, where string) [
 	return List
 }
 
+//已归档样本条码批量打印--蜜蜂所
+func (s *SamplesFileInfoService) QueryAnimalSampleList(acccode string, where string) []AnimalSamplesFileShow {
+	tblmain := acccode + SamplesMaintbName
+	tbldetail := acccode + SamplesDetailFiletbName
+	animaltb := acccode + AnimalInfoName
+	sql := "select a.*,b.*,c.Genus,c.GenusName,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.InnerNo as SourceInner,c.Amount,c.Unit as SourceUni,c.ProjectName,c.Longitude,c.Latitude,c.Altitude,c.SurveyDate,c.ZBack11 as BeeKeepers,c.ZBack17 as TakeAway from  " + tbldetail +
+		" a left join " + tblmain + " b on a.SampleCode = b.SampleCode left join " + animaltb + " c on b.SourceId = c.Id where " + where + " order by a.Id desc"
+	List := make([]AnimalSamplesFileShow, 0)
+	utils.DBE.Sql(sql).Find(&List)
+
+	for i := 0; i < len(List); i++ {
+		//List[i].AllbarCode = "蜂种:" + List[i].Genus + "&&蜂种备注:" + List[i].GenusName + "&&项目属性:" + List[i].ProjectName + "&&采样地址:" + List[i].AddressName + "&&采样时间:" + List[i].SurveyDate.Format("2006-01-02") + "&&群数:" + strconv.Itoa(List[i].Amount) + "&&经度:" + List[i].Longitude + "&&纬度:" + List[i].Latitude + "&&海拔:" + List[i].Altitude + "&&采集人:" + List[i].TakeAway + "&&供蜂人:" + List[i].BeeKeepers + "&&样本编码:" + List[i].BarCode
+		List[i].AllbarCode = List[i].BarCode + "·" + List[i].Genus + "-" + List[i].GenusName + "·" + List[i].AddressName + "·" + List[i].SurveyDate.Format("2006-01-02") + "·" + List[i].Altitude + "米·" + List[i].ProjectName
+	}
+	return List
+}
+
 func (s *SamplesFileInfoService) GetSearchTemplateByName(tablename, name string) (*SamplesSearchTemplate, error) {
 	var template SamplesSearchTemplate
 	_, err := s.DBE.Table(tablename).Where("Name='" + name + "'").Get(&template)

src/dashoo.cn/backend/api/business/samplesinfo/samplesinfoService.go

@@ -881,8 +881,7 @@ func (s *SamplesInfoService) QueryAnimalSampleList(acccode string, where string)
 
 	for i := 0; i < len(List); i++ {
 		//List[i].AllbarCode = "蜂种:" + List[i].Genus + "&&蜂种备注:" + List[i].GenusName + "&&项目属性:" + List[i].ProjectName + "&&采样地址:" + List[i].AddressName + "&&采样时间:" + List[i].SurveyDate.Format("2006-01-02") + "&&群数:" + strconv.Itoa(List[i].Amount) + "&&经度:" + List[i].Longitude + "&&纬度:" + List[i].Latitude + "&&海拔:" + List[i].Altitude + "&&采集人:" + List[i].TakeAway + "&&供蜂人:" + List[i].BeeKeepers + "&&样本编码:" + List[i].BarCode
-		//List[i].AllbarCode = "蜂种:" + List[i].Genus + "-" + List[i].GenusName + "&&项目属性:" + List[i].ProjectName + "&&采样地址:" + List[i].AddressName + "&&群数:" + strconv.Itoa(List[i].Amount) + "&&经度:" + List[i].Longitude + "&&纬度:" + List[i].Latitude + "&&海拔:" + List[i].Altitude + "&&样本编码:" + List[i].BarCode
-		List[i].AllbarCode = "测试测试测试测试十个测试测试测试测试二十测试测试测试测试三十测试测试测试测试四十测试测试测试测试五十"
+		List[i].AllbarCode = List[i].BarCode + "·" + List[i].Genus + "-" + List[i].GenusName + "·" + List[i].AddressName + "·" + List[i].SurveyDate.Format("2006-01-02") + "·" + List[i].Altitude + "米·" + List[i].ProjectName
 	}
 	return List
 }

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

@@ -172,6 +172,34 @@ func animalBarcodeprintbatch(param string) (it samplesinfo.AnimalSamplesInfoShow
 	return
 }
 
+//已归档样本条码批量打印--蜜蜂所
+func animalArchivedSampleBarcode(param string) (it samplesfileinfo.AnimalSamplesFileShow, datas []samplesfileinfo.AnimalSamplesFileShow) {
+	param = Base64Decode(param)
+	params := strings.Split(param, ",")
+	acccode := params[1]
+	codes := params[2]
+	fmt.Println(acccode)
+	fmt.Println(codes)
+	codess := strings.Split(codes, ";")
+	where := ""
+	if len(codess) > 0 {
+		where = where + " a.Id in ( "
+		for i := 0; i < len(codess); i++ {
+			if codess[i] != "" {
+				if i == len(codess)-1 {
+					where = where + codess[i] + ""
+				} else {
+					where = where + "" + codess[i] + ","
+				}
+			}
+		}
+		where = where + " ) "
+	}
+	svc := samplesfileinfo.GetSamplesFileInfoService(utils.DBE)
+	datas = svc.QueryAnimalSampleList(acccode, where)
+	return
+}
+
 //预录入、已录入、待复存样本条码批量打印
 func sampleBarcodeprintbatch(param string) (it samplesinfo.SamplesInfoShow, datas []samplesinfo.SamplesInfoShow) {
 	param = Base64Decode(param)
@@ -771,6 +799,10 @@ func (this *HomeController) Printservice() {
 		it, itema := animalBarcodeprintbatch(param)
 		cols = AutoColType(&it)
 		item = itema
+	case "animalarchivedbatch":
+		it, itema := animalArchivedSampleBarcode(param)
+		cols = AutoColType(&it)
+		item = itema
 	case "lableprint":
 		it, itema := lablepreprint(param)
 		cols = AutoColType(&it)

src/dashoo.cn/backend/api/controllers/samplesinfo/samplesfiles.go

@@ -184,7 +184,7 @@ func (this *SamplesfilesController) AnimalList() {
 		where = where + " and SourceName like '%" + donorname + "%'"
 	}
 	svc := samplesfileinfo.GetSamplesFileInfoService(utils.DBE)
-	var list []samplesfileinfo.SamplesFileInfoList
+	var list []samplesfileinfo.AnimalSamplesFileInfoList
 	total, list := svc.GetPagingEntitiesWithTb(this.User.AccCode, page.CurrentPage, page.Size, this.User.AccCode+AnimaltbName, "Id desc", where)
 	var datainfo DataInfo
 	datainfo.Items = list

src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -1020,16 +1020,16 @@
       },
       //----------------------------------------------------------------
       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, 19)
-        }
+        // 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, 19)
+        // }
       },
       Jstimehandle(val) {
         if (val === '') {
@@ -1187,7 +1187,7 @@
               }
               idstring = idstring.substring(0, idstring.length - 1)
               // 执行打印操作
-              window.PrintReport(res.data, `archivedsamplesbatch,${this.authUser.Profile.AccCode},${idstring}`)
+              window.PrintReport(res.data, `animalarchivedbatch,${this.authUser.Profile.AccCode},${idstring}`)
             } else {
               _this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/index.vue

@@ -752,7 +752,7 @@
               }
               idstring = idstring.substring(0, idstring.length - 1)
               // 执行打印操作
-              window.PrintReport(res.data, `samplesbatch,${this.authUser.Profile.AccCode},${idstring}`)
+              window.PrintReport(res.data, `animalsamplesbatch,${this.authUser.Profile.AccCode},${idstring}`)
             } else {
               _this.$message({
                 type: 'warning',
@@ -1244,8 +1244,7 @@
         this.dialogPrintVisible = false
         // 执行打印操作
         window.PrintReport(this.Printscheme,
-          `samplespreinput,${this.peintitemid},${this.authUser.Profile.AccCode}`)
-          console.log("00000000000000p",this.Printscheme)
+          `animalsamples,${this.peintitemid},${this.authUser.Profile.AccCode}`)
       }
     }
   }

src/dashoo.cn/frontend_animal/src/pages/samples/waitingstore/index.vue

@@ -1095,7 +1095,7 @@
               }
               idstring = idstring.substring(0, idstring.length - 1)
               // 执行打印操作
-              window.PrintReport(res.data, `samplesbatch,${this.authUser.Profile.AccCode},${idstring}`)
+              window.PrintReport(res.data, `animalsamplesbatch,${this.authUser.Profile.AccCode},${idstring}`)
             } else {
               _this.$message({
                 type: 'warning',

src/dashoo.cn/frontend_animal/src/static/js/printUtilities.js

@@ -167,7 +167,6 @@ function PrintReport(repID, param) {
   //  var url = "47.92.238.200:9081"
   href = href + "&host=" + url;
 
-
   if (typeof preview == "undefined") {
     preview = true;
   }

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    // baseURL: '//localhost:9081/api/' // 本机开发使用
-    baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
+    baseURL: '//localhost:9081/api/' // 本机开发使用
+    // baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统