删除 样本预录入的容器类型 修改样本管理容器类型查询判断

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

@@ -527,7 +527,7 @@ export default {
         CreateBy: this.CreateBy,
         SourceName: this.SourceName,
         DItem: this.DItem,
-        EquipmentIds: this.EquipmentIds.join(','),
+        EquipmentIds: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
         Name: this.Name,
         Validity: this.Validity,
         CreateOn: this.CreateOn,
@@ -548,7 +548,7 @@ export default {
         }
         params = Object.assign(params, params3)
       }
-      store.set('samplesfiles/animallist', params)
+      store.set('samplestoredseach', params)
       _this.getAllSearchTab()
       this.$axios.get('/samplesfiles/animallist', {
         params
@@ -565,7 +565,7 @@ export default {
         .then(res => {
           this.EquipmentList = res.data
         })
-      /* this.$refs.multipleTable.doLayout() */
+      /*this.$refs.multipleTable.doLayout()*/
       // 获取样本扩展列表
       service.postRequest('dashoo.biobank.bee-0.1', 'SampleRelated', 'CustomizeSearch', {type: 'Sample'})
         .then(res => {
@@ -622,9 +622,6 @@ export default {
         }).catch(() => {})
     },
     seachdata () {
-      if (this.selectedzuzhi.length > 0) {
-        this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
-      }
       this.currentPage = 1
       this.initData()
       this.dialogVisible = false

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

@@ -130,7 +130,7 @@
                 placeholder="请选择">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="容器类型">
+<!--            <el-form-item label="容器类型">
               <el-select
                 size="mini"
                 style="width:100%"
@@ -145,7 +145,7 @@
                   :value="item.DItem">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本编码">
@@ -170,7 +170,7 @@
                 placeholder="请选择">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="容器名称">
+<!--            <el-form-item label="容器名称">
               <el-select
                 size="mini"
                 v-model="EquipmentIds"
@@ -185,7 +185,7 @@
                   :value="item.id">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本源名称">
@@ -562,7 +562,7 @@
           CreateBy: this.CreateBy,
           SourceName: this.SourceName,
           DItem: this.DItem,
-          EquipmentIds: this.EquipmentIds.join(','),
+          EquipmentIds: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           Name: this.Name,
           Validity: this.Validity,
           CreateOn: this.CreateOn,
@@ -612,18 +612,18 @@
             this.SampleTypeList = res.data
           })
       },
-      GetEquipmentInfos () {
+      /* GetEquipmentInfos () {
         if (this.DItem != '') {
           service.postRequest('dashoo.biobank.bee-0.1', 'Equipment', 'GetEquipmentInfos', {DItem: this.DItem})
             .then(res => {
               this.EquipmentInfosList = res.data
             })
         }
-      },
-      GetEquipmentClear () {
+      }, */
+      /*  GetEquipmentClear () {
         this.EquipmentInfosList = null
         this.EquipmentIds = null
-      },
+      }, */
       // 根据子code获取所有父code
       // getparentcodebytopcode(v) {
       //   let _this = this

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

@@ -624,7 +624,7 @@
           CreateBy: this.CreateBy,
           SourceName: this.SourceName,
           DItem: this.DItem,
-          EquipmentIds: this.EquipmentIds.join(','),
+          EquipmentIds: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           Name: this.Name,
           Validity: this.Validity,
           CreateOn: this.CreateOn,

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

@@ -525,7 +525,7 @@
           CreateBy: this.CreateBy,
           SourceName: this.SourceName,
           DItem: this.DItem,
-          EquipmentIds: this.EquipmentIds.join(','),
+          EquipmentIds: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           Name: this.Name,
           Validity: this.Validity,
           CreateOn: this.CreateOn,