删除card固定高度

src/dashoo.cn/frontend_web/src/pages/biobank/allsearch/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="exportloading" element-loading-text="数据准备中，请稍候。。。">
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/book/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/partner/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/partner/organize.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/protocol/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/sampleCK/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/sampleRK/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/sampletest/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/service/complated.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/service/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/source/animal.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/source/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/source/micro.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/biobank/sourcextends/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/donors/familyman/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/donors/flupplan/fluprecord.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/donors/flupplan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/donors/flupplan/willfluprecord.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/log/donorlog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/log/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/log/operationlog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/log/samplelog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/projectmanage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/equipment.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesall.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesarchived.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesbycreatedate.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesbygroup.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesbysource.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesbytype.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstored.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstoredbydate.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstoredbyequipment.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/report/samples/samplesstoredbysampletype.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>
@@ -346,7 +346,7 @@
     components: {
       draggable
     },
-    data() {
+    data () {
       return {
         dialogVisible: false,
         currentItemCount: 0, // 当前页显示数量
@@ -363,7 +363,7 @@
         Noteitem: [], // 公共扩展名称
         CreateBy: '', // 录入人
         CreateOn: [], // 录入时期
-        GroupName: '', //所属分组
+        GroupName: '', // 所属分组
         Name: '', // 名称
         SourceName: '', // 样本来源
         Validity: [], // 有效日期
@@ -401,17 +401,17 @@
         selectedzuzhi: [],
         selectsigorg: '',
         typetykzlist: [], // 特有扩展
-        multipleSelection: [], //多选框
+        multipleSelection: [], // 多选框
         showcolumn: [], // 显示列
         cachecols: [],
         columndialogVisible: false, // 自定义显示列弹框
         isIndeterminate: false,
         checkAll: true,
         searchDialogVisible: false, // 自定义搜索弹框
-        searchTemplateName: "自定义搜索1",
+        searchTemplateName: '自定义搜索1',
         searchTemplates: [],
-        currentSearchTemplateName: "",
-        searchField: "BarCode",
+        currentSearchTemplateName: '',
+        searchField: 'BarCode',
         searchValue: {
           BarCode: '',
           SampleCode: '',
@@ -427,7 +427,7 @@
           Capacity: '',
           Location: '',
           Extension: '',
-          GroupName: '', //所属分组
+          GroupName: '' // 所属分组
         },
         sampinputtreeprops2: {
           value: 'name',
@@ -436,79 +436,79 @@
         },
         selectedzuzhi2: [],
         samplesitenames2: [], // 取材部位
-        orAnd: "and",
+        orAnd: 'and',
         orAndData: [{
-            name: "并且",
-            value: "and",
-          },
-          {
-            name: "或者",
-            value: "or",
-          }
+          name: '并且',
+          value: 'and'
+        },
+        {
+          name: '或者',
+          value: 'or'
+        }
         ],
         searchTableData: [],
         searchcolumn: [], // 搜索列
         currentSearchTemplate: '',
-        acc: '',
+        acc: ''
       }
     },
-    created() {
+    created () {
       this.acc = this.authUser.Profile.AccCode
       if (this.$route.query.size && this.$route.query.currentPage) {
         this.size = parseInt(this.$route.query.size)
         this.currentPage = parseInt(this.$route.query.currentPage)
         let searchmodel = store.get('samplearchivedseach')
 
-        if (typeof (this.searchmodel) != 'undefined') {
-          if (this.searchmodel.BarCode && this.searchmodel.BarCode !== '') { //样本条码
+        if (typeof (this.searchmodel) !== 'undefined') {
+          if (this.searchmodel.BarCode && this.searchmodel.BarCode !== '') { // 样本条码
             this.BarCode = this.searchmodel.BarCode
           }
-          if (this.searchmodel.SampleCode && this.searchmodel.SampleCode !== '') { //样本编码
+          if (this.searchmodel.SampleCode && this.searchmodel.SampleCode !== '') { // 样本编码
             this.SampleCode = this.searchmodel.SampleCode
           }
-          if (this.searchmodel.SourceName && this.searchmodel.SourceName !== '') { //样本来源
+          if (this.searchmodel.SourceName && this.searchmodel.SourceName !== '') { // 样本来源
             this.SourceName = this.searchmodel.SourceName
           }
-          if (this.searchmodel.InnerCode && this.searchmodel.InnerCode !== '') { //样本内码
+          if (this.searchmodel.InnerCode && this.searchmodel.InnerCode !== '') { // 样本内码
             this.InnerCode = this.searchmodel.InnerCode
           }
-          if (this.searchmodel.Name && this.searchmodel.Name !== '') { //名称
+          if (this.searchmodel.Name && this.searchmodel.Name !== '') { // 名称
             this.Name = this.searchmodel.Name
           }
-          if (this.searchmodel.CreateBy && this.searchmodel.CreateBy !== '') { //录入人
+          if (this.searchmodel.CreateBy && this.searchmodel.CreateBy !== '') { // 录入人
             this.CreateBy = this.searchmodel.CreateBy
           }
-          if (this.searchmodel.CreateOn && this.searchmodel.CreateOn.length === 2) { //录入日期
+          if (this.searchmodel.CreateOn && this.searchmodel.CreateOn.length === 2) { // 录入日期
             this.CreateOn = [new Date(this.searchmodel.CreateOn[0]), new Date(this.searchmodel.CreateOn[1])]
           }
-          if (this.searchmodel.SamplingOrgan && this.searchmodel.SamplingOrgan !== '') { //组织器官
+          if (this.searchmodel.SamplingOrgan && this.searchmodel.SamplingOrgan !== '') { // 组织器官
             this.selectsigorg = this.searchmodel.SamplingOrgan
             this.getparentcodebytopcode(this.searchmodel.SamplingOrgan)
             // this.selectedzuzhi=searchmodel.SamplingOrgan
           }
-          if (this.searchmodel.SamplingSite && this.searchmodel.SamplingSite !== '') { //取材部位
+          if (this.searchmodel.SamplingSite && this.searchmodel.SamplingSite !== '') { // 取材部位
             this.SamplingSite = this.searchmodel.SamplingSite
           }
-          if (this.searchmodel.SampleType && this.searchmodel.SampleType !== '') { //样本类型
+          if (this.searchmodel.SampleType && this.searchmodel.SampleType !== '') { // 样本类型
             this.SampleType = this.searchmodel.SampleType
             this.searchsampletypeChange()
           }
-          if (this.searchmodel.STNoteField && this.searchmodel.STNoteField.length > 0) { //特有扩展
+          if (this.searchmodel.STNoteField && this.searchmodel.STNoteField.length > 0) { // 特有扩展
             this.STNoteField = this.searchmodel.STNoteField
           }
-          if (this.searchmodel.Stnotevalue && this.searchmodel.Stnotevalue !== '') { //特有检索内容
+          if (this.searchmodel.Stnotevalue && this.searchmodel.Stnotevalue !== '') { // 特有检索内容
             this.Stnotevalue = this.searchmodel.Stnotevalue
           }
-          if (this.searchmodel.Validity && this.searchmodel.Validity.length === 2) { //有效日期
+          if (this.searchmodel.Validity && this.searchmodel.Validity.length === 2) { // 有效日期
             this.Validity = [new Date(this.searchmodel.Validity[0]), new Date(this.searchmodel.Validity[1])]
           }
-          if (this.searchmodel.Noteitem && this.searchmodel.Noteitem.length > 0) { //公有扩展
+          if (this.searchmodel.Noteitem && this.searchmodel.Noteitem.length > 0) { // 公有扩展
             this.Noteitem = this.searchmodel.Noteitem
           }
-          if (this.searchmodel.Noteitemvalue && this.searchmodel.Noteitemvalue !== '') { //公共检索内容
+          if (this.searchmodel.Noteitemvalue && this.searchmodel.Noteitemvalue !== '') { // 公共检索内容
             this.Noteitemvalue = this.searchmodel.Noteitemvalue
           }
-          if (searchmodel.GroupName && searchmodel.GroupName !== '') { //所属分组
+          if (searchmodel.GroupName && searchmodel.GroupName !== '') { // 所属分组
             this.GroupName = searchmodel.GroupName
           }
         }
@@ -517,7 +517,7 @@
       }
 
       this.cachecols = store.get('samplearchivedshowcolumn')
-      //当前显示列无数据，使用已录入样本显示列数据
+      // 当前显示列无数据，使用已录入样本显示列数据
       if (!(this.cachecols && this.cachecols !== '')) {
         this.cachecols = store.get('sapminputshowcolumn')
       }
@@ -597,14 +597,14 @@
       this.checkedshowall()
       this.getAllSearchTab()
     },
-    mounted() {
+    mounted () {
       let _this = this
       window.clickmodeltypetag = function (val, e) {
         _this.clickmodeltypetag(val)
       }
     },
     methods: {
-      initData() {
+      initData () {
         this.currentSearchTemplate = ''
         let _this = this
         // paginate
@@ -638,8 +638,8 @@
         store.set('samplearchivedseach', params)
         // request
         this.$axios.get('/samplesfiles/list', {
-            params
-          })
+          params
+        })
           .then(res => {
             // response
             _this.list = res.data.items
@@ -650,8 +650,8 @@
             console.error(err)
           })
       },
-      //根据子code获取所有父code
-      getparentcodebytopcode(v) {
+      // 根据子code获取所有父code
+      getparentcodebytopcode (v) {
         let _this = this
         _this.$axios.get('/sampleorgan/getparentcodebytopcode/' + v, {})
           .then(res => {
@@ -665,18 +665,18 @@
             _this.searchzuzhitreehandleChange()
           })
       },
-      getextends() {
+      getextends () {
         let _this = this
         this.$axios.get('/sampleinput/getsampletype', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.sampletypes = res.data.items
             // _this.sampletypes = [{'Id': 123, 'Name': '987'}]
           }).catch(() => {})
         this.$axios.get('/sampleinput/getpublicsampletype', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.publicsampletypes = res.data.items
             // 扩展列增加到显示列中
@@ -735,7 +735,7 @@
             }
             if (store.get('samplearchivedseach').searchWithTemplate && store.get('samplearchivedseach')
               .searchWithTemplate !==
-              '') { //自定义查询
+              '') { // 自定义查询
               this.handleSearchCommand(store.get('samplearchivedseach').searchWithTemplate)
             } else {
               // initial data
@@ -743,20 +743,20 @@
             }
           }).catch(() => {})
         this.$axios.get('/sampleinput/getoperations', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.zuzhitreelist = window.toolfun_gettreejson(res.data.items, 'id', 'pId', 'id,name,code')
           }).catch(() => {})
       },
-      seachdata() {
+      seachdata () {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
         }
         this.currentPage = 1
         this.initData()
       },
-      deletedata(val) {
+      deletedata (val) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -783,8 +783,8 @@
             .catch(() => {})
         }).catch(() => {})
       },
-      //批量删除
-      batchdelete() {
+      // 批量删除
+      batchdelete () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -804,33 +804,33 @@
           let count = 0
           for (var i = 0; i < _this.multipleSelection.length; i++) {
             _this.$axios.delete('samplesfiles/' + _this.multipleSelection[i].Id + '?sampletype=' + _this
-                .multipleSelection[
-                  i].SampleType, null)
+              .multipleSelection[
+                i].SampleType, null)
               .then(res => {
                 // response
                 if (res.data.code === 0) {
                   succeedMsg = res.data.message
                 } else {
                   errorMsg = res.data.message
-                  failedIds.push(_this.multipleSelection[i].Id);
-                }
+                  failedIds.push(_this.multipleSelection[i].Id)
+              }
                 count++
-                //最后一个请求结束
+                // 最后一个请求结束
                 if (count == _this.multipleSelection.length) {
-                  //更新界面
+                  // 更新界面
                   this.initData()
-                  //全部删除成功
+                  // 全部删除成功
                   if (failedIds.length == 0) {
                     _this.$message({
                       type: 'success',
-                      message: succeedMsg,
+                      message: succeedMsg
                     })
                   } else {
-                    //存在删除失败
-                    errorMsg = errorMsg + "，失败ID：" + failedIds.join(",")
+                    // 存在删除失败
+                    errorMsg = errorMsg + '，失败ID：' + failedIds.join(',')
                     _this.$message({
                       type: 'warning',
-                      message: errorMsg,
+                      message: errorMsg
                     })
                   }
                 }
@@ -841,7 +841,7 @@
           console.error(err)
         })
       },
-      selsampletypeChange() {
+      selsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -853,8 +853,8 @@
             })
         }
       },
-      //返回查询条件执行
-      searchsampletypeChange() {
+      // 返回查询条件执行
+      searchsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -865,9 +865,9 @@
             })
         }
       },
-      //---------------------------------------------------
-      //自定义显示列
-      checkedshowall() {
+      // ---------------------------------------------------
+      // 自定义显示列
+      checkedshowall () {
         let tc = 0
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].show) {
@@ -886,13 +886,13 @@
           }
         }
       },
-      handleCheckAllChange(val) {
+      handleCheckAllChange (val) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           this.showcolumn[i].show = val
         }
       },
       // 自定义显示列保存操作
-      saveshowfiled() {
+      saveshowfiled () {
         store.set('samplearchivedshowcolumn', this.showcolumn)
         this.columndialogVisible = false
         this.$message({
@@ -901,7 +901,7 @@
         })
         this.initData()
       },
-      header_dragend(newWidth, oldWidth, column, event) {
+      header_dragend (newWidth, oldWidth, column, event) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].name === column.label) {
             this.showcolumn[i].columnwidth = newWidth
@@ -910,17 +910,17 @@
           }
         }
       },
-      //----------------------------------------------------------------
-      //自定义查询
-      handleSearchCommand(command) {
+      // ----------------------------------------------------------------
+      // 自定义查询
+      handleSearchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
-        } else if (command == "编辑") {
+        } else if (command == '编辑') {
           this.searchDialogVisible = true
           this.searchcolumn = this.showcolumn.filter(function (e) {
-            return e.filed != "Location"
+            return e.filed != 'Location'
           })
         } else {
           this.currentSearchTemplate = command
@@ -931,19 +931,19 @@
           this.searchWithTemplate(command)
         }
       },
-      //添加自定义搜索
-      addSearchTab(name) {
+      // 添加自定义搜索
+      addSearchTab (name) {
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == name) {
-            this.$message("名称已经存在")
+            this.$message('名称已经存在')
             return
           }
         }
         this.searchTemplates.push({
-            Name: name,
-            Fields: [],
-          }),
-          this.currentSearchTemplateName = name
+          Name: name,
+          Fields: []
+        }),
+        this.currentSearchTemplateName = name
 
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
@@ -951,32 +951,31 @@
           }
         }
       },
