出库审核bug 修改，界面缩放

src/dashoo.cn/backend/api/business/items/itemsService.go

@@ -97,7 +97,8 @@ func (s *ItemsService) GetKeyValueItems(code, acccode string) (list []KeyValue)
 		whereCondi := "Enabled=1"
 		if item.TargetTable == "Base_ItemDetails" {
 			whereCondi = whereCondi + " and ParentId=" + utils.ToStr(item.Id)
-			whereCondi = whereCondi + " and AccCode='" + acccode + "'"
+			whereCondi = whereCondi + " and AccCode= 'ALL' "
+			whereCondi = whereCondi + " or AccCode='" + acccode + "'"
 		}
 		s.DBE.Desc("Id").Cols("Id", "Itemname", "Itemvalue").Table(item.TargetTable).Where(whereCondi).Find(&list)
 	}

src/dashoo.cn/backend/api/controllers/biobank/samplesapply.go

@@ -591,16 +591,16 @@ func (this *SamplesApplyController) SaveDetail() {
 		datadetail.ModifiedBy = this.User.Realname
 		datadetail.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
 		var cols_detail []string = []string{"ParentId", "ModifiedBy", "ModifiedUserId"}
-		where_detail := " BarCode='" + dataother.Detaillist[i].BarCode + "'"
+		where_detail := " Id ='" + strconv.Itoa(dataother.Detaillist[i].Id) + "'"
 		svc.UpdateEntityBywheretbl(this.User.AccCode+SamplesApplyDetailName, &datadetail, cols_detail, where_detail)
 
-		//		var modeldetail samplesinfo.SamplesDetail
-		//		modeldetail.ModifiedBy = this.User.Realname
-		//		modeldetail.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
-		//		modeldetail.IState = 10
-		//		where := "BarCode = '" + dataother.Detaillist[i].BarCode + "'"
-		//		var cols []string = []string{"IState", "ModifiedBy", "ModifiedUserId"}
-		//		svc.UpdateEntityBywheretbl(this.User.AccCode+SamplesDetailtbName, &modeldetail, cols, where)
+		var modeldetail samplesinfo.SamplesDetail
+		modeldetail.ModifiedBy = this.User.Realname
+		modeldetail.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+		modeldetail.IState = 10
+		where := "BarCode = '" + dataother.Detaillist[i].BarCode + "'"
+		var cols []string = []string{"IState", "ModifiedBy", "ModifiedUserId"}
+		svc.UpdateEntityBywheretbl(this.User.AccCode+SamplesDetailtbName, &modeldetail, cols, where)
 	}
 }
 

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -159,8 +159,8 @@ module.exports = {
   },
 
   axios: {
-    // baseURL: '//localhost:9081/api/' // 本机开发使用
-    baseURL: '//52.80.133.197:9081/api/' // BioBank on AWS发布使用
+    baseURL: '//localhost:9081/api/' // 本机开发使用
+    // baseURL: '//52.80.133.197:9081/api/' // BioBank on AWS发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统

src/dashoo.cn/frontend_web/src/components/Headbar.vue

@@ -19,8 +19,14 @@
       <span class="headerseachclose" :class="{ headerclosehavetxt: sampcode != ''}" @click="headclearsearch()"></span>
       <ul class="list">
         <li class="item">
-          <a style="font-size: 90%" href="#" v-if="authUser">您好, {{department}}{{ authUser.Profile.Realname }}
-            <img v-if="authUser.Profile.Photo" :src="'http://'+authUser.Profile.Host+authUser.Profile.Photo" class="avatar">
+          <a style="font-size: 90%" href="#" v-if="authUser">
+            <span style="margin-right: 20px;">
+              <el-button type="text" icon="icon icon-shrink" v-if="fullscreen" @click="handleFullScreen"></el-button>
+              <el-button type="text" icon="icon icon-enlarge" v-if="!fullscreen" @click="handleFullScreen"></el-button>
+            </span>
+            您好, {{department}}{{ authUser.Profile.Realname }}
+            <img v-if="authUser.Profile.Photo" :src="'http://'+authUser.Profile.Host+authUser.Profile.Photo"
+              class="avatar">
             <img v-else class="avatar" src="~/assets/img/avatar.svg" :alt="authUser.name">
           </a>
           <ul class="list" style="text-align: center;">
@@ -53,12 +59,12 @@
     },
     data() {
       return {
+        fullscreen: false,
         sampcode: '',
         department: ''
       }
     },
