From a4f0e49a3cad2d90e44b823ed301b387509725de Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 5 Sep 2023 10:50:35 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E9=83=A8=E9=97=A8=E6=A0=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DevicerepairmstServiceImpl.java | 9 +- .../impl/DevicerepairrequestServiceImpl.java | 16 +-- .../impl/DevicemaintenancemstServiceImpl.java | 15 ++- .../DevicemaintenanceplanmstServiceImpl.java | 24 ++-- .../impl/EquipmentfileServiceImpl.java | 21 ++-- .../service/dept/ISysDeptService.java | 16 +++ .../service/dept/impl/SysDeptServiceImpl.java | 46 ++++++++ .../deviceFile/equipmentfile/AddDialog.vue | 110 +++++++----------- .../deviceFile/equipmentfile/index.vue | 36 +++--- .../repair/devicegridcheck/index.vue | 9 -- .../device_manage/repair/devicevprs/index.vue | 48 +++----- 11 files changed, 185 insertions(+), 165 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java index f7948eea..2666ecc0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairmstServiceImpl.java @@ -25,6 +25,7 @@ import org.nl.wms.device_manage.repair.service.dto.DevicerepairmstDto; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; +import org.nl.wms.system_manage.service.dept.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -48,6 +49,9 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { // private final StorattrService storattrService; // private final SparePartOutServiceImpl sparePartOutService; + @Autowired + private ISysDeptService deptService; + @Autowired private IStIvtBsrealstorattrService storattrService; // 仓库服务 @@ -1097,7 +1101,6 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { @Override public Map query5(Map whereJson, Pageable page) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); String device_code = MapUtil.getStr(whereJson, "device_code"); String repair_code = MapUtil.getStr(whereJson, "repair_code"); @@ -1128,8 +1131,8 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService { // 归属部门 String dept_id = MapUtil.getStr(whereJson, "dept_id"); if (!StrUtil.isEmpty(dept_id)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); } JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIR_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); return json; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java index 872699f6..3cae8afc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/repair/service/impl/DevicerepairrequestServiceImpl.java @@ -21,6 +21,7 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.device_manage.repair.service.DevicerepairrequestService; import org.nl.wms.device_manage.repair.service.dto.DevicerepairrequestDto; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; +import org.nl.wms.system_manage.service.dept.ISysDeptService; import org.nl.wms.system_manage.service.user.ISysUserService; import org.nl.wms.system_manage.service.user.dao.SysUser; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +47,9 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic @Autowired private ISysUserService iSysUserService; + @Autowired + private ISysDeptService deptService; + @Override public Map queryAll(Map whereJson, Pageable page) { String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); @@ -78,8 +82,6 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic @Override public Map query2(Map whereJson, Pageable page) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); - String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String device_code = MapUtil.getStr(whereJson, "device_code"); String request_code = MapUtil.getStr(whereJson, "request_code"); @@ -107,14 +109,14 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic // 归属部门 String dept_id = MapUtil.getStr(whereJson, "dept_id"); if (!StrUtil.isEmpty(dept_id)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); } // 归属部门 String use_groupid = MapUtil.getStr(whereJson, "use_groupid"); if (!StrUtil.isEmpty(use_groupid)) { -// String use_groupidIds = deptService.getChildIdStr(Long.parseLong(use_groupid)); -// map.put("use_groupid", use_groupidIds); + String use_groupidIds = deptService.getChildIdStr(Long.parseLong(use_groupid)); + map.put("use_groupid", use_groupidIds); } JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.create_time DESC"); return json; @@ -151,8 +153,6 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic @Override @Transactional(rollbackFor = Exception.class) public void create(DevicerepairrequestDto dto) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); - WQLObject fileTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); WQLObject userTab = WQLObject.getWQLObject("sys_user"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java index 710b6d6a..21e65fdd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenancemstServiceImpl.java @@ -20,6 +20,8 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.device_manage.upkeep.service.DevicemaintenancemstService; import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenancemstDto; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; +import org.nl.wms.system_manage.service.dept.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +42,9 @@ import java.util.Map; public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstService { private final ClassstandardService classstandardService; + @Autowired + private ISysDeptService deptService; + @Override public Map queryAll(Map whereJson, Pageable page) { String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); @@ -552,7 +557,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ @Override public Map query4(Map whereJson, Pageable page) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); String device_code = MapUtil.getStr(whereJson, "device_code"); @@ -582,8 +586,8 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ // 归属部门 String dept_id = MapUtil.getStr(whereJson, "dept_id"); if (!StrUtil.isEmpty(dept_id)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); } JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC"); return json; @@ -591,7 +595,6 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ @Override public Map query5(Map whereJson, Pageable page) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); String material_type_id = MapUtil.getStr(whereJson, "material_type_id"); String class_idStr = MapUtil.getStr(whereJson, "class_idStr"); String device_code = MapUtil.getStr(whereJson, "device_code"); @@ -623,8 +626,8 @@ public class DevicemaintenancemstServiceImpl implements DevicemaintenancemstServ // 归属部门 String dept_id = MapUtil.getStr(whereJson, "dept_id"); if (!StrUtil.isEmpty(dept_id)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); } JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCE_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time DESC"); return json; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java index c1e03921..3f83dacd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java @@ -20,6 +20,8 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.device_manage.upkeep.service.DevicemaintenanceplanmstService; import org.nl.wms.device_manage.upkeep.service.dto.DevicemaintenanceplanmstDto; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; +import org.nl.wms.system_manage.service.dept.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +41,9 @@ import java.util.Map; @Slf4j public class DevicemaintenanceplanmstServiceImpl implements DevicemaintenanceplanmstService { private final ClassstandardService classstandardService; -// private final DeptService deptService; + + @Autowired + private ISysDeptService deptService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -247,7 +251,6 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla @Override @Transactional(rollbackFor = Exception.class) public Map queryDevice(Map whereJson, Pageable page) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); String device_code = MapUtil.getStr(whereJson, "device_code"); // 查询设备档案 HashMap map = new HashMap<>(); @@ -256,14 +259,14 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla String dept_id = MapUtil.getStr(whereJson, "dept_id"); if (!StrUtil.isEmpty(dept_id)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); } String use_id = MapUtil.getStr(whereJson, "use_id"); if (!StrUtil.isEmpty(use_id)) { -// String useIds = deptService.getChildIdStr(Long.parseLong(use_id)); -// map.put("useIds", useIds); + String useIds = deptService.getChildIdStr(Long.parseLong(use_id)); + map.put("useIds", useIds); } JSONObject json = WQL.getWO("EM_BIDEVICEMAINTENANCEPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "file.update_time DESC"); @@ -272,7 +275,6 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla @Override public Map queryDevice2(Map whereJson, Pageable page) { -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); String device_code = MapUtil.getStr(whereJson, "device_code"); // 查询设备档案 HashMap map = new HashMap<>(); @@ -281,14 +283,14 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla String dept_id = MapUtil.getStr(whereJson, "dept_id"); if (!StrUtil.isEmpty(dept_id)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(dept_id)); + map.put("deptIds", deptIds); } String use_id = MapUtil.getStr(whereJson, "use_id"); if (!StrUtil.isEmpty(use_id)) { -// String useIds = deptService.getChildIdStr(Long.parseLong(use_id)); -// map.put("useIds", useIds); + String useIds = deptService.getChildIdStr(Long.parseLong(use_id)); + map.put("useIds", useIds); } // 如果班组为空 则默认当前用户部门 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java index 5ac5a250..dbbb4cb4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/EquipmentfileServiceImpl.java @@ -15,10 +15,11 @@ import org.nl.modules.common.utils.FileUtil; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.masterdata_manage.em.service.EquipmentfileService; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; +import org.nl.wms.system_manage.service.dept.ISysDeptService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,12 +32,15 @@ import java.util.*; @RequiredArgsConstructor @Slf4j public class EquipmentfileServiceImpl implements EquipmentfileService { + private final ClassstandardService classstandardService; + @Autowired + private ISysDeptService deptService; + @Override public Map queryAll(Map whereJson, Pageable page) { HashMap map = new HashMap<>(whereJson); -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); map.put("flag", "1"); String device_code = map.get("device_code"); if (StrUtil.isNotEmpty(device_code)) { @@ -53,8 +57,8 @@ public class EquipmentfileServiceImpl implements EquipmentfileService { } String use_deptid = map.get("use_deptid"); if (!StrUtil.isEmpty(use_deptid)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(use_deptid)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(use_deptid)); + map.put("deptIds", deptIds); } String begin_time = map.get("begin_time"); if (StrUtil.isNotEmpty(begin_time)) { @@ -71,7 +75,6 @@ public class EquipmentfileServiceImpl implements EquipmentfileService { @Override public JSONArray query(Map whereJson) { HashMap map = new HashMap<>(whereJson); -// DeptService deptService = SpringContextHolder.getBean(DeptService.class); map.put("flag", "11"); String device_code = map.get("device_code"); if (StrUtil.isNotEmpty(device_code)) { @@ -88,8 +91,8 @@ public class EquipmentfileServiceImpl implements EquipmentfileService { } String use_deptid = map.get("use_deptid"); if (!StrUtil.isEmpty(use_deptid)) { -// String deptIds = deptService.getChildIdStr(Long.parseLong(use_deptid)); -// map.put("deptIds", deptIds); + String deptIds = deptService.getChildIdStr(Long.parseLong(use_deptid)); + map.put("deptIds", deptIds); } String begin_time = map.get("begin_time"); if (StrUtil.isNotEmpty(begin_time)) { @@ -108,8 +111,6 @@ public class EquipmentfileServiceImpl implements EquipmentfileService { Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId()); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); -// JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); -// Long deptId = currentUser.getDeptId(); WQLObject mstTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 工艺路线主表 WQLObject EM_BI_DeviceLifeCycle = WQLObject.getWQLObject("EM_BI_DeviceLifeCycle"); // 工艺路线主表 @@ -149,8 +150,6 @@ public class EquipmentfileServiceImpl implements EquipmentfileService { Long currentUserId = Long.parseLong(SecurityUtils.getCurrentUserId()); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); -// JwtUserDto currentUser = (JwtUserDto) SecurityUtils.getCurrentUser(); -// Long deptId = currentUser.getDeptId(); WQLObject mstTab = WQLObject.getWQLObject("EM_BI_EquipmentFile"); // 工艺路线主表 String device_code = whereJson.getString("device_code"); String devicerecord_id = whereJson.getString("devicerecord_id"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java index 016fa8a6..69e7d5d4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/ISysDeptService.java @@ -67,4 +67,20 @@ public interface ISysDeptService extends IService { void createDept(SysDept dept); + /** + * 获取当前节点的所有子类节点集合数据 + * + * @param dept_id + * @return + */ + Set getChildIdSet(Long dept_id); + + /** + * 获取当前节点的所有子类节点集合串,用于拼接SQL（in） + * + * @param dept_id + * @return + */ + String getChildIdStr(Long dept_id); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java index ccd32556..809e81cc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/dept/impl/SysDeptServiceImpl.java @@ -1,6 +1,9 @@ package org.nl.wms.system_manage.service.dept.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.db.Db; +import cn.hutool.db.Entity; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,6 +13,7 @@ import org.nl.common.utils.CopyUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.system_manage.service.dept.ISysDeptService; import org.nl.wms.system_manage.service.dept.dao.SysDept; import org.nl.wms.system_manage.service.dept.dao.mapper.SysDeptMapper; @@ -22,6 +26,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.sql.DataSource; +import java.sql.SQLException; import java.util.*; import java.util.stream.Collectors; @@ -183,4 +189,44 @@ public class SysDeptServiceImpl extends ServiceImpl impl sysDeptMapper.updateSubCount(dept.getPid()); } } + + @Override + public Set getChildIdSet(Long pid) { + String sql = "select dept_id from (\n" + + " select t1.dept_id,\n" + + " if(find_in_set(pid, @pids) > 0, @pids := concat(@pids, ',', dept_id), 0) as ischild\n" + + " from (\n" + + " select dept_id,pid from sys_dept t where t.is_used = 1\n" + + " ) t1,\n" + + " (select @pids :=" + pid + ") t2\n" + + " ) t3 where ischild != 0"; + Set set = new HashSet<>(); + //添加本级 + set.add(pid); + + //添加子节点 + try { + List list = Db.use((DataSource) SpringContextHolder.getBean("dataSource")).query(sql); + list.forEach(item -> { + set.add(item.getLong("dept_id")); + }); + } catch (SQLException e) { + e.printStackTrace(); + } + return set; + } + + @Override + public String getChildIdStr(Long dept_id) { + Set set = this.getChildIdSet(dept_id); + StringBuilder sb = new StringBuilder(); + set.forEach(item -> { + sb.append(",'" + item + "'"); + }); + String str = sb.toString(); + if (StrUtil.isNotEmpty(str)) { + str = "(" + str.substring(1) + ")"; + } + return str; + } } diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue index defd38f1..0e96505c 100644 --- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue +++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/AddDialog.vue @@ -11,7 +11,7 @@ - + @@ -78,7 +78,7 @@ @select="typeChange" /> - + - - - - - + @@ -163,6 +155,7 @@ :options="depts" :load-options="loadDepts" style="width: 210px" + :normalizer="normalizer" placeholder="选择部门" /> @@ -260,7 +253,7 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import equipmentfile from '@/views/wms/device_manage/deviceFile/equipmentfile/equipmentfile' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' -// import { getDepts, getDeptSuperior } from '@/api/system/dept' +import crudDept from '@/views/system/dept/dept' // import crudDevicebom from '@/api/wms/basedata/em/devicebom' const defaultForm = { @@ -313,7 +306,7 @@ export default { default: false } }, - // dicts: ['device_type', 'is_produceuse', 'device_status', 'device_level'], + dicts: ['device_type', 'is_produceuse', 'device_status', 'device_level'], data() { return { dialogVisible: false, @@ -360,6 +353,14 @@ export default { crudWorkProcedure.downSelect().then(res => { this.workProcedureList = res }) + const param = { + 'materOpt_code': '23' + } + crudMaterialbase.getMaterOptType(param).then(res => { + this.class_idStr = res.class_idStr + this.queryClassId() + }) + this.deptTree() }, methods: { close() { @@ -395,23 +396,6 @@ export default { }) } }, - getSubTypes(id) { - crudClassstandard.getClassSuperior2(id).then(res => { - const date = res.content - this.buildClass(date) - this.classes = date - }) - }, - buildClass(classes) { - classes.forEach(data => { - if (data.children) { - this.buildClass(data.children) - } - if (data.hasChildren && !data.children) { - data.children = null - } - }) - }, queryClassId() { const param = { 'class_idStr': this.class_idStr @@ -440,56 +424,40 @@ export default { }) } }, - getSupDepts(deptId) { - var number = parseFloat(deptId) - getDeptSuperior(number).then(res => { - const date = res.content - this.buildDepts(date) - this.depts = date - }) - }, - buildDepts(depts) { - depts.forEach(data => { - if (data.children) { - this.buildDepts(data.children) - } - if (data.hasChildren && !data.children) { - data.children = null - } - }) - }, - // 获取弹窗内部门数据 + + // 获取部门 loadDepts({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { - getDepts({ enabled: true, pid: parentNode.id }).then(res => { + crudDept.getDeptvo({ is_used: true, pid: parentNode.dept_id }).then(res => { parentNode.children = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } + obj.children = null return obj }) setTimeout(() => { callback() - }, 200) + }, 100) }) } }, - getDepts() { - getDepts({ enabled: true }).then(res => { - this.depts = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } - return obj + deptTree() { + setTimeout(() => { + crudDept.getDeptTree().then(res => { + this.depts = res.content }) - }) + }, 100) + }, + normalizer(node) { + return { + id: node.dept_id, + label: node.name, + children: node.children + } }, typeChange(old) { - debugger - this.form.device_bom_id = '' + /*this.form.device_bom_id = '' equipmentfile.queryBomList({ material_type_id: old.class_id }).then(res => { this.bomlist = res - }) + })*/ }, [CRUD.HOOK.beforeSubmit]() { } diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue index c8cd1cef..652567fb 100644 --- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue +++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/index.vue @@ -16,6 +16,7 @@ v-model="query.use_deptid" :options="depts" :load-options="loadDepts" + :normalizer="normalizer" clearable style="width: 200px" placeholder="选择部门" @@ -287,6 +288,7 @@ import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' // import { getDepts } from '@/api/system/dept' +import crudDept, { getDeptTree } from '@/views/system/dept/dept' import crudClassstandard from '@/api/wms/basedata/master/classstandard' import crudMaterialbase from '@/api/wms/basedata/master/materialbase' import { download } from '@/api/data' @@ -346,7 +348,7 @@ export default { this.class_idStr = res.class_idStr this.queryClassId() }) - // this.getDepts() + this.deptTree() }, methods: { canUd(row) { @@ -394,32 +396,36 @@ export default { }) } }, - // 获取弹窗内部门数据 + + // 获取部门 loadDepts({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { - getDepts({ enabled: true, pid: parentNode.id }).then(res => { + crudDept.getDeptvo({ is_used: true, pid: parentNode.dept_id }).then(res => { parentNode.children = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } + obj.children = null return obj }) setTimeout(() => { callback() - }, 200) + }, 100) }) } }, - getDepts() { - getDepts({ enabled: true }).then(res => { - this.depts = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } - return obj + deptTree() { + setTimeout(() => { + crudDept.getDeptTree().then(res => { + this.depts = res.content }) - }) + }, 100) }, + normalizer(node) { + return { + id: node.dept_id, + label: node.name, + children: node.children + } + }, + mySelectionChange(rows) { this.buttonChange(rows) }, diff --git a/mes/qd/src/views/wms/device_manage/repair/devicegridcheck/index.vue b/mes/qd/src/views/wms/device_manage/repair/devicegridcheck/index.vue index 891b69c3..69da0443 100644 --- a/mes/qd/src/views/wms/device_manage/repair/devicegridcheck/index.vue +++ b/mes/qd/src/views/wms/device_manage/repair/devicegridcheck/index.vue @@ -20,15 +20,6 @@ placeholder="请选择" /> - - - - - - { + crudDept.getDeptvo({ is_used: true, pid: parentNode.dept_id }).then(res => { parentNode.children = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } + obj.children = null return obj }) setTimeout(() => { callback() - }, 200) + }, 100) }) } }, - getDepts() { - getDepts({ enabled: true }).then(res => { - this.depts = res.content.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } - return obj + deptTree() { + setTimeout(() => { + crudDept.getDeptTree().then(res => { + this.depts = res.content }) - }) + }, 100) }, - getSupDepts(deptId) { - debugger - var number = parseFloat(deptId) - getDeptSuperior(number).then(res => { - const date = res.content - this.buildDepts(date) - this.depts = date - }) + normalizer(node) { + return { + id: node.dept_id, + label: node.name, + children: node.children + } }, buildDepts(depts) { depts.forEach(data => {