-      removeSearchTab(targetName) {
+      removeSearchTab (targetName) {
         let _this = this
         this.$axios.delete('/sampleinput/searchTemplate?name=' + targetName, {})
           .then(res => {
             if (res.data.code == 0) {
-              let tabs = _this.searchTemplates;
-              let activeName = _this.currentSearchTemplateName;
-              if (activeName === targetName) {
+              let tabs = _this.searchTemplates
+            let activeName = _this.currentSearchTemplateName
+            if (activeName === targetName) {
                 tabs.forEach((tab, index) => {
                   if (tab.Name === targetName) {
-                    let nextTab = tabs[index + 1] || tabs[index - 1];
-                    if (nextTab) {
+                    let nextTab = tabs[index + 1] || tabs[index - 1]
+                  if (nextTab) {
                       activeName = nextTab.Name
                       _this.searchTableData = this.getSearchTableData(nextTab.Fields)
                     }
                   }
-                });
-              }
+                })
+            }
 
               _this.currentSearchTemplateName = activeName
               _this.searchTemplates = tabs.filter(tab => tab.Name !== targetName)
-
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -985,7 +984,7 @@
             console.error(err)
           })
       },
-      zuzhitreehandleChange2(value) {
+      zuzhitreehandleChange2 (value) {
         if (this.selectedzuzhi2.length > 0) {
           let selectsigorg = this.selectedzuzhi2[this.selectedzuzhi2.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + selectsigorg, {})
@@ -995,11 +994,11 @@
             }).catch(() => {})
         }
       },
-      //添加自定义搜索详情
-      addSearchField() {
+      // 添加自定义搜索详情
+      addSearchField () {
         let searchValue
         for (let k in this.searchValue) {
-          if (typeof this.searchValue[k] == 'number') {
+          if (typeof this.searchValue[k] === 'number') {
             searchValue = this.searchValue[k]
             break
           } else if (this.searchValue[k] && this.searchValue[k].length > 0) {
@@ -1009,18 +1008,18 @@
         }
 
         if (!searchValue) {
-          this.$message("请输入检索数值或范围")
+          this.$message('请输入检索数值或范围')
           return
         }
 
-        let s = ""
+        let s = ''
         if (searchValue instanceof Array && searchValue.length > 0) {
           if (searchValue[0] instanceof Date) {
             let arr = []
             for (let j = 0; j < searchValue.length; j++) {
               arr.push(this.formatDateTime(searchValue[j]))
             }
-            s = arr.join("--")
+            s = arr.join('--')
           } else {
             s = searchValue[searchValue.length - 1]
           }
@@ -1033,7 +1032,7 @@
             for (let index in this.searchTemplates[i].Fields) {
               let field = this.searchTemplates[i].Fields[index]
               if (field.Field == this.searchField && field.Value == this.searchValue && field.OrAnd == this.orAnd) {
-                this.$message("此查询条件已经存在")
+                this.$message('此查询条件已经存在')
                 return
               }
             }
@@ -1042,23 +1041,23 @@
               Field: this.searchField,
               Value: s + '',
               OrAnd: this.orAnd,
-              Name: this.getFieldName(this.searchField),
+              Name: this.getFieldName(this.searchField)
             })
             this.searchTableData = this.getSearchTableData(this.searchTemplates[i].Fields)
             break
           }
         }
       },
-      //查询自定义搜索详情
-      saveAndSearchWithTemplate() {
+      // 查询自定义搜索详情
+      saveAndSearchWithTemplate () {
         let _this = this
         this.saveSearchTemplate(function () {
           _this.currentSearchTemplate = _this.currentSearchTemplateName
           _this.searchWithTemplate(_this.currentSearchTemplateName)
         })
       },
-      //保存自定义搜索详情
-      saveSearchTemplate(cb) {
+      // 保存自定义搜索详情
+      saveSearchTemplate (cb) {
         let _this = this
         let template = JSON.stringify(this.searchTableData)
         this.$axios.put('/sampleinput/searchTemplate?name=' + this.currentSearchTemplateName, template)
@@ -1066,7 +1065,7 @@
             if (res.data.code == 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               if (cb) {
                 cb()
@@ -1074,7 +1073,7 @@
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -1083,7 +1082,7 @@
             console.error(err)
           })
       },
-      deleteSearchField(v) {
+      deleteSearchField (v) {
         if (v.Name) {
           for (let i = 0; i < this.searchTemplates.length; i++) {
             if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
@@ -1096,20 +1095,20 @@
           }
         }
       },
-      searchWithTemplate(name) {
+      searchWithTemplate (name) {
         console.log(name)
         this.searchDialogVisible = false
 
         let params = {
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
 
         }
         let _this = this
         // request
         this.$axios.get('/samplesfiles/search?name=' + name, {
-            params
-          })
+          params
+        })
           .then(res => {
             console.log(res.data.items)
             // response
@@ -1124,27 +1123,27 @@
             console.error(err)
           })
       },
-      getSearchTableData(searchFields) {
+      getSearchTableData (searchFields) {
         let data = searchFields.map(function (ele) {
-          if (ele["OrAnd"] == "or") {
-            ele["Guanxi"] = "或者"
+          if (ele['OrAnd'] == 'or') {
+            ele['Guanxi'] = '或者'
           } else {
-            ele["Guanxi"] = "并且"
+            ele['Guanxi'] = '并且'
           }
           return ele
         })
 
         return data || []
       },
-      clickmodeltypetag(val) {
-        this.currentSearchTemplateName = val.getAttribute("id")
+      clickmodeltypetag (val) {
+        this.currentSearchTemplateName = val.getAttribute('id')
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
             this.searchTableData = this.getSearchTableData(this.searchTemplates[i].Fields)
           }
         }
       },
-      getAllSearchTab() {
+      getAllSearchTab () {
         let _this = this
         this.$axios.get('/sampleinput/searchTemplate', {})
           .then(res => {
@@ -1167,7 +1166,7 @@
             console.error(err)
           })
       },
-      changeSearchField(val) {
+      changeSearchField (val) {
         this.searchValue = {
           BarCode: '',
           SampleCode: '',
@@ -1186,16 +1185,16 @@
           GroupName: ''
         }
       },
-      getFieldName(field) {
+      getFieldName (field) {
         for (let i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].filed == field) {
             return this.showcolumn[i].name
           }
         }
-        return ""
+        return ''
       },
-      //----------------------------------------------------------------
-      jstimehandle(val) {
+      // ----------------------------------------------------------------
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1207,7 +1206,7 @@
           return val.substring(0, 19)
         }
       },
-      zuzhitreehandleChange(value) {
+      zuzhitreehandleChange (value) {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + this.selectsigorg, {})
@@ -1217,8 +1216,8 @@
             }).catch(() => {})
         }
       },
