Merge branch 'master' of http://code.dashoo.cn/dashoo/biobank

# Conflicts:
#	src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

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

@@ -49,7 +49,7 @@
         </el-form>
       </div>
 
-      <el-table ref="multipleTable" :data="list" bordertooltip-effect="dark" border height="calc(100vh - 230px)" style="width: 100%;"
+      <el-table ref="multipleTable" :data="donorsList" bordertooltip-effect="dark" border height="calc(100vh - 230px)" style="width: 100%;"
         @selection-change="handleSelectionChange" @header-dragend="header_dragend">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="操作" width="110" align="center" fixed>
@@ -123,7 +123,7 @@
             </el-form-item>
 
             <el-form-item label="容器类型">
-              <el-select size="mini" style="width:100%" v-model="value" placeholder="请选择">
+              <el-select size="mini" style="width:100%" v-model="DItem" placeholder="请选择" @change="GetEquipmentInfos">
                 <el-option
                   v-for="item in EquipmentList"
                   :key="item.DItem"
@@ -158,6 +158,22 @@
                 placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
+            <el-form-item label="容器名称">
+              <el-select
+                size="mini"
+                v-model="EquipmentIds"
+                multiple
+                collapse-tags
+                style="width: 100%"
+                placeholder="请选择">
+                <el-option
+                  v-for="item in EquipmentInfosList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本源名称">
@@ -341,6 +357,10 @@
         SampleCode: '', // 样本编码
         SampleType: '', // 样本类型
         Stnotevalue: '', // 特有扩展检索值
+        DItem: '', // 容器类型id
+        EquipmentList: [], // 容器类型列表
+        EquipmentIds: [], // 设备id列表
+        EquipmentInfosList: [], // 容器名称列表
         STNoteField: [], // 特有扩展名称
         CreateBy: '', // 录入人
         CreateOn: [], // 录入时期
@@ -583,20 +603,40 @@
         }
         this.currentSearchTemplate = ''
         let _this = this
+        // 增加自定义显示列，存储位置，之后需要去掉
+        let ishaslocation = false
+        for (let i = 0; i < _this.showcolumn.length; i++) {
+          if (_this.showcolumn[i].filed === 'Location') {
+            ishaslocation = true
+            break
+          }
+        }
+        if (!ishaslocation) {
+          _this.showcolumn.push({
+            filed: 'Location',
+            name: '存储位置',
+            show: true,
+            kuoz: false,
+            columnwidth: 200
+          })
+        }
+        // paginate
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
-          BarCode: _this.BarCode,
-          SampleCode: _this.SampleCode,
-          SampleType: _this.SampleType,
-          Stnotevalue: _this.Stnotevalue,
-          STNoteField: _this.STNoteField,
-          CreateBy: _this.CreateBy,
-          SourceName: _this.SourceName,
-          Name: _this.Name,
-          Validity: _this.Validity,
-          CreateOn: _this.CreateOn,
-          InnerCode: _this.InnerCode,
+          BarCode: this.BarCode,
+          SampleCode: this.SampleCode,
+          SampleType: this.SampleType,
+          Stnotevalue: this.Stnotevalue,
+          STNoteField: this.STNoteField,
+          CreateBy: this.CreateBy,
+          SourceName: this.SourceName,
+          DItem: this.DItem,
+          EquipmentIds: this.EquipmentIds,
+          Name: this.Name,
+          Validity: this.Validity,
+          CreateOn: this.CreateOn,
+          InnerCode: this.InnerCode,
           GroupName: _this.GroupName
         }
         if (this.CreateOn && this.CreateOn.length === 2) {
@@ -606,9 +646,16 @@
           }
           params = Object.assign(params, params2)
         }
