界面修改，编码规则判断修改

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

@@ -83,6 +83,52 @@ func (s *SamplesInfoService) GetPagingEntitiesWithOrderSearch(acccode string, pa
 	return total, List
 }
 
+func (s *SamplesInfoService) GetPagingEntitiesWithTb(acccode string, pageIndex, itemsPerPage int64, tbldonor, order, where string) (int64, []SamplesInfoList) {
+	var err error
+	var total int64
+	if order != "" {
+		order = " order by " + order
+	}
+	//获取总记录数
+	if where == "" {
+		where = "1=1"
+	}
+	tbldetail := acccode + SamplesDetailtbName
+	tblmain := acccode + SamplesMaintbName
+	//tbldonor := acccode + DonorstbName
+	groupdetail := acccode + GroupDetailName
+
+	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 Shelf d on a.ShelfId=d.Id left join Box e on a.BoxId=e.Id left join Equipment f on a.EquipmentId=f.Id left join " + groupdetail + " g on g.SampleId=a.Id where " + where
+
+	fmt.Println(sqlCount)
+	var sql string
+
+	sql = ` select a.*,b.*,d.XStation ShelfX,d.YStation ShelfY,d.Code ShelfCode,e.XStation BoxX,e.YStation BoxY,e.Code BoxCode,f.Id Eid,f.Name EName,f.Code ECode,g.GroupId,g.GroupName from ` + tbldetail + ` a 
+	left join ` + tblmain + ` b on a.SampleCode = b.SampleCode  
+	left join ` + tbldonor + ` c on b.SourceId = c.Id 
+	left join Shelf d on a.ShelfId=d.Id 
+	left join Box e on a.BoxId=e.Id 
+	left join Equipment f on a.EquipmentId=f.Id 
+	left join ` + groupdetail + ` g on g.SampleId=a.Id 
+	where ` + where + order + `
+		 limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage) + ""
+	fmt.Println(sql)
+	List := make([]SamplesInfoList, 0)
+	utils.DBE.Sql(sql).Find(&List)
+	resultsSlice, err := s.DBE.Query(sqlCount)
+	LogError(err)
+
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}
+
 //质控随机显示
 func (s *SamplesInfoService) GetPagingEntitiesSearch(acccode string, page, size string, order, where string) (int64, []SamplesInfoList) {
 	var err error

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

@@ -1699,76 +1699,46 @@ func (this *SamplesinputController) DaySaveXlsx(name string, title []string, col
 // @router /getlistajax [get]
 func (this *SamplesinputController) Listajax() {
 	page := this.GetPageInfoForm()
-
-	this.Data["PageTitle"] = "预录入管理"
-	search := this.GetString("search1")
-	name := this.GetString("name1")
-	sampletype1 := this.GetString("SampleType1")
-	fname1 := this.GetString("fname1")
-	//	fid := this.GetString("fid1")
-	//	samplingsite := this.GetString("SamplingSite1")
-	samplingsitename := this.GetString("SamplingSiteName1")
-	validity := this.GetString("validity1")
-	validity_start, _ := utils.TimeParse(this.GetString("validity1")+" 00:00:00", "2006-1-2 15:4:5")
-	enddate := this.GetString("enddate1")
-	enddate_end, _ := utils.TimeParse(enddate+" 23:59:59", "2006-1-2 15:4:5")
-	createby := this.GetString("CreateBy1")
-	sbarcode := this.GetString("sbarcode1")
+	barcode := this.GetString("barcode")
+	samplecode := this.GetString("samplecode")
+	name := this.GetString("name")
+	operator := this.GetString("operator")
+	sampletype := this.GetString("sampletype")
+	ReceiveDate := this.GetString("ReceiveDate")
 
 	where := " IState in (2,3,4,7,8) and DeletionStateCode=0  "
-	if search != "" {
-		where = where + " and a.SampleCode '%" + search + "%' "
+	if barcode != "" {
+		where = where + " and a.BarCode like '%" + barcode + "%' "
 	}
-	if sbarcode != "" {
-		where = where + " and BarCode like '%" + sbarcode + "%' "
+	if samplecode != "" {
+		where = where + " and a.SampleCode like '%" + samplecode + "%' "
 	}
 	if name != "" {
-		where = where + " and  Name ='" + name + "'"
-	}
-	if sampletype1 != "" {
-		where = where + " and  SampleType =" + sampletype1 + ""
+		where = where + " and b.Name like '%" + name + "%' "
 	}
-	if fname1 != "" {
-		where = where + " and  SamplingOrganName ='" + fname1 + "'"
+	if operator != "" {
+		where = where + " and a.CreateBy like '%" + operator + "%' "
 	}
-	if samplingsitename != "" {
-		where = where + " and  SamplingSiteName ='" + samplingsitename + "'"
-	}
-	if validity != "" {
-		where = where + " and  a.CreateOn >'" + utils.ToStr(validity_start) + "'"
-	}
-	if enddate != "" {
-		where = where + " and a.CreateOn <'" + utils.ToStr(enddate_end) + "'"
-	}
-	if createby != "" {
-		where = where + "and  a.CreateBy ='" + createby + "'"
+	if sampletype != "" {
+		where = where + " and b.SampleType = '" + sampletype + "' "
+	}
+	if ReceiveDate != "" {
+		dates := strings.Split(ReceiveDate, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and ReceiveDate>='" + minDate + "' and ReceiveDate<='" + maxDate + "'"
+		}
 	}
-	//样本类型
-	//	sample_type := sampletype.GetSampleTypeService(utils.DBE)
-	//	where2 := " AccCode='" + this.User.AccCode + "'"
-	//	list := sample_type.ListSampleType(where2)
-	//	this.Data["entitySampleType"] = list
-
-	//绑定组织器官
-	//	svcOrgan := sampleorgan.GetSampleOrganService(utils.DBE)
-	//	where3 := "where AccCode = '" + this.User.AccCode + "' and Item=1 "
-	//	operationtree := svcOrgan.GetTreeList(where3)
-	//	this.Data["operation"] = operationtree
-
 	svc := samplesinfo.GetSamplesInfoService(utils.DBE)
 	var samplespre []samplesinfo.SamplesInfoList
-	total, samplespre := svc.GetPagingEntitiesWithOrderSearch(this.User.AccCode, page.CurrentPage, page.Size, "a.Id desc", where)
+	total, samplespre := svc.GetPagingEntitiesWithTb(this.User.AccCode, page.CurrentPage, page.Size, this.User.AccCode+AnimaltbName, "a.Id desc", where)
 
 	var datainfo DataInfo
 	datainfo.Items = samplespre
 	datainfo.CurrentItemCount = total
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
-	//列表扩展列
-	//	svclistextend := listextend.GetListExtendService(utils.DBE)
-	//	listextenddata := svclistextend.GetInfoByFunc(this.User.AccCode, "预录入样本")
-	//	this.Data["listextenddata"] = listextenddata
-	//	fmt.Println("-----------------------listextenddata:", listextenddata)
 }
 
 // @Title 获取搜索模版列表

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

@@ -228,7 +228,7 @@ func (this *SamplespreinputController) Add() {
 	has := svcSample.GetEntityByWhere(this.User.AccCode+SamplesMaintbName, wheremain, &datamainold)
 	if has { //如果存在，表示添加新管，主信息不允许修改
 		if datadetail.BarCode == "" {
-			if timecode != "" {
+			if this.User.AccCode == "sBBo4" {
 				subSvc := samplesubpackage.GetSampleSubpackageService(utils.DBE)
 				datadetail.BarCode = subSvc.AutoGetBarCodeAnimal(this.User.AccCode, datamainold.SampleCode, timecode)
 			} else {
@@ -261,7 +261,7 @@ func (this *SamplespreinputController) Add() {
 
 	} else { //如果不存在，表示完全新增
 		if datadetail.BarCode == "" {
-			if timecode != "" {
+			if this.User.AccCode == "sBBo4" {
 				datadetail.BarCode = datamain.SampleCode + "01"
 			} else {
 				datadetail.BarCode = datamain.SampleCode + "-1"
@@ -321,7 +321,7 @@ func (this *SamplespreinputController) Add() {
 				n, _ := utils.StrTo(dataother.Code_lastnum).Int()
 				count := len(dataother.Code_lastnum)
 				Auto_Code_Struct.Num = strconv.FormatFloat(float64(n+1)*(1/math.Pow(10, float64(count))), 'f', count, 64)[2:]
-				if timecode != "" {
+				if this.User.AccCode == "sBBo4" {
 					Auto_Code_Struct.SampleCode = this.AutoBarCodeAdd() + "-" + timecode
 				} else {
 					Auto_Code_Struct.SampleCode = this.AutoBarCodeAdd()
@@ -344,7 +344,7 @@ func (this *SamplespreinputController) Add() {
 			errinfo.Item = Auto_Code_Struct
 		} else if saveandadd == "2" { //保存并添加分管
 			if dataother.Code_codeId > 0 { //使用默认规则
-				if timecode != "" {
+				if this.User.AccCode == "sBBo4" {
 					Auto_Code_Struct.Num = dataother.Code_lastnum + "-" + timecode
 				} else {
 					Auto_Code_Struct.Num = dataother.Code_lastnum

src/dashoo.cn/frontend_animal/src/components/samples/preoperation.vue

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本编码">
-              <el-input v-model="form.number" placeholder="请输入样本编码"></el-input>
+              <el-input v-model="form.samplecode" placeholder="请输入样本编码"></el-input>
             </el-form-item>
             <el-form-item label="样本类型">
               <el-select v-model="form.sampletype" clearable style="width:100%" placeholder="请选择">
@@ -21,15 +21,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="开始日期">
-              <el-date-picker style="width: 100%" v-model="form.startdate" type="date" :clearable="false"
-                placeholder="请输入开始日期" :picker-options="pickerOptions0">
-              </el-date-picker>
-            </el-form-item> -->
-            <!-- <el-form-item label="组织器官" v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'">
-              <el-cascader :options="cascade" style="width:100%" :props="sampleorganprops" change-on-select
-                :show-all-levels="false" v-model="selectedorgan" placeholder="请选择" @change="choose"></el-cascader>
-            </el-form-item> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本名称">
@@ -37,21 +28,10 @@
             </el-form-item>
             <el-col :span="12">
               <el-form-item label="接收日期">
-                <el-date-picker size="mini" style="width: 240px" v-model="ReceiveDate" type="daterange"
+                <el-date-picker size="mini" style="width: 220px" v-model="ReceiveDate" type="daterange"
                   range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
             </el-col>
-            <!-- <el-form-item label="结束日期">
-              <el-date-picker style="width: 100%" v-model="form.enddate" type="date" :clearable="false"
-                placeholder="请输入结束日期" :picker-options="pickerOptions0">
-              </el-date-picker>
-            </el-form-item> -->
-            <!-- <el-form-item label="取材部位" v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'">
-              <el-select v-model="form.samplingsite" clearable style="width:100%" placeholder="请选择">
-                <el-option v-for="item in ssoption" :label="item.label" :value="item.value" :key="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>
@@ -150,7 +130,7 @@
           operator: '',
           sampletype: '',
           sampleorgan: '',
-          number: '',
+          samplecode: '',
           startdate: '',
           enddate: '',
           name: '',
@@ -250,6 +230,17 @@
         }
         this.form.samplingsite = this.ssoption[0].value
       },
+      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;
+      },
       jstimehandle(val) {
         return val.substring(0, 10)
       },

src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/_opera/unhumanadd.vue

@@ -33,7 +33,7 @@
         style="min-height: calc(100vh - 189px)">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="样本源名称" v-if="acc =='sBBo4' || acc == 'saB4v'" prop="SourceName">
+            <el-form-item label="样本源名称" prop="SourceName">
               <el-input placeholder="样本源名称" v-model="sampleform.SourceName" style="width:100%">
                 <el-button type="primary" style="width:30%" @click="animalSourceVisible = true"
                   :disabled="disabledanimalbutton" slot="append">选择
@@ -422,13 +422,10 @@
       }
     },
     created() {
-      // initial data
       this.getType()
       this.getsampetypeunit()
       this.getsametypetreelist()
       this.getautocodedata()
-      // 获取公共扩展
-      // this.getpublickz()
       let operaid = this.$route.params.opera
       this.acc = this.authUser.Profile.AccCode
       if (operaid && operaid !== '' && operaid !== 'new') {
@@ -846,8 +843,7 @@
               for (let i = 0; i < this.typetykzlist.length; i++) {
                 if (this.typetykzlist[i].FieldType == '4') {
                   this.typetykzlist[i].FieldDefault = foo.eval('typetykzsampedit.' + this.typetykzlist[i].FieldName)
-                    .substr(
-                      0, 24)
+                    .substr(0, 24)
                 } else {
                   this.typetykzlist[i].FieldDefault = foo.eval('typetykzsampedit.' + this.typetykzlist[i].FieldName)
                 }

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

@@ -131,10 +131,6 @@
             <el-form-item label="样本名称">
               <el-input v-model="Name" placeholder="请输入样本名称" size="mini" style="width:100%"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="组织器官">
-              <el-cascader :options="zuzhitreelist" :props="sampinputtreeprops" change-on-select :show-all-levels="false"
-                v-model="selectedzuzhi" @change="zuzhitreehandleChange" placeholder="请选择组织" size="mini" style="width:100%"></el-cascader>
-            </el-form-item> -->
             <el-form-item label="特有扩展">
               <el-select v-model="STNoteField" multiple placeholder="请选择" size="mini" style="width:100%">
                 <el-option v-for="item in typetykzlist" :label="item.Name" :value="item.FieldName" :key="item.FieldName"></el-option>
@@ -148,11 +144,6 @@
             <el-form-item label="录入人">
               <el-input v-model="CreateBy" placeholder="请输入录入人" size="mini" style="width:100%"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="取材部位">
-              <el-select v-model="SamplingSite" clearable placeholder="请选择" size="mini" style="width:100%">
-                <el-option v-for="item in samplesitenames" :label="item.Name" :value="item.Code" :key="item.Code"></el-option>
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="特有检索">
               <el-input v-model="Stnotevalue" placeholder="输入检索内容" size="mini" style="width:100%"></el-input>
             </el-form-item>
@@ -243,18 +234,7 @@
                   <el-input v-else-if="searchField == 'GroupName'" v-model="searchValue.GroupName" placeholder="请输入所属分组"></el-input>
                   <el-date-picker v-else-if="searchField == 'ReceiveDate'" v-model="searchValue.CreateOn" type="daterange"
                     range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width:100%"></el-date-picker>
-                  <!-- <el-cascader v-else-if="searchField == 'SamplingOrganName'" :options="zuzhitreelist" :props="sampinputtreeprops2"
-                    change-on-select :show-all-levels="false" v-model="searchValue.selectedzuzhi" @change="zuzhitreehandleChange2"
-                    placeholder="请选择组织" style="width:100%">
-                  </el-cascader> -->
-                  <!-- <span v-else-if="searchField == 'SamplingSiteName'">
-                    <el-cascader :options="zuzhitreelist" :props="sampinputtreeprops" change-on-select :show-all-levels="false"
-                      v-model="selectedzuzhi2" @change="zuzhitreehandleChange2" placeholder="请选择组织" style="width:50%">
-                    </el-cascader>
-                    <el-select v-model="searchValue.SamplingSite" clearable placeholder="请选择" style="width:45%;margin-left:5px;">
-                      <el-option v-for="item in samplesitenames2" :key="item.Code" :label="item.Name" :value="item.Name"></el-option>
-                    </el-select>
-                  </span> -->
+                
                   <el-select v-else-if="searchField == 'SampleTypeName'" v-model="searchValue.SampleType" clearable
                     placeholder="请选择" @change="selsampletypeChange" style="width:100%">
                     <el-option v-for="item in sampletypes" :key="item.Id" :label="item.Name" :value="item.Name"></el-option>
@@ -343,10 +323,7 @@
         Validity: [], // 有效日期
         InnerCode: '', // 样本内码
         showquerydiv: false,
-        //publicsampletypedata: [], // 样本公共扩展
         sampletypes: [], // 样本类型
-        // zuzhitreelist: [], // 组织器官
-        // samplesitenames: [], // 取材部位
         dialogPrintVisible: false, // 打印弹框是否显示
         Printscheme: '', // 打印选项
         printschemelist: [], // 打印列表
@@ -439,14 +416,6 @@
           if (searchmodel.CreateOn && searchmodel.CreateOn.length === 2) { //录入日期
             this.CreateOn = [new Date(searchmodel.CreateOn[0]), new Date(searchmodel.CreateOn[1])]
           }
-          // if (searchmodel.SamplingOrgan && searchmodel.SamplingOrgan !== '') { //组织器官
-          //   this.selectsigorg = searchmodel.SamplingOrgan
-          //   this.getparentcodebytopcode(searchmodel.SamplingOrgan)
-          //   // this.selectedzuzhi=searchmodel.SamplingOrgan
-          // }
-          // if (searchmodel.SamplingSite && searchmodel.SamplingSite !== '') { //取材部位
-          //   this.SamplingSite = searchmodel.SamplingSite
-          // }
           if (searchmodel.SampleType && searchmodel.SampleType !== '') { //样本类型
             this.SampleType = searchmodel.SampleType
             this.searchsampletypeChange()
@@ -460,9 +429,6 @@
           if (searchmodel.Validity && searchmodel.Validity.length === 2) { //有效日期
             this.Validity = [new Date(searchmodel.Validity[0]), new Date(searchmodel.Validity[1])]
           }
-          // if (searchmodel.Noteitem && searchmodel.Noteitem.length > 0) { //公有扩展
-          //   this.Noteitem = searchmodel.Noteitem
-          // }
           if (searchmodel.Noteitemvalue && searchmodel.Noteitemvalue !== '') { //公共检索内容
             this.Noteitemvalue = searchmodel.Noteitemvalue
           }
@@ -512,19 +478,7 @@
           name: '可用容量',
           show: true,
           kuoz: false
-        },
-        //  {
-        //   filed: 'SamplingOrganName',
-        //   name: '组织器官',
-        //   show: true,
-        //   kuoz: false
-        // }, {
-        //   filed: 'SamplingSiteName',
-        //   name: '取材部位',
-        //   show: true,
-        //   kuoz: false
-        // },
-         {
+        },{
           filed: 'InnerCode',
           name: '样本内码',
           show: true,
@@ -579,13 +533,6 @@
               this.initData()
             }
           }).catch(() => {})
-
-        // this.$axios.get('/sampleinput/getoperations', {
-        //     _currentPage: -1
-        //   })
-        //   .then(res => {
-        //     _this.zuzhitreelist = window.toolfun_gettreejson(res.data.items, 'id', 'pId', 'id,name,code')
-        //   }).catch(() => {})
       },
       initData() {
         this.currentSearchTemplate = ''

src/dashoo.cn/frontend_animal/src/pages/setting/sampletype/sampletypeadd.vue

@@ -187,12 +187,14 @@
           .catch(err => {
             console.error(err);
           });
-        this.$axios
-          .get("equipment/elist", {
-            _currentPage: -1
-          })
+        this.$axios.get("/equipment/elist", {})
           .then(res => {
-            _this.devicelist = res.data;
+            for (var i = 0; i < res.data.items.length / 2; i++) {
+              _this.devicelist.push({
+                Name: res.data.items[2 * i],
+                Id: res.data.items[2 * i + 1]
+              })
+            }
           })
           .catch(() => {});
         this.$axios

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

@@ -175,8 +175,8 @@ module.exports = {
   env: {
     appclient: 'biobank', //因顿LIMS:lims,样本库：biobank,细胞制备：cellbank，样本搜索判断，登录跳转判断
 
-    imgserverhost: 'http://localhost:9081', // BioBank服务地址,图片上传文件
-    //imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件
+    //imgserverhost: 'http://localhost:9081', // BioBank服务地址,图片上传文件
+    imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件
     upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
 
     //imgserverhost: 'http://188.188.30.89:9081', // 临沂服务地址,图片上传文件

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstored.vue

@@ -42,8 +42,6 @@
         <el-table-column label="名称" prop="Name" align="center"></el-table-column>
         <el-table-column label="样本类型" prop="SampleTypeName" align="center"></el-table-column>
         <el-table-column label="样本来源" align="center" prop="SourceName"></el-table-column>
-        <el-table-column label="组织器官" prop="SamplingOrganName" align="center"></el-table-column>
-        <el-table-column label="取材部位" prop="SamplingSiteName" align="center"></el-table-column>
         <el-table-column label="可用容量" prop="Capacity" align="center">
           <template slot-scope="scope">
             {{ scope.row.Capacity }} {{ scope.row.Unit }}
@@ -97,7 +95,6 @@
       }
     },
     created() {
-      // initial data
       this.initData()
     },
     methods: {

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstoredbydate.vue

@@ -296,7 +296,7 @@
           CreateDate.push(_this.formatDateTime(_this.CreateDate[1]))
         }
         params = Object.assign(params, this.searchform)
-        this.$axios.get('reports/animaldetaillist?CreateDate=' + CreateDate, {
+        this.$axios.get('reports/animalstoredlist?CreateDate=' + CreateDate, {
             params
           })
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstoredbyequipment.vue

@@ -298,7 +298,7 @@
           CreateDate.push(_this.formatDateTime(this.CreateDate[1]))
         }
         params = Object.assign(params, this.searchform)
-        this.$axios.get('reports/animaldetaillist?CreateDate=' + CreateDate, {
+        this.$axios.get('reports/animalstoredlist?CreateDate=' + CreateDate, {
             params
           })
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstoredbysampletype.vue

@@ -334,7 +334,7 @@
           CreateDate.push(this.formatDateTime(this.CreateDate[0]))
           CreateDate.push(this.formatDateTime(this.CreateDate[1]))
         }
-        this.$axios.get('reports/animaldetaillist?CreateDate=' + CreateDate, {
+        this.$axios.get('reports/animalstoredlist?CreateDate=' + CreateDate, {
             params
           })
           .then(res => {

src/dashoo.cn/frontend_web/src/pages/samples/prerecorded/_opera/operation.vue

@@ -955,7 +955,6 @@
         let _this = this
         _this.$axios.get('/sampletype/list', {})
           .then(res => {
-            // response
             _this.sampletypelist = []
             for (var i = 0; i < res.data.currentItemCount; i++) {
               _this.sampletypelist.push({

src/dashoo.cn/frontend_web/src/pages/setting/sampletype/sampletypeadd.vue

@@ -187,12 +187,14 @@
           .catch(err => {
             console.error(err);
           });
-        this.$axios
-          .get("equipment/elist", {
-            _currentPage: -1
-          })
+        this.$axios.get("/equipment/elist", {})
           .then(res => {
-            _this.devicelist = res.data;
+            for (var i = 0; i < res.data.items.length / 2; i++) {
+              _this.devicelist.push({
+                Name: res.data.items[2 * i],
+                Id: res.data.items[2 * i + 1]
+              })
+            }
           })
           .catch(() => {});
         this.$axios
@@ -208,7 +210,6 @@
             _currentPage: -1
           })
           .then(res => {
-            // response
             _this.devices = res.data.items;
             _this.devices.forEach((item, k) => {
               _this.devicesallid.push(item.Id);