-      //返回查询条件执行
-      searchzuzhitreehandleChange(value) {
+      // 返回查询条件执行
+      searchzuzhitreehandleChange (value) {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + this.selectsigorg, {})
@@ -1227,10 +1226,10 @@
             }).catch(() => {})
         }
       },
-      //导出样本
-      handleExportsamplesCommand(command) {
+      // 导出样本
+      handleExportsamplesCommand (command) {
         let _this = this
-        if (command == 'exportchosen') { //导出所选数据
+        if (command == 'exportchosen') { // 导出所选数据
           if (_this.multipleSelection.length < 1) {
             _this.$message({
               type: 'warning',
@@ -1239,7 +1238,7 @@
             return
           }
           _this.exportsamples('exportchosen')
-        } else if (command == 'exportpage') { //导出当前页数据
+        } else if (command == 'exportpage') { // 导出当前页数据
           if (_this.list.length < 1) {
             _this.$message({
               type: 'warning',
@@ -1248,7 +1247,7 @@
             return
           }
           _this.exportsamples('exportpage')
-        } else if (command == 'exportall') { //导出所有数据
+        } else if (command == 'exportall') { // 导出所有数据
           _this.$confirm('此操作将导出所有满足条件的数据！是否继续导出?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -1258,7 +1257,7 @@
           }).catch(() => {})
         }
       },
-      exportsamples(val) {
+      exportsamples (val) {
         let _this = this
         // 显示列
         let showcolumnarr = []
@@ -1306,13 +1305,13 @@
           }
           params = Object.assign(params, params3)
         }
-        //导出所选样本
+        // 导出所选样本
         if (val == 'exportchosen') {
           for (var i = 0; i < _this.multipleSelection.length; i++) {
             if (i == _this.multipleSelection.length - 1) {
               id += _this.multipleSelection[i].Id
             } else {
-              id += _this.multipleSelection[i].Id + ","
+              id += _this.multipleSelection[i].Id + ','
             }
           }
           let paramsid = {
@@ -1320,13 +1319,13 @@
           }
           params = Object.assign(params, paramsid)
         }
-        //导出当前页样本
+        // 导出当前页样本
         if (val == 'exportpage') {
           for (var i = 0; i < _this.list.length; i++) {
             if (i == _this.list.length - 1) {
               id += _this.list[i].Id
             } else {
-              id += _this.list[i].Id + ","
+              id += _this.list[i].Id + ','
             }
           }
           let paramsid = {
@@ -1335,8 +1334,8 @@
           params = Object.assign(params, paramsid)
         }
         _this.$axios.get('/sampleinput/exportexcel', {
-            params
-          })
+          params
+        })
           .then(res => {
             window.location = 'http://' + res.data
           })
@@ -1345,8 +1344,8 @@
             console.error(err)
           })
       },
-      //样本条码批量打印
-      batchprint() {
+      // 样本条码批量打印
+      batchprint () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -1377,8 +1376,8 @@
             console.error(err)
           })
       },
