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

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

@@ -60,9 +60,9 @@
                       closable
                       color="#F2F6FC"
                       class="reporttag reportselect"
+                      style="margin-right: auto"
                       @click="clickmodeltypetag(tag.name, tag.id)"
                       @close="removeSearchTab(tag.id,tag.name)">
-
                 <i class="el-icon-caret-right"
                    v-if="tag.name === currentSearchTemplateName"></i>
                 {{tag.name}}

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

@@ -34,6 +34,7 @@
                       :key="tag.name"
                       closable
                       color="#F2F6FC"
+                      style="margin-right: auto"
                       class="reporttag reportselect"
                       @click="clickmodeltypetag(tag.name, tag.id)"
                       @close="removeSearchTab(tag.id,tag.name)">

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

@@ -1149,11 +1149,10 @@ export default {
         size: this.size,
         bar_code: this.BarCode,
         sample_code: this.SampleCode,
-        sample_type: this.SampleType,
-        start_date: this.StartDate,
-        end_date: this.EndDate,
+        sample_type: this.SampleType == '' ? 0 : this.SampleType,
+        create_on: this.create_on,
         d_item: this.DItem,
-        equipment_ids: this.EquipmentIds,
+        equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
         stnote_value: this.Stnotevalue,
         stnote_field: this.STNoteField,
         create_by: this.CreateBy,

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

@@ -769,11 +769,10 @@
           size: this.exportType == 'exportall' ? 0 : this.size,
           bar_code: this.BarCode,
           sample_code: this.SampleCode,
-          sample_type: this.SampleType,
-          start_date: this.StartDate,
-          end_date: this.EndDate,
+          sample_type: this.SampleType == '' ? 0 : this.SampleType,
+          create_on: this.create_on,
           d_item: this.DItem,
-          equipment_ids: this.EquipmentIds,
+          equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           stnote_value: this.Stnotevalue,
           stnote_field: this.STNoteField,
           create_by: this.CreateBy,

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

@@ -994,11 +994,10 @@
           size: this.exportType == 'exportall' ? 0 : this.size,
           bar_code: this.BarCode,
           sample_code: this.SampleCode,
-          sample_type: this.SampleType,
-          start_date: this.StartDate,
-          end_date: this.EndDate,
+          sample_type: this.SampleType == '' ? 0 : this.SampleType,
+          create_on: this.create_on,
           d_item: this.DItem,
-          equipment_ids: this.EquipmentIds,
+          equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           stnote_value: this.Stnotevalue,
           stnote_field: this.STNoteField,
           create_by: this.CreateBy,

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

@@ -1150,11 +1150,10 @@
           size: this.exportType == 'exportall' ? 0 : this.size,
           bar_code: this.BarCode,
           sample_code: this.SampleCode,
-          sample_type: this.SampleType,
-          start_date: this.StartDate,
-          end_date: this.EndDate,
+          sample_type: this.SampleType == '' ? 0 : this.SampleType,
+          create_on: this.create_on,
           d_item: this.DItem,
-          equipment_ids: this.EquipmentIds,
+          equipment_ids: (this.EquipmentIds).length == 0 ? '' : this.EquipmentIds.join(','),
           stnote_value: this.Stnotevalue,
           stnote_field: this.STNoteField,
           create_by: this.CreateBy,