Ver código fonte

更新表格默认宽度和导出样本类型默认为全部

gongyb 4 anos atrás
pai
commit
739b669a0a

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

@@ -407,35 +407,41 @@ export default {
         filed: 'BarCode',
         name: '样本条码',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 170
       }, {
         filed: 'SampleCode',
         name: '样本编码',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 130
       }, {
         filed: 'SourceName',
         name: '样本来源',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 250
       }, {
         filed: 'Genus',
         name: '蜂种名称',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 100
       }, {
         filed: 'AddressName',
         name: '取样地区',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 250
       }, {
         filed: 'SurveyDate',
         name: '采样日期',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 150
       }, {
         filed: 'Name',
-        name: '名称',
+        name: '样本名称',
         show: true,
         kuoz: false
       }, {
@@ -452,17 +458,20 @@ export default {
         filed: 'InnerCode',
         name: '样本内码',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 150
       }, {
         filed: 'ValidityDate',
         name: '有效日期',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 100
       }, {
         filed: 'ReceiveDate',
         name: '接收日期',
         show: true,
-        kuoz: false
+        kuoz: false,
+        columnwidth: 150
       }, {
         filed: 'CreateBy',
         name: '录入人',
@@ -471,7 +480,7 @@ export default {
       }, {
         filed: 'GroupName',
         name: '所属分组',
-        show: true,
+        show: false,
         kuoz: false
       }]
     }
@@ -1105,6 +1114,7 @@ export default {
         name: '全部',
         id: 0
       }]
+      this.SampleType = 0
       // 导出当前页,遍历当前页数据的样本类型
       if (multipleSelection != null) {
         for (var i = 0; i < multipleSelection.length; i++) {

+ 19 - 9
src/dashoo.cn/frontend_animal/src/pages/samples/prerecorded/index.vue

@@ -426,32 +426,38 @@
           filed: 'BarCode',
           name: '样本条码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 170
         }, {
           filed: 'SampleCode',
           name: '样本编码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 130
         }, {
           filed: 'SourceName',
           name: '样本来源',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 250
         }, {
           filed: 'Genus',
           name: '蜂种名称',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 100
         }, {
           filed: 'AddressName',
           name: '取样地区',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 250
         }, {
           filed: 'SurveyDate',
           name: '采样日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'Name',
           name: '样本名称',
@@ -471,17 +477,20 @@
           filed: 'InnerCode',
           name: '样本内码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'ValidityDate',
           name: '有效日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 100
         }, {
           filed: 'ReceiveDate',
           name: '接收日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'CreateBy',
           name: '录入人',
@@ -727,6 +736,7 @@
           name: '全部',
           id: 0
         }]
+        this.SampleType = 0
         // 导出当前页,遍历当前页数据的样本类型
         if (multipleSelection != null) {
           for (var i = 0; i < multipleSelection.length; i++) {

+ 23 - 12
src/dashoo.cn/frontend_animal/src/pages/samples/stored/index.vue

@@ -259,7 +259,8 @@
               <el-option v-for="(item, index) in ExportSampleTypeList"
                   :label="item.name"
                   :value="item.id"
-                  :key="index"></el-option>
+                  :key="index"
+              ></el-option>
             </el-select>
           </el-form-item>
         </el-form>
@@ -502,35 +503,41 @@
           filed: 'BarCode',
           name: '样本条码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 170
         }, {
           filed: 'SampleCode',
           name: '样本编码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 130
         }, {
           filed: 'SourceName',
           name: '样本来源',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 250
         }, {
           filed: 'Genus',
           name: '蜂种名称',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 100
         }, {
           filed: 'AddressName',
           name: '取样地区',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 250
         }, {
           filed: 'SurveyDate',
           name: '采样日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'Name',
-          name: '名称',
+          name: '样本名称',
           show: true,
           kuoz: false
         }, {
@@ -547,17 +554,20 @@
           filed: 'InnerCode',
           name: '样本内码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'ValidityDate',
           name: '有效日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 100
         }, {
           filed: 'ReceiveDate',
           name: '接收日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'CreateBy',
           name: '录入人',
@@ -665,7 +675,7 @@
           })
         this.$nextTick(() => {
           this.$refs.multipleTable.doLayout()
-        });
+        })
       },
       GetEquipmentInfos () {
         if (this.DItem != '') {
@@ -948,6 +958,7 @@
           name: '全部',
           id: 0
         }]
+        this.SampleType = 0
         // 导出当前页,遍历当前页数据的样本类型
         if (multipleSelection != null) {
           for (var i = 0; i < multipleSelection.length; i++) {

+ 21 - 11
src/dashoo.cn/frontend_animal/src/pages/samples/waitingstore/index.vue

@@ -410,35 +410,41 @@
           filed: 'BarCode',
           name: '样本条码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 170
         }, {
           filed: 'SampleCode',
           name: '样本编码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 130
         }, {
           filed: 'SourceName',
           name: '样本来源',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 250
         }, {
           filed: 'Genus',
           name: '蜂种名称',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 100
         }, {
           filed: 'AddressName',
           name: '取样地区',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 250
         }, {
           filed: 'SurveyDate',
           name: '采样日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'Name',
-          name: '名称',
+          name: '样本名称',
           show: true,
           kuoz: false
         }, {
@@ -455,17 +461,20 @@
           filed: 'InnerCode',
           name: '样本内码',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'ValidityDate',
           name: '有效日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 100
         }, {
           filed: 'ReceiveDate',
           name: '接收日期',
           show: true,
-          kuoz: false
+          kuoz: false,
+          columnwidth: 150
         }, {
           filed: 'CreateBy',
           name: '录入人',
@@ -474,7 +483,7 @@
         }, {
           filed: 'GroupName',
           name: '所属分组',
-          show: true,
+          show: false,
           kuoz: false
         }]
       }
@@ -1109,6 +1118,7 @@
           name: '全部',
           id: 0
         }]
+        this.SampleType = 0
         // 导出当前页,遍历当前页数据的样本类型
         if (multipleSelection != null) {
           for (var i = 0; i < multipleSelection.length; i++) {