-      //清空查询数据
-      clearSearch() {
+      // 清空查询数据
+      clearSearch () {
         this.BarCode = ''
         this.SampleCode = ''
         this.SourceName = ''
@@ -1399,10 +1398,10 @@
         this.GroupName = ''
         this.initData()
       },
-      deleteRow(index, rows) {
+      deleteRow (index, rows) {
         rows.splice(index, 1)
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         if (this.currentSearchTemplate) {
@@ -1411,7 +1410,7 @@
           this.initData()
         }
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         if (this.currentSearchTemplate) {
           this.searchWithTemplate(this.currentSearchTemplate)
@@ -1419,15 +1418,14 @@
           this.initData()
         }
       },
-      handleChange(value) {
+      handleChange (value) {
         console.log(value)
       },
-      handleSelectionChange(val) {
+      handleSelectionChange (val) {
         this.multipleSelection = val
       }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>
@@ -322,7 +322,7 @@
     components: {
       draggable
     },
-    data() {
+    data () {
       return {
         dialogVisible: false,
         currentItemCount: 0, // 当前页显示数量
@@ -340,7 +340,7 @@
         selectsigorg: '', // 组织器官
         CreateBy: '', // 录入人
         CreateOn: [], // 录入时期
-        GroupName: '', //所属分组
+        GroupName: '', // 所属分组
         Name: '', // 名称
         SourceName: '', // 样本来源
         Validity: [], // 有效日期
@@ -361,17 +361,17 @@
         },
         selectedzuzhi: [],
         typetykzlist: [], // 特有扩展
-        multipleSelection: [], //多选框
+        multipleSelection: [], // 多选框
         showcolumn: [], // 显示列
         cachecols: [],
         columndialogVisible: false, // 自定义显示列弹框
         isIndeterminate: false,
         checkAll: true,
         searchDialogVisible: false, // 自定义搜索弹框
-        searchTemplateName: "自定义搜索1",
+        searchTemplateName: '自定义搜索1',
         searchTemplates: [],
-        currentSearchTemplateName: "",
-        searchField: "BarCode",
+        currentSearchTemplateName: '',
+        searchField: 'BarCode',
         searchValue: {
           BarCode: '',
           SampleCode: '',
@@ -388,7 +388,7 @@
           Location: '',
           Extension: '',
           GroupName: '',
-          GroupName: '',
+          GroupName: ''
         },
         sampinputtreeprops2: {
           value: 'name',
@@ -397,79 +397,79 @@
         },
         selectedzuzhi2: [],
         samplesitenames2: [], // 取材部位
-        orAnd: "and",
+        orAnd: 'and',
         orAndData: [{
-            name: "并且",
-            value: "and",
-          },
-          {
-            name: "或者",
-            value: "or",
-          }
+          name: '并且',
+          value: 'and'
+        },
+        {
+          name: '或者',
+          value: 'or'
+        }
         ],
         searchTableData: [],
         searchcolumn: [], // 搜索列
         currentSearchTemplate: '',
-        acc: '',
+        acc: ''
       }
     },
-    created() {
+    created () {
       this.acc = this.authUser.Profile.AccCode
       if (this.$route.query.size && this.$route.query.currentPage) {
         this.size = parseInt(this.$route.query.size)
         this.currentPage = parseInt(this.$route.query.currentPage)
 
         let searchmodel = store.get('sampleprerecordedseach')
-        if (typeof (searchmodel) != 'undefined') {
-          if (searchmodel.BarCode && searchmodel.BarCode !== '') { //样本条码
+        if (typeof (searchmodel) !== 'undefined') {
+          if (searchmodel.BarCode && searchmodel.BarCode !== '') { // 样本条码
             this.BarCode = searchmodel.BarCode
           }
-          if (searchmodel.SampleCode && searchmodel.SampleCode !== '') { //样本编码
+          if (searchmodel.SampleCode && searchmodel.SampleCode !== '') { // 样本编码
             this.SampleCode = searchmodel.SampleCode
           }
-          if (searchmodel.SourceName && searchmodel.SourceName !== '') { //样本来源
+          if (searchmodel.SourceName && searchmodel.SourceName !== '') { // 样本来源
             this.SourceName = searchmodel.SourceName
           }
-          if (searchmodel.InnerCode && searchmodel.InnerCode !== '') { //样本内码
+          if (searchmodel.InnerCode && searchmodel.InnerCode !== '') { // 样本内码
             this.InnerCode = searchmodel.InnerCode
           }
-          if (searchmodel.Name && searchmodel.Name !== '') { //名称
+          if (searchmodel.Name && searchmodel.Name !== '') { // 名称
             this.Name = searchmodel.Name
           }
-          if (searchmodel.CreateBy && searchmodel.CreateBy !== '') { //录入人
+          if (searchmodel.CreateBy && searchmodel.CreateBy !== '') { // 录入人
             this.CreateBy = searchmodel.CreateBy
           }
-          if (searchmodel.CreateOn && searchmodel.CreateOn.length === 2) { //录入日期
+          if (searchmodel.CreateOn && searchmodel.CreateOn.length === 2) { // 录入日期
             this.CreateOn = [new Date(searchmodel.CreateOn[0]), new Date(searchmodel.CreateOn[1])]
           }
-          if (searchmodel.SamplingOrgan && searchmodel.SamplingOrgan !== '') { //组织器官
+          if (searchmodel.SamplingOrgan && searchmodel.SamplingOrgan !== '') { // 组织器官
             this.selectsigorg = searchmodel.SamplingOrgan
             this.getparentcodebytopcode(searchmodel.SamplingOrgan)
             // this.selectedzuzhi=searchmodel.SamplingOrgan
           }
-          if (searchmodel.SamplingSite && searchmodel.SamplingSite !== '') { //取材部位
+          if (searchmodel.SamplingSite && searchmodel.SamplingSite !== '') { // 取材部位
             this.SamplingSite = searchmodel.SamplingSite
           }
-          if (searchmodel.SampleType && searchmodel.SampleType !== '') { //样本类型
+          if (searchmodel.SampleType && searchmodel.SampleType !== '') { // 样本类型
             this.SampleType = searchmodel.SampleType
             this.searchsampletypeChange()
           }
-          if (searchmodel.STNoteField && searchmodel.STNoteField.length > 0) { //特有扩展
+          if (searchmodel.STNoteField && searchmodel.STNoteField.length > 0) { // 特有扩展
             this.STNoteField = searchmodel.STNoteField
           }
-          if (searchmodel.Stnotevalue && searchmodel.Stnotevalue !== '') { //特有检索内容
+          if (searchmodel.Stnotevalue && searchmodel.Stnotevalue !== '') { // 特有检索内容
             this.Stnotevalue = searchmodel.Stnotevalue
           }
-          if (searchmodel.Validity && searchmodel.Validity.length === 2) { //有效日期
+          if (searchmodel.Validity && searchmodel.Validity.length === 2) { // 有效日期
             this.Validity = [new Date(searchmodel.Validity[0]), new Date(searchmodel.Validity[1])]
           }
           // if (searchmodel.Noteitem && searchmodel.Noteitem.length > 0) { //公有扩展
           //   this.Noteitem = searchmodel.Noteitem
           // }
-          if (searchmodel.Noteitemvalue && searchmodel.Noteitemvalue !== '') { //公共检索内容
+          if (searchmodel.Noteitemvalue && searchmodel.Noteitemvalue !== '') { // 公共检索内容
             this.Noteitemvalue = searchmodel.Noteitemvalue
           }
-          if (searchmodel.GroupName && searchmodel.GroupName !== '') { //所属分组
+          if (searchmodel.GroupName && searchmodel.GroupName !== '') { // 所属分组
             this.GroupName = searchmodel.GroupName
           }
         }
@@ -478,7 +478,7 @@
       }
 
       this.cachecols = store.get('sampleprerecordedshowcolumn')
-      //当前显示列无数据，使用已录入样本显示列数据
+      // 当前显示列无数据，使用已录入样本显示列数据
       if (!(this.cachecols && this.cachecols !== '')) {
         this.cachecols = store.get('sapminputshowcolumn')
       }
@@ -527,7 +527,7 @@
         //   show: true,
         //   kuoz: false
         // },
-         {
+        {
           filed: 'InnerCode',
           name: '样本内码',
           show: true,
@@ -559,24 +559,24 @@
       this.checkedshowall()
       this.getAllSearchTab()
     },
-    mounted() {
+    mounted () {
       let _this = this
       window.clickmodeltypetag = function (val, e) {
         _this.clickmodeltypetag(val)
       }
     },
     methods: {
-      getextends() {
+      getextends () {
         let _this = this
         this.$axios.get('/sampleinput/getsampletype', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.sampletypes = res.data.items
             if (store.get('sampleprerecordedseach').searchWithTemplate && store.get(
-                'sampleprerecordedseach')
+              'sampleprerecordedseach')
               .searchWithTemplate !==
-              '') { //自定义查询
+              '') { // 自定义查询
               this.handleSearchCommand(store.get('sampleprerecordedseach').searchWithTemplate)
             } else {
               this.initData()
@@ -584,13 +584,13 @@
           }).catch(() => {})
 
         this.$axios.get('/sampleinput/getoperations', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.zuzhitreelist = window.toolfun_gettreejson(res.data.items, 'id', 'pId', 'id,name,code')
           }).catch(() => {})
       },
-      initData() {
+      initData () {
         this.currentSearchTemplate = ''
         let _this = this
         // paginate
@@ -621,11 +621,11 @@
           }
           params = Object.assign(params, params2)
         }
-        //返回时保存查找内容
+        // 返回时保存查找内容
         store.set('sampleprerecordedseach', params)
         this.$axios.get('/samplepreinput/list', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.list = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -634,8 +634,8 @@
             console.error(err)
           })
       },
-      //根据子code获取所有父code
-      getparentcodebytopcode(v) {
+      // 根据子code获取所有父code
+      getparentcodebytopcode (v) {
         let _this = this
         _this.$axios.get('/sampleorgan/getparentcodebytopcode/' + v, {})
           .then(res => {
@@ -650,15 +650,15 @@
           })
       },
 
-      loadprintdata() {
+      loadprintdata () {
         this.$axios.get('/sampleinput/getprintschemelist', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             this.printschemelist = res.data.items
           }).catch(() => {})
       },
-      seachdata() {
+      seachdata () {
         // selectedzuzhi
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1]
@@ -666,7 +666,7 @@
         this.currentPage = 1
         this.initData()
       },
-      selsampletypeChange() {
+      selsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType != '') {
@@ -678,8 +678,8 @@
             })
         }
       },
-      //返回查询条件执行
-      searchsampletypeChange() {
+      // 返回查询条件执行
+      searchsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -689,7 +689,7 @@
             })
         }
       },
-      zuzhitreehandleChange(value) {
+      zuzhitreehandleChange (value) {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + this.selectsigorg, {})
@@ -699,7 +699,7 @@
             }).catch(() => {})
         }
       },
-      searchzuzhitreehandleChange(value) {
+      searchzuzhitreehandleChange (value) {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + this.selectsigorg, {})
@@ -708,10 +708,10 @@
             }).catch(() => {})
         }
       },
-      //导出样本
-      handleExportsamplesCommand(command) {
+      // 导出样本
+      handleExportsamplesCommand (command) {
         let _this = this
-        if (command == 'exportchosen') { //导出所选数据
+        if (command == 'exportchosen') { // 导出所选数据
           if (_this.multipleSelection.length < 1) {
             _this.$message({
               type: 'warning',
@@ -720,7 +720,7 @@
             return
           }
           _this.exportsamples('exportchosen')
-        } else if (command == 'exportpage') { //导出当前页数据
+        } else if (command == 'exportpage') { // 导出当前页数据
           if (_this.list.length < 1) {
             _this.$message({
               type: 'warning',
@@ -729,7 +729,7 @@
             return
           }
           _this.exportsamples('exportpage')
-        } else if (command == 'exportall') { //导出所有数据
+        } else if (command == 'exportall') { // 导出所有数据
           _this.$confirm('此操作将导出所有满足条件的数据！是否继续导出?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -739,7 +739,7 @@
           }).catch(() => {})
         }
       },
-      exportsamples(val) {
+      exportsamples (val) {
         let _this = this
         // 显示列
         let showcolumnarr = []
@@ -767,7 +767,7 @@
           Name: this.Name,
           Validity: this.Validity,
           InnerCode: this.InnerCode,
-         // SamplingOrgan: this.selectsigorg,
+          // SamplingOrgan: this.selectsigorg,
           GroupName: this.GroupName,
           showcolumnarr: showcolumnarr + '',
           showcolumnnamearr: showcolumnnamearr + '',
@@ -787,13 +787,13 @@
           }
           params = Object.assign(params, params3)
         }
-        //导出所选样本
+        // 导出所选样本
         if (val == 'exportchosen') {
           for (var i = 0; i < _this.multipleSelection.length; i++) {
             if (i == _this.multipleSelection.length - 1) {
               id += _this.multipleSelection[i].Id
             } else {
-              id += _this.multipleSelection[i].Id + ","
+              id += _this.multipleSelection[i].Id + ','
             }
           }
           let paramsid = {
@@ -801,13 +801,13 @@
           }
           params = Object.assign(params, paramsid)
         }
-        //导出当前页样本
+        // 导出当前页样本
         if (val == 'exportpage') {
           for (var i = 0; i < _this.list.length; i++) {
             if (i == _this.list.length - 1) {
               id += _this.list[i].Id
             } else {
-              id += _this.list[i].Id + ","
+              id += _this.list[i].Id + ','
             }
           }
           let paramsid = {
@@ -817,8 +817,8 @@
         }
         console.log(params, 'params++')
         _this.$axios.get('/sampleinput/exportexcel', {
-            params
-          })
+          params
+        })
           .then(res => {
             window.location = 'http://' + res.data
           })
@@ -826,8 +826,8 @@
             console.error(err)
           })
       },
-      //样本条码批量打印
-      batchprint() {
+      // 样本条码批量打印
+      batchprint () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -858,9 +858,9 @@
             console.error(err)
           })
       },
-      //---------------------------------------------------
-      //自定义显示列
-      checkedshowall() {
+      // ---------------------------------------------------
+      // 自定义显示列
+      checkedshowall () {
         let tc = 0
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].show) {
@@ -879,13 +879,13 @@
           }
         }
       },
-      handleCheckAllChange(val) {
+      handleCheckAllChange (val) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           this.showcolumn[i].show = val
         }
       },
       // 自定义显示列保存操作
-      saveshowfiled() {
+      saveshowfiled () {
         store.set('sampleprerecordedshowcolumn', this.showcolumn)
         this.columndialogVisible = false
         this.$message({
@@ -894,7 +894,7 @@
         })
         this.initData()
       },
-      header_dragend(newWidth, oldWidth, column, event) {
+      header_dragend (newWidth, oldWidth, column, event) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].name === column.label) {
             this.showcolumn[i].columnwidth = newWidth
@@ -903,17 +903,17 @@
           }
         }
       },
-      //----------------------------------------------------------------
-      //自定义查询
-      handleSearchCommand(command) {
+      // ----------------------------------------------------------------
+      // 自定义查询
+      handleSearchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
-        } else if (command == "编辑") {
+        } else if (command == '编辑') {
           this.searchDialogVisible = true
           this.searchcolumn = this.showcolumn.filter(function (e) {
-            return e.filed != "Location"
+            return e.filed != 'Location'
           })
         } else {
           this.currentSearchTemplate = command
@@ -924,19 +924,19 @@
           this.searchWithTemplate(command)
         }
       },
-      //添加自定义搜索
-      addSearchTab(name) {
+      // 添加自定义搜索
+      addSearchTab (name) {
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == name) {
-            this.$message("名称已经存在")
+            this.$message('名称已经存在')
             return
           }
         }
         this.searchTemplates.push({
-            Name: name,
-            Fields: [],
-          }),
-          this.currentSearchTemplateName = name
+          Name: name,
+          Fields: []
+        }),
+        this.currentSearchTemplateName = name
 
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
@@ -944,32 +944,31 @@
           }
         }
       },
