From e5f4aaff35e005c4f3d699e042134e1199b4b3a3 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 21 Sep 2023 21:48:16 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E5=AF=BC=E5=85=A5/=E6=95=85=E9=9A=9C=E5=88=86=E7=B1=BB;rev:?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=86=E7=B1=BB=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ClassstandardService.java | 1 + .../impl/ClassstandardServiceImpl.java | 27 ++++ .../em/rest/DevicefaultclassController.java | 11 +- .../em/service/DevicefaultclassService.java | 9 ++ .../impl/DevicefaultclassServiceImpl.java | 60 ++++++++- .../ClassstandardController.java | 11 +- .../api/wms/basedata/master/classstandard.js | 10 +- .../deviceFile/equipmentfile/AddDialog.vue | 38 ++++-- .../deviceFile/equipmentfile/ViewDialog.vue | 8 +- .../device_manage/repair/devicevprs/index.vue | 14 +- .../em/devicefaultclass/UploadDialog.vue | 121 ++++++++++++++++++ .../em/devicefaultclass/devicefaultclass.js | 9 +- .../em/devicefaultclass/index.vue | 44 +++++-- .../em/devicelubricateitems/index.vue | 18 +-- .../em/devicemaintain/index.vue | 18 +-- .../em/devicerepairitems/index.vue | 15 +-- .../em/devicesportcheckitems/index.vue | 19 ++- 17 files changed, 358 insertions(+), 75 deletions(-) create mode 100644 mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/UploadDialog.vue diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/ClassstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/ClassstandardService.java index eb701c89..b1df8089 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/ClassstandardService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/ClassstandardService.java @@ -75,6 +75,7 @@ public interface ClassstandardService { JSONObject loadClass(Map whereJson); JSONArray getSuperior(JSONObject jo, JSONArray ja); + JSONArray getSuperiorLimit(JSONObject jo, JSONArray ja,String parent_id); JSONObject buildTree(JSONArray ja); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/ClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/ClassstandardServiceImpl.java index dc2531c8..02bc7dbc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/ClassstandardServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/bfmaster/service/impl/ClassstandardServiceImpl.java @@ -255,6 +255,33 @@ public class ClassstandardServiceImpl implements ClassstandardService { return getSuperior(id_row, ja); } + + @Override + public JSONArray getSuperiorLimit(JSONObject jo, JSONArray ja, String parent_id) { + WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard"); + if (StrUtil.isEmpty(jo.getString("parent_class_id")) || jo.getString("parent_class_id").equals("0")) { + JSONArray null_pids = new JSONArray(); + null_pids = wo.query("(parent_class_id = '0' OR parent_class_id is null) and is_delete = '0'").getResultJSONArray(0); + + for (int m = 0; m < null_pids.size(); m++) { + JSONObject null_pid = null_pids.getJSONObject(m); + ja.add(null_pid); + } + return ja; + } + JSONArray pid_rows = wo.query("parent_class_id = '" + jo.getString("parent_class_id") + "'").getResultJSONArray(0); + for (int n = 0; n < pid_rows.size(); n++) { + JSONObject pid_row = pid_rows.getJSONObject(n); + ja.add(pid_row); + } + JSONObject id_row = wo.query("class_id = '" + jo.getString("parent_class_id") + "'").uniqueResult(0); + if (id_row.getString("class_id").equals(parent_id)){ + ja.add(id_row); + return ja; + } + return getSuperiorLimit(id_row, ja,parent_id); + } + @Override public JSONObject buildTree(JSONArray ja) { Set trees = new LinkedHashSet<>(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java index 79ba8905..f4a1d271 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/rest/DevicefaultclassController.java @@ -12,7 +12,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.Map; /** @@ -50,12 +52,17 @@ public class DevicefaultclassController { devicefaultclassService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("删除设备故障分类维护") - //@PreAuthorize("@el.check('devicefaultclass:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { devicefaultclassService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } + + @PostMapping("/excelImport") + @ApiOperation("故障分类导入") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { + devicefaultclassService.excelImport(file,request); + return new ResponseEntity<>(HttpStatus.CREATED); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java index 98d45e59..1a0ec975 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/DevicefaultclassService.java @@ -4,7 +4,9 @@ package org.nl.wms.masterdata_manage.em.service; import com.alibaba.fastjson.JSONObject; import org.nl.wms.masterdata_manage.em.service.dto.DevicefaultclassDto; import org.springframework.data.domain.Pageable; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; @@ -69,4 +71,11 @@ public interface DevicefaultclassService { * @param ids / */ void deleteAll(Long[] ids); + + /** + * 导入 + * @param file + * @param request + */ + void excelImport(MultipartFile file, HttpServletRequest request); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java index 39983615..c36ea01a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/em/service/impl/DevicefaultclassServiceImpl.java @@ -7,11 +7,14 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.poi.excel.ExcelReader; +import cn.hutool.poi.excel.ExcelUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; @@ -19,13 +22,19 @@ import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.masterdata_manage.em.service.DevicefaultclassService; import org.nl.wms.masterdata_manage.em.service.dto.DevicefaultclassDto; import org.nl.wms.masterdata_manage.bfmaster.service.ClassstandardService; +import org.nl.wms.system_manage.service.tableData.ColumnInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @author Liuxy @@ -33,10 +42,13 @@ import java.util.Map; * @date 2022-06-16 **/ @Service -@RequiredArgsConstructor @Slf4j public class DevicefaultclassServiceImpl implements DevicefaultclassService { - private final ClassstandardService classstandardService; + + @Autowired + private ClassstandardService classstandardService; + @Autowired + private ColumnInfoService columnInfoService; @Override public Map queryAll(Map whereJson, Pageable page) { @@ -148,4 +160,48 @@ public class DevicefaultclassServiceImpl implements DevicefaultclassService { } } + @Override + public void excelImport(MultipartFile file, HttpServletRequest request) { + try { + // 调用用 hutool 方法读取数据 调用第一个sheet白班数据 + ExcelReader excelReader = ExcelUtil.getReader(file.getInputStream(), 0); + // 从第1行开始获取数据 excelReader.read的结果是一个2纬的list，外层是行，内层是行对应的所有列 + Map tableColumn = columnInfoService.TableColumn2("em_bi_devicefaultclass"); + List> read = excelReader.read(0, excelReader.getRowCount()); + Map IndexValue = new HashMap<>(); + for (int i = 0; i < read.get(0).size(); i++) { + String label = String.valueOf(read.get(0).get(i));String value = tableColumn.get(label); + if (value!=null){ IndexValue.put(i,value); } + } + String currentUserId = SecurityUtils.getCurrentUserId(); + String currentUsername = SecurityUtils.getCurrentUsername(); + String now = DateUtil.now(); + JSONArray array = new JSONArray(); + List ids = new ArrayList<>(); + for (int i = 1; i < read.size(); i++) { + List list = read.get(i); + JSONObject item = new JSONObject(); + for (int i1 = 0; i1 < list.size(); i1++) { + String s = IndexValue.get(i1); + if (s!=null){ + item.put(s,list.get(i1)); + + } + } + item.put("create_id",currentUserId); + item.put("create_name",currentUsername); + item.put("create_time",now); + array.add(item); + ids.add(item.getString("device_faultclass_id")); + } + System.out.println(array.size()); + WQLObject mstTab = WQLObject.getWQLObject("em_bi_devicefaultclass"); // 工艺路线主表 + mstTab.delete("device_faultclass_id in "+"('" + ids.stream().collect(Collectors.joining("','")) + "')"); + for (Object o : array) { + mstTab.insert((JSONObject)o); + } + }catch (Exception ex){ + throw new BadRequestException(ex.getMessage()); + } + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java index eb4a09e7..662809d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java @@ -116,12 +116,21 @@ public class ClassstandardController { //("查询类别:根据ID获取同级与上级数据") @PostMapping("/superior") //@PreAuthorize("@el.check('user:list','dept:list')") - public ResponseEntity getSuperior(@RequestBody Long id) { + public ResponseEntity getSuperior(@RequestBody String id) { JSONObject jo = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + id + "'").uniqueResult(0); JSONArray maters = ClassstandardService.getSuperior(jo, new JSONArray()); return new ResponseEntity<>(ClassstandardService.buildTree(maters), HttpStatus.OK); } + @PostMapping("/superior2") + public ResponseEntity getSuperior2(@RequestBody String param) { + JSONArray arr = JSONArray.parseArray(param); + JSONObject parse = arr.getJSONObject(0); + JSONObject jo = WQLObject.getWQLObject("MD_PB_ClassStandard").query("class_id = '" + parse.getString("id") + "'").uniqueResult(0); + JSONArray maters = ClassstandardService.getSuperiorLimit(jo, new JSONArray(),parse.getString("parent_id")); + return new ResponseEntity<>(ClassstandardService.buildTree(maters), HttpStatus.OK); + } + @GetMapping("/getType") @Log("获取分类类型") //("获取分类类型") diff --git a/mes/qd/src/api/wms/basedata/master/classstandard.js b/mes/qd/src/api/wms/basedata/master/classstandard.js index 83db3529..ae71a32f 100644 --- a/mes/qd/src/api/wms/basedata/master/classstandard.js +++ b/mes/qd/src/api/wms/basedata/master/classstandard.js @@ -40,6 +40,14 @@ export function getClassSuperior(ids) { data }) } +export function getClassSuperior2(ids) { + const data = ids.length || ids.length === 0 ? ids : Array.of(ids) + return request({ + url: 'api/Classstandard/superior2', + method: 'post', + data + }) +} export function getClassType(params) { return request({ @@ -87,4 +95,4 @@ export function excelImport(data) { }) } -export default { add, edit, del, getClass, getClassSuperior, getClassType, getClassTable, getType, queryClassById, getClassName, excelImport } +export default { add, edit, del, getClass, getClassSuperior,getClassSuperior2, getClassType, getClassTable, getType, queryClassById, getClassName, excelImport } 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 2a2c5756..dd549360 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 @@ -83,7 +83,6 @@ style="width: 210px" :clearable="false" placeholder="设备类别" - @select="typeChange" /> @@ -359,18 +358,41 @@ export default { this.$emit('AddChanged') }, [CRUD.HOOK.afterToCU](crud, form) { + const data = {} + data.id = form.material_type_id + data.parent_id = '2' + this.getSubTypes(data) + if (!form.devicerecord_code) { this.getDepts() + // const param = { + // 'materOpt_code': '23' + // } + // crudMaterialbase.getMaterOptType(param).then(res => { + // this.class_idStr = res.class_idStr + // this.queryClassId() + // }) - const param = { - 'materOpt_code': '23' - } - crudMaterialbase.getMaterOptType(param).then(res => { - this.class_idStr = res.class_idStr - this.queryClassId() - }) } }, + getSubTypes(id) { + console.log(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': '2' diff --git a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue index 84573f7b..0f3feaf5 100644 --- a/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue +++ b/mes/qd/src/views/wms/device_manage/deviceFile/equipmentfile/ViewDialog.vue @@ -51,11 +51,11 @@ - + - + @@ -267,7 +267,9 @@ export default { this.$emit('update:dialogShow', false) this.form = {} this.$emit('AddChanged') - } + }, + open() { + }, } } diff --git a/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue b/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue index b334eb17..c62afac2 100644 --- a/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue +++ b/mes/qd/src/views/wms/device_manage/repair/devicevprs/index.vue @@ -98,12 +98,12 @@ - + - + @@ -113,14 +113,14 @@ - + - + - + @@ -149,7 +149,7 @@ - + @@ -157,7 +157,7 @@ - + diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/UploadDialog.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/UploadDialog.vue new file mode 100644 index 00000000..0a51df2a --- /dev/null +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/UploadDialog.vue @@ -0,0 +1,121 @@ + + + + diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass.js b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass.js index ff92cc7e..713409d5 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass.js +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/devicefaultclass.js @@ -23,5 +23,12 @@ export function edit(data) { data }) } +export function excelImport(data) { + return request({ + url: 'api/devicefaultclass/excelImport', + method: 'post', + data + }) +} -export default { add, edit, del } +export default { add, edit, del, excelImport } diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue index a1aa510d..541fe602 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicefaultclass/index.vue @@ -34,17 +34,28 @@ - + + + 导入 + + - + - + @@ -52,7 +63,7 @@ - + - + @@ -75,7 +86,7 @@ - + @@ -108,6 +119,7 @@ + @@ -122,12 +134,14 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard' import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudMaterialbase from '@/api/wms/basedata/master/materialbase' -// import crudDevicebom from '@/api/wms/basedata/em/devicebom' +import UploadDialog from '@/views/wms/masterdata_manage/em/devicefaultclass/UploadDialog' +import {getClassSuperior, queryClassById} from "../../../../../api/wms/basedata/master/classstandard"; + const defaultForm = { device_faultclass_id: null, device_faultclass_code: null, device_faultclass_name: null, material_type_id: null, solutions: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null } export default { name: 'Devicefaultclass', - components: { pagination, crudOperation, rrOperation, udOperation, Treeselect }, + components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -146,6 +160,7 @@ export default { }, data() { return { + uploadShow: false, classes: [], class_idStr: null, materOpt_code: '23', @@ -178,9 +193,9 @@ export default { const data = { 'materOpt_code': this.materOpt_code_2 } - crudDevicebom.getBjId(data).then(res => { - this.classBj_id = res.class_idStr - }) + // crudDevicebom.getBjId(data).then(res => { + // this.classBj_id = res.class_idStr + // }) }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 @@ -194,10 +209,13 @@ export default { } else { const data = {} data.id = form.material_type_id - data.goal_id = this.classBj_id + data.parent_id = "2" this.getSubTypes(data) } }, + tableChanged3() { + this.crud.toQuery() + }, loadClass({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { crudClassstandard.getClass({ pid: parentNode.id }).then(res => { @@ -227,9 +245,7 @@ export default { }) }, getSubTypes(id) { - crudClassstandard.getClassSuperior2(id).then(res => { - const date = res.content this.buildClass(date) this.classes = date diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue index d8a0c04c..af580357 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicelubricateitems/index.vue @@ -65,12 +65,12 @@ - + - + @@ -78,7 +78,7 @@ - + - + @@ -97,7 +97,7 @@ - + - + @@ -119,7 +119,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -256,7 +256,7 @@ export default { } else { const data = {} data.id = form.material_type_id - data.goal_id = this.classBj_id + data.parent_id = '2' this.getSubTypes(data) } }, diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue index 935d3223..602817a1 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicemaintain/index.vue @@ -65,12 +65,12 @@ - + - + @@ -78,7 +78,7 @@ - + - + @@ -97,7 +97,7 @@ - + - + @@ -119,7 +119,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -256,7 +256,7 @@ export default { } else { const data = {} data.id = form.material_type_id - data.goal_id = this.classBj_id + data.parent_id = '2' this.getSubTypes(data) } }, diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue index 312a88aa..49377fb3 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicerepairitems/index.vue @@ -47,12 +47,12 @@ - + - + @@ -60,7 +60,7 @@ - + - + @@ -82,7 +82,7 @@ - + @@ -193,7 +193,7 @@ export default { } else { const data = {} data.id = form.material_type_id - data.goal_id = this.classBj_id + data.parent_id = '2' this.getSubTypes(data) } }, @@ -226,9 +226,8 @@ export default { }) }, getSubTypes(id) { - + console.log(id) crudClassstandard.getClassSuperior2(id).then(res => { - const date = res.content this.buildClass(date) this.classes = date diff --git a/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue b/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue index 86dfdcba..75791bda 100644 --- a/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/em/devicesportcheckitems/index.vue @@ -65,12 +65,12 @@ - + - + @@ -78,7 +78,7 @@ - + - + @@ -97,7 +97,7 @@ - + - + @@ -119,7 +119,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -256,7 +256,7 @@ export default { } else { const data = {} data.id = form.material_type_id - data.goal_id = this.classBj_id + data.parent_id = '2' this.getSubTypes(data) } }, @@ -302,7 +302,6 @@ export default { }, getSubTypes(id) { crudClassstandard.getClassSuperior2(id).then(res => { - const date = res.content this.buildClass(date) this.classes = date