页面注释掉组织器官、取材部位

src/dashoo.cn/frontend_web/src/components/samples/preoperation.vue

@@ -26,10 +26,10 @@
                 placeholder="请输入开始日期" :picker-options="pickerOptions0">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="组织器官" v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'">
+            <!-- <el-form-item label="组织器官" v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'">
               <el-cascader :options="cascade" style="width:100%" :props="sampleorganprops" change-on-select
                 :show-all-levels="false" v-model="selectedorgan" placeholder="请选择" @change="choose"></el-cascader>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="样本名称">
@@ -40,12 +40,12 @@
                 placeholder="请输入结束日期" :picker-options="pickerOptions0">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="取材部位" v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'">
+            <!-- <el-form-item label="取材部位" v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'">
               <el-select v-model="form.samplingsite" clearable style="width:100%" placeholder="请选择">
                 <el-option v-for="item in ssoption" :label="item.label" :value="item.value" :key="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>
@@ -72,10 +72,10 @@
             {{scope.row.Capacity}} {{scope.row.Unit}}
           </template>
         </el-table-column>
-        <el-table-column v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'" prop="SamplingOrganName" label="组织器官"
+        <!-- <el-table-column v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'" prop="SamplingOrganName" label="组织器官"
           show-overflow-tooltip></el-table-column>
         <el-table-column v-if="acc != '' || acc != 'ssqOy' || acc != 'saB4v'" prop="SamplingSiteName" label="取材部位"
-          show-overflow-tooltip></el-table-column>
+          show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="SourceName" label="样本来源" show-overflow-tooltip>
         </el-table-column>
         <el-table-column prop="InnerCode" label="样本内码" show-overflow-tooltip>
@@ -114,7 +114,7 @@
       },
       model: {}
     },
