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

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

@@ -7,17 +7,17 @@
     <el-row class="inputrow" type="flex">
       <el-col :span="4"  >
 
-        <el-row style="height:100%">
-        <el-tabs type="border-card" style="height:100%">
+        <el-row style="height:calc(100% - 1px)">
+        <el-tabs type="border-card" style="height:calc(100% - 1px)">
           <el-tab-pane label="基础字段"
-                       style="height:100%">
+                       style="calc(100% - 1px)">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data1"
                        @node-click="handleNodeClick"></el-tree>
             </div>
           </el-tab-pane>
           <el-tab-pane label="扩展字段"
-                       style="height:100%">
+                       style="height:calc(100% - 1px)">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data3"
                        @node-click="handleNodeClicKuoZhan"></el-tree>
@@ -25,14 +25,14 @@
 
           </el-tab-pane>
           <el-tab-pane label="样本来源基础字段"
-                       style="height:100%">
+                       style="height:calc(100% - 1px)">
             <div :style="{'width':'100%','height': '100%','overflow':'auto'}">
               <el-tree :data="data2"
                        @node-click="handleNodeClickSource"></el-tree>
             </div>
           </el-tab-pane>
           <el-tab-pane label="样本来源扩展字段"
-                       style="height:100%">
+                       style="height:calc(100% - 1px)">
             <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
               <el-tree :data="data"
                        @node-click="handleNodeClicKuoZhanSource"></el-tree>

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

@@ -5,33 +5,25 @@
              :before-close="beforeClose"
              :close-on-click-modal="false">
     <el-row class="inputrow" type="flex">
-      <el-col :span="4">
-        <!-- <el-row> -->
-        <el-tabs type="border-card" style="height:100%">
-          <el-tab-pane label="基础字段"
-                       style="height:100%">
-            <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
-              <el-tree :data="data1"
-                       @node-click="handleNodeClick"></el-tree>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="扩展字段"
-                       style="height:100%">
-            <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
-              <el-tree :data="data"
-                       @node-click="handleNodeClicKuoZhan"></el-tree>
-            </div>
-          </el-tab-pane>
-<!--          <el-tab-pane label="样本来源"-->
-<!--                       style="height:calc(100vh - 370px)">-->
-<!--            <div :style="{'width':'100%','height':tableHeight-60+'px','overflow':'auto'}">-->
-<!--              <el-tree :data="data2"-->
-<!--                       @node-click="handleNodeClicSource"></el-tree>-->
-<!--            </div>-->
-<!--          </el-tab-pane>-->
-        </el-tabs>
-        <!-- </el-row> -->
-
+      <el-col :span="4"  >
+        <el-row style="height:calc(100% - 1px)">
+          <el-tabs type="border-card" style="height:calc(100% - 1px)">
+            <el-tab-pane label="基础字段"
+                         style="calc(100% - 1px)">
+              <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
+                <el-tree :data="data1"
+                         @node-click="handleNodeClick"></el-tree>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane label="扩展字段"
+                         style="height:calc(100% - 1px)">
+              <div :style="{'width':'100%','height':'100%','overflow':'auto'}">
+                <el-tree :data="data"
+                         @node-click="handleNodeClicKuoZhan"></el-tree>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
+        </el-row>
       </el-col>
       <el-col :span="18">
         <el-row style="margin-bottom:20px">

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

@@ -1017,6 +1017,8 @@ export default {
       this.Name = ''
       this.CreateBy = ''
       this.CreateOn = []
+      this.StartDate = ''
+      this.EndDate = ''
       this.SampleType = ''
       this.STNoteField = ''
       this.Stnotevalue = ''

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

@@ -1195,6 +1195,8 @@
         this.SourceName = ''
         this.InnerCode = ''
         this.Name = ''
+        this.StartDate = ''
+        this.EndDate = ''
         this.CreateBy = ''
         this.CreateOn = []
         this.SampleType = ''

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

@@ -1323,8 +1323,8 @@
         this.Name = ''
         this.CreateBy = ''
         this.CreateOn = []
-        this.StartDate = []
-        this.EndDate = []
+        this.StartDate = ''
+        this.EndDate = ''
         this.SampleType = ''
         this.STNoteField = ''
         this.Stnotevalue = ''

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

@@ -1017,6 +1017,8 @@
         this.Name = ''
         this.CreateBy = ''
         this.CreateOn = []
+        this.StartDate = ''
+        this.EndDate = ''
         this.SampleType = ''
         this.STNoteField = ''
         this.Stnotevalue = ''