-      removeSearchTab(targetName) {
+      removeSearchTab (targetName) {
         let _this = this
         this.$axios.delete('/sampleinput/searchTemplate?name=' + targetName, {})
           .then(res => {
             if (res.data.code == 0) {
-              let tabs = _this.searchTemplates;
-              let activeName = _this.currentSearchTemplateName;
-              if (activeName === targetName) {
+              let tabs = _this.searchTemplates
+            let activeName = _this.currentSearchTemplateName
+            if (activeName === targetName) {
                 tabs.forEach((tab, index) => {
                   if (tab.Name === targetName) {
-                    let nextTab = tabs[index + 1] || tabs[index - 1];
-                    if (nextTab) {
+                    let nextTab = tabs[index + 1] || tabs[index - 1]
+                  if (nextTab) {
                       activeName = nextTab.Name
                       _this.searchTableData = this.getSearchTableData(nextTab.Fields)
                     }
                   }
-                });
-              }
+                })
+            }
 
               _this.currentSearchTemplateName = activeName
               _this.searchTemplates = tabs.filter(tab => tab.Name !== targetName)
-
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -978,7 +977,7 @@
             console.error(err)
           })
       },
-      zuzhitreehandleChange2(value) {
+      zuzhitreehandleChange2 (value) {
         if (this.selectedzuzhi2.length > 0) {
           let selectsigorg = this.selectedzuzhi2[this.selectedzuzhi2.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + selectsigorg, {})
@@ -988,11 +987,11 @@
             }).catch(() => {})
         }
       },
-      //添加自定义搜索详情
-      addSearchField() {
+      // 添加自定义搜索详情
+      addSearchField () {
         let searchValue
         for (let k in this.searchValue) {
-          if (typeof this.searchValue[k] == 'number') {
+          if (typeof this.searchValue[k] === 'number') {
             searchValue = this.searchValue[k]
             break
           } else if (this.searchValue[k] && this.searchValue[k].length > 0) {
@@ -1002,18 +1001,18 @@
         }
 
         if (!searchValue) {
-          this.$message("请输入检索数值或范围")
+          this.$message('请输入检索数值或范围')
           return
         }
 
-        let s = ""
+        let s = ''
         if (searchValue instanceof Array && searchValue.length > 0) {
           if (searchValue[0] instanceof Date) {
             let arr = []
             for (let j = 0; j < searchValue.length; j++) {
               arr.push(this.formatDateTime(searchValue[j]))
             }
-            s = arr.join("--")
+            s = arr.join('--')
           } else {
             s = searchValue[searchValue.length - 1]
           }
@@ -1026,7 +1025,7 @@
             for (let index in this.searchTemplates[i].Fields) {
               let field = this.searchTemplates[i].Fields[index]
               if (field.Field == this.searchField && field.Value == this.searchValue && field.OrAnd == this.orAnd) {
-                this.$message("此查询条件已经存在")
+                this.$message('此查询条件已经存在')
                 return
               }
             }
@@ -1035,23 +1034,23 @@
               Field: this.searchField,
               Value: s + '',
               OrAnd: this.orAnd,
-              Name: this.getFieldName(this.searchField),
+              Name: this.getFieldName(this.searchField)
             })
             this.searchTableData = this.getSearchTableData(this.searchTemplates[i].Fields)
             break
           }
         }
       },
-      //查询自定义搜索详情
-      saveAndSearchWithTemplate() {
+      // 查询自定义搜索详情
+      saveAndSearchWithTemplate () {
         let _this = this
         this.saveSearchTemplate(function () {
           _this.currentSearchTemplate = _this.currentSearchTemplateName
           _this.searchWithTemplate(_this.currentSearchTemplateName)
         })
       },
-      //保存自定义搜索详情
-      saveSearchTemplate(cb) {
+      // 保存自定义搜索详情
+      saveSearchTemplate (cb) {
         let _this = this
         let template = JSON.stringify(this.searchTableData)
         this.$axios.put('/sampleinput/searchTemplate?name=' + this.currentSearchTemplateName, template)
@@ -1059,7 +1058,7 @@
             if (res.data.code == 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               if (cb) {
                 cb()
@@ -1067,7 +1066,7 @@
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -1076,7 +1075,7 @@
             console.error(err)
           })
       },
-      deleteSearchField(v) {
+      deleteSearchField (v) {
         if (v.Name) {
           for (let i = 0; i < this.searchTemplates.length; i++) {
             if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
@@ -1089,20 +1088,20 @@
           }
         }
       },
-      searchWithTemplate(name) {
+      searchWithTemplate (name) {
         console.log(name)
         this.searchDialogVisible = false
 
         let params = {
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
 
         }
         let _this = this
         // request
         this.$axios.get('/samplepreinput/search?name=' + name, {
-            params
-          })
+          params
+        })
           .then(res => {
             console.log(res.data.items)
             // response
@@ -1117,27 +1116,27 @@
             console.error(err)
           })
       },
-      getSearchTableData(searchFields) {
+      getSearchTableData (searchFields) {
         let data = searchFields.map(function (ele) {
-          if (ele["OrAnd"] == "or") {
-            ele["Guanxi"] = "或者"
+          if (ele['OrAnd'] == 'or') {
+            ele['Guanxi'] = '或者'
           } else {
-            ele["Guanxi"] = "并且"
+            ele['Guanxi'] = '并且'
           }
           return ele
         })
 
         return data || []
       },
-      clickmodeltypetag(val) {
-        this.currentSearchTemplateName = val.getAttribute("id")
+      clickmodeltypetag (val) {
+        this.currentSearchTemplateName = val.getAttribute('id')
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
             this.searchTableData = this.getSearchTableData(this.searchTemplates[i].Fields)
           }
         }
       },
-      getAllSearchTab() {
+      getAllSearchTab () {
         let _this = this
         this.$axios.get('/sampleinput/searchTemplate', {})
           .then(res => {
@@ -1160,7 +1159,7 @@
             console.error(err)
           })
       },
-      changeSearchField(val) {
+      changeSearchField (val) {
         this.searchValue = {
           BarCode: '',
           SampleCode: '',
@@ -1176,19 +1175,19 @@
           Capacity: '',
           Location: '',
           Extension: '',
-          GroupName: '',
+          GroupName: ''
         }
       },
-      getFieldName(field) {
+      getFieldName (field) {
         for (let i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].filed == field) {
             return this.showcolumn[i].name
           }
         }
-        return ""
+        return ''
       },
-      //----------------------------------------------------------------
-      handleSizeChange(value) {
+      // ----------------------------------------------------------------
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         if (this.currentSearchTemplate) {
@@ -1197,7 +1196,7 @@
           this.initData()
         }
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1209,7 +1208,7 @@
           return val.substring(0, 19)
         }
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         if (this.currentSearchTemplate) {
           this.searchWithTemplate(this.currentSearchTemplate)
@@ -1217,8 +1216,8 @@
           this.initData()
         }
       },
-      //清空查询数据
-      clearSearch() {
+      // 清空查询数据
+      clearSearch () {
         this.BarCode = ''
         this.SampleCode = ''
         this.SourceName = ''
@@ -1239,7 +1238,7 @@
         this.currentPage = 1
         this.initData()
       },
-      deletedata(val) {
+      deletedata (val) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -1266,8 +1265,8 @@
             .catch(() => {})
         }).catch(() => {})
       },
-      //批量删除
-      batchdelete() {
+      // 批量删除
+      batchdelete () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -1295,25 +1294,25 @@
                   succeedMsg = res.data.message
                 } else {
                   errorMsg = res.data.message
-                  failedIds.push(_this.multipleSelection[i].Id);
-                }
+                  failedIds.push(_this.multipleSelection[i].Id)
+              }
                 count++
-                //最后一个请求结束
+                // 最后一个请求结束
                 if (count == _this.multipleSelection.length) {
-                  //更新界面
+                  // 更新界面
                   this.initData()
-                  //全部删除成功
+                  // 全部删除成功
                   if (failedIds.length == 0) {
                     _this.$message({
                       type: 'success',
-                      message: succeedMsg,
+                      message: succeedMsg
                     })
                   } else {
-                    //存在删除失败
-                    errorMsg = errorMsg + "，失败ID：" + failedIds.join(",")
+                    // 存在删除失败
+                    errorMsg = errorMsg + '，失败ID：' + failedIds.join(',')
                     _this.$message({
                       type: 'warning',
-                      message: errorMsg,
+                      message: errorMsg
                     })
                   }
                 }
@@ -1324,29 +1323,28 @@
           console.error(err)
         })
       },
