2 Комити b822818b70 ... fd986e1223

Аутор SHA1 Порука Датум
  jianglw fd986e1223 Merge branch 'master' of http://code.dashoo.cn/dashoo/biobank пре 4 година
  jianglw bde726365f 样本来源导出参数名修改 пре 4 година

+ 13 - 13
src/dashoo.cn/frontend_animal/src/pages/biobank/source/animal.vue

@@ -714,6 +714,7 @@ export default {
     seachdata () {
       console.log("this.SurveyDateStart", this.SurveyDateStart)
       console.log("this.SurveyDateEnd", this.SurveyDateEnd)
+      this.dialogVisible = false
       this.currentPage = 1
       this.SurveyDate = []
       if ((this.SurveyDateStart != '' && this.SurveyDateEnd == '') || (this.SurveyDateStart == '' && this.SurveyDateEnd != '')) {
@@ -887,18 +888,17 @@ export default {
       let params = {
         currentPage: this.currentPage,
         size: this.size,
-        GenusId: this.GenusId,
-        Genus: this.Genus,
-        Address: this.Address,
-        InnerNo: this.InnerNo,
-        CreateOn: (this.CreateOn).join(','),
-        SourceType: this.SourceType,
-        ProjectName: this.ProjectName,
-        Name: this.Name,
-        AuditorStatus: this.AuditorStatus,
-        AuditorName: this.AuditorName,
-        showColumn: showcolumnarr + '',
-        showColumnName: showcolumnnamearr + '',
+        name: this.searchform.Name,
+        inner_no: this.InnerNo,
+        genus: this.searchform.Genus,
+        address: this.searchform.Address,
+        survey_date: (this.SurveyDate).join(','),
+        project_name: this.searchform.ProjectName,
+        auditor_status: this.searchform.AuditorStatus,
+        auditor_name: this.searchform.AuditorName,
+        create_on: (this.CreateOn).join(','),
+        show_column: showcolumnarr + '',
+        show_column_name: showcolumnnamearr + '',
         type: 'SampleSource'
       }
       /*    if (this.CreateOn && this.CreateOn.length === 2) {
@@ -939,7 +939,7 @@ export default {
           }
         }
         let paramsid = {
-          Id: id
+          id: id
         }
         params = Object.assign(params, paramsid)
       }

+ 1 - 1
src/dashoo.cn/frontend_animal/src/pages/samples/archived/index.vue

@@ -549,7 +549,7 @@ export default {
       }
       store.set('samplesfiles/animallist', params)
       _this.getAllSearchTab()
-      this.$axios.get('/samplesunsave/animallist', {
+      this.$axios.get('/samplesfiles/animallist', {
         params
       })
         .then(res => {