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

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

@@ -1146,23 +1146,23 @@ export default {
       let params = {
         currentPage: this.currentPage,
         size: this.size,
-        BarCode: this.BarCode,
-        SampleCode: this.SampleCode,
-        SampleType: this.SampleType,
-        Stnotevalue: this.Stnotevalue,
-        STNoteField: this.STNoteField,
-        Noteitemvalue: this.Noteitemvalue,
-        Noteitem: this.Noteitem,
-        DItem: this.DItem,
-        EquipmentIds: this.EquipmentIds,
-        CreateBy: this.CreateBy,
-        SourceName: this.SourceName,
-        Name: this.Name,
-        Validity: this.Validity,
-        InnerCode: this.InnerCode,
-        GroupName: this.GroupName,
-        showColumn: showcolumnarr + '',
-        showColumnName: showcolumnnamearr + '',
+        bar_code: this.BarCode,
+        sample_code: this.SampleCode,
+        sample_type: this.SampleType,
+        start_date: this.StartDate,
+        end_date: this.EndDate,
+        d_item: this.DItem,
+        equipment_ids: this.EquipmentIds,
+        stnote_value: this.Stnotevalue,
+        stnote_field: this.STNoteField,
+        create_by: this.CreateBy,
+        source_name: this.SourceName,
+        name: this.Name,
+        validity: this.Validity,
+        inner_code: this.InnerCode,
+        group_name: this.GroupName,
+        show_column: showcolumnarr + '',
+        show_column_name: showcolumnnamearr + '',
         type: 'archived'
         // showcolumnarr: showcolumnarr + '',
         // showcolumnnamearr: showcolumnnamearr + '',
@@ -1206,7 +1206,7 @@ export default {
           }
         }
         let paramsid = {
-          Id: id
+          id: id
         }
         params = Object.assign(params, paramsid)
       }

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

@@ -767,19 +767,23 @@
         let params = {
           currentPage: this.exportType == 'exportall' ? 0 : this.currentPage,
           size: this.exportType == 'exportall' ? 0 : 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,
-          InnerCode: this.InnerCode,
-          GroupName: this.GroupName,
-          showColumn: showcolumnarr + '',
-          showColumnName: showcolumnnamearr + '',
+          bar_code: this.BarCode,
+          sample_code: this.SampleCode,
+          sample_type: this.SampleType,
+          start_date: this.StartDate,
+          end_date: this.EndDate,
+          d_item: this.DItem,
+          equipment_ids: this.EquipmentIds,
+          stnote_value: this.Stnotevalue,
+          stnote_field: this.STNoteField,
+          create_by: this.CreateBy,
+          source_name: this.SourceName,
+          name: this.Name,
+          validity: this.Validity,
+          inner_code: this.InnerCode,
+          group_name: this.GroupName,
+          show_column: showcolumnarr + '',
+          show_column_name: showcolumnnamearr + '',
           type: 'prerecorded'
           /* showcolumnarr: showcolumnarr + '',
           showcolumnnamearr: showcolumnnamearr + '',
@@ -810,7 +814,7 @@
             }
           }
           let paramsid = {
-            Id: id
+            id: id
           }
           params = Object.assign(params, paramsid)
         }

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

@@ -197,7 +197,7 @@
                 <el-input v-model="Name" placeholder="请输入名称" size="mini" style="width:100%"></el-input>
               </el-form-item>
               <el-form-item label="特有扩展">
-                <el-select v-model="STNoteField" placeholder="请选择" size="mini" style="width:100%" clearable>
+                <el-select v-model="STNoteField" clearable placeholder="请选择" size="mini" style="width:100%">
                   <el-option v-for="item in typetykzlist" :label="item.Name" :value="item.FieldName"
                     :key="item.FieldName"></el-option>
                 </el-select>
@@ -992,19 +992,23 @@
         let params = {
           currentPage: this.exportType == 'exportall' ? 0 : this.currentPage,
           size: this.exportType == 'exportall' ? 0 : 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,
-          InnerCode: this.InnerCode,
-          GroupName: this.GroupName,
-          showColumn: showcolumnarr + '',
-          showColumnName: showcolumnnamearr + '',
+          bar_code: this.BarCode,
+          sample_code: this.SampleCode,
+          sample_type: this.SampleType,
+          start_date: this.StartDate,
+          end_date: this.EndDate,
+          d_item: this.DItem,
+          equipment_ids: this.EquipmentIds,
+          stnote_value: this.Stnotevalue,
+          stnote_field: this.STNoteField,
+          create_by: this.CreateBy,
+          source_name: this.SourceName,
+          name: this.Name,
+          validity: this.Validity,
+          inner_code: this.InnerCode,
+          group_name: this.GroupName,
+          show_column: showcolumnarr + '',
+          show_column_name: showcolumnnamearr + '',
           type: 'stored'
           // showcolumnarr: showcolumnarr + '',
           // showcolumnnamearr: showcolumnnamearr + '',
@@ -1034,7 +1038,7 @@
             }
           }
           let paramsid = {
-            Id: id
+            id: id
           }
           params = Object.assign(params, paramsid)
         }
@@ -1411,7 +1415,6 @@
         this.STNoteField = ''
         this.Stnotevalue = ''
         this.exportType = ''
-
         this.Validity = []
         this.currentPage = 1
         this.GroupName = ''

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

@@ -1148,23 +1148,23 @@
         let params = {
           currentPage: this.exportType == 'exportall' ? 0 : this.currentPage,
           size: this.exportType == 'exportall' ? 0 : this.size,
-          BarCode: this.BarCode,
-          SampleCode: this.SampleCode,
-          SampleType: this.SampleType,
-          Stnotevalue: this.Stnotevalue,
-          STNoteField: this.STNoteField,
-          Noteitemvalue: this.Noteitemvalue,
-          Noteitem: this.Noteitem,
-          DItem: this.DItem,
-          EquipmentIds: this.EquipmentIds,
-          CreateBy: this.CreateBy,
-          SourceName: this.SourceName,
-          Name: this.Name,
-          Validity: this.Validity,
-          InnerCode: this.InnerCode,
-          GroupName: this.GroupName,
-          showColumn: showcolumnarr + '',
-          showColumnName: showcolumnnamearr + '',
+          bar_code: this.BarCode,
+          sample_code: this.SampleCode,
+          sample_type: this.SampleType,
+          start_date: this.StartDate,
+          end_date: this.EndDate,
+          d_item: this.DItem,
+          equipment_ids: this.EquipmentIds,
+          stnote_value: this.Stnotevalue,
+          stnote_field: this.STNoteField,
+          create_by: this.CreateBy,
+          source_name: this.SourceName,
+          name: this.Name,
+          validity: this.Validity,
+          inner_code: this.InnerCode,
+          group_name: this.GroupName,
+          show_column: showcolumnarr + '',
+          show_column_name: showcolumnnamearr + '',
           type: 'waitingstore'
           // showcolumnarr: showcolumnarr + '',
           // showcolumnnamearr: showcolumnnamearr + '',
@@ -1208,7 +1208,7 @@
             }
           }
           let paramsid = {
-            Id: id
+            id: id
           }
           params = Object.assign(params, paramsid)
         }