-    created() {
+    created () {
       this.acc = this.authUser.Profile.AccCode
     },
     computed: {
@@ -124,7 +124,7 @@
       })
     },
     watch: {
-      visible(val) {
+      visible (val) {
         this.selfVisible = val
         if (this.visible) {
           this.initData()
@@ -132,11 +132,11 @@
           this.createoptions
         }
       },
-      selfVisible(val) {
+      selfVisible (val) {
         this.$emit('update:visible', val)
       }
     },
-    data() {
+    data () {
       return {
         acc: '',
         formLabelWidth: 120,
@@ -155,7 +155,7 @@
         organdialog: '',
         sampletype: '',
         pickerOptions0: { //  日期选择
-          disabledDate(time) {
+          disabledDate (time) {
             return time.getTime() < Date.now() - 8.64e7
           }
         },
@@ -175,16 +175,16 @@
       }
     },
     methods: {
-      initData() {
+      initData () {
         let _this = this
         // request
         const params = {
           _currentPage: this.currentPage,
-          _size: this.pagesize,
+          _size: this.pagesize
         }
         this.$axios.get('sampleinput/getlistdonors', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.sampleyulurulist = res.data.items
             _this.currentItemCount = res.data.currentItemCount
@@ -194,40 +194,40 @@
             console.error(err)
           })
       },
-      getSampletype() {
-        let _this = this;
+      getSampletype () {
+        let _this = this
         const params = {
           _currentPage: 1,
           _size: 1000
-        };
+        }
         this.$axios
-          .get("sampletype/list", {
+          .get('sampletype/list', {
             params
           })
           .then(res => {
             // response
-            _this.typelist = res.data.items;
+            _this.typelist = res.data.items
           })
           .catch(err => {
             // handle error
-            console.error(err);
-          });
+            console.error(err)
+          })
       },
-      seachdata() {
+      seachdata () {
         this.currentPage = 1
         this.initData()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initData()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.pagesize = value
         this.currentPage = 1
         this.initData()
       },
       // 组织器官和取材部位的连接
-      choose(value) {
+      choose (value) {
         this.ssoption = []
         for (var i = 0; i < this.model.organlist.length; i++) {
           if (this.model.organlist[i].TNodeParent === value[value.length - 1]) {
@@ -239,16 +239,15 @@
         }
         this.form.samplingsite = this.ssoption[0].value
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         return val.substring(0, 10)
       },
-      handleselect(val) {
+      handleselect (val) {
         this.$emit('close', val)
         this.selfVisible = false
       }
     }
   }
-
 </script>
 
 <style>

src/dashoo.cn/frontend_web/src/pages/samples/archived/_opera/detailed.vue

@@ -56,12 +56,12 @@
             <el-col :span="6">
               <label>初始容量 ：{{ sampleinfodetail.InitCapacity }} {{ sampleinfodetail.Unit }}</label>
             </el-col>
-            <el-col :span="6" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
+            <!-- <el-col :span="6" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
               <label>组织器官 ： {{ sampleinfodetail.SamplingOrganName }}</label>
             </el-col>
             <el-col :span="6" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
               <label>取材部位 ：{{ sampleinfodetail.SamplingSiteName }}</label>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -258,7 +258,7 @@
     computed: mapGetters({
       authUser: 'authUser'
     }),
-    data() {
+    data () {
       return {
         currentItemCount: 0, // 总数
         currentPage: 1, // 当前页
@@ -278,7 +278,7 @@
           RecordTime: '',
           RecordId: '',
           RecordBy: '',
-          Record: '',
+          Record: ''
         },
         userlist: [],
         acc: '',
@@ -286,28 +286,28 @@
 
         typetykzlist: [], // 特有扩展
         Tabs: '',
-        groupnameList: [], //扩展字段分组列表
+        groupnameList: [] // 扩展字段分组列表
       }
     },
-    created() {
+    created () {
       this.createpage()
       this.getuserlist()
     },
     watch: {
-      '$route'(to, from) {
+      '$route' (to, from) {
         this.createpage()
         var anchor = this.$el.querySelector('#topdiv')
         anchor.scrollIntoView()
       }
     },
     methods: {
-      createpage() {
+      createpage () {
         this.Pid = this.$route.params.opera
         this.acc = this.authUser.Profile.AccCode
         // initial data
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         // request
         this.$axios.get('/samplesfiles/detailed/' + _this.Pid, null)
@@ -326,7 +326,7 @@
             console.error(err)
           })
       },
-      getgroupname(val) {
+      getgroupname (val) {
         let _this = this
         _this.$axios.get('/sampletype/gettykzzdgroup?SampleType=' + val.SampleType, {})
           .then(res => {
@@ -338,7 +338,7 @@
             _this.getItemDetail(val)
           })
       },
-      getItemDetail(val) {
+      getItemDetail (val) {
         // 获取特有扩展
         if (val && val.SampleType > 0) {
           let _this = this
@@ -363,7 +363,7 @@
         }
       },
 
-      getGroup(val) {
+      getGroup (val) {
         this.$axios.get('samplesgroup/groupbybarcode/' + val, {})
           .then(res => {
             this.GroupName = res.data.GroupName
@@ -386,15 +386,15 @@
       //       }
       //     }).catch(() => {})
       // },
-      getusedrecord() {
+      getusedrecord () {
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
           BarCode: this.sampleinfodetail.BarCode
         }
         this.$axios.get('/sampleinput/getusedrecord', {
-            params
-          })
+          params
+        })
           .then(res => {
             // response
             if (res.data.items) {
@@ -407,10 +407,10 @@
             console.error(err)
           })
       },
-      getresultList() {
+      getresultList () {
         let _this = this
         // request
-        _this.$axios.get("/samplesfiles/resultlist/" + _this.Pid, {})
+        _this.$axios.get('/samplesfiles/resultlist/' + _this.Pid, {})
           .then(res => {
             _this.resultList = res.data.items
           })
@@ -419,7 +419,7 @@
             console.error(err)
           })
       },
-      resultshow() {
+      resultshow () {
         this.resultShow = true
         this.Result = '添加操作记录'
         this.resultForm.Id = ''
@@ -431,7 +431,7 @@
         this.resultForm.RecordTime = new Date()
         this.resultForm.Record = ''
       },
-      resultdetail(val) {
+      resultdetail (val) {
         this.resultShow = true
         this.Result = '编辑操作记录'
         this.resultForm.Id = val.Id
@@ -440,14 +440,14 @@
         this.resultForm.RecordId = val.RecordId
         this.resultForm.Record = val.Record
       },
-      addResult() {
+      addResult () {
         let _this = this
         _this.resultForm.BarCode = _this.sampleinfodetail.BarCode
         _this.resultForm.SampleCode = _this.sampleinfodetail.SampleCode
         _this.resultForm.RecordId = parseInt(_this.resultForm.RecordId)
         _this.resultForm.RecordBy = _this.$refs.reflrrselect.selectedLabel
         _this.$axios.post('/samplesfiles/addresult?ParentId=' + _this.Pid,
-            _this.resultForm)
+          _this.resultForm)
           .then(res => {
             // response
             if (res.data.code === 0) {
@@ -469,7 +469,7 @@
             console.error(err)
           })
       },
-      editResult() {
+      editResult () {
         let _this = this
         _this.resultForm.RecordId = parseInt(_this.resultForm.RecordId)
         _this.resultForm.RecordBy = _this.$refs.reflrrselect.selectedLabel
@@ -495,37 +495,37 @@
             console.error(err)
           })
       },
-      delrecord(val) {
-        let _this = this;
-        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
+      delrecord (val) {
+        let _this = this
+      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
           .then(() => {
-            _this.$axios.delete("samplesfiles/delrecord/" + val.Id, {})
+            _this.$axios.delete('samplesfiles/delrecord/' + val.Id, {})
               .then(function (response) {
                 if (response.data.code === 0) {
                   _this.$message({
-                    type: "success",
+                    type: 'success',
                     message: response.data.message
-                  });
-                  // 更新界面
-                  _this.getresultList()
+                  })
+                // 更新界面
+                _this.getresultList()
                 } else {
                   _this.$message({
-                    type: "warning",
+                    type: 'warning',
                     message: response.data.message
-                  });
-                }
+                  })
+              }
               })
               .catch(function (error) {
-                console.log(error);
-              });
-          })
-          .catch(() => {});
-      },
-      getuserlist() {
+                console.log(error)
+            })
+        })
+          .catch(() => {})
+    },
+      getuserlist () {
         let _this = this
         _this.$axios.get('users/list', {})
           .then(res => {
@@ -546,11 +546,11 @@
             console.error(err)
           })
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.getusedrecord()
       },
-      goback() {
+      goback () {
         if (this.$route.query.size) {
           this.$router.push({
             name: this.$route.query.pname,
@@ -563,7 +563,7 @@
           this.$router.go(-1)
         }
       },
-      jsOpTypehandle(val) {
+      jsOpTypehandle (val) {
         if (val === 0) {
           return '无'
         } else if (val === 1) {
@@ -624,7 +624,7 @@
           return '制备交付至已归档'
         }
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -638,7 +638,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -137,11 +137,11 @@
             <el-form-item label="名称">
               <el-input v-model="Name" placeholder="请输入名称" size="mini" style="width:100%"></el-input>
             </el-form-item>
-            <el-form-item label="组织器官">
+            <!-- <el-form-item label="组织器官">
               <el-cascader :options="zuzhitreelist" :props="sampinputtreeprops" change-on-select
                 :show-all-levels="false" v-model="selectedzuzhi" @change="zuzhitreehandleChange" placeholder="请选择组织"
                 size="mini" style="width:100%"></el-cascader>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="特有扩展">
               <el-select v-model="STNoteField" multiple placeholder="请选择" size="mini" style="width:100%">
                 <el-option v-for="item in typetykzlist" :label="item.Name" :value="item.FieldName"
@@ -159,11 +159,11 @@
             <el-form-item label="录入人">
               <el-input v-model="CreateBy" placeholder="请输入录入人" size="mini" style="width:100%"></el-input>
             </el-form-item>
-            <el-form-item label="取材部位">
+            <!-- <el-form-item label="取材部位">
               <el-select v-model="SamplingSite" clearable placeholder="请选择" size="mini" style="width:100%">
                 <el-option v-for="item in samplesitenames" :label="item.Name" :value="item.Code" :key="item.Code">
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
             <el-form-item label="特有检索">
               <el-input v-model="Stnotevalue" placeholder="输入检索内容" size="mini" style="width:100%"></el-input>
@@ -813,7 +813,7 @@
                 } else {
                   errorMsg = res.data.message
                   failedIds.push(_this.multipleSelection[i].Id)
-              }
+                }
                 count++
                 // 最后一个请求结束
                 if (count == _this.multipleSelection.length) {
@@ -957,18 +957,18 @@
           .then(res => {
             if (res.data.code == 0) {
               let tabs = _this.searchTemplates
-            let activeName = _this.currentSearchTemplateName
-            if (activeName === targetName) {
+              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) {
+                    if (nextTab) {
                       activeName = nextTab.Name
                       _this.searchTableData = this.getSearchTableData(nextTab.Fields)
                     }
                   }
                 })
-            }
+              }
 
               _this.currentSearchTemplateName = activeName
               _this.searchTemplates = tabs.filter(tab => tab.Name !== targetName)

src/dashoo.cn/frontend_web/src/pages/samples/prerecorded/_opera/detailed.vue

@@ -54,12 +54,12 @@
             <el-col :span="6">
               <label>初始容量 ：{{ sampleinfodetail.InitCapacity }} {{ sampleinfodetail.Unit }}</label>
             </el-col>
-            <el-col :span="6" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
+            <!-- <el-col :span="6" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
               <label>组织器官 ： {{ sampleinfodetail.SamplingOrganName }}</label>
             </el-col>
             <el-col :span="6" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
               <label>取材部位 ：{{ sampleinfodetail.SamplingSiteName }}</label>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <label>有效日期 ： {{ jstimehandle(sampleinfodetail.ValidityDate+'') }}</label>
             </el-col>

src/dashoo.cn/frontend_web/src/pages/samples/prerecorded/_opera/operation.vue

@@ -52,7 +52,7 @@
                 placeholder="样本编码"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="组织器官" v-if="acc !='sBBo4' && acc != 'ssqOy' && acc != 'saB4v'">
               <el-cascader :options="organlist2" style="width:100%" :props="sampleorganprops" change-on-select
                 :show-all-levels="false" v-model="selectedorgan" placeholder="请选择" @change="chooseorgange"
@@ -67,7 +67,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="名称">
               <el-input v-model="sampleform.Name" placeholder="样本名称"></el-input>
@@ -249,13 +249,13 @@
         }
       }
       var checkSampleCode = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入样本编码'))
-          return
-        } else {
-          callback()
-        }
+      if (value === '') {
+        callback(new Error('请输入样本编码'))
+        
+      } else {
+        callback()
       }
+    }
       var checkBarCode = (rule, value, callback) => {
         let _this = this
         if (_this.sampleform.type_flag === 'add') {

src/dashoo.cn/frontend_web/src/pages/samples/prerecorded/_opera/prerecordedadd.vue

@@ -64,7 +64,7 @@
             <legend style="color:#436EEE"></legend>
             <i class="icon icon-paragraph-justify"> 预录入信息</i>
           </div>
-          <el-col :span="8">
+          <el-col :span="8" style="margin-top:10px">
             <el-form-item label="样本类型" required prop="SampleTypestr">
               <el-select v-model="sampleform.SampleTypestr" clearable placeholder="请选择" style="width:100%" @change="choosetype"
                 :disabled="disabledsampletype">
@@ -82,7 +82,7 @@
               <el-input v-model="sampleform.Name" placeholder="样本名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="组织器官">
               <el-cascader :options="organlist2" style="width:100%" :props="sampleorganprops" change-on-select
                 :show-all-levels="false" v-model="selectedorgan" placeholder="请选择" @change="chooseorgange" :disabled="disabledsamplingorgan"></el-cascader>
@@ -94,7 +94,7 @@
                 <el-option v-for="item in samplequcailist" :label="item.label" :value="item.value" :key="item.value"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="有效日期">
               <el-date-picker style="width: 70%" v-model="sampleform.ValidityDate" type="date" :clearable="false"
@@ -267,7 +267,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="组织器官">
               <el-select ref="samptype" :disabled="true" v-model="transportForm.SamplingOrganName" style="width:100%"
                 placeholder="组织器官">
@@ -281,7 +281,7 @@
                 placeholder="取材部位">
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="样本量">
               <el-input v-model="transportForm.SampleSize" :disabled="true" placeholder="样本量" style="width: 49%"></el-input>

src/dashoo.cn/frontend_web/src/pages/samples/stored/_opera/detailed.vue

@@ -70,12 +70,12 @@
             <el-col :span="6">
               <label>初始容量 ：{{ sampleinfodetail.InitCapacity }} {{ sampleinfodetail.Unit }}</label>
             </el-col>
-            <el-col :span="6" v-if="acc !='sBBo4' && acc !='ssqOy' && acc != 'saB4v'">
+            <!-- <el-col :span="6" v-if="acc !='sBBo4' && acc !='ssqOy' && acc != 'saB4v'">
               <label>组织器官 ： {{ sampleinfodetail.SamplingOrganName }}</label>
             </el-col>
             <el-col :span="6" v-if="acc !='sBBo4' && acc !='ssqOy' && acc != 'saB4v'">
               <label>取材部位 ：{{ sampleinfodetail.SamplingSiteName }}</label>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -337,7 +337,7 @@
     computed: mapGetters({
       authUser: 'authUser'
     }),
-    data() {
+    data () {
       return {
         currentItemCount: 0, // 当前页显示数量
         currentPage: 1, // 当前页
@@ -365,34 +365,34 @@
 
         typetykzlist: [], // 特有扩展
         Tabs: '',
-        groupnameList: [], //扩展字段分组列表
+        groupnameList: [], // 扩展字段分组列表
         imageDialog: false,
         ImageTitle: '',
         imagefiles: '',
         imagefilelist: [],
-        imagenewlist: '', //删除图片时使用
+        imagenewlist: '', // 删除图片时使用
         dialogImageUrl: '',
-        dialogVisible: false,
+        dialogVisible: false
       }
     },
-    created() {
+    created () {
       this.createpage()
     },
     watch: {
-      '$route'(to, from) {
+      '$route' (to, from) {
         this.createpage()
         var anchor = this.$el.querySelector('#topdiv')
         anchor.scrollIntoView()
       }
     },
     methods: {
-      createpage() {
+      createpage () {
         this.Pid = this.$route.params.opera
         this.acc = this.authUser.Profile.AccCode
         // initial data
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         // request
         this.$axios.get('/sampleinput/detailed/' + _this.Pid, null)
@@ -415,8 +415,8 @@
             console.error(err)
           })
       },
-      //获取扩展字段分组
-      getgroupname(val) {
+      // 获取扩展字段分组
+      getgroupname (val) {
         let _this = this
         _this.$axios.get('/sampletype/gettykzzdgroup?SampleType=' + val.SampleType, {})
           .then(res => {
@@ -428,7 +428,7 @@
             _this.gettykzlist(val)
           })
       },
-      gettykzlist(val) {
+      gettykzlist (val) {
         // 获取特有扩展
         if (val && val.SampleType > 0) {
           let _this = this
@@ -452,8 +452,8 @@
             })
         }
       },
-      //获取样本分组信息
-      getGroup(val) {
+      // 获取样本分组信息
+      getGroup (val) {
         this.$axios.get('samplesgroup/groupbybarcode/' + val, {})
           .then(res => {
             this.GroupName = res.data.GroupName
@@ -464,15 +464,15 @@
           })
       },
       // 获取附件信息
-      getattachment(barcode, samplecode) {
+      getattachment (barcode, samplecode) {
         let _this = this
         let params = {
           samplecode: samplecode,
           barcode: barcode
         }
         this.$axios.get('/sampleoperation/getattachmentbysamplecode', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.achmentlist = res.data
           }).catch(() => {})
@@ -490,22 +490,22 @@
       //       }
       //     }).catch(() => {})
       // },
-      getusedrecord() {
+      getusedrecord () {
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
           BarCode: this.sampleinfodetail.BarCode
         }
         this.$axios.get('/sampleinput/getusedrecord', {
-            params
-          })
+          params
+        })
           .then(res => {
             this.sampleusedlogs = res.data.items
             this.currentItemCount = res.data.currentItemCount
           }).catch(() => {})
       },
 
-      goback() {
+      goback () {
         if (this.$route.query.size) {
           this.$router.push({
             name: this.$route.query.pname,
@@ -518,7 +518,7 @@
           this.$router.go(-1)
         }
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -530,11 +530,11 @@
           return val.substring(0, 19)
         }
       },
-      jssubstrhandle(val, no) {
+      jssubstrhandle (val, no) {
         let position = val.split(';')
         return position[no]
       },
-      jsStatehandle(val) {
+      jsStatehandle (val) {
         switch (val) {
           case 1:
             return '设备中'
@@ -551,7 +551,7 @@
             return '----'
         }
       },
-      jsOpTypehandle(val) {
+      jsOpTypehandle (val) {
         if (val === 0) {
           return '无'
         } else if (val === 1) {
@@ -613,23 +613,23 @@
         }
       },
 
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.getusedrecord()
       },
-      getrelationSamples(val1, val2) {
+      getrelationSamples (val1, val2) {
         let params = {
           BarCode: val1,
           SampleCode: val2
         }
         this.$axios.get('/sampleinput/getrelationSamples', {
-            params
-          })
+          params
+        })
           .then(res => {
             this.relationSamples = res.data.items
           }).catch(() => {})
       },
-      todetail(val) {
+      todetail (val) {
         switch (val.IState) {
           case 1:
             this.$router.push({
@@ -653,17 +653,17 @@
             break
         }
       },
-      recoverydialogcallback(v) {
+      recoverydialogcallback (v) {
         // this.initData()
         this.goback()
       },
-      uploaddialogcallback(v) {
+      uploaddialogcallback (v) {
         this.createpage()
       },
-      clickachment(host, fid) {
+      clickachment (host, fid) {
         window.open(`http://${host}/${fid}`)
       },
-      deleteupattachdata(val) {
+      deleteupattachdata (val) {
         let _this = this
         _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -695,7 +695,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

src/dashoo.cn/frontend_web/src/pages/samples/stored/_opera/edit.vue

@@ -48,7 +48,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="组织器官">
               <el-input v-model="sampleinfo.SamplingOrganName" disabled></el-input>
             </el-form-item>
@@ -57,14 +57,13 @@
             <el-form-item label="取材部位">
               <el-input v-model="sampleinfo.SamplingSiteName" disabled></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
             <el-form-item label="接收日期">
               <el-input v-model="ReceiveDate" disabled></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
+        
           <el-col :span="8">
             <el-form-item label="有效日期">
               <el-input v-model="ValidityDate" disabled></el-input>
@@ -217,7 +216,7 @@
     computed: mapGetters({
       authUser: 'authUser'
     }),
-    data() {
+    data () {
       return {
         BarCode: '', // 样本条码
         SampleCode: '', // 样本编码
@@ -242,12 +241,12 @@
         ValidityDate: '',
 
         Tabs: '',
-        groupnameList: [], //扩展字段分组列表
+        groupnameList: [], // 扩展字段分组列表
         imageDialog: false,
         ImageTitle: '',
         imagefiles: '',
         imagefilelist: [],
-        imagenewlist: '', //删除图片时使用
+        imagenewlist: '', // 删除图片时使用
         dialogImageUrl: '',
         dialogVisible: false,
 
@@ -265,7 +264,7 @@
         acc: ''
       }
     },
-    created() {
+    created () {
       this.Pid = this.$route.params.opera
       this.acc = this.authUser.Profile.AccCode
       // initial data
@@ -274,7 +273,7 @@
       this.getGrouplist()
     },
     methods: {
-      initData() {
+      initData () {
         let _this = this
         // request
         this.$axios.get('/sampleinput/edit/' + _this.Pid, null)
@@ -299,7 +298,7 @@
             console.error(err)
           })
       },
-      saveeditdata() {
+      saveeditdata () {
         let _this = this
         let params = {
           Name: _this.EditForm.Name,
@@ -309,7 +308,7 @@
           MId: _this.EditForm.MId + ''
         }
         let jsonstr = ''
-        // 拼接样本扩展字段成json形式的字符串      
+        // 拼接样本扩展字段成json形式的字符串
         // for (let i = 0; i < _this.publicsampletypes.length; i++) {
         //   jsonstr += '"' + _this.publicsampletypes[i].FieldName + '" : "' + _this.publicsampletypes[i].FieldDefault +
         //     '",'
@@ -342,7 +341,7 @@
           .catch(() => {})
       },
 
-      getItemGroupName(val) {
+      getItemGroupName (val) {
         // 获取特有扩展
         let _this = this
         _this.$axios.get('/sampletype/gettykzzdgroup?SampleType=' + val.SampleType, {})
@@ -356,7 +355,7 @@
             _this.getItemDetail(val)
           })
       },
-      getItemDetail(val) {
+      getItemDetail (val) {
         // 获取特有扩展
         if (val && val.SampleType > 0) {
           let _this = this
@@ -371,12 +370,12 @@
             })
         }
       },
-      //获取当前上传图片字段
-      getitem(val) {
+      // 获取当前上传图片字段
+      getitem (val) {
         this.imagefiles = ''
         this.imagefilelist = []
         this.ImageTitle = val.Name
-        //显示已存储图片
+        // 显示已存储图片
         if (val.FieldDefault != '') {
           let imagearr = []
           imagearr = val.FieldDefault.split('|')
@@ -393,8 +392,8 @@
         this.imageDialog = true
         this.extendId = val.Id
       },
-      //扩展字段图片类型处理
-      beforeAvatarUpload(file) {
+      // 扩展字段图片类型处理
+      beforeAvatarUpload (file) {
         const isJPG = (file.type.indexOf('image/') === 0)
         const isLt2M = file.size / 1024 / 1024 < 10
         if (!isJPG) {
@@ -407,11 +406,11 @@
         }
         return true
       },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
+      handlePictureCardPreview (file) {
+        this.dialogImageUrl = file.url
+        this.dialogVisible = true
       },
-      uploadrequest(option) {
+      uploadrequest (option) {
         let _this = this
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
@@ -438,7 +437,7 @@
             })
           })
       },
-      handleAvatarSuccess(res, file) {
+      handleAvatarSuccess (res, file) {
         for (var i = 0; i < this.typetykzlist.length; i++) {
           if (this.typetykzlist[i].Id == this.extendId) {
             this.typetykzlist[i].FieldDefault = this.typetykzlist[i].FieldDefault +
@@ -447,8 +446,8 @@
         }
         this.imagefiles = ''
       },
-      handleRemove(file, fileList) {
-        console.log(this.imagefilelist);
+      handleRemove (file, fileList) {
+        console.log(this.imagefilelist)
         for (var i = 0; i < this.imagefilelist.length; i++) {
           if (this.imagefilelist[i].uid != file.uid) {
             this.imagenewlist = this.imagenewlist + this.imagefilelist[i].url.substring(7, 42) + `|`
@@ -461,14 +460,14 @@
         }
       },
 
-      getGroup(val) {
+      getGroup (val) {
         this.$axios.get('samplesgroup/groupbybarcode/' + val, {})
           .then(res => {
-            this.GroupIdOption = [];
-            if (res.data.GroupId != "") {
-              let tempArr = res.data.GroupId.split(',');
+            this.GroupIdOption = []
+            if (res.data.GroupId != '') {
+              let tempArr = res.data.GroupId.split(',')
               for (let idx in tempArr) {
-                this.GroupIdOption.push(parseInt(tempArr[idx]));
+                this.GroupIdOption.push(parseInt(tempArr[idx]))
               }
             }
           })
@@ -477,7 +476,7 @@
             console.error(err)
           })
       },
-      getGrouplist() {
+      getGrouplist () {
         let _this = this
         _this.$axios.get('/samplesgroup/grouplist', {})
           .then(res => {
@@ -495,8 +494,7 @@
       //     }).catch(() => {})
       // },
 
-
-      goback() {
+      goback () {
         if (this.$route.query.size) {
           this.$router.push({
             name: this.$route.query.pname,
@@ -510,7 +508,7 @@
         }
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -524,7 +522,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -155,10 +155,10 @@
               <el-form-item label="名称">
                 <el-input v-model="Name" placeholder="请输入名称" size="mini" style="width:100%"></el-input>
               </el-form-item>
-              <el-form-item label="组织器官">
+              <!-- <el-form-item label="组织器官">
                 <el-cascader :options="zuzhitreelist" :props="sampinputtreeprops" change-on-select :show-all-levels="false"
                   v-model="selectedzuzhi" @change="zuzhitreehandleChange" placeholder="请选择组织" size="mini" style="width:100%"></el-cascader>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="特有扩展">
                 <el-select v-model="STNoteField" multiple placeholder="请选择" size="mini" style="width:100%">
                   <el-option v-for="item in typetykzlist" :label="item.Name" :value="item.FieldName" :key="item.FieldName"></el-option>
@@ -175,11 +175,11 @@
               <el-form-item label="录入人">
                 <el-input v-model="CreateBy" placeholder="请输入录入人" size="mini" style="width:100%"></el-input>
               </el-form-item>
-              <el-form-item label="取材部位">
+              <!-- <el-form-item label="取材部位">
                 <el-select v-model="SamplingSite" clearable placeholder="请选择" size="mini" style="width:100%">
                   <el-option v-for="item in samplesitenames" :label="item.Name" :value="item.Code" :key="item.Code"></el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="特有检索">
                 <el-input v-model="Stnotevalue" placeholder="输入检索内容" size="mini" style="width:100%"></el-input>
               </el-form-item>
@@ -1177,7 +1177,7 @@
                 } else {
                   errorMsg = res.data.message
                   failedIds.push(_this.multipleSelection[i].Id)
-              }
+                }
                 count++
                 // 最后一个请求结束
                 if (count == _this.multipleSelection.length) {
@@ -1381,18 +1381,18 @@
           .then(res => {
             if (res.data.code == 0) {
               let tabs = _this.searchTemplates
-            let activeName = _this.currentSearchTemplateName
-            if (activeName === targetName) {
+              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) {
+                    if (nextTab) {
                       activeName = nextTab.Name
                       _this.searchTableData = this.getSearchTableData(nextTab.Fields)
                     }
                   }
                 })
-            }
+              }
 
               _this.currentSearchTemplateName = activeName
               _this.searchTemplates = tabs.filter(tab => tab.Name !== targetName)
@@ -1540,17 +1540,17 @@
       },
       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
-    }
+        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>

src/dashoo.cn/frontend_web/src/pages/samples/waitingstore/_opera/detailed.vue

@@ -54,12 +54,12 @@
             <el-col :span="6">
               <label>初始容量 ：{{ sampleinfodetail.InitCapacity }} {{ sampleinfodetail.Unit }}</label>
             </el-col>
-            <el-col :span="6" v-if="acc !='sBBo4' && acc !='ssqOy' && acc != 'saB4v'">
+            <!-- <el-col :span="6" v-if="acc !='sBBo4' && acc !='ssqOy' && acc != 'saB4v'">
               <label>组织器官 ： {{ sampleinfodetail.SamplingOrganName }}</label>
             </el-col>
             <el-col :span="6" v-if="acc !='sBBo4' && acc !='ssqOy' && acc != 'saB4v'">
               <label>取材部位 ：{{ sampleinfodetail.SamplingSiteName }}</label>
-            </el-col>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -224,7 +224,7 @@
     computed: mapGetters({
       authUser: 'authUser'
     }),
-    data() {
+    data () {
       return {
         currentItemCount: 0, // 总数
         currentPage: 1, // 当前页
@@ -240,27 +240,27 @@
 
         typetykzlist: [], // 特有扩展
         Tabs: '',
-        groupnameList: [], //扩展字段分组列表
+        groupnameList: [] // 扩展字段分组列表
       }
     },
-    created() {
+    created () {
       this.createpage()
     },
     watch: {
-      '$route'(to, from) {
+      '$route' (to, from) {
         this.createpage()
         var anchor = this.$el.querySelector('#topdiv')
         anchor.scrollIntoView()
       }
     },
     methods: {
-      createpage() {
+      createpage () {
         this.Pid = this.$route.params.opera
         this.acc = this.authUser.Profile.AccCode
         // initial data
         this.initData()
       },
-      initData() {
+      initData () {
         let _this = this
         // request
         this.$axios.get('/samplepreinput/detailed/' + _this.Pid, null)
@@ -281,7 +281,7 @@
             console.error(err)
           })
       },
-      getgroupname(val) {
+      getgroupname (val) {
         let _this = this
         _this.$axios.get('/sampletype/gettykzzdgroup?SampleType=' + val.SampleType, {})
           .then(res => {
@@ -293,7 +293,7 @@
             _this.getItemDetail(val)
           })
       },
-      getItemDetail(val) {
+      getItemDetail (val) {
         // 获取特有扩展
         if (val && val.SampleType > 0) {
           let _this = this
@@ -317,7 +317,7 @@
             })
         }
       },
-      getGroup(val) {
+      getGroup (val) {
         this.$axios.get('samplesgroup/groupbybarcode/' + val, {})
           .then(res => {
             this.GroupName = res.data.GroupName
@@ -341,14 +341,14 @@
       //     }).catch(() => {})
       // },
 
-      getrelationSamples(val1, val2) {
+      getrelationSamples (val1, val2) {
         let params = {
           BarCode: val1,
           SampleCode: val2
         }
         this.$axios.get('/sampleinput/getrelationSamples', {
-            params
-          })
+          params
+        })
           .then(res => {
             // response
             this.relationSamples = res.data.items
@@ -358,15 +358,15 @@
             console.error(err)
           })
       },
-      getusedrecord() {
+      getusedrecord () {
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
           BarCode: this.sampleinfodetail.BarCode
         }
         this.$axios.get('/sampleinput/getusedrecord', {
-            params
-          })
+          params
+        })
           .then(res => {
             // response
             if (res.data.items) {
@@ -379,11 +379,11 @@
             console.error(err)
           })
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.getusedrecord()
       },
-      goback() {
+      goback () {
         if (this.$route.query.size) {
           this.$router.push({
             name: this.$route.query.pname,
@@ -396,7 +396,7 @@
           this.$router.go(-1)
         }
       },
-      jsOpTypehandle(val) {
+      jsOpTypehandle (val) {
         if (val === 0) {
           return '无'
         } else if (val === 1) {
@@ -457,7 +457,7 @@
           return '制备交付至已归档'
         }
       },
-      jsStatehandle(val) {
+      jsStatehandle (val) {
         switch (val) {
           case 1:
             return '设备中'
@@ -474,7 +474,7 @@
             return '----'
         }
       },
-      todetail(val) {
+      todetail (val) {
         switch (val.IState) {
           case 1:
             this.$router.push({
@@ -498,7 +498,7 @@
             break
         }
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -512,7 +512,6 @@
       }
     }
   }
-
 </script>
 
 <style lang="scss">

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

@@ -137,10 +137,10 @@
             <el-form-item label="名称">
               <el-input v-model="Name" placeholder="请输入名称" size="mini" style="width:100%"></el-input>
             </el-form-item>
-            <el-form-item label="组织器官">
+            <!-- <el-form-item label="组织器官">
               <el-cascader :options="zuzhitreelist" :props="sampinputtreeprops" change-on-select :show-all-levels="false"
                 v-model="selectedzuzhi" @change="zuzhitreehandleChange" placeholder="请选择组织" size="mini" style="width:100%"></el-cascader>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="特有扩展">
               <el-select v-model="STNoteField" multiple placeholder="请选择" size="mini" style="width:100%">
                 <el-option v-for="item in typetykzlist" :label="item.Name" :value="item.FieldName" :key="item.FieldName"></el-option>
@@ -157,11 +157,11 @@
             <el-form-item label="录入人">
               <el-input v-model="CreateBy" placeholder="请输入录入人" size="mini" style="width:100%"></el-input>
             </el-form-item>
-            <el-form-item label="取材部位">
+            <!-- <el-form-item label="取材部位">
               <el-select v-model="SamplingSite" clearable placeholder="请选择" size="mini" style="width:100%">
                 <el-option v-for="item in samplesitenames" :label="item.Name" :value="item.Code" :key="item.Code"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="特有检索">
               <el-input v-model="Stnotevalue" placeholder="输入检索内容" size="mini" style="width:100%"></el-input>
             </el-form-item>
@@ -319,7 +319,7 @@
     components: {
       draggable
     },
-    data() {
+    data () {
       return {
         dialogVisible: false,
         currentItemCount: 0, // 当前页显示数量
@@ -337,7 +337,7 @@
         selectsigorg: '', // 组织器官
         CreateBy: '', // 录入人
         CreateOn: [], // 录入时期
-        GroupName: '', //所属分组
+        GroupName: '', // 所属分组
         Name: '', // 名称
         SourceName: '', // 样本来源
         InnerCode: '', // 样本内码
@@ -357,17 +357,17 @@
         // 新增
         organlist: [],
         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: '',
@@ -383,7 +383,7 @@
           Capacity: '',
           Location: '',
           Extension: '',
-          GroupName: '', //所属分组
+          GroupName: '' // 所属分组
         },
         sampinputtreeprops2: {
           value: 'name',
@@ -392,79 +392,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('samplewaitstoreseach')
-        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
           }
         }
@@ -473,7 +473,7 @@
       }
 
       this.cachecols = store.get('samplewaitstoreshowcolumn')
-      //当前显示列无数据，使用已录入样本显示列数据
+      // 当前显示列无数据，使用已录入样本显示列数据
       if (!(this.cachecols && this.cachecols !== '')) {
         this.cachecols = store.get('sapminputshowcolumn')
       }
@@ -552,14 +552,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
         let params = {
@@ -589,11 +589,11 @@
           }
           params = Object.assign(params, params2)
         }
-        //返回时保存查找内容
+        // 返回时保存查找内容
         store.set('samplewaitstoreseach', params)
         this.$axios.get('/samplesunsave/list', {
-            params
-          })
+          params
+        })
           .then(res => {
             // response
             _this.list = res.data.items
@@ -603,8 +603,8 @@
             console.error(err)
           })
       },
-      //根据子code获取所有父code
-      getparentcodebytopcode(v) {
+      // 根据子code获取所有父code
+      getparentcodebytopcode (v) {
         let _this = this
         _this.$axios.get('/sampleorgan/getparentcodebytopcode/' + v, {})
           .then(res => {
@@ -618,7 +618,7 @@
             _this.searchzuzhitreehandleChange()
           })
       },
-      getOrgan() {
+      getOrgan () {
         if (this.organlist.length === 0) {
           let _this = this
           _this.$axios.get('/shelfset/getorgan', {})
@@ -628,17 +628,17 @@
             })
         }
       },
-      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
             // 扩展列增加到显示列中
@@ -695,7 +695,7 @@
               }
             }
             if (store.get('samplewaitstoreseach').searchWithTemplate && store.get('samplewaitstoreseach').searchWithTemplate !==
-              '') { //自定义查询
+              '') { // 自定义查询
               this.handleSearchCommand(store.get('samplewaitstoreseach').searchWithTemplate)
             } else {
               // initial data
@@ -703,13 +703,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(() => {})
       },
-      seachdata() {
+      seachdata () {
         // selectedzuzhi
         if (this.selectedzuzhi.length > 0) {
           this.selectsigorg = this.selectedzuzhi[this.selectedzuzhi.length - 1] + ''
@@ -717,7 +717,7 @@
         this.currentPage = 1
         this.initData()
       },
-      selsampletypeChange() {
+      selsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -729,8 +729,8 @@
             })
         }
       },
-      //返回查询条件执行
-      searchsampletypeChange() {
+      // 返回查询条件执行
+      searchsampletypeChange () {
         // 获取特有扩展
         let _this = this
         if (_this.SampleType !== '') {
@@ -741,9 +741,9 @@
             })
         }
       },
-      //---------------------------------------------------
-      //自定义显示列
-      checkedshowall() {
+      // ---------------------------------------------------
+      // 自定义显示列
+      checkedshowall () {
         let tc = 0
         for (var i = 0; i < this.showcolumn.length; i++) {
           if (this.showcolumn[i].show) {
@@ -762,13 +762,13 @@
           }
         }
       },
-      handleCheckAllChange(val) {
+      handleCheckAllChange (val) {
         for (var i = 0; i < this.showcolumn.length; i++) {
           this.showcolumn[i].show = val
         }
       },
       // 自定义显示列保存操作
-      saveshowfiled() {
+      saveshowfiled () {
         store.set('samplewaitstoreshowcolumn', this.showcolumn)
         this.columndialogVisible = false
         this.$message({
@@ -777,7 +777,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
@@ -786,17 +786,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
@@ -807,19 +807,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) {
@@ -827,32 +827,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;
+              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];
+                    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
               })
             }
           })
@@ -861,7 +860,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, {})
@@ -871,11 +870,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) {
@@ -885,18 +884,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]
           }
@@ -909,7 +908,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
               }
             }
@@ -918,23 +917,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)
@@ -942,7 +941,7 @@
             if (res.data.code == 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
               if (cb) {
                 cb()
@@ -950,7 +949,7 @@
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
           })
@@ -959,7 +958,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) {
@@ -972,20 +971,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('/samplesunsave/search?name=' + name, {
-            params
-          })
+          params
+        })
           .then(res => {
             console.log(res.data.items)
             // response
@@ -1000,27 +999,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 => {
@@ -1043,7 +1042,7 @@
             console.error(err)
           })
       },
-      changeSearchField(val) {
+      changeSearchField (val) {
         this.searchValue = {
           BarCode: '',
           SampleCode: '',
@@ -1062,17 +1061,17 @@
           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 ''
       },
-      //----------------------------------------------------------------
-      //批量复存
-      batchsave() {
+      // ----------------------------------------------------------------
+      // 批量复存
+      batchsave () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -1102,12 +1101,12 @@
             if (res.data.code == 0) {
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
             } else {
               _this.$message({
                 type: 'warning',
-                message: res.data.message,
+                message: res.data.message
               })
             }
             _this.initData()
@@ -1117,8 +1116,8 @@
             console.error(err)
           })
       },
-      //清空查询数据
-      clearSearch() {
+      // 清空查询数据
+      clearSearch () {
         this.BarCode = ''
         this.SampleCode = ''
         this.SourceName = ''
@@ -1139,7 +1138,7 @@
         this.GroupName = ''
         this.initData()
       },
-      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, {})
@@ -1149,8 +1148,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, {})
@@ -1159,10 +1158,10 @@
             }).catch(() => {})
         }
       },
-      //导出样本
-      handleExportsamplesCommand(command) {
+      // 导出样本
+      handleExportsamplesCommand (command) {
         let _this = this
-        if (command == 'exportchosen') { //导出所选数据
+        if (command == 'exportchosen') { // 导出所选数据
           if (_this.multipleSelection.length < 1) {
             _this.$message({
               type: 'warning',
@@ -1171,7 +1170,7 @@
             return
           }
           _this.exportsamples('exportchosen')
-        } else if (command == 'exportpage') { //导出当前页数据
+        } else if (command == 'exportpage') { // 导出当前页数据
           if (_this.list.length < 1) {
             _this.$message({
               type: 'warning',
@@ -1180,7 +1179,7 @@
             return
           }
           _this.exportsamples('exportpage')
-        } else if (command == 'exportall') { //导出所有数据
+        } else if (command == 'exportall') { // 导出所有数据
           _this.$confirm('此操作将导出所有满足条件的数据！是否继续导出?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -1190,7 +1189,7 @@
           }).catch(() => {})
         }
       },
-      exportsamples(val) {
+      exportsamples (val) {
         let _this = this
         // 显示列
         let showcolumnarr = []
@@ -1238,13 +1237,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 = {
@@ -1252,13 +1251,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 = {
@@ -1267,8 +1266,8 @@
           params = Object.assign(params, paramsid)
         }
         _this.$axios.get('/sampleinput/exportexcel', {
-            params
-          })
+          params
+        })
           .then(res => {
             window.location = 'http://' + res.data
           })
@@ -1277,8 +1276,8 @@
             console.error(err)
           })
       },
-      //样本条码批量打印
-      batchprint() {
+      // 样本条码批量打印
+      batchprint () {
         let _this = this
         if (_this.multipleSelection.length < 1) {
           _this.$message({
@@ -1309,7 +1308,7 @@
             console.error(err)
           })
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         if (this.currentSearchTemplate) {
@@ -1318,7 +1317,7 @@
           this.initData()
         }
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         if (this.currentSearchTemplate) {
           this.searchWithTemplate(this.currentSearchTemplate)
@@ -1326,13 +1325,13 @@
           this.initData()
         }
       },
-      handleSelectionChange(val) {
+      handleSelectionChange (val) {
         this.multipleSelection = val
       },
-      handleChange(value) {
+      handleChange (value) {
         console.log(value)
       },
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1343,10 +1342,9 @@
           val = val.replace('T', ' ')
           return val.substring(0, 19)
         }
-      },
+      }
     }
   }
-
 </script>
 
 <style lang="scss">