went

src/dashoo.cn/backend/api/business/limsbalance/limsbalanceService.go

@@ -490,6 +490,7 @@ func (this *LimsBalanceService) adddataentrydetail(entrustmainId, dataentryid, b
 			zuhq.Spec = item.Spec
 			zuhq.DeviceName = item.DeviceName
 			zuhq.DeviceId = item.DeviceId
+			zuhq.PositionCheckId = item.PositionCheckId
 			zuhq.VentVolume1 = "0"
 			zuhq.VentVolume2 = "0"
 			zuhq.VentVolume3 = "0"

src/dashoo.cn/backend/api/controllers/lims/devicestatistics.go

@@ -328,7 +328,11 @@ func (this *DeviceStatisticsController) GetAuthority() {
 
 	code := this.GetString("Code")
 	organizeSvc := organize.GetOrganizeService(utils.DBE)
-	dictList["unitId"] = organizeSvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	unitId := organizeSvc.GetMyUnitDepartmentId(this.User.DepartmentId)
+	dictList["unitId"] = unitId
+	if unitId == this.User.DepartmentId {
+		dictList["unitId"] = ""
+	}
 	svcPerm := permission.GetPermissionService(utils.DBE)
 	dictList["isauth"] = svcPerm.IsAuthorized(this.User.Id, code)
 

src/dashoo.cn/backend/api/controllers/lims/limsZuhq.go

@@ -45,7 +45,7 @@ func (this *LimsReportZuhqController) GetEntityList() {
 	OrderNo := this.GetString("OrderNo")
 	Position := this.GetString("Position")
 	CustNo := this.GetString("CustNo")
-	CheckDate := this.GetString("CheckDate")
+	//CheckDate := this.GetString("CheckDate")
 	Temperature := this.GetString("Temperature")
 	Spec := this.GetString("Spec")
 	Manufacturer := this.GetString("Manufacturer")
@@ -96,14 +96,14 @@ func (this *LimsReportZuhqController) GetEntityList() {
 	if Remark2 != "" {
 		where = where + " and Remark2 like '%" + Remark2 + "%'"
 	}
-	if CheckDate != "" {
-		dates := strings.Split(CheckDate, ",")
-		if len(dates) == 2 {
-			minDate := dates[0]
-			maxDate := dates[1]
-			where = where + " and CheckDate>='" + minDate + "' and CheckDate<='" + maxDate + "'"
-		}
-	}
+	//if CheckDate != "" {
+	//	dates := strings.Split(CheckDate, ",")
+	//	if len(dates) == 2 {
+	//		minDate := dates[0]
+	//		maxDate := dates[1]
+	//		where = where + " and CheckDate>='" + minDate + "' and CheckDate<='" + maxDate + "'"
+	//	}
+	//}
 
 	svc := Limsreportzuhq.GetLimsreportzuhqService(utils.DBE)
 	var list []Limsreportzuhq.LimsReportZuhq

src/dashoo.cn/backend/api/controllers/lims/testtype.go

@@ -159,8 +159,8 @@ func (this *TestTypeController) TestTypeTreeAll() {
 	var list []testtype.TestTemplateModel
 	svc := testtype.GetTestTypeService(utils.DBE)
 	where := " 1=1 "
-	list = svc.GetListWithTemplate(this.User.AccCode+TestPackageTypesName, this.User.AccCode+LimsDocTemplateName, where, "a.Id desc")
 	var datainfo DataInfo
+	list = svc.GetListWithTemplate(this.User.AccCode+TestPackageTypesName, this.User.AccCode+LimsDocTemplateName, where, "CONVERT(a.FullName USING gbk)")
 	datainfo.Items = list
 	this.Data["json"] = &datainfo
 	this.ServeJSON()

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

@@ -164,7 +164,7 @@ module.exports = {
   ignore: [
       'pages/lims/report*/**/*.*',
      'pages/lims/createreport/**/*.*',
-     'pages/lims/dataentry/**/*.*',
+     // 'pages/lims/dataentry/**/*.*',
      'pages/lims/deliver/**/*.*',
      'pages/lims/drillingdaily/**/*.*',
      'pages/lims/oiltestingdaily/**/*.*',

src/dashoo.cn/frontend_web/src/pages/lims/checkequipmentlist/index.vue

@@ -170,6 +170,7 @@
         </el-form-item>
         <el-form-item label="安装地点" :label-width="formLabelWidth" required>
           <el-cascader
+            filterable
             ref="cascaderPosition"
             v-model="PositionList" placeholder="请选择安装地点"
             :options="customerTreeList"

src/dashoo.cn/frontend_web/src/pages/lims/secondcenter/towLevelCenter.vue

@@ -158,7 +158,9 @@
         api.getAuthority(params, this.$axios).then(res => {
           console.log(res, 'res.data.items')
           this.Isauthority = res.data.items['isauth']
-          this.UnitCheckId = parseInt(res.data.items['unitId'])
+          if (res.data.items['unitId'] !== '') {
+            this.UnitCheckId = parseInt(res.data.items['unitId'])
+          }
           this.initData()
         })
       },

src/dashoo.cn/frontend_web/src/pages/lims/secondunitform/index.vue

@@ -61,15 +61,15 @@
         </el-row>
       </el-form>
 
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="检测地点及安装位置" name="1">
-          <customer-position :CustomerId="this.customerForm.Id" DivStyle="height: 700px" v-if="this.customerForm.Id"></customer-position>
-        </el-tab-pane>
+      <!--<el-tabs v-model="activeName">-->
+        <!--<el-tab-pane label="检测地点及安装位置" name="1">-->
+          <!--<customer-position :CustomerId="this.customerForm.Id" DivStyle="height: 700px" v-if="this.customerForm.Id"></customer-position>-->
+        <!--</el-tab-pane>-->
 
-        <el-tab-pane label="设备列表" name="2">
-          <check-equipment-list  v-if="this.customerForm.Id"></check-equipment-list>
-        </el-tab-pane>
-      </el-tabs>
+        <!--<el-tab-pane label="设备列表" name="2">-->
+          <!--<check-equipment-list  v-if="this.customerForm.Id"></check-equipment-list>-->
+        <!--</el-tab-pane>-->
+      <!--</el-tabs>-->
 
     </el-card>