-    created () {
-    },
+    created() {},
     methods: {
       show: function (ev) {
         let _this = this
@@ -122,7 +128,34 @@
       },
       headclearsearch() {
         this.sampcode = ''
-      }
+      },
+
+      handleFullScreen() {
+        let element = document.documentElement;
+        if (this.fullscreen) {
+          if (document.exitFullscreen) {
+            document.exitFullscreen();
+          } else if (document.webkitCancelFullScreen) {
+            document.webkitCancelFullScreen();
+          } else if (document.mozCancelFullScreen) {
+            document.mozCancelFullScreen();
+          } else if (document.msExitFullscreen) {
+            document.msExitFullscreen();
+          }
+        } else {
+          if (element.requestFullscreen) {
+            element.requestFullscreen();
+          } else if (element.webkitRequestFullScreen) {
+            element.webkitRequestFullScreen();
+          } else if (element.mozRequestFullScreen) {
+            element.mozRequestFullScreen();
+          } else if (element.msRequestFullscreen) {
+            // IE11
+            element.msRequestFullscreen();
+          }
+        }
+        this.fullscreen = !this.fullscreen;
+      },
     }
   })
   export default class Headbar extends Vue {

src/dashoo.cn/frontend_web/src/pages/biobank/sampleCK/_opera/operation.vue

@@ -2,9 +2,11 @@
   .input-with-select .el-select .el-input {
     width: 110px;
   }
+
   .input-with-select .el-input-group__append {
     background-color: #fff;
   }
+
 </style>
 
 <template>
@@ -22,7 +24,8 @@
         <span style="float: right;">
           <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" :disabled="save_flag"
             @click="saveApply">保存</el-button>
-          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
+          <el-button size="mini" type="primary" class="el-button--small" style="margin-left: 8px"
+            onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
 
@@ -51,8 +54,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="申请时间">
-                  <el-date-picker v-model="SampleCKform.EntryTime" type="datetime" style="width:100%" placeholder="请选择申请时间"
-                    :disabled="add_flag">
+                  <el-date-picker v-model="SampleCKform.EntryTime" type="datetime" style="width:100%"
+                    placeholder="请选择申请时间" :disabled="add_flag">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
@@ -66,13 +69,15 @@
               </el-col>
               <el-col :span="8" v-if="(save_flag) && (SampleCKform.ApplyStatus != 5)">
                 <el-form-item label="审核时间">
-                  <el-date-picker v-model="SampleCKform.ConTime" type="datetime" style="width:100%" placeholder="请选择审核时间">
+                  <el-date-picker v-model="SampleCKform.ConTime" type="datetime" style="width:100%"
+                    placeholder="请选择审核时间">
                   </el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="备注">
-                  <el-input v-model="SampleCKform.Remark" type="textarea" :rows=3 :disabled="add_flag" placeholder="请输入备注信息"></el-input>
+                  <el-input v-model="SampleCKform.Remark" type="textarea" :rows=3 :disabled="add_flag"
+                    placeholder="请输入备注信息"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24" v-if="(save_flag) && (SampleCKform.ApplyStatus != 5)">
@@ -104,15 +109,19 @@
               <!-- <el-table :data="ApplyList" border style="width: 100%" @selection-change="authorSelectionChange"> -->
               <!-- <el-table-column type="selection" width="35px"></el-table-column> -->
               <el-table :data="ApplyList" border style="width: 100%">
-                <el-table-column prop="BarCode" label="样本条码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="SampleCode" label="样本编码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="SampleTypeName" min-width="80" label="样本类型" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="BarCode" label="样本条码" min-width="120" align="center" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="SampleCode" label="样本编码" min-width="120" align="center" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="SampleTypeName" min-width="80" label="样本类型" align="center" show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column label="可用容量" min-width="80" show-overflow-tooltip align="center" header-align="center">
                   <template slot-scope="scope">
                     {{ scope.row.Capacity }} {{ scope.row.Unit }}
                   </template>
                 </el-table-column>
-                <el-table-column label="存储位置" min-width="120" show-overflow-tooltip align="center" header-align="center">
+                <el-table-column label="存储位置" min-width="120" show-overflow-tooltip align="center"
+                  header-align="center">
                   <template slot-scope="scope">
                     {{ scope.row.ECode + "-" + numtoupchar(scope.row.ShelfY) + scope.row.ShelfX + "-" +
                     numtoupchar(scope.row.BoxY) + scope.row.BoxX + "-" + postiontoupchar(scope.row.Position) }}
@@ -127,11 +136,14 @@
                     <el-tag v-show="scope.row.DetailStatus=='5'" type="danger">已撤销</el-tag>
                   </template>
                 </el-table-column>
-                <el-table-column prop="CHUserBy" min-width="80" label="操作人" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="CancelBy" min-width="80" label="撤销人" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="CHUserBy" min-width="80" label="操作人" align="center" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="CancelBy" min-width="80" label="撤销人" align="center" show-overflow-tooltip>
+                </el-table-column>
               </el-table>
-              <el-pagination @size-change="HandleSizeChange" @current-change="HandleCurrentChange" :current-page="CurrentPage"
-                :page-sizes="[10, 15, 20]" :page-size="Size" layout="total, sizes, prev, next, jumper" :total="CurrentItemCount">
+              <el-pagination @size-change="HandleSizeChange" @current-change="HandleCurrentChange"
+                :current-page="CurrentPage" :page-sizes="[10, 15, 20]" :page-size="Size"
+                layout="total, sizes, prev, next, jumper" :total="CurrentItemCount">
               </el-pagination>
             </el-card>
           </el-col>
@@ -150,14 +162,18 @@
                 <legend style="color:#436EEE"></legend>
                 <i class="icon icon-paragraph-justify">样本信息</i>
                 <span style="float: right;">
-                  <el-button type="primary" class="el-button--mini" @click="AddDetail" :disabled="!add_flag">样本出库</el-button>
+                  <el-button type="primary" class="el-button--mini" @click="AddDetail" :disabled="!add_flag">样本出库
+                  </el-button>
                 </span>
               </div>
               <el-table :data="SamplesList" border style="width: 100%" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="35px"></el-table-column>
-                <el-table-column prop="BarCode" label="样本条码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="SampleCode" label="样本编码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column prop="SampleTypeName" min-width="80" label="样本类型" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="BarCode" label="样本条码" min-width="120" align="center" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="SampleCode" label="样本编码" min-width="120" align="center" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="SampleTypeName" min-width="80" label="样本类型" align="center" show-overflow-tooltip>
+                </el-table-column>
                 <el-table-column label="可用容量" min-width="80" show-overflow-tooltip align="center" header-align="center">
                   <template slot-scope="scope">
                     {{ scope.row.Capacity }} {{ scope.row.Unit }}
@@ -170,16 +186,19 @@
                     </router-link>
                   </template>
                 </el-table-column> -->
-                <el-table-column label="存储位置" min-width="120" show-overflow-tooltip align="center" header-align="center">
+                <el-table-column label="存储位置" min-width="120" show-overflow-tooltip align="center"
+                  header-align="center">
                   <template slot-scope="scope">
                     {{ scope.row.ECode + "-" + numtoupchar(scope.row.ShelfY) + scope.row.ShelfX + "-" +
                     numtoupchar(scope.row.BoxY) + scope.row.BoxX + "-" + postiontoupchar(scope.row.Position) }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="CHUserBy" min-width="80" label="提交人" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="CHUserBy" min-width="80" label="提交人" align="center" show-overflow-tooltip>
+                </el-table-column>
               </el-table>
-              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-                :page-sizes="[10, 15, 20]" :page-size="size" layout="total, sizes, prev, next, jumper" :total="currentItemCount">
+              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                :current-page="currentPage" :page-sizes="[10, 15, 20]" :page-size="size"
+                layout="total, sizes, prev, next, jumper" :total="currentItemCount">
               </el-pagination>
             </el-card>
           </el-col>
@@ -242,7 +261,7 @@
     components: {},
     data() {
       return {
-        breadcrumb: '', //面包屑标题
+        pagetitle: '', //面包屑标题
         service_flag: '', //页面新增或编辑标志位
         CurrentItemCount: 0, // 当前页显示数量
         CurrentPage: 1, // 当前页
@@ -310,11 +329,11 @@
       let _this = this
       _this.ServiceId = _this.$route.params.opera //主单id
       if (_this.ServiceId && _this.ServiceId == 'addCK') {
-        _this.breadcrumb = '新增样本出库'
+        _this.pagetitle = '新增样本出库'
         _this.service_flag = 'addCK'
         _this.getEntryNo()
       } else if (_this.ServiceId != '0') {
-        _this.breadcrumb = '编辑样本出库'
+        _this.pagetitle = '编辑样本出库'
         _this.service_flag = 'editCK'
         _this.save_flag = true
         _this.getApplyInfo()

src/dashoo.cn/frontend_web/src/pages/biobank/source/_opera/operation.vue

@@ -63,7 +63,7 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="出生日期" prop="Birthday">
-                    <el-date-picker v-model="samplesForm.Birthday" @change="getAge" type="date" style="width:100%"
+                    <el-date-picker v-model="samplesForm.Birthday" type="date" @change="getAge()" style="width:100%"
                       placeholder="选择日期"></el-date-picker>
                   </el-form-item>
                 </el-col>
@@ -73,7 +73,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item :label="(acc==='srNA2')?'样本条码':'内部编码'" prop="InnerNo">
+                  <el-form-item :label="(acc==='srNA2')?'样本条码':'来源编码'" prop="InnerNo">
                     <el-input v-model="samplesForm.InnerNo" placeholder="请输入内部编码"></el-input>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/biobank/source/_opera/operationb.vue

@@ -46,7 +46,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="内部编号" prop="InnerNo">
+              <el-form-item label="来源编码" prop="InnerNo">
                 <el-input v-model="samplesForm.InnerNo" placeholder="请输入内部编号"></el-input>
               </el-form-item>
             </el-col>
@@ -226,7 +226,7 @@
             } else {
               _this.$message({
                 type: 'warning',
-                message: '内部编码重复！'
+                message: '来源编码重复！'
               })
             }
           })

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

@@ -18,8 +18,8 @@
           <el-form-item label="样本名称">
             <el-input size="mini" style="width: 165px;" v-model="searchform.Name" placeholder="请输入样本名称"></el-input>
           </el-form-item>
-          <el-form-item label="内部编码">
-            <el-input size="mini" style="width: 165px;" v-model="searchform.InnerNo" placeholder="请输入内部编码"></el-input>
+          <el-form-item label="来源编码">
+            <el-input size="mini" style="width: 165px;" v-model="searchform.InnerNo" placeholder="请输入来源编码"></el-input>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="seachdata" @command="searchCommand">
@@ -72,8 +72,8 @@
       <el-form ref="advancedSearchForm" label-width="90px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="内部编码">
-              <el-input size="mini" v-model="searchform.InnerNo" style="width:100%" placeholder="请输入内部编码"></el-input>
+            <el-form-item label="来源编码">
+              <el-input size="mini" v-model="searchform.InnerNo" style="width:100%" placeholder="请输入来源编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">

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

@@ -20,8 +20,8 @@
           <el-form-item label="姓名">
             <el-input size="mini" v-model="searchform.name" style="width:100%" placeholder="请输入姓名"></el-input>
           </el-form-item>
-          <el-form-item label="内部编码">
-            <el-input size="mini" style="width: 165px;" v-model="searchform.innerno" placeholder="请输入内部编码"></el-input>
+          <el-form-item label="来源编码">
+            <el-input size="mini" style="width: 165px;" v-model="searchform.innerno" placeholder="请输入来源编码"></el-input>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="seachdata" @command="searchCommand">
@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column prop="Name" sortable min-width="80" label="姓名" align="center" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column prop="InnerNo" sortable align="center" :label="(acc==='srNA2')?'样本条码':'内部编码'" min-width="100"
+        <el-table-column prop="InnerNo" sortable align="center" :label="(acc==='srNA2')?'样本条码':'来源编码'" min-width="100"
           show-overflow-tooltip></el-table-column>
         <el-table-column prop="Sex" sortable align="center" label="性别" min-width="60" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -84,7 +84,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="(acc==='srNA2')?'样本条码':'内部编码'">
+            <el-form-item :label="(acc==='srNA2')?'样本条码':'来源编码'">
               <el-input size="mini" v-model="searchform.innerno" style="width:100%"
                 :placeholder="(acc==='srNA2')?'请输入样本条码':'请输入内部编码'"></el-input>
             </el-form-item>

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

@@ -18,8 +18,8 @@
           <el-form-item label="样本名称">
             <el-input size="mini" v-model="searchform.name" style="width:100%" placeholder="请输入样本名称"></el-input>
           </el-form-item>
-          <el-form-item label="内部编码">
-            <el-input size="mini" style="width: 165px;" v-model="searchform.innerno" placeholder="请输入内部编码"></el-input>
+          <el-form-item label="来源编码">
+            <el-input size="mini" style="width: 165px;" v-model="searchform.innerno" placeholder="请输入来源编码"></el-input>
           </el-form-item>
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="seachdata" @command="searchCommand">

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

@@ -1018,7 +1018,7 @@
               })
               return
             } else {
-              _this.updataDonorsInfo()
+              _this.makesureDonors()
             }
           } else {
             return false
@@ -1026,22 +1026,22 @@
         })
       },
       //查询人员表ID是否重复 重复则修改