-        // 返回时保存查找内容
-        store.set('sampleprerecordedseach', params)
-        this.$axios.get('/samplepreinput/animallist', {
+        if (this.Validity && this.Validity.length === 2) {
+          let params3 = {
+            Validitystart: this.Validity[0] / 1000,
+            Validityend: this.Validity[1] / 1000
+          }
+          params = Object.assign(params, params3)
+        }
+        store.set('samplestoredseach', params)
+        _this.getAllSearchTab()
+        this.$axios.get('/sampleinput/animallist', {
           params
         })
           .then(res => {
@@ -623,6 +670,12 @@
             this.EquipmentList = res.data
           })
       },
+      GetEquipmentInfos () {
+        service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
+          .then(res => {
+            this.EquipmentInfosList = res.data
+          })
+      },
       // 根据子code获取所有父code
       // getparentcodebytopcode(v) {
       //   let _this = this
@@ -1214,6 +1267,8 @@
       clearSearch () {
         this.BarCode = ''
         this.SampleCode = ''
+        this.DItem = ''
+        this.EquipmentIds = ''
         this.SourceName = ''
         this.InnerCode = ''
         this.Name = ''

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

@@ -40,7 +40,7 @@
         </el-form>
       </div>
 
-      <el-table ref="multipleTable" :data="list" bordertooltip-effect="dark" border height="calc(100vh - 230px)" style="width: 100%;"
+      <el-table ref="multipleTable" :data="donorsList" bordertooltip-effect="dark" border height="calc(100vh - 230px)" style="width: 100%;"
         @selection-change="handleSelectionChange" @header-dragend="header_dragend">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="操作" width="80" align="center" fixed>
@@ -124,7 +124,7 @@
             </el-form-item>
 
             <el-form-item label="容器类型">
-              <el-select  size="mini" style="width:100%" v-model="value" placeholder="请选择">
+              <el-select size="mini" style="width:100%" v-model="DItem" placeholder="请选择" @change="GetEquipmentInfos">
                 <el-option
                   v-for="item in EquipmentList"
                   :key="item.DItem"
@@ -159,6 +159,22 @@
                 placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
+            <el-form-item label="容器名称">
+              <el-select
+                size="mini"
+                v-model="EquipmentIds"
+                multiple
+                collapse-tags
+                style="width: 100%"
+                placeholder="请选择">
+                <el-option
+                  v-for="item in EquipmentInfosList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本源名称">
@@ -331,6 +347,10 @@
         SampleCode: '', // 样本编码
         SampleType: '', // 样本类型
         Stnotevalue: '', // 特有扩展检索值
+        DItem: '', // 容器类型id
+        EquipmentList: [], // 容器类型列表
+        EquipmentInfosList: [], // 容器名称列表
+        EquipmentIds: [], // 设备id列表
         STNoteField: [], // 特有扩展名称
         CreateBy: '', // 录入人
         CreateOn: [], // 录入时期
@@ -539,6 +559,24 @@
         }
         this.currentSearchTemplate = ''
         let _this = this
+        // 增加自定义显示列，存储位置，之后需要去掉
+        let ishaslocation = false
+        for (let i = 0; i < _this.showcolumn.length; i++) {
+          if (_this.showcolumn[i].filed === 'Location') {
+            ishaslocation = true
+            break
+          }
+        }
+        if (!ishaslocation) {
+          _this.showcolumn.push({
+            filed: 'Location',
+            name: '存储位置',
+            show: true,
+            kuoz: false,
+            columnwidth: 200
+          })
+        }
+        // paginate
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
@@ -547,10 +585,10 @@
           SampleType: this.SampleType,
           Stnotevalue: this.Stnotevalue,
           STNoteField: this.STNoteField,
-          Noteitemvalue: this.Noteitemvalue,
-          Noteitem: this.Noteitem,
           CreateBy: this.CreateBy,
           SourceName: this.SourceName,
+          DItem: this.DItem,
+          EquipmentIds: this.EquipmentIds,
           Name: this.Name,
           Validity: this.Validity,
           CreateOn: this.CreateOn,
@@ -564,9 +602,16 @@
           }
           params = Object.assign(params, params2)
         }
-        // 返回时保存查找内容
-        store.set('samplewaitstoreseach', params)
-        this.$axios.get('/samplesunsave/animallist', {
+        if (this.Validity && this.Validity.length === 2) {
+          let params3 = {
+            Validitystart: this.Validity[0] / 1000,
+            Validityend: this.Validity[1] / 1000
+          }
+          params = Object.assign(params, params3)
+        }
+        store.set('samplestoredseach', params)
+        _this.getAllSearchTab()
+        this.$axios.get('/sampleinput/animallist', {
           params
         })
           .then(res => {
@@ -581,6 +626,12 @@
             this.EquipmentList = res.data
           })
       },
+      GetEquipmentInfos () {
+        service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
+          .then(res => {
+            this.EquipmentInfosList = res.data
+          })
+      },
       // 根据子code获取所有父code
       getparentcodebytopcode (v) {
         let _this = this
@@ -1030,6 +1081,8 @@
         this.BarCode = ''
         this.SampleCode = ''
         this.SourceName = ''
+        this.DItem = ''
+        this.EquipmentIds = ''
         this.InnerCode = ''
         this.Name = ''
         this.CreateBy = ''
@@ -1097,6 +1150,8 @@
           STNoteField: this.STNoteField,
           Noteitemvalue: this.Noteitemvalue,
           Noteitem: this.Noteitem,
+          DItem: this.DItem,
+          EquipmentIds: this.EquipmentIds,
           CreateBy: this.CreateBy,
           SourceName: this.SourceName,
           Name: this.Name,