1.蜜蜂所出入库查询2.CE8120结构图添加

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

@@ -102,18 +102,16 @@ func (s *SamplesInfoService) GetPagingEntitiesWithTb(acccode string, pageIndex,
 	fmt.Println(sqlCount)
 	var sql string
 
-	sql = ` select z.*, g.GroupId,g.GroupName from(select a.*,
-	b.MId,b.AccCode,b.Name,b.Department,b.SampleType ,b.SampleTypeName,b.SamplingOrgan,b.SamplingOrganName,b.SamplingSite ,b.SamplingSiteName,b.ReceiveDate ,b.SourceId ,b.SourceIdCard ,b.SourceName,b.SerialNum,b.MCreateOn,b.MCreateUserId ,b.MCreateBy ,b.MModifiedOn ,b.MModifiedUserId ,b.MModifiedBy ,b.ZBack11,b.ZBack12,b.ZBack13,b.ZBack14,b.ZBack15,b.ZBack16,b.ZBack17,b.ZBack18,b.ZBack19,b.ZBack20,b.ZBack21,b.ZBack22,b.ZBack23,b.ZBack24,b.ZBack25,b.ZBack26,b.ZBack27,b.ZBack28,b.ZBack29,b.ZBack30,b.ZBack31,b.ZBack32,b.ZBack33,b.ZBack34,b.ZBack35,b.ZBack36,b.ZBack37,b.ZBack38,b.ZBack39,b.ZBack40,b.ZBack41,b.ZBack42,b.ZBack43,b.ZBack44,b.ZBack45,b.ZBack46,b.ZBack47,b.ZBack48,b.ZBack49,b.ZBack50,b.ZBack51,b.ZBack52,b.ZBack53,b.ZBack54,b.ZBack55,b.ZBack56,b.ZBack57,b.ZBack58,b.ZBack59,b.ZBack60,` +
-	` c.Genus,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.SurveyDate, ` +
-	` 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 from ` + tbldetail + ` a 
+	//sql = ` select a.*,b.*,c.Genus,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.SurveyDate,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
+	sql = ` select a.*,b.*,c.Genus,concat(c.ProvinceName,c.CityName,c.StreetName,c.Address) as AddressName,c.SurveyDate,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 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 
-	where ` + where + order+ ` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)+ ` ) z  ` + ` left join `+ groupdetail + ` g on g.SampleId=z.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)

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

