设备台账

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

@@ -171,12 +171,12 @@ func (this *LimsCustomerpositionController) CustomerpositionTree() {
 
 	organizeSvc := organize.GetOrganizeService(utils.DBE)
 	thrunitId := organizeSvc.GetMyThrUnitDepartmentId(this.User.DepartmentId)
-	if thrunitId == this.User.DepartmentId {
+	if thrunitId != strconv.Itoa(this.User.UintThirdId) {
 		Uidstring := strconv.Itoa(this.User.UnitId)
 		listorganize = organizeSvc.GetAllThirdChildByTopId(Uidstring,this.User.Id)
 	} else {
-		where = where + " and Id = '" + thrunitId + "'"
-		svc.GetEntitysByOrderbyWhere("Base_Organize", where, "SortCode, Id asc", &listorganize)
+		whereOrg := " 1=1 and Id = '" + thrunitId + "'"
+		svc.GetEntitysByOrderbyWhere("Base_Organize", whereOrg, "SortCode, Id asc", &listorganize)
 	}
 
 	for _, value := range listorganize {

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

@@ -162,7 +162,7 @@ module.exports = {
 	  baseURL: '//localhost:10091/api/'
   },
   ignore: [
-      'pages/lims/report*/**/*.*',
+     // 'pages/lims/report*/**/*.*',
      'pages/lims/createreport/**/*.*',
      // 'pages/lims/dataentry/**/*.*',
      'pages/lims/deliver/**/*.*',

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

@@ -885,7 +885,6 @@ export default {
     },
 
     handlePositionChange (value) {
-      console.log(value)
       this.ThridUnit = value[0]
       this.formData.PositionCheckId = value[1]
       this.formData.PositionID = value[2]

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

@@ -593,8 +593,8 @@
       },
 
       handlePositionChange (value) {
-        this.formData.PositionCheckId = value[0]
-        this.formData.PositionID = value[1]
+        this.formData.PositionCheckId = value[value.length - 2]
+        this.formData.PositionID = value[value.length - 1]
       },
       ShowEntityDialog (entityId) {
         this.initEntity(entityId)

src/dashoo.cn/frontend_web/src/pages/lims/principal/subdata/customerposition.vue

@@ -23,12 +23,12 @@
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-tree style="height: 570px; overflow: auto;" draggable highlight-current :expand-on-click-node="true" node-key="id" :data="customerTreeList" :props="orgtreeprops"
+          <el-tree style="height: calc(100vh - 240px); overflow: auto;" draggable highlight-current :expand-on-click-node="true" node-key="id" :data="customerTreeList" :props="orgtreeprops"
                    :default-expanded-keys="defaultSelect" @node-click="orgtreeNodeClick" ref="orgmanagetree">
           </el-tree>
         </el-col>
         <el-col :span="18">
-          <el-table :data="entityList" border style="height: 570px; overflow: auto;" size="small">
+          <el-table :data="entityList" border style="height: calc(100vh - 240px); overflow: auto;" size="small">
             <el-table-column label="操作" width="150" align="center" fixed>
               <template slot-scope="scope" v-if="scope.row.Parentid !== 0">
                 <el-button  type="primary" plain size="mini" @click="editEntity(scope.row)"