-      deleteRow(index, rows) {
+      deleteRow (index, rows) {
         rows.splice(index, 1)
       },
-      handleSelectionChange(val) {
+      handleSelectionChange (val) {
         this.multipleSelection = val
       },
-      handleChange(value) {
+      handleChange (value) {
         console.log(value)
       },
-      openPrintDialog(val) {
+      openPrintDialog (val) {
         this.peintitemid = val.Id
         this.dialogPrintVisible = true
       },
-      doprintscheme() {
+      doprintscheme () {
         this.dialogPrintVisible = false
         // 执行打印操作
         window.PrintReport(this.Printscheme,
           `samplespreinput,${this.peintitemid},${this.authUser.Profile.AccCode}`)
-          console.log("00000000000000p",this.Printscheme)
+        console.log('00000000000000p', this.Printscheme)
       }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card" >
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>
@@ -348,14 +348,14 @@
     computed: {
       ...mapGetters({
         authUser: 'authUser'
-      }),
+      })
     },
     components: {
       draggable,
       batchrecoverydialog,
       uploadattachdialog
     },
-    data() {
+    data () {
       return {
         dialogVisible: false,
         sampleinfodetail: {
@@ -392,7 +392,7 @@
         publicsampletypes: [], // 公共拓展
         publicdatas: [], // 样本取用记录
         relationSamples: [], // 相关样本
-        GroupName: '', //所属分组
+        GroupName: '', // 所属分组
         path: '', // 上传文件路径
         userextends: [], // 扩展字段
         specialelist: [], // 特殊扩展字段
@@ -416,7 +416,7 @@
         selectedzuzhi2: [],
         peintitemid: 0,
         shenhe: {
-          applyfusu_flag: true,
+          applyfusu_flag: true
         },
         multipleSelection: [],
         typetykzlist: [], // 特有扩展
@@ -429,9 +429,9 @@
         searchDialogVisible: false, // 自定义搜索弹框
 
         searchTableData: [],
-        searchTemplateName: "自定义搜索1",
-        currentSearchTemplateName: "",
-        searchField: "BarCode",
+        searchTemplateName: '自定义搜索1',
+        currentSearchTemplateName: '',
+        searchField: 'BarCode',
         searchValue: {
           BarCode: '',
           SampleCode: '',
@@ -447,80 +447,80 @@
           Capacity: '',
           Location: '',
           Extension: '',
-          GroupName: '', //所属分组
+          GroupName: '' // 所属分组
         },
-        orAnd: "and",
+        orAnd: 'and',
         searchTemplates: [],
         orAndData: [{
-            name: "并且",
-            value: "and",
-          },
-          {
-            name: "或者",
-            value: "or",
-          }
+          name: '并且',
+          value: 'and'
+        },
+        {
+          name: '或者',
+          value: 'or'
+        }
         ],
         searchcolumn: [], // 搜索列
         currentSearchTemplate: '',
-        acc: '',
+        acc: ''
       }
     },
-    created() {
+    created () {
       this.acc = this.authUser.Profile.AccCode
       if (this.$route.query.size && this.$route.query.currentPage) {
         this.size = parseInt(this.$route.query.size)
         this.currentPage = parseInt(this.$route.query.currentPage)
         let searchmodel = store.get('samplestoredseach')
-        if (typeof (searchmodel) != 'undefined') {
-          if (searchmodel.BarCode && searchmodel.BarCode !== '') { //样本条码
+        if (typeof (searchmodel) !== 'undefined') {
+          if (searchmodel.BarCode && searchmodel.BarCode !== '') { // 样本条码
             this.BarCode = searchmodel.BarCode
           }
-          if (searchmodel.SampleCode && searchmodel.SampleCode !== '') { //样本编码
+          if (searchmodel.SampleCode && searchmodel.SampleCode !== '') { // 样本编码
             this.SampleCode = searchmodel.SampleCode
           }
-          if (searchmodel.SourceName && searchmodel.SourceName !== '') { //样本来源
+          if (searchmodel.SourceName && searchmodel.SourceName !== '') { // 样本来源
             this.SourceName = searchmodel.SourceName
           }
-          if (searchmodel.InnerCode && searchmodel.InnerCode !== '') { //样本内码
+          if (searchmodel.InnerCode && searchmodel.InnerCode !== '') { // 样本内码
             this.InnerCode = searchmodel.InnerCode
           }
-          if (searchmodel.Name && searchmodel.Name !== '') { //名称
+          if (searchmodel.Name && searchmodel.Name !== '') { // 名称
             this.Name = searchmodel.Name
           }
-          if (searchmodel.CreateBy && searchmodel.CreateBy !== '') { //录入人
+          if (searchmodel.CreateBy && searchmodel.CreateBy !== '') { // 录入人
             this.CreateBy = searchmodel.CreateBy
           }
-          if (searchmodel.CreateOn && searchmodel.CreateOn.length === 2) { //录入日期
+          if (searchmodel.CreateOn && searchmodel.CreateOn.length === 2) { // 录入日期
             this.CreateOn = [new Date(searchmodel.CreateOn[0]), new Date(searchmodel.CreateOn[1])]
           }
-          if (searchmodel.SamplingOrgan && searchmodel.SamplingOrgan !== '') { //组织器官
+          if (searchmodel.SamplingOrgan && searchmodel.SamplingOrgan !== '') { // 组织器官
             this.selectsigorg = searchmodel.SamplingOrgan
             this.getparentcodebytopcode(searchmodel.SamplingOrgan)
             // this.selectedzuzhi=searchmodel.SamplingOrgan
           }
-          if (searchmodel.SamplingSite && searchmodel.SamplingSite !== '') { //取材部位
+          if (searchmodel.SamplingSite && searchmodel.SamplingSite !== '') { // 取材部位
             this.SamplingSite = searchmodel.SamplingSite
           }
-          if (searchmodel.SampleType && searchmodel.SampleType !== '') { //样本类型
+          if (searchmodel.SampleType && searchmodel.SampleType !== '') { // 样本类型
             this.SampleType = searchmodel.SampleType
             this.searchsampletypeChange()
           }
-          if (searchmodel.STNoteField && searchmodel.STNoteField.length > 0) { //特有扩展
+          if (searchmodel.STNoteField && searchmodel.STNoteField.length > 0) { // 特有扩展
             this.STNoteField = searchmodel.STNoteField
           }
-          if (searchmodel.Stnotevalue && searchmodel.Stnotevalue !== '') { //特有检索内容
+          if (searchmodel.Stnotevalue && searchmodel.Stnotevalue !== '') { // 特有检索内容
             this.Stnotevalue = searchmodel.Stnotevalue
           }
-          if (searchmodel.Validity && searchmodel.Validity.length === 2) { //有效日期
+          if (searchmodel.Validity && searchmodel.Validity.length === 2) { // 有效日期
             this.Validity = [new Date(searchmodel.Validity[0]), new Date(searchmodel.Validity[1])]
           }
-          if (searchmodel.Noteitem && searchmodel.Noteitem.length > 0) { //公有扩展
+          if (searchmodel.Noteitem && searchmodel.Noteitem.length > 0) { // 公有扩展
             this.Noteitem = searchmodel.Noteitem
           }
-          if (searchmodel.Noteitemvalue && searchmodel.Noteitemvalue !== '') { //公共检索内容
+          if (searchmodel.Noteitemvalue && searchmodel.Noteitemvalue !== '') { // 公共检索内容
             this.Noteitemvalue = searchmodel.Noteitemvalue
           }
-          if (searchmodel.GroupName && searchmodel.GroupName !== '') { //所属分组
+          if (searchmodel.GroupName && searchmodel.GroupName !== '') { // 所属分组
             this.GroupName = searchmodel.GroupName
           }
         }
@@ -561,7 +561,7 @@
           name: '可用容量',
           show: true,
           kuoz: false
-        }, 
+        },
         // {
         //   filed: 'SamplingOrganName',
         //   name: '组织器官',
@@ -573,7 +573,7 @@
         //   show: true,
         //   kuoz: false
         // },
-         {
+        {
           filed: 'InnerCode',
           name: '样本内码',
           show: true,
@@ -612,7 +612,7 @@
       this.getAllSearchTab()
     },
 
-    mounted() {
+    mounted () {
       let _this = this
       window.clickmodeltypetag = function (val, e) {
         _this.clickmodeltypetag(val)
@@ -620,7 +620,7 @@
     },
 
     methods: {
-      initData() {
+      initData () {
         this.currentSearchTemplate = ''
         let _this = this
         // 增加自定义显示列，存储位置，之后需要去掉
@@ -675,10 +675,10 @@
           params = Object.assign(params, params3)
         }
         store.set('samplestoredseach', params)
-     
+  
         this.$axios.get('/sampleinput/list', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.list = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -687,8 +687,8 @@
             console.error(err)
           })
       },
-      //根据子code获取所有父code
-      getparentcodebytopcode(v) {
+      // 根据子code获取所有父code
+      getparentcodebytopcode (v) {
         let _this = this
         _this.$axios.get('/sampleorgan/getparentcodebytopcode/' + v, {})
           .then(res => {
@@ -702,33 +702,33 @@
             _this.searchzuzhitreehandleChange()
           })
       },
-      uploadfile(val) {
+      uploadfile (val) {
         this.sampleinfodetail.BarCode = val.BarCode
         this.sampleinfodetail.SampleCode = val.SampleCode
         this.dialoguploadVisible = true
       },
-      uploaddialogcallback() {
+      uploaddialogcallback () {
         this.initData()
       },
-      loadprintdata() {
+      loadprintdata () {
         this.$axios.get('/sampleinput/getprintschemelist', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             this.printschemelist = res.data.items
           }).catch(() => {})
       },
-      getextends() {
+      getextends () {
         let _this = this
         this.$axios.get('/sampleinput/getsampletype', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.sampletypes = res.data.items
           }).catch(() => {})
         this.$axios.get('/sampleinput/getpublicsampletype', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.publicsampletypes = res.data.items
             // 扩展列增加到显示列中
@@ -786,31 +786,31 @@
               }
             }
             if (store.get('samplestoredseach').searchWithTemplate && store.get('samplestoredseach').searchWithTemplate !==
-              '') { //自定义查询
+              '') { // 自定义查询
               this.handleSearchCommand(store.get('samplestoredseach').searchWithTemplate)
             } else {
               this.initData()
             }
           }).catch(() => {})
         this.$axios.get('/sampleinput/getoperations', {
-            _currentPage: -1
-          })
+          _currentPage: -1
+        })
           .then(res => {
             _this.zuzhitreelist = window.toolfun_gettreejson(res.data.items, 'id', 'pId', 'id,name,code')
           }).catch(() => {})
       },
-      seachdata() {
+      seachdata () {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1]
         }
         this.currentPage = 1
         this.initData()
       },
-      openPrintDialog(val) {
+      openPrintDialog (val) {
         this.peintitemid = val.Id
         this.dialogPrintVisible = true
       },
-      selsampletypeChange() {
+      selsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -822,8 +822,8 @@
             })
         }
       },
-      //返回查询条件执行
-      searchsampletypeChange() {
+      // 返回查询条件执行
+      searchsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -835,7 +835,7 @@
         }
       },
       // 自定义显示列保存操作
-      saveshowfiled() {
+      saveshowfiled () {
         store.set('sapminputshowcolumn', this.showcolumn)
         this.columndialogVisible = false
         this.$message({
@@ -844,12 +844,12 @@
         })
         this.initData()
       },
-      handleCheckAllChange(val) {
+      handleCheckAllChange (val) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           this.showcolumn[i].show = val
         }
       },
-      checkedshowall() {
+      checkedshowall () {
         let tc = 0
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].show) {
@@ -868,7 +868,7 @@
           }
         }
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         if (this.currentSearchTemplate) {
@@ -876,9 +876,8 @@
         } else {
           this.initData()
         }
-
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         if (this.currentSearchTemplate) {
           this.searchWithTemplate(this.currentSearchTemplate)
@@ -887,7 +886,7 @@
         }
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -899,11 +898,11 @@
           return val.substring(0, 19)
         }
       },
-      jssubstrhandle(val, no) {
+      jssubstrhandle (val, no) {
         let position = val.split(';')
         return position[no]
       },
-      deletedata(val) {
+      deletedata (val) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -930,10 +929,10 @@
             .catch(() => {})
         }).catch(() => {})
       },
-      handleSelectionChange(val) {
+      handleSelectionChange (val) {
         this.multipleSelection = val
       },
-      header_dragend(newWidth, oldWidth, column, event) {
+      header_dragend (newWidth, oldWidth, column, event) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].name === column.label) {
             this.showcolumn[i].columnwidth = newWidth
@@ -942,7 +941,7 @@
           }
         }
       },
-      zuzhitreehandleChange(value) {
+      zuzhitreehandleChange (value) {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + this.selectsigorg, {})
@@ -952,7 +951,7 @@
             }).catch(() => {})
         }
       },
-      searchzuzhitreehandleChange(value) {
+      searchzuzhitreehandleChange (value) {
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + this.selectsigorg, {})
@@ -961,7 +960,7 @@
             }).catch(() => {})
         }
       },
-      zuzhitreehandleChange2(value) {
+      zuzhitreehandleChange2 (value) {
         if (this.selectedzuzhi2.length > 0) {
           let selectsigorg = this.selectedzuzhi2[this.selectedzuzhi2.length - 1] + ''
           this.$axios.get('/samplesite/getsitebyfcode?code=' + selectsigorg, {})
@@ -971,7 +970,7 @@
             }).catch(() => {})
         }
       },
-      chooseType(command) {
+      chooseType (command) {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -980,7 +979,7 @@
           })
           return
         }
-        if (command == 'Apply') { //生成出库申请单:复苏
+        if (command == 'Apply') { // 生成出库申请单:复苏
           _this.shenhe.applyfusu_flag = false
         }
         _this.shenhe = Object.assign(_this.shenhe, {
@@ -988,10 +987,10 @@
         })
         _this.dialogfusuVisible = true
       },
-      //导出样本
-      handleExportsamplesCommand(command) {
+      // 导出样本
+      handleExportsamplesCommand (command) {
         let _this = this
-        if (command == 'exportchosen') { //导出所选数据
+        if (command == 'exportchosen') { // 导出所选数据
           if (_this.multipleSelection.length < 1) {
             _this.$message({
               type: 'warning',
@@ -1000,7 +999,7 @@
             return
           }
           _this.exportsamples('exportchosen')
-        } else if (command == 'exportpage') { //导出当前页数据
+        } else if (command == 'exportpage') { // 导出当前页数据
           if (_this.list.length < 1) {
             _this.$message({
               type: 'warning',
@@ -1009,7 +1008,7 @@
             return
           }
           _this.exportsamples('exportpage')
-        } else if (command == 'exportall') { //导出所有数据
+        } else if (command == 'exportall') { // 导出所有数据
           _this.$confirm('此操作将导出所有满足条件的数据！是否继续导出?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -1019,7 +1018,7 @@
           }).catch(() => {})
         }
       },
-      exportsamples(val) {
+      exportsamples (val) {
         let _this = this
         _this.exportloading = true
         // 显示列
@@ -1068,13 +1067,13 @@
           }
           params = Object.assign(params, params3)
         }
-        //导出所选样本
+        // 导出所选样本
         if (val == 'exportchosen') {
           for (var i = 0; i < _this.multipleSelection.length; i++) {
             if (i == _this.multipleSelection.length - 1) {
               id += _this.multipleSelection[i].Id
             } else {
-              id += _this.multipleSelection[i].Id + ","
+              id += _this.multipleSelection[i].Id + ','
             }
           }
           let paramsid = {
@@ -1082,13 +1081,13 @@
           }
           params = Object.assign(params, paramsid)
         }
-        //导出当前页样本
+        // 导出当前页样本
         if (val == 'exportpage') {
           for (var i = 0; i < _this.list.length; i++) {
             if (i == _this.list.length - 1) {
               id += _this.list[i].Id
             } else {
-              id += _this.list[i].Id + ","
+              id += _this.list[i].Id + ','
             }
           }
           let paramsid = {
@@ -1097,10 +1096,10 @@
           params = Object.assign(params, paramsid)
         }
         _this.$axios.get('/sampleinput/exportexcel', {
-            params
-          })
+          params
+        })
           .then(res => {
-            console.log("wwwwwwwwwwwwwwww",res.data)
+            console.log('wwwwwwwwwwwwwwww', res.data)
             _this.exportloading = false
             window.location = 'http://' + res.data
           })
@@ -1109,15 +1108,15 @@
             console.error(err)
           })
       },
-      doprintscheme() {
+      doprintscheme () {
         this.dialogPrintVisible = false
         // 执行打印操作
         window.PrintReport(this.Printscheme, `samples,${this.peintitemid},${this.authUser.Profile.AccCode}`)
       },
-      getstationurl(val) {
+      getstationurl (val) {
         return `?station=${val.ShelfX};${val.ShelfY};${val.BoxX};${val.BoxY};${val.Position};${val.Id}&pname=samples-stored&size=${this.size}&currentPage=${this.currentPage}`
       },
-      batchprint() {
+      batchprint () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -1149,7 +1148,7 @@
           })
       },
 
-      batchdelete() {
+      batchdelete () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -1170,32 +1169,32 @@
           let count = 0
           for (var i = 0; i < _this.multipleSelection.length; i++) {
             _this.$axios.delete('sampleinput/' + _this.multipleSelection[i].Id + '?sampletype=' + _this.multipleSelection[
-                i].SampleType, null)
+              i].SampleType, null)
               .then(res => {
                 // response
                 if (res.data.code === 0) {
                   succeedMsg = res.data.message
                 } else {
                   errorMsg = res.data.message
-                  failedIds.push(_this.multipleSelection[i].Id);
-                }
+                  failedIds.push(_this.multipleSelection[i].Id)
+              }
                 count++
-                //最后一个请求结束
+                // 最后一个请求结束
                 if (count == _this.multipleSelection.length) {
-                  //更新界面
+                  // 更新界面
                   this.initData()
-                  //全部删除成功
+                  // 全部删除成功
                   if (failedIds.length == 0) {
                     _this.$message({
                       type: 'success',
-                      message: succeedMsg,
+                      message: succeedMsg
                     })
                   } else {
-                    //存在删除失败
-                    errorMsg = errorMsg + "，失败ID：" + failedIds.join(",")
+                    // 存在删除失败
+                    errorMsg = errorMsg + '，失败ID：' + failedIds.join(',')
                     _this.$message({
                       type: 'warning',
-                      message: errorMsg,
+                      message: errorMsg
                     })
                   }
                 }
@@ -1217,10 +1216,10 @@
       //   }
       //   _this.dialogfusuVisible = true
       // },
-      numtoupchar(num) {
+      numtoupchar (num) {
         return String.fromCharCode(64 + parseInt(num))
       },
-      postiontoupchar(postion) {
+      postiontoupchar (postion) {
         let pos = postion.split(';')
         if (pos.length === 2) {
           return this.numtoupchar(pos[1]) + pos[0]
@@ -1228,15 +1227,15 @@
           return postion
         }
       },
-      recoverydialogcallback(v) {
+      recoverydialogcallback (v) {
         this.multipleSelection = []
         this.initData()
       },
 
-      addSearchField() {
+      addSearchField () {
         let searchValue
         for (let k in this.searchValue) {
-          if (typeof this.searchValue[k] == 'number') {
+          if (typeof this.searchValue[k] === 'number') {
             searchValue = this.searchValue[k]
             break
           } else if (this.searchValue[k] && this.searchValue[k].length > 0) {
@@ -1246,18 +1245,18 @@
         }
 
         if (!searchValue) {
-          this.$message("请输入检索数值或范围")
+          this.$message('请输入检索数值或范围')
           return
         }
 
-        let s = ""
+        let s = ''
         if (searchValue instanceof Array && searchValue.length > 0) {
           if (searchValue[0] instanceof Date) {
             let arr = []
             for (let j = 0; j < searchValue.length; j++) {
               arr.push(this.formatDateTime(searchValue[j]))
             }
-            s = arr.join("--")
+            s = arr.join('--')
           } else {
             s = searchValue[searchValue.length - 1]
           }
@@ -1270,7 +1269,7 @@
             for (let index in this.searchTemplates[i].Fields) {
               let field = this.searchTemplates[i].Fields[index]
               if (field.Field == this.searchField && field.Value == this.searchValue && field.OrAnd == this.orAnd) {
-                this.$message("此查询条件已经存在")
+                this.$message('此查询条件已经存在')
                 return
               }
             }
@@ -1279,7 +1278,7 @@
               Field: this.searchField,
               Value: s + '',
               OrAnd: this.orAnd,
-              Name: this.getFieldName(this.searchField),
+              Name: this.getFieldName(this.searchField)
             })
             this.searchTableData = this.getSearchTableData(this.searchTemplates[i].Fields)
             break
@@ -1287,7 +1286,7 @@
         }
       },
 
-      deleteSearchField(v) {
+      deleteSearchField (v) {
         if (v.Name) {
           for (let i = 0; i < this.searchTemplates.length; i++) {
             if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
@@ -1301,12 +1300,12 @@
         }
       },
 
-      getSearchTableData(searchFields) {
+      getSearchTableData (searchFields) {
         let data = searchFields.map(function (ele) {
-          if (ele["OrAnd"] == "or") {
-            ele["Guanxi"] = "或者"
+          if (ele['OrAnd'] == 'or') {
+            ele['Guanxi'] = '或者'
           } else {
-            ele["Guanxi"] = "并且"
+            ele['Guanxi'] = '并且'
           }
           return ele
         })
@@ -1314,36 +1313,36 @@
         return data || []
       },
 
-      getFieldName(field) {
+      getFieldName (field) {
         for (let i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].filed == field) {
             return this.showcolumn[i].name
           }
         }
-        return ""
+        return ''
       },
 
-      getFieldByName(name) {
+      getFieldByName (name) {
         for (let i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].name == name) {
             return this.showcolumn[i].filed
           }
         }
-        return ""
+        return ''
       },
 
-      addSearchTab(name) {
+      addSearchTab (name) {
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == name) {
-            this.$message("名称已经存在")
+            this.$message('名称已经存在')
             return
           }
         }
         this.searchTemplates.push({
-            Name: name,
-            Fields: [],
-          }),
-          this.currentSearchTemplateName = name
+          Name: name,
+          Fields: []
+        }),
+        this.currentSearchTemplateName = name
 
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
@@ -1352,7 +1351,7 @@
         }
       },
 
-      getAllSearchTab() {
+      getAllSearchTab () {
         let _this = this
         this.$axios.get('/sampleinput/searchTemplate', {})
           .then(res => {
@@ -1376,32 +1375,31 @@
           })
       },
 
-      removeSearchTab(targetName) {
+      removeSearchTab (targetName) {
         let _this = this
         this.$axios.delete('/sampleinput/searchTemplate?name=' + targetName, {})
           .then(res => {
             if (res.data.code == 0) {
-              let tabs = _this.searchTemplates;
-              let activeName = _this.currentSearchTemplateName;
-              if (activeName === targetName) {
+              let tabs = _this.searchTemplates
+            let activeName = _this.currentSearchTemplateName
+            if (activeName === targetName) {
                 tabs.forEach((tab, index) => {
                   if (tab.Name === targetName) {
-                    let nextTab = tabs[index + 1] || tabs[index - 1];
-                    if (nextTab) {
+                    let nextTab = tabs[index + 1] || tabs[index - 1]
+                  if (nextTab) {
                       activeName = nextTab.Name
                       _this.searchTableData = this.getSearchTableData(nextTab.Fields)
                     }
                   }
-                });
-              }
+                })
+            }
 
               _this.currentSearchTemplateName = activeName
               _this.searchTemplates = tabs.filter(tab => tab.Name !== targetName)
-
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -1411,8 +1409,8 @@
           })
       },
 
-      clickmodeltypetag(val) {
-        this.currentSearchTemplateName = val.getAttribute("id")
+      clickmodeltypetag (val) {
+        this.currentSearchTemplateName = val.getAttribute('id')
         for (let i = 0; i < this.searchTemplates.length; i++) {
           if (this.searchTemplates[i].Name == this.currentSearchTemplateName) {
             this.searchTableData = this.getSearchTableData(this.searchTemplates[i].Fields)
@@ -1420,15 +1418,15 @@
         }
       },
 
-      handleSearchCommand(command) {
+      handleSearchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
-        } else if (command == "编辑") {
+        } else if (command == '编辑') {
           this.searchDialogVisible = true
           this.searchcolumn = this.showcolumn.filter(function (e) {
-            return e.filed != "Location"
+            return e.filed != 'Location'
           })
         } else {
           this.currentSearchTemplate = command
@@ -1440,18 +1438,18 @@
         }
       },
 
-      searchWithTemplate(name) {
+      searchWithTemplate (name) {
         this.searchDialogVisible = false
         let params = {
           _currentPage: this.currentPage,
-          _size: this.size,
+          _size: this.size
 
         }
         let _this = this
         // request
         this.$axios.get('/sampleinput/search?name=' + name, {
-            params
-          })
+          params
+        })
           .then(res => {
             // response
             if (res.data.items) {
@@ -1466,7 +1464,7 @@
           })
       },
 
-      saveAndSearchWithTemplate() {
+      saveAndSearchWithTemplate () {
         let _this = this
         this.saveSearchTemplate(function () {
           _this.currentSearchTemplate = _this.currentSearchTemplateName
@@ -1474,7 +1472,7 @@
         })
       },
 
-      saveSearchTemplate(cb) {
+      saveSearchTemplate (cb) {
         let _this = this
         let template = JSON.stringify(this.searchTableData)
         this.$axios.put('/sampleinput/searchTemplate?name=' + this.currentSearchTemplateName, template)
@@ -1482,7 +1480,7 @@
             if (res.data.code == 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               if (cb) {
                 cb()
@@ -1490,7 +1488,7 @@
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -1500,7 +1498,7 @@
           })
       },
 
-      changeSearchField(val) {
+      changeSearchField (val) {
         this.searchValue = {
           BarCode: '',
           SampleCode: '',
@@ -1519,7 +1517,7 @@
           GroupName: ''
         }
       },
-      clearSearch() {
+      clearSearch () {
         this.BarCode = ''
         this.SampleCode = ''
         this.SourceName = ''
@@ -1540,22 +1538,21 @@
         this.GroupName = ''
         this.initData()
       },
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        var second = date.getSeconds();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        minute = second < 10 ? ('0' + second) : second;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
-      }
+      formatDateTime (date) {
+        var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      var second = date.getSeconds()
+      minute = minute < 10 ? ('0' + minute) : minute
+      minute = second < 10 ? ('0' + second) : second
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second
+    }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/admincoderule/_opera/admincoderuledetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/admincoderule/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/printscheme/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/samplenoteitem/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/sampleorgan/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/samplesite/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/sampletemplate/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/sampletype/_opera/stypeitem.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/sampletype/_opera/stypenoteitem.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/sampletype/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/systemitems/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/triggers/actions.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/setting/triggers/triggers.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/_opera/operation.vue

@@ -7,7 +7,7 @@
       <el-breadcrumb-item :to="{ path: '/system/auditsetting' }">单位审批步骤自定义配置</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 113px);">
+    <el-card class="box-card">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 编辑

src/dashoo.cn/frontend_web/src/pages/system/auditsetting/index.vue

@@ -4,7 +4,7 @@
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
       <el-breadcrumb-item :to="{ path: '/system/auditsetting' }">单位审批步骤自定义配置</el-breadcrumb-item>
     </el-breadcrumb>
-    <el-card class="box-card" style="height: calc(100vh - 115px);">
+    <el-card class="box-card">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 自定义配置

src/dashoo.cn/frontend_web/src/pages/system/userrole.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_web/src/pages/system/users.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="box-card" style="height: calc(100vh - 92px);">
+    <el-card class="box-card">
       <div slot="header" style="height: 20px;">
         <span style="float: left;">
           <i class="icon icon-table2"></i>

src/dashoo.cn/frontend_weixin/src/pages/samples.vue

@@ -20,12 +20,12 @@
       <cell title="细胞信息" is-link :border-intent="false" :arrow-direction="showCelldetail ? 'up' : 'down'" @click.native="showCelldetail = !showCelldetail"></cell>
 
       <template v-if="showCelldetail">
-        <x-textarea :value="donorslist.ZBack12" :max="200" title="细胞状态:" :show-counter="false"></x-textarea>
-        <x-textarea :value="donorslist.ZBack11" :max="200" title="细胞出库信息:" :show-counter="false"></x-textarea>
-        <x-textarea :value="donorslist.SamplePosition" title="自体存储位置:" text-align="right"></x-textarea>
+        <x-textarea :value="donorslist.ZBack12" :max="200" title="细胞状态:" :show-counter="false" readonly="true"></x-textarea>
+        <x-textarea :value="donorslist.ZBack11" :max="200" title="细胞出库信息:" :show-counter="false" readonly="true"></x-textarea>
+        <x-textarea :value="donorslist.SamplePosition" title="自体存储位置:" text-align="right" readonly="true"></x-textarea>
         <cell :value="donorslist.Temperature" title="存储温度:" text-align="right"></cell>
-        <cell :value="donorslist.ReceiveDate" title="储存日期:" text-align="right"></cell>
-        <cell :value="donorslist.ValidityDate" title="储存年限:" text-align="right"></cell>
+        <cell :value="donorslist.ReceiveDate" title="储存日期:" text-align="right" readonly="true"></cell>
+        <cell :value="donorslist.ValidityDate" title="储存年限:" text-align="right" readonly="true"></cell>
 
       </template>
 
@@ -282,7 +282,7 @@
           return "永久";
         } else {
           val = val.replace("T", " ");
-          return val.substring(0, 19);
+          return val.substring(0, 11);
         }
       },
       numtoupchar(num) {