创建人

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

@@ -1404,7 +1404,7 @@ func (this *SamplesSourceController) DaySaveXlsxExport(name string, title []stri
 	sheet.Cols[17].Width = 20
 }
 
-// @Title 下载导入模板
+// @Title 导入模板
 // @Description 下载导入模板
 // @Success	200	{object} controllers.Request
 // @router /exceltosave [put]

src/dashoo.cn/backend/api/controllers/samplesinfo/samplesubpackage.go

@@ -347,15 +347,15 @@ func (this *SampleSubpackageController) Subpackage() {
 					datadetail.BarCode = datamain.SampleCode + "01"
 				}
 				datamain.AccCode = this.User.AccCode
-				datamain.MCreateUserId = datadetail.CreateUserId
-				datamain.MCreateBy = datadetail.CreateBy
+				datamain.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				datamain.MCreateBy = this.User.Realname
 				datadetail.InitCapacity = datadetail.Capacity + UsedCapacity
 				datamain.ReceiveDate = time.Unix(dataother.ReceiveDateint/1000, 0)
 				_, err = svc.InsertSamplePre(this.User.AccCode+SamplesMaintbName, this.User.AccCode+SamplesDetailtbName, &datamain, &datadetail)
 			} else {
 				datamain.AccCode = this.User.AccCode
-				datamain.MCreateUserId = datadetail.CreateUserId
-				datamain.MCreateBy = datadetail.CreateBy
+				datamain.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				datamain.MCreateBy = this.User.Realname
 				datamain.ReceiveDate = time.Unix(dataother.ReceiveDateint/1000, 0)
 				_, err = svc.InsertEntityBytbl(this.User.AccCode+SamplesMaintbName, &datamain)
 			}
@@ -368,6 +368,8 @@ func (this *SampleSubpackageController) Subpackage() {
 					datadetailnew.BarCode = svc.AutoGetBarCodeAnimal(this.User.AccCode, datamainnew.SampleCode, timecode)
 					datadetailnew.SampleCode = datamain.SampleCode
 					datadetailnew.ParentBarCode = datadetail.BarCode
+					datadetailnew.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+					datadetailnew.CreateBy = this.User.Realname
 					_, err = svc.InsertEntityBytbl(this.User.AccCode+SamplesDetailtbName, &datadetailnew)
 					if groupid != "" {
 						var entity samplesgroup.GroupDetail
@@ -396,35 +398,6 @@ func (this *SampleSubpackageController) Subpackage() {
 				errinfo.Code = -1
 				errinfo.Message = "保存失败！" + err.Error()
 			}
-			//			saveandadd := dataother.Saveandadd
-			//			var Auto_Code_Struct AutoCodeStruct
-			//			if err == nil {
-			//				if saveandadd == "1" { //保存并新增新编码
-			//					n, _ := utils.StrTo(dataother.Code_lastnum).Int()
-			//					count := len(dataother.Code_lastnum)
-			//					Auto_Code_Struct.Num = strconv.FormatFloat(float64(n+1)*(1/math.Pow(10, float64(count))), 'f', count, 64)[2:]
-			//					Auto_Code_Struct.SampleCode = this.AutoBarCodeAdd() + "-" + timecode
-			//					errinfo.Code = 1
-			//					errinfo.Message = "保存成功"
-			//					errinfo.Item = Auto_Code_Struct
-			//				} else if saveandadd == "2" { //保存并添加分管
-			//					Auto_Code_Struct.Num = dataother.Code_lastnum + "-" + timecode
-			//					Auto_Code_Struct.SampleCode = datamain.SampleCode
-			//					errinfo.Code = 2
-			//					errinfo.Message = "保存成功"
-			//					errinfo.Item = Auto_Code_Struct
-			//				}
-			//			} else {
-			//				if saveandadd == "1" {
-			//					Auto_Code_Struct.SampleCode = "01"
-			//					errinfo.Code = -2
-			//					errinfo.Message = "保存失败！"
-			//					errinfo.Item = Auto_Code_Struct
-			//				} else {
-			//					errinfo.Code = -1
-			//					errinfo.Message = "保存失败！" + err.Error()
-			//				}
-			//			}
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
@@ -435,15 +408,15 @@ func (this *SampleSubpackageController) Subpackage() {
 				datadetail.BarCode = datamain.SampleCode + "01"
 			}
 			datamain.AccCode = this.User.AccCode
-			datamain.MCreateUserId = datadetail.CreateUserId
-			datamain.MCreateBy = datadetail.CreateBy
+			datamain.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			datamain.MCreateBy = this.User.Realname
 			datadetail.InitCapacity = datadetail.Capacity + UsedCapacity
 			datamain.ReceiveDate = time.Unix(dataother.ReceiveDateint/1000, 0)
 			_, err = svc.InsertSamplePre(this.User.AccCode+SamplesMaintbName, this.User.AccCode+SamplesDetailtbName, &datamain, &datadetail)
 		} else {
 			datamain.AccCode = this.User.AccCode
-			datamain.MCreateUserId = datadetail.CreateUserId
-			datamain.MCreateBy = datadetail.CreateBy
+			datamain.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			datamain.MCreateBy = this.User.Realname
 			datamain.ReceiveDate = time.Unix(dataother.ReceiveDateint/1000, 0)
 			_, err = svc.InsertEntityBytbl(this.User.AccCode+SamplesMaintbName, &datamain)
 		}
@@ -455,6 +428,8 @@ func (this *SampleSubpackageController) Subpackage() {
 				datadetailnew.InitCapacity, _ = utils.StrTo(utils.ToStr(subpackagecapacity)).Float32()
 				datadetailnew.BarCode = svc.AutoGetBarCodeAnimal(this.User.AccCode, datamainnew.SampleCode, timecode)
 				datadetailnew.ParentBarCode = datadetail.BarCode
+				datadetailnew.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+				datadetailnew.CreateBy = this.User.Realname
 				svc.InsertEntityBytbl(this.User.AccCode+SamplesDetailtbName, &datadetailnew)
 				if groupid != "" {
 					var entity samplesgroup.GroupDetail

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

@@ -123,12 +123,12 @@
           barcode: '',
           operator: '',
           sampletype: '',
-          sampleorgan: '',
+          // sampleorgan: '',
           samplecode: '',
           startdate: '',
           enddate: '',
           name: '',
-          samplingsite: ''
+          // samplingsite: ''
         },
         sampleyulurulist: [],
         organdialog: '',
@@ -217,18 +217,18 @@
         this.initData()
       },
       // 组织器官和取材部位的连接
-      choose(value) {
-        this.ssoption = []
-        for (var i = 0; i < this.model.organlist.length; i++) {
-          if (this.model.organlist[i].TNodeParent === value[value.length - 1]) {
-            this.ssoption.push({
-              label: this.model.organlist[i].Name,
-              value: this.model.organlist[i].Code
-            })
-          }
-        }
-        this.form.samplingsite = this.ssoption[0].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]) {
+      //       this.ssoption.push({
+      //         label: this.model.organlist[i].Name,
+      //         value: this.model.organlist[i].Code
+      //       })
+      //     }
+      //   }
+      //   this.form.samplingsite = this.ssoption[0].value
+      // },
       formatDateTime(date) {
         var y = date.getFullYear();
         var m = date.getMonth() + 1;

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

@@ -47,7 +47,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="8">
             <el-form-item label="组织器官">
               <el-input v-model="sampleinfo.SamplingOrganName" disabled></el-input>
@@ -57,7 +57,7 @@
             <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>