-      updataDonorsInfo() {
+      makesureDonors() {
         let _this = this
         this.$axios.get("samplesubpackage/getIdlist?SourceId=" + _this.sourceform.SourceId, {})
           .then(function (response) {
             _this.total = response.data.items
             if (_this.total === 0) {
-              _this.savedataDonorstbName()
+              _this.saveSampleSourceInfo()
             } else {
-              _this.updataDonorsInfoTwo()
+              _this.editSampleSourceInfo()
             }
           })
       },
       //添加人员信息
-      savedataDonorstbName() {
+      saveSampleSourceInfo() {
         let _this = this
-        _this.$axios.post('/donors/subpackageDonorstbName', _this.sourceform)
+        _this.$axios.post('/samplessource/savebasic', _this.sourceform)
           .then(res => {
             if (res.data.code === 0) {
               _this.sourceform.SourceId = res.data.item
@@ -1059,9 +1059,9 @@
           })
       },
       //修改样本来源表
-      updataDonorsInfoTwo() {
+      editSampleSourceInfo() {
         let _this = this
-        _this.$axios.put('/donors/donorsInfoedit/' + _this.sourceform.SourceId, _this.sourceform)
+        _this.$axios.put('/samplessource/editbasic/' + _this.sourceform.SourceId, _this.sourceform)
           .then(res => {
             if (res.data.code === 0) {
               _this.savedata()