@@ -1104,6 +1104,107 @@ func (this *EquipmentController) AddEquipment() {
 		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
 		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
 
+	}else if model.DItem == 25 { // Thermo Fisher  CE8120
+		shelf_x_int := 1
+		shelf_y_int := 1
+		box_x_int := 1
+		box_y_int := 1
+		svcshelf := shelfset.GetshelfsetService(utils.DBE)
+		lastdata := svcshelf.GetLastShelfNum(this.User.AccCode)
+		num_lastdata, _ := utils.StrTo(lastdata[1:]).Int64()
+		lastdata_box := svcshelf.GetLastBoxNum(this.User.AccCode)
+		num_lastdata_box, _ := utils.StrTo(lastdata_box[1:]).Int64()
+		for i := 1; i <= equip.RowNum; i++ {
+			for j := 1; j <= equip.ColumnNum; j++ {
+				if j == 4 { //第4个为小型格4行5x5冻存盒
+					shelf_x_int = 1
+					shelf_y_int = 14
+					box_x_int = 5
+					box_y_int = 5
+				} else { //其他为大型格14行9*9冻存盒
+					shelf_x_int = 1
+					shelf_y_int = 14
+					box_x_int = 9
+					box_y_int = 9
+				}
+				var shelfempty shelfset.Shelf
+				shelfempty.AccCode = this.User.AccCode
+				shelfempty.EquipmentId = equip.Id
+				shelfempty.Code = "F" + utils.ToStr(num_lastdata)
+				shelfempty.BarCode = "F" + utils.ToStr(num_lastdata)
+				shelfempty.RowNum = shelf_x_int
+				shelfempty.ColumnNum = shelf_y_int
+				shelfempty.XStation = j
+				shelfempty.YStation = i
+				shelfempty.SampleType = equip.SampleType
+				shelfempty.CreateBy = this.User.Realname
+				shelfempty.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				num_lastdata = num_lastdata + 1
+				_, err = svcshelf.InsertEntity(&shelfempty)
+				sqlfield := " AccCode,EquipmentId,ShelfId,XStation,YStation,RowNum,ColumnNum,"
+				sqlvalue := "'" + this.User.AccCode + "'," + utils.ToStr(equip.Id) + "," + utils.ToStr(shelfempty.Id) + "," + utils.ToStr(j) + "," + utils.ToStr(i) + "," + utils.ToStr(shelf_x_int) + "," + utils.ToStr(shelf_y_int) + ","
+				ii, jj := shelf_x_int, shelf_y_int
+				//添加冻存盒
+				if box_x_int > 0 && box_y_int > 0 {
+					for e := 0; e < ii; e++ {
+						charname := Boxlinename(e + 1)
+						for f := 0; f < jj; f++ {
+							fieldname := fmt.Sprintf("%v%v", charname, f+1)
+							if f == jj-1 && e == ii-1 {
+								sqlfield += fieldname
+								sqlvalue += "-1"
+							} else {
+								sqlfield += fieldname + ","
+								sqlvalue += "-1,"
+							}
+						}
+					}
+					for a := 1; a <= shelf_x_int; a++ {
+						for b := 1; b <= shelf_y_int; b++ {
+							var boxempty shelfset.Box
+							boxempty.AccCode = this.User.AccCode
+							boxempty.EquipmentId = equip.Id
+							boxempty.ShelfId = shelfempty.Id
+							boxempty.Code = "B" + utils.ToStr(num_lastdata_box)
+							boxempty.BarCode = "B" + utils.ToStr(num_lastdata_box)
+							boxempty.YStation = a
+							boxempty.XStation = b
+							boxempty.RowNum = box_x_int
+							boxempty.ColumnNum = box_y_int
+							boxempty.SampleType = equip.SampleType
+							boxempty.CreateBy = this.User.Realname
+							boxempty.CreateBy = this.User.Realname
+							num_lastdata_box = num_lastdata_box + 1
+							_, err = svc.InsertEntity(&boxempty)
+						}
+					}
+				} else {
+					for e := 0; e < ii; e++ {
+						charname := Boxlinename(e + 1)
+						for f := 0; f < jj; f++ {
+							fieldname := fmt.Sprintf("%v%v", charname, f+1)
+							if f == jj-1 && e == ii-1 {
+								sqlfield += fieldname
+								sqlvalue += "-2"
+							} else {
+								sqlfield += fieldname + ","
+								sqlvalue += "-2,"
+							}
+						}
+					}
+				}
+				svc1 := currboxcapacity.GetCurrboxcapacityService(utils.DBE)
+				svc1.Add(sqlfield, sqlvalue)
+			}
+		}
+		num_lastdata_box = num_lastdata_box - 1
+		var lastnum lastordernum.LastOrderNum
+		lastnum.LastNum = "B" + utils.ToStr(num_lastdata_box)
+		svcshelf.UpdateBoxNum(lastnum, this.User.AccCode)
+		num_lastdata = num_lastdata - 1
+		var lastnum_shelf lastordernum.LastOrderNum
+		lastnum_shelf.LastNum = "F" + utils.ToStr(num_lastdata)
+		svcshelf.UpdateShelfNum(lastnum_shelf, this.User.AccCode)
 	} else {
 
 		if model.Shelf_X > 0 && model.Shelf_y > 0 {

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

@@ -212,6 +212,82 @@ func (this *SamplespreinputController) AnimalList() {
 	this.ServeJSON()
 }
 
+// @Title get
+// @Success 200 {object} controllers.Request
+// @router /animalapplylist [get]
+func (this *SamplespreinputController) AnimalApplyList() {
+	page := this.GetPageInfoForm()
+	where := " a.IState in (2,3,4,7,8) and a.DeletionStateCode=0 "
+	sampleCode := this.GetString("SampleCode")
+	if sampleCode != "" {
+		where = where + " and a.SampleCode like '%" + sampleCode + "%' "
+	}
+	barCode := this.GetString("BarCode")
+	if barCode != "" {
+		where = where + " and a.BarCode like '%" + barCode + "%' "
+	}
+	name := this.GetString("Name")
+	if name != "" {
+		where = where + " and  b.Name ='" + name + "'"
+	}
+	sampletype := this.GetString("SampleType")
+	stnotevalue := this.GetString("Stnotevalue") //特有扩展检索值
+	stnote := this.GetStrings("STNoteField")     //特有扩展名称
+	if sampletype != "" {
+		where = where + " and  b.SampleType = '" + sampletype + "'"
+		if j := len(stnote); j > 0 && stnotevalue != "" {
+			tysql := ""
+			for i := 0; i < j; i++ {
+				if tysql == "" {
+					tysql = " b." + stnote[i] + " like '%" + stnotevalue + "%' "
+				} else {
+					tysql += " or b." + stnote[i] + " like '%" + stnotevalue + "%' "
+				}
+			}
+			where = where + " and (" + tysql + ") "
+		}
+	}
+	CreateOnstart, _ := this.GetInt64("CreateOnstart")
+	if CreateOnstart != 0 {
+		where = where + " and  a.CreateOn >'" + time.Unix(CreateOnstart, 0).Format("2006-01-02") + "'"
+	}
+	CreateOnend, _ := this.GetInt64("CreateOnend")
+	if CreateOnend != 0 {
+		where = where + " and a.CreateOn <'" + time.Unix(CreateOnend, 0).Format("2006-01-02") + " 23:59:59'"
+	}
+	innercode := this.GetString("InnerCode")
+	if innercode != "" {
+		where = where + " and a.InnerCode ='" + innercode + "'"
+	}
+
+	createby := this.GetString("CreateBy")
+	if createby != "" {
+		where = where + "and  a.CreateBy ='" + createby + "'"
+	}
+	groupname := this.GetString("GroupName")
+	if groupname != "" {
+		where = where + "and  g.GroupName like '%" + groupname + "%' "
+	}
+	//支持从样本来源详情处跳转
+	ssouceid := this.GetString("sourceid")
+	if ssouceid != "" {
+		where = where + " and  SourceId = " + ssouceid + ""
+	}
+	donorname := this.GetString("SourceName")
+	if donorname != "" {
+		where = where + " and SourceName like '%" + donorname + "%'"
+	}
+	svc := samplesinfo.GetSamplesInfoService(utils.DBE)
+	var list []samplesinfo.SamplesInfoList
+	total, list := svc.GetPagingEntitiesWithTb(this.User.AccCode, page.CurrentPage, page.Size, this.User.AccCode+AnimaltbName, "Id ", where)
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
 // @Title get
 // @Success 200 {object} controllers.Request
 // @router /getunit [get]

src/dashoo.cn/frontend_animal/src/pages/biobank/sampleRK/_opera/operation.vue

@@ -143,7 +143,7 @@
               <div >
                 <legend style="color:#436EEE"></legend>
                 <i class="icon icon-paragraph-justify">样本信息</i>
-                  <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+                  <!-- <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
                     <el-form-item label="样本条码">
                       <el-input size="small" style="width: 165px;" v-model="BarCode" placeholder="请输入样本条码"></el-input>
                     </el-form-item>
@@ -159,8 +159,10 @@
                     <el-form-item>
                       <el-button type="primary" class="el-button--small" @click="EquipmentlistShow" :disabled="SampleRKform.ApplyStatus != 0">样本存储</el-button>
                     </el-form-item>
+                  </el-form> -->
+                  <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+                    <el-button type="primary" class="el-button--small" @click="EquipmentlistShow" :disabled="SampleRKform.ApplyStatus != 0">样本存储</el-button>
                   </el-form>
-                  
               </div>
               <el-table :data="SamplesList" border stripe style="width: 100%" height="530" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="35px"></el-table-column>
@@ -181,7 +183,7 @@
                 </el-table-column>
               </el-table>
               <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                :page-sizes="[10, 20, 50, 100, 500]" :page-size="size" layout="total, sizes, prev, next, jumper" :total="currentItemCount">
+                :page-sizes="[10, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, next, jumper" :total="currentItemCount">
               </el-pagination>
             </el-card>
           </el-col>
@@ -543,7 +545,7 @@
           _size: this.size
         }
         if (_this.samplecodelist == '') {
-          _this.$axios.get('/samplepreinput/list', {
+          _this.$axios.get('/samplepreinput/animalapplylist', {
             params
           })
             .then(res => {

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

@@ -90,7 +90,7 @@
         </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 50, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
+        :page-sizes="[10, 100, 200, 500]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
       </el-pagination>
     </el-card>
 

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/manage_new.vue

@@ -3301,6 +3301,152 @@
             type: 2
           }
         ],
+        CE8120: [ // 25：Thermo Fisher CE8120,type:1规则图形，2不规则图形
+          {
+            XStation: 4,
+            YStation: 1,
+            x: 77,
+            y: 76,
+            width: 53,
+            height: 53,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 1,
+            x: 134,
+            y: 45,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 1,
+            x: 122,
+            y: 133,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 1,
+            x: 33,
+            y: 133,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 2,
+            x: 34,
+            y: 234,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 2,
+            x: 123,
+            y: 234,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 2,
+            x: 135,
+            y: 322,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 2,
+            x: 77,
+            y: 322,
+            width: 53,
+            height: 53,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 3,
+            x: 233,
+            y: 322,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 3,
+            x: 245,
+            y: 233,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 3,
+            x: 333,
+            y: 233,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 3,
+            x: 322,
+            y: 322,
+            width: 53,
+            height: 53,
+            type: 1
+          },
+          {
+            XStation: 1,
+            YStation: 4,
+            x: 333,
+            y: 134,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 2,
+            YStation: 4,
+            x: 245,
+            y: 134,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 3,
+            YStation: 4,
+            x: 232,
+            y: 45,
+            width: 84,
+            height: 84,
+            type: 1
+          },
+          {
+            XStation: 4,
+            YStation: 4,
+            x: 321,
+            y: 77,
+            width: 53,
+            height: 53,
+            type: 1
+          }
+        ],
         waituploads: [], // 等待上传的附件列表
         downloadTemplates: [{
           Name: '默认模版'
@@ -3379,6 +3525,8 @@
                 yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
               } else if (_this.yedanguanitem === 22) {
                 yedanguandatarrtrmp = _this.genepointlite1
+              } else if (_this.yedanguanitem === 25) { // Thermo Fisher CE8120
+                yedanguandatarrtrmp = _this.CE8120
               } else {
                 yedanguandatarrtrmp = _this.genepointlite2
               }
@@ -3496,7 +3644,7 @@
               _this.showtsyedanguan = false
               _this.showcgshebei = true
               _this.fridgebottomimg = _this.filehost + '/static/img/sampletypeimg/bottomydg.png'
-            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21 || res.data.DItem === 22 || res.data.DItem === 23)) {
+            } else if (res.data && (res.data.DItem === 19 || res.data.DItem === 20 || res.data.DItem === 21 || res.data.DItem === 22 || res.data.DItem === 23 || res.data.DItem === 25)) {
               _this.yedanguanitem = res.data.DItem
               if (res.data.DItem === 19) {
                 _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
@@ -3506,6 +3654,8 @@
                 _this.yeshuyedanguanimgid = 'cryobiobank97K_newmodelimg'
               } else if (res.data.DItem === 22) {
                 _this.yeshuyedanguanimgid = 'GenePointLITE1'
+              } else if (res.data.DItem === 25) {
+                _this.yeshuyedanguanimgid = 'cryobiobank97Kimg'
               } else {
                 _this.yeshuyedanguanimgid = 'GenePointLITE2'
               }
@@ -3548,6 +3698,8 @@
           yedanguandatarrtrmp = _this.yedanguanrongqiarr_newmodel
         } else if (_this.yedanguanitem === 22) {
           yedanguandatarrtrmp = _this.genepointlite1
+        } else if (_this.yedanguanitem === 25) {
+          yedanguandatarrtrmp = _this.CE8120
         } else {
           yedanguandatarrtrmp = _this.genepointlite2
         }

src/dashoo.cn/frontend_web/src/pages/equipment/_opera/operation.vue

@@ -37,7 +37,7 @@
             </el-form-item>
             <el-form-item label="品牌" required>
               <el-select
-                :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20 || formmodel.DItem === 21)"
+                :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20 || formmodel.DItem === 21 || formmodel.DItem === 25)"
                 v-model="formmodel.Brand" placeholder="请选择品牌" @change="selectDModel" style="width:100%">
                 <el-option v-for="item in brandoptions" :label="item.label" :value="item.value" :key="item.value">
                 </el-option>
@@ -51,7 +51,7 @@
             </el-form-item>
             <el-form-item label="型号" required>
               <el-select
-                :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20 || formmodel.DItem === 21)"
+                :disabled="!isadd && (formmodel.DItem === 19 || formmodel.DItem === 20 || formmodel.DItem === 21 || formmodel.DItem === 25)"
                 v-model="formmodel.ModelVersion" placeholder="请选择型号" @change="selectPhoto" style="width:100%">
                 <el-option v-for="item in modeloptions" :label="item.label" :value="item.value" :key="item.value">
                 </el-option>
@@ -151,7 +151,7 @@
   export default {
     name: 'makerTemplatesEdit',
 
-    data() {
+    data () {
       var checkvalue = (rule, value, callback) => {
         if (!isNaN(parseFloat(value)) && !isNaN(value)) {
           callback()
@@ -253,7 +253,7 @@
         equipid: 0 // 柴新增，设备id
       }
     },
-    created() {
+    created () {
       this.remoteurl = process.env.imgserverhost
       let eid = this.$route.params.opera
       this.equipid = eid // 未进行变量优化
@@ -271,7 +271,7 @@
       }
     },
     methods: {
-      getbrand(brand) {
+      getbrand (brand) {
         // toggle loading
         let _this = this
         // request
@@ -295,7 +295,7 @@
             this.loading = false
           })
       },
-      getsensorsbyequid(equid) {
+      getsensorsbyequid (equid) {
         // toggle loading
         let _this = this
         // request
@@ -311,7 +311,7 @@
             console.error(err)
           })
       },
-      selectDModel(value) {
+      selectDModel (value) {
         // toggle loading
         let _this = this
         this.modeloptions = []
@@ -340,7 +340,7 @@
             this.loading = false
           })
       },
-      selectPhoto(value) {
+      selectPhoto (value) {
         let _this = this
         this.$axios.get('/equipment/getbydmodel/' + value, {})
           .then(res => {
@@ -391,6 +391,12 @@
                     _this.haveshelf = true
                     _this.showdchdcj = false
                     break
+                  case 25:
+                    _this.formmodel.RowNum = '4'
+                    _this.formmodel.ColumnNum = '4'
+                    _this.haveshelf = true
+                    _this.showdchdcj = false
+                    break
                   default:
                     _this.formmodel.RowNum = '1'
                     _this.formmodel.ColumnNum = '1'
@@ -413,7 +419,7 @@
           })
       },
       // 全选框控制
-      handleCheckAllChange(val) {
+      handleCheckAllChange (val) {
         this.checkedsampetype = []
         if (val) {
           for (var i = 0; i < this.sampelist.length; i++) {
@@ -422,12 +428,12 @@
         }
         this.issampetypecheckedall = false
       },
-      handlecheckedsampetypeChange(value) {
+      handlecheckedsampetypeChange (value) {
         let checkedCount = value.length
         this.checkAll = checkedCount === this.sampelist.length
         this.issampetypecheckedall = checkedCount > 0 && checkedCount < this.sampelist.length
       },
-      getmodel(opera) {
+      getmodel (opera) {
         // toggle loading
         let _this = this
         // request
@@ -475,7 +481,7 @@
             this.loading = false
           })
       },
-      isesedshelf(opera) {
+      isesedshelf (opera) {
         // 是否有冻存架使用
         let _this = this
         // request
@@ -491,7 +497,7 @@
             this.loading = false
           })
       },
-      getType() {
+      getType () {
         let _this = this
         _this.$axios.get('/sampletype/list', {})
           .then(res => {
@@ -521,7 +527,7 @@
             }
           })
       },
-      savedata() {
+      savedata () {
         let _this = this
         this.$refs['deviceform'].validate((valid) => {
           if (valid) {
@@ -546,7 +552,7 @@
             } else {
               // 不能修改为特殊型号
               if ((_this.editdataitem !== 19 && _this.editdataitem !== 20 && _this.editdataitem !== 21) && (_this
-                  .formmodel.DItem === 19 ||
+                .formmodel.DItem === 19 ||
                   _this.formmodel.DItem === 20 || _this.formmodel.DItem === 21)) {
                 this.$message({
                   type: 'warning',
@@ -573,7 +579,7 @@
           }
         })
       },
-      goback() {
+      goback () {
         if (this.$route.query.size) {
           this.$router.push({
             name: this.$route.query.pname,
@@ -588,7 +594,6 @@
       }
     }
   }
-
 </script>
 <style type="text/css">
   .deviceaddsamptype {

src/dashoo.cn/frontend_web/src/pages/equipment/index.vue

@@ -63,7 +63,7 @@
               <router-link :to="'/equipment/' + v.Equipment.Id + '/manage_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                 <el-button type="primary" size="mini">样本录入</el-button>
               </router-link>
-              <router-link v-if="v.Equipment.DItem !== 20 && v.Equipment.DItem !== 19 && v.Equipment.DItem !== 21 && v.Equipment.DItem !== 22 && v.Equipment.DItem !== 23" :to="'/equipment/' + v.Equipment.Id + '/shelfset_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
+              <router-link v-if="v.Equipment.DItem !== 20 && v.Equipment.DItem !== 19 && v.Equipment.DItem !== 21 && v.Equipment.DItem !== 22 && v.Equipment.DItem !== 23 && v.Equipment.DItem !== 25" :to="'/equipment/' + v.Equipment.Id + '/shelfset_new?name=' + v.Equipment.Name + '&pname=equipment&size='+size+'&currentPage='+currentPage">
                 <el-button type="primary" size="mini">设置</el-button>
               </router-link>
               <el-button type="primary" size="mini" @click="copy(v.Equipment.Id, v.Equipment.Code)">复制</el-button>
@@ -94,7 +94,7 @@
   export default {
     name: 'equipmanage',
 
-    data() {
+    data () {
       return {
         remoteurl: '',
         isnodata: false,
@@ -108,7 +108,7 @@
         downloading: true
       }
     },
-    created() {
+    created () {
       this.remoteurl = process.env.imgserverhost
       if (this.$route.query.size && this.$route.query.currentPage) {
         this.size = parseInt(this.$route.query.size)
@@ -118,7 +118,7 @@
       this.initData()
     },
     methods: {
-      initData() {
+      initData () {
         let _this = this
         const params = {
           _currentPage: this.currentPage,
@@ -126,8 +126,8 @@
           searchkey: this.keyword
         }
         this.$axios.get('/equipment/list', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.downloading = false
             _this.list = res.data.items
@@ -144,14 +144,14 @@
             _this.downloading = false
           })
       },
-      loadsensordata(code, i, j) {
+      loadsensordata (code, i, j) {
         let _this = this
         return _this.$axios.get('/channels/datavalue/' + code, null)
           .then(res => {
             _this.list[i].SensorData[j].Temperature = res.data.Temp + '  ℃'
           })
       },
-      loadsensordataall() {
+      loadsensordataall () {
         for (let i = 0; i < this.list.length; i++) {
           if (this.list[i].SensorData && this.list[i].SensorData.length > 0) {
             for (let j = 0; j < this.list[i].SensorData.length; j++) {
@@ -160,25 +160,25 @@
           }
         }
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      seachdata() {
+      seachdata () {
         this.currentPage = 1
         this.initData()
       },
-      toeditdevice(opera) {
+      toeditdevice (opera) {
         this.$router.push({
           path: '/equipment/' + opera + '/operation?pname=equipment&size=' + this.size + '&currentPage=' + this.currentPage
         })
       },
-      deletedata(val, name) {
+      deletedata (val, name) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -207,7 +207,7 @@
             })
         }).catch(() => {})
       },
-      copy(val, code) {
+      copy (val, code) {
         let _this = this
         _this.$confirm('确认复制此设备所有数据吗, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -245,18 +245,17 @@
         }).catch(() => {})
       },
 
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'clear') {
           this.clearSearch()
         }
       },
-      clearSearch(){
+      clearSearch () {
         this.keyword = ''
         this.seachdata()
       }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_weixin/src/pages/samples.vue

@@ -22,7 +22,7 @@
       <template v-if="showCelldetail">
         <x-textarea :value="donorslist.ZBack12" :max="200" title="细胞状态:" :show-counter="false" readonly="true"></x-textarea>
         <x-textarea :value="donorslist.ZBack11" :max="200" title="细胞出库信息:" :show-counter="false" readonly="true"></x-textarea>
-        <x-textarea :value="donorslist.WeiZhi" title="自体存储位置:" text-align="right" readonly="true"></x-textarea>
+        <x-textarea :value="donorslist.WeiZhi" title="存储位置:" text-align="right" readonly="true"></x-textarea>
         <cell :value="donorslist.Temperature" title="存储温度:" text-align="right"></cell>
         <cell :value="donorslist.RiQi" title="储存日期:" text-align="right" readonly="true"></cell>
         <cell :value="donorslist.NianXian" title="储存年限:" text-align="right" readonly="true"></cell>