add:新增质检基础模块
This commit is contained in:
@@ -1,6 +1,16 @@
|
|||||||
package org.nl.wms.quality_manage.controller.inspection;
|
package org.nl.wms.quality_manage.controller.inspection;
|
||||||
|
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.nl.common.anno.Log;
|
||||||
|
import org.nl.common.domain.query.PageQuery;
|
||||||
|
import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService;
|
||||||
|
import org.nl.wms.quality_manage.service.inspection.dto.ItemPointQuery;
|
||||||
|
import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
@@ -14,8 +24,17 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
* @since 2023-05-06
|
* @since 2023-05-06
|
||||||
*/
|
*/
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/qlTestInspectionitempoint")
|
@RequestMapping("/api/inspectionItemPoint")
|
||||||
public class QlTestInspectionitempointController {
|
public class QlTestInspectionitempointController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IQlTestInspectionitempointService inspectionitempointService;
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
@Log("查询检测项点")
|
||||||
|
@ApiOperation("查询检测项点")
|
||||||
|
public ResponseEntity<Object> query(ItemPointQuery query, PageQuery page) {
|
||||||
|
return new ResponseEntity<>(inspectionitempointService.pageQuery(query, page), HttpStatus.OK);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
package org.nl.wms.quality_manage.service.inspection;
|
package org.nl.wms.quality_manage.service.inspection;
|
||||||
|
|
||||||
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import org.nl.common.domain.query.PageQuery;
|
||||||
|
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
|
||||||
|
import org.nl.wms.quality_manage.service.inspection.dto.ItemPointQuery;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||||||
*/
|
*/
|
||||||
public interface IQlTestInspectionitempointService extends IService<QlTestInspectionitempoint> {
|
public interface IQlTestInspectionitempointService extends IService<QlTestInspectionitempoint> {
|
||||||
|
|
||||||
|
Object pageQuery(ItemPointQuery query, PageQuery page);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package org.nl.wms.quality_manage.service.inspection.dto;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
import org.nl.common.domain.query.BaseQuery;
|
||||||
|
import org.nl.common.domain.query.QParam;
|
||||||
|
import org.nl.common.enums.QueryTEnum;
|
||||||
|
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
|
||||||
|
import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @author ZZQ
|
||||||
|
* @Date 2023/5/4 19:49
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class ItemPointQuery extends BaseQuery<QlTestInspectionitempoint> {
|
||||||
|
|
||||||
|
|
||||||
|
private String inspection_item_type;
|
||||||
|
|
||||||
|
private String inspection_type;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,9 +1,15 @@
|
|||||||
package org.nl.wms.quality_manage.service.inspection.impl;
|
package org.nl.wms.quality_manage.service.inspection.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import org.nl.common.TableDataInfo;
|
||||||
|
import org.nl.common.domain.query.PageQuery;
|
||||||
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
|
import org.nl.wms.quality_manage.service.inspection.dao.QlTestInspectionitempoint;
|
||||||
import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionitempointMapper;
|
import org.nl.wms.quality_manage.service.inspection.dao.mapper.QlTestInspectionitempointMapper;
|
||||||
import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService;
|
import org.nl.wms.quality_manage.service.inspection.IQlTestInspectionitempointService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.nl.wms.quality_manage.service.inspection.dto.ItemPointQuery;
|
||||||
|
import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp;
|
||||||
|
import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -16,5 +22,11 @@ import org.springframework.stereotype.Service;
|
|||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class QlTestInspectionitempointServiceImpl extends ServiceImpl<QlTestInspectionitempointMapper, QlTestInspectionitempoint> implements IQlTestInspectionitempointService {
|
public class QlTestInspectionitempointServiceImpl extends ServiceImpl<QlTestInspectionitempointMapper, QlTestInspectionitempoint> implements IQlTestInspectionitempointService {
|
||||||
|
@Override
|
||||||
|
public Object pageQuery(ItemPointQuery query, PageQuery page) {
|
||||||
|
// 分页查询
|
||||||
|
Page<QlTestInspectionitempoint> pageQuery = this.page(page.build(), query.build());
|
||||||
|
TableDataInfo<QlTestInspectionitempoint> build = TableDataInfo.build(pageQuery);
|
||||||
|
return build;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
1
mes/qd/src/assets/icons/svg/4-2检测项.svg
Normal file
1
mes/qd/src/assets/icons/svg/4-2检测项.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687230228843" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5260" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M500.56 734.42c-127.93 0-232-104.07-232-231.99 0-127.93 104.07-232 232-232 127.92 0 231.99 104.07 231.99 232 0 127.92-104.07 231.99-231.99 231.99z m0-422.56c-105.08 0-190.57 85.49-190.57 190.57s85.49 190.56 190.57 190.56 190.56-85.48 190.56-190.56-85.48-190.57-190.56-190.57z" fill="#231815" p-id="5261"></path><path d="M761.51 782.01c-5.3 0-10.6-2.02-14.65-6.07l-92.09-92.08c-8.09-8.09-8.09-21.2 0-29.29s21.2-8.09 29.29 0l92.09 92.08c8.09 8.09 8.09 21.2 0 29.29a20.608 20.608 0 0 1-14.64 6.07zM512.3 581.87h-88.08c-11.44 0-20.72-9.28-20.72-20.72s9.28-20.72 20.72-20.72h88.08c11.44 0 20.72 9.28 20.72 20.72s-9.28 20.72-20.72 20.72zM576.9 464.42H424.22c-11.44 0-20.72-9.28-20.72-20.72s9.28-20.72 20.72-20.72H576.9c11.44 0 20.72 9.28 20.72 20.72-0.01 11.44-9.28 20.72-20.72 20.72z" fill="#231815" p-id="5262"></path><path d="M512 960C264.97 960 64 759.03 64 512S264.97 64 512 64s448 200.97 448 448c0 48.91-7.84 96.99-23.3 142.95a447.048 447.048 0 0 1-17.37 43.8c-7.15 15.59-25.6 22.42-41.21 15.27-15.6-7.16-22.44-25.61-15.27-41.21a382.748 382.748 0 0 0 14.94-37.68c13.31-39.55 20.06-80.98 20.06-123.13 0-212.76-173.09-385.85-385.85-385.85S126.15 299.24 126.15 512 299.24 897.85 512 897.85c51.27 0 101.04-9.88 147.93-29.37 5.93-2.46 11.78-5.07 17.56-7.81 15.52-7.32 34.04-0.76 41.4 14.74 7.36 15.51 0.76 34.04-14.74 41.4-6.71 3.19-13.49 6.2-20.37 9.06C629.3 948.52 571.5 960 512 960z" fill="#231815" p-id="5263"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.7 KiB |
1
mes/qd/src/assets/icons/svg/质检单.svg
Normal file
1
mes/qd/src/assets/icons/svg/质检单.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1687228576586" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2162" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M46.155345 920.711821v-815.32794c0-34.329598 27.144333-62.172498 60.475977-62.172498H766.478121c33.331644 0 60.475977 27.942696 60.475977 62.172498v283.61836h39.918137V105.383881c0-56.883345-45.007699-103.288179-100.394114-103.288179H106.631322C51.244908 2.095702 6.237209 48.500536 6.237209 105.383881v815.32794c0 56.98314 45.007699 103.288179 100.394113 103.288179h539.294026V982.984115H106.631322c-33.331644 0-60.475977-27.942696-60.475977-62.272294z" fill="#4D4D4D" p-id="2163"></path><path d="M130.88159 196.097846h445.685996v39.918137H130.88159zM130.88159 349.982263h564.043271v39.918137H130.88159zM130.88159 504.265861h232.922328v39.918137H130.88159zM752.207387 417.144528c-71.453465 0-138.715525 27.8429-189.211967 78.339343-50.496443 50.496443-78.339343 117.758503-78.339344 189.211968s27.8429 138.715525 78.339344 189.211967 117.758503 78.339343 189.211967 78.339343 138.715525-27.8429 189.211968-78.339343 78.339343-117.758503 78.339343-189.211967-27.8429-138.715525-78.339343-189.211968c-50.596238-50.496443-117.758503-78.339343-189.211968-78.339343z m0 495.28428c-125.54254 0-227.732969-102.19043-227.732969-227.732969S626.664847 457.062664 752.207387 457.062664s227.732969 102.19043 227.73297 227.73297-102.19043 227.633174-227.73297 227.633174z" fill="#4D4D4D" p-id="2164"></path><path d="M803.901374 752.35708c9.380762-4.2912 13.172985-11.476464 11.476464-21.755384-6.786083-26.445766-13.671962-46.404834-20.458045-60.076796-3.393042-8.482604-10.678102-11.476464-21.755384-8.981581-9.380762 3.393042-12.374622 9.779943-8.981581 19.160706 8.482604 22.952929 15.368483 43.011792 20.458045 60.076796 3.492837 10.27892 9.879739 14.170939 19.260501 11.576259z" fill="#4D4D4D" p-id="2165"></path><path d="M824.359419 545.381542l-10.179125-10.179125c-13.671962-11.077283-26.844947-9.779943-39.61875 3.792223-6.786083 7.684241-15.767664 17.863366-26.844947 30.63717-17.863366 19.559887-31.535328 34.130007-40.91609 43.410973 1.696521-5.089562 1.696521-10.678102 0-16.566026-2.594679-5.089562-6.386902-7.684241-11.476465-7.684242h-21.755384v-46.005652c-0.898158-9.380762-6.386902-14.470325-16.566027-15.368483-10.179125 0.898158-15.767664 5.98772-16.566026 15.368483V588.792515H614.789202c-9.380762 0.898158-14.470325 6.386902-15.368483 16.566027 0.798363 11.077283 5.98772 17.065003 15.368483 17.863366h22.952928c-6.786083 30.63717-19.559887 64.767177-38.321411 102.19043-5.089562 11.077283-3.393042 19.559887 5.089563 25.547607 10.179125 4.2912 18.761524 1.297339 25.547607-8.98158 2.594679-4.2912 5.98772-11.875646 10.179125-22.952929v98.398207c0.798363 9.380762 6.386902 14.071143 16.566027 14.071143 10.179125-0.898158 15.767664-5.98772 16.566026-15.368483V682.10116c5.089562 10.179125 11.077283 18.761524 17.863366 25.547607 6.786083 5.98772 13.572166 5.588539 20.458046-1.297339 6.786083 17.863366 12.773804 36.225709 17.863366 54.987233 4.2912 9.380762 11.476464 12.773804 21.755384 10.179125 9.380762-4.2912 12.773804-11.875646 10.179125-22.952929-5.98772-22.154566-13.671962-44.708313-22.952929-67.761037-2.594679-4.2912-6.786083-6.386902-12.773803-6.386902-6.786083-0.798363-11.975441 0.898158-15.368483 5.089563-1.696521-2.594679-4.2912-6.386902-7.684241-11.476464-4.2912-6.786083-7.28506-11.875646-8.981581-15.368483-7.684241-10.179125-14.470325-13.572166-20.458045-10.179125v-19.160705H696.621382c-5.98772 7.684241-5.089562 15.368483 2.594679 22.952928 8.482604 6.786083 16.566027 7.28506 24.250268 1.29734 0.798363 6.786083 5.488744 10.678102 14.071143 11.476464h126.540493c10.179125-0.798363 14.869506-7.185265 14.071143-19.160706 9.380762 7.684241 17.065003 8.083423 22.952929 1.29734 6.786083-11.875646 6.786083-21.755384 0-29.439626-18.761524-14.470325-44.309132-36.62489-76.742618-66.363902z m-79.237501 79.137706l35.826528-35.826528c5.089562-5.98772 8.083423-9.380762 8.98158-10.179125 5.089562-5.98772 11.077283-5.488744 17.863366 1.29734 14.470325 14.470325 31.535328 29.439626 51.095215 44.708313h-113.766689z" fill="#4D4D4D" p-id="2166"></path><path d="M888.228438 785.588929h-35.826528c12.773804-28.940649 25.148426-61.374135 37.024072-97.100867 3.393042-11.875646 0-20.458045-10.179125-25.547608-11.077283-3.393042-18.761524 0.399181-22.952929 11.476464-13.671962 45.20729-27.743105 82.231361-42.213429 111.172011H696.621382c-9.380762 0.898158-14.470325 6.386902-15.368483 16.566027 0.798363 11.077283 6.386902 17.065003 16.566027 17.863366H888.228438c9.380762-0.898158 14.470325-6.786083 15.368482-17.863366-0.798363-10.179125-5.98772-15.667869-15.368482-16.566027z" fill="#4D4D4D" p-id="2167"></path></svg>
|
||||||
|
After Width: | Height: | Size: 4.8 KiB |
@@ -101,9 +101,9 @@
|
|||||||
<el-form-item v-if="form.type.toString() !== '1' && form.type.toString() !== '2'" label="路由地址" prop="path">
|
<el-form-item v-if="form.type.toString() !== '1' && form.type.toString() !== '2'" label="路由地址" prop="path">
|
||||||
<el-input v-model="form.path" placeholder="路由地址" style="width: 190px;" />
|
<el-input v-model="form.path" placeholder="路由地址" style="width: 190px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="菜单排序" prop="menuSort">
|
<el-form-item label="菜单排序" prop="menu_sort">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
v-model.number="form.menuSort"
|
v-model.number="form.menu_sort"
|
||||||
:min="0"
|
:min="0"
|
||||||
:max="999"
|
:max="999"
|
||||||
controls-position="right"
|
controls-position="right"
|
||||||
@@ -160,9 +160,9 @@
|
|||||||
<svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
|
<svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="menuSort" align="center" label="排序" :min-width="flexWidth('menuSort',crud.data,'排序')">
|
<el-table-column prop="menu_sort" align="center" label="排序" :min-width="flexWidth('menu_sort',crud.data,'排序')">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.menuSort }}
|
{{ scope.row.menu_sort }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="permission" label="权限标识" :min-width="flexWidth('permission',crud.data,'权限标识')" />
|
<el-table-column prop="permission" label="权限标识" :min-width="flexWidth('permission',crud.data,'权限标识')" />
|
||||||
@@ -221,7 +221,7 @@ import Dict from '../../../components/Dict/Dict'
|
|||||||
const defaultForm = {
|
const defaultForm = {
|
||||||
menu_id: null,
|
menu_id: null,
|
||||||
title: null,
|
title: null,
|
||||||
menuSort: 999,
|
menu_sort: 999,
|
||||||
path: null,
|
path: null,
|
||||||
systemType: null,
|
systemType: null,
|
||||||
category: null,
|
category: null,
|
||||||
|
|||||||
@@ -0,0 +1,306 @@
|
|||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<!--工具栏-->
|
||||||
|
<div class="head-container">
|
||||||
|
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||||
|
<div v-if="crud.props.searchToggle">
|
||||||
|
<el-form
|
||||||
|
:inline="true"
|
||||||
|
class="demo-form-inline"
|
||||||
|
label-position="right"
|
||||||
|
label-width="80px"
|
||||||
|
label-suffix=":"
|
||||||
|
>
|
||||||
|
<el-form-item label="模糊搜索">
|
||||||
|
<el-input
|
||||||
|
v-model="query.blurry"
|
||||||
|
clearable
|
||||||
|
placeholder="项点编码、名称"
|
||||||
|
@keyup.enter.native="crud.toQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="项点类别">
|
||||||
|
<el-select
|
||||||
|
v-model="query.inspection_item_type"
|
||||||
|
clearable
|
||||||
|
size="mini"
|
||||||
|
placeholder="项点类别"
|
||||||
|
class="filter-item"
|
||||||
|
@change="hand"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QL_TEST_POINTTYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="检测方式">
|
||||||
|
<el-select
|
||||||
|
v-model="query.inspection_type"
|
||||||
|
clearable
|
||||||
|
filterable
|
||||||
|
size="mini"
|
||||||
|
placeholder="检测方式"
|
||||||
|
class="filter-item"
|
||||||
|
@change="hand"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QC_INSPECTION_TYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<rrOperation />
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<crudOperation :permission="permission" />
|
||||||
|
<!--表单组件-->
|
||||||
|
<el-dialog
|
||||||
|
:close-on-click-modal="false"
|
||||||
|
:before-close="crud.cancelCU"
|
||||||
|
:visible.sync="crud.status.cu > 0 || crud.status.view"
|
||||||
|
:title="crud.status.title"
|
||||||
|
width="800px"
|
||||||
|
>
|
||||||
|
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="项点编码" prop="inspection_item_code">
|
||||||
|
<el-input v-model.trim="form.inspection_item_code" style="width: 280px;" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="项点名称" prop="inspection_item_name">
|
||||||
|
<el-input v-model.trim="form.inspection_item_name" style="width: 280px;" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="项点类别" prop="inspection_item_type">
|
||||||
|
<el-select
|
||||||
|
v-model="form.inspection_item_type"
|
||||||
|
size="mini"
|
||||||
|
placeholder="项点类别"
|
||||||
|
class="filter-item"
|
||||||
|
style="width: 280px;"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QL_TEST_POINTTYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="检验方式" prop="inspection_type">
|
||||||
|
<el-radio-group v-model="form.inspection_type">
|
||||||
|
<el-radio v-for="item in dict.QC_INSPECTION_TYPE" :label="item.value">{{ item.label }}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="所属工序" prop="workprocedure_uuid">
|
||||||
|
<el-select
|
||||||
|
v-model="form.workprocedure_uuid"
|
||||||
|
filterable
|
||||||
|
clearable
|
||||||
|
placeholder="请选择"
|
||||||
|
style="width: 280px;"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in workProcedureList"
|
||||||
|
:key="item.workprocedure_id"
|
||||||
|
:label="item.workprocedure_name"
|
||||||
|
:value="item.workprocedure_id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="12">
|
||||||
|
<el-form-item label="物料" prop="material_name">
|
||||||
|
<el-input
|
||||||
|
v-model="form.material_name"
|
||||||
|
style="width: 280px;"
|
||||||
|
clearable
|
||||||
|
@focus="materShow=true"
|
||||||
|
@clear="form.material_uuid=''"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="false" label="物料" prop="material_uuid">
|
||||||
|
<el-input v-model.trim="form.material_uuid" style="width: 280px;" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="临界值备注显示" prop="is_limit_remark" label-width="auto">
|
||||||
|
<el-switch v-model="form.is_limit_remark" active-value="1" inactive-value="0" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="24">
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model.trim="form.remark" style="width: 380px;" rows="2" type="textarea" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||||
|
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
ref="table"
|
||||||
|
v-loading="crud.loading"
|
||||||
|
:data="crud.data"
|
||||||
|
size="mini"
|
||||||
|
style="width: 100%;"
|
||||||
|
@selection-change="crud.selectionChangeHandler"
|
||||||
|
>
|
||||||
|
<el-table-column type="selection" width="55" />
|
||||||
|
<el-table-column v-if="false" prop="inspection_item_id" label="项点标识" />
|
||||||
|
<el-table-column v-if="false" prop="material_uuid" label="物料标识" />
|
||||||
|
<el-table-column v-if="false" prop="material_name" label="物料名称" />
|
||||||
|
<el-table-column prop="inspection_item_code" label="项点编码" />
|
||||||
|
<el-table-column prop="inspection_item_name" label="项点名称" />
|
||||||
|
<el-table-column prop="inspection_item_type_name" label="项点类别" />
|
||||||
|
<el-table-column prop="workprocedure_name" label="工序名称" />
|
||||||
|
<el-table-column prop="inspection_type_name" label="检验方式" />
|
||||||
|
<el-table-column prop="remark" label="备注" />
|
||||||
|
<el-table-column prop="update_optname" label="修改人" />
|
||||||
|
<el-table-column prop="update_time" label="修改时间" width="135" />
|
||||||
|
<el-table-column v-if="false" prop="is_limit_remark" label="是否临界值填充备注" />
|
||||||
|
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<udOperation
|
||||||
|
:data="scope.row"
|
||||||
|
:permission="permission"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!--分页组件-->
|
||||||
|
<pagination />
|
||||||
|
</div>
|
||||||
|
<MaterDtl :dialog-show.sync="materShow" :dialog-matertype="materType" @tableChanged2="tableChanged2" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import crudInspectionItemPoint from '@/views/wms/masterdata_manage/ql/inspectionItemPoint/inspectionItemPoint'
|
||||||
|
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||||
|
import rrOperation from '@crud/RR.operation'
|
||||||
|
import crudOperation from '@crud/CRUD.operation'
|
||||||
|
import udOperation from '@crud/UD.operation'
|
||||||
|
import pagination from '@crud/Pagination'
|
||||||
|
import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
|
||||||
|
import MaterDtl from '@/views/wms/pub/MaterDialog'
|
||||||
|
|
||||||
|
const defaultForm = {
|
||||||
|
inspection_item_id: null,
|
||||||
|
inspection_item_code: null,
|
||||||
|
inspection_item_name: null,
|
||||||
|
inspection_item_type: null,
|
||||||
|
workprocedure_uuid: null,
|
||||||
|
workprocedure_code: null,
|
||||||
|
workprocedure_name: null,
|
||||||
|
inspection_type: '02',
|
||||||
|
material_uuid: null,
|
||||||
|
material_name: null,
|
||||||
|
remark: null,
|
||||||
|
create_id: null,
|
||||||
|
create_name: null,
|
||||||
|
create_time: null,
|
||||||
|
update_optid: null,
|
||||||
|
update_optname: null,
|
||||||
|
update_time: null,
|
||||||
|
is_delete: null,
|
||||||
|
is_limit_remark: null
|
||||||
|
}
|
||||||
|
export default {
|
||||||
|
name: 'InspectionItemPoint',
|
||||||
|
dicts: ['QL_TEST_POINTTYPE', 'QC_INSPECTION_TYPE'],
|
||||||
|
|
||||||
|
components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl },
|
||||||
|
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||||
|
cruds() {
|
||||||
|
return CRUD({
|
||||||
|
title: '检验项点',
|
||||||
|
url: 'api/inspectionItemPoint',
|
||||||
|
idField: 'inspection_item_id',
|
||||||
|
sort: 'inspection_item_id,desc',
|
||||||
|
optShow: {
|
||||||
|
add: true,
|
||||||
|
edit: true,
|
||||||
|
del: true,
|
||||||
|
download: false,
|
||||||
|
reset: true
|
||||||
|
},
|
||||||
|
crudMethod: { ...crudInspectionItemPoint }
|
||||||
|
})
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
workProcedureList: [],
|
||||||
|
materShow: false,
|
||||||
|
materType: '',
|
||||||
|
permission: {},
|
||||||
|
rules: {
|
||||||
|
inspection_item_id: [
|
||||||
|
{ required: true, message: '项点标识不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_item_code: [
|
||||||
|
{ required: true, message: '项点编码不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_item_name: [
|
||||||
|
{ required: true, message: '项点名称不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_item_type: [
|
||||||
|
{ required: true, message: '项点类别不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_type: [
|
||||||
|
{ required: true, message: '检验方式不能为空', trigger: 'blur' }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
crudWorkProcedure.downSelect().then(res => {
|
||||||
|
this.workProcedureList = res
|
||||||
|
})
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||||
|
[CRUD.HOOK.beforeRefresh]() {
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
hand(value) {
|
||||||
|
this.crud.toQuery()
|
||||||
|
},
|
||||||
|
tableChanged2(row) {
|
||||||
|
// 新增一行物料时，给行进行赋值
|
||||||
|
this.form.material_uuid = row.material_id
|
||||||
|
this.form.material_name = row.material_name
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
export function add(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionItemPoint',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function del(ids) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionItemPoint',
|
||||||
|
method: 'delete',
|
||||||
|
data: ids
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function edit(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionItemPoint',
|
||||||
|
method: 'put',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export default { add, edit, del }
|
||||||
@@ -0,0 +1,158 @@
|
|||||||
|
<template>
|
||||||
|
<el-dialog
|
||||||
|
title="添加检测项"
|
||||||
|
append-to-body
|
||||||
|
:visible.sync="dialogVisible"
|
||||||
|
destroy-on-close
|
||||||
|
width="1000px"
|
||||||
|
@close="close"
|
||||||
|
@open="open"
|
||||||
|
>
|
||||||
|
<!-- 搜索 -->
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-input
|
||||||
|
v-model="query.name"
|
||||||
|
clearable
|
||||||
|
style="width: 200px"
|
||||||
|
size="mini"
|
||||||
|
placeholder="输入项点编、名称"
|
||||||
|
prefix-icon="el-icon-search"
|
||||||
|
class="filter-item"
|
||||||
|
/>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="6">
|
||||||
|
<el-select
|
||||||
|
v-model="query.inspection_item_type"
|
||||||
|
disabled
|
||||||
|
size="mini"
|
||||||
|
placeholder="项点类别"
|
||||||
|
class="filter-item"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QL_TEST_POINTTYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-col>
|
||||||
|
|
||||||
|
<el-col :span="6">
|
||||||
|
<rrOperation />
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-divider />
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
ref="table"
|
||||||
|
v-loading="crud.loading"
|
||||||
|
:data="crud.data"
|
||||||
|
style="width: 100%;"
|
||||||
|
border
|
||||||
|
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
|
||||||
|
@select="handleSelectionChange"
|
||||||
|
@select-all="onSelectAll"
|
||||||
|
>
|
||||||
|
<el-table-column type="selection" width="55" />
|
||||||
|
<el-table-column v-if="false" prop="inspection_item_id" label="项点标识" />
|
||||||
|
<el-table-column prop="inspection_item_code" label="项点编码" />
|
||||||
|
<el-table-column prop="inspection_item_name" label="项点名称" />
|
||||||
|
<el-table-column prop="inspection_item_type_name" label="项点类别" />
|
||||||
|
<el-table-column prop="workprocedure_name" label="工序" />
|
||||||
|
<el-table-column prop="inspection_type_name" label="检测方式" />
|
||||||
|
</el-table>
|
||||||
|
<!--分页组件-->
|
||||||
|
<pagination />
|
||||||
|
<span slot="footer" class="dialog-footer">
|
||||||
|
<el-button @click="close">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="submit">确 定</el-button>
|
||||||
|
</span>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
|
||||||
|
import CRUD, { crud, header, presenter } from '@crud/crud'
|
||||||
|
import rrOperation from '@crud/RR.operation'
|
||||||
|
import pagination from '@crud/Pagination'
|
||||||
|
|
||||||
|
import crudInspectionItemPoint from '@/views/wms/masterdata_manage/ql/inspectionItemPoint/inspectionItemPoint'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'ItemDialog',
|
||||||
|
dicts: ['QL_TEST_POINTTYPE'],
|
||||||
|
components: { rrOperation, pagination },
|
||||||
|
cruds() {
|
||||||
|
return CRUD({ title: '物料', url: 'api/inspectionItemPoint', crudMethod: { ...crudInspectionItemPoint }, optShow: {}})
|
||||||
|
},
|
||||||
|
mixins: [presenter(), header(), crud()],
|
||||||
|
props: {
|
||||||
|
dialogShow: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
|
inspectionItemType: {
|
||||||
|
type: String
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
dialogVisible: false,
|
||||||
|
checkrow: [],
|
||||||
|
rows: []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
dialogShow: {
|
||||||
|
handler(newValue, oldValue) {
|
||||||
|
this.dialogVisible = newValue
|
||||||
|
}
|
||||||
|
},
|
||||||
|
inspectionItemType: {
|
||||||
|
handler(newValue, oldValue) {
|
||||||
|
this.crud.query.inspection_item_type = newValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
[CRUD.HOOK.beforeRefresh]() {
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
open() {
|
||||||
|
this.crud.query.inspection_item_type = this.$parent.inspectionItemType
|
||||||
|
this.crud.toQuery()
|
||||||
|
},
|
||||||
|
handleSelectionChange(val, row) {
|
||||||
|
/* if (val.length > 1) {
|
||||||
|
this.$refs.table.clearSelection()
|
||||||
|
this.$refs.table.toggleRowSelection(val.pop())
|
||||||
|
} else {
|
||||||
|
this.checkrow = row
|
||||||
|
}*/
|
||||||
|
this.checkrow = val
|
||||||
|
},
|
||||||
|
onSelectAll() {
|
||||||
|
this.$refs.table.clearSelection()
|
||||||
|
},
|
||||||
|
close() {
|
||||||
|
this.crud.resetQuery(false)
|
||||||
|
this.$emit('update:dialogShow', false)
|
||||||
|
},
|
||||||
|
submit() {
|
||||||
|
this.rows = this.$refs.table.selection
|
||||||
|
if (this.rows.length <= 0) {
|
||||||
|
this.$message('至少选择一项1')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.crud.resetQuery(false)
|
||||||
|
this.$emit('update:dialogShow', false)
|
||||||
|
this.$emit('tableChanged2', this.checkrow)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
@@ -0,0 +1,207 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-dialog
|
||||||
|
title="新增检测项"
|
||||||
|
append-to-body
|
||||||
|
:visible.sync="dialogVisible"
|
||||||
|
fullscreen
|
||||||
|
destroy-on-close
|
||||||
|
@close="close"
|
||||||
|
@open="open"
|
||||||
|
>
|
||||||
|
<el-form :inline="true" :model="openParam" class="demo-form-inline">
|
||||||
|
<el-form-item label="方案编码">
|
||||||
|
<el-input v-model.trim="openParam.inspection_scheme_code" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="方案名称">
|
||||||
|
<el-input v-model.trim="openParam.inspection_scheme_name" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="明细项数">
|
||||||
|
<el-input v-model.trim="tableData.length" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button icon="el-icon-plus" type="primary" @click="itemDialogVisible=true">添加项点</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button icon="el-icon-check" type="success" @click="onSubmit">保存</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button icon="el-icon-error" type="info" @click="close">关闭</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
:data="tableData"
|
||||||
|
border
|
||||||
|
stripe
|
||||||
|
style="width: 100%"
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
v-if="false"
|
||||||
|
prop="inspection_item_id"
|
||||||
|
label="项点标识"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_code"
|
||||||
|
label="项点编码"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_name"
|
||||||
|
label="项点名称"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_type_name"
|
||||||
|
label="项点类别"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
v-if="'02'===$parent.inspection_item_type"
|
||||||
|
prop="workprocedure_name"
|
||||||
|
label="工序名称"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_type_name"
|
||||||
|
label="检测方式"
|
||||||
|
/>
|
||||||
|
<el-table-column prop="order_index" label="顺序号">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input
|
||||||
|
v-model="tableData[scope.$index].order_index"
|
||||||
|
size="mini"
|
||||||
|
type="number"
|
||||||
|
class="edit-input"
|
||||||
|
style="width: 100px"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column label="操作">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="danger"
|
||||||
|
@click="handleDelete(scope.$index, scope.row)"
|
||||||
|
>删除
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!-- <span slot="footer" class="dialog-footer">
|
||||||
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
|
||||||
|
</span>-->
|
||||||
|
</el-dialog>
|
||||||
|
<ItemDialog
|
||||||
|
:dialog-show.sync="itemDialogVisible"
|
||||||
|
:inspection-item-type="inspectionItemType"
|
||||||
|
:open-param="openParam"
|
||||||
|
@tableChanged2="tableChanged2"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import CRUD, { crud } from '@crud/crud'
|
||||||
|
import ItemDialog from '@/views/wms/masterdata_manage/ql/inspectionSchemeMst/ItemDialog'
|
||||||
|
import crudInspectionSchemeMst from '@/views/wms/masterdata_manage/ql/inspectionSchemeMst/inspectionSchemeMst'
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'SetDialog',
|
||||||
|
mixins: [crud()],
|
||||||
|
components: { ItemDialog },
|
||||||
|
props: {
|
||||||
|
dialogShow: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
|
openParam: {
|
||||||
|
type: Object,
|
||||||
|
default: () => { return {} }
|
||||||
|
},
|
||||||
|
openArray: {
|
||||||
|
type: Array,
|
||||||
|
default: () => { return [] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
itemDialogVisible: false,
|
||||||
|
dialogVisible: false,
|
||||||
|
inspectionItemType: null,
|
||||||
|
cols: [],
|
||||||
|
tableData: [],
|
||||||
|
formData: {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
openArray: {
|
||||||
|
handler(newValue) {
|
||||||
|
this.tableData = newValue
|
||||||
|
}
|
||||||
|
},
|
||||||
|
dialogShow: {
|
||||||
|
handler(newValue, oldValue) {
|
||||||
|
this.dialogVisible = newValue
|
||||||
|
if (newValue) {
|
||||||
|
this.inspectionItemType = this.$parent.inspection_item_type
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
open() {
|
||||||
|
/* const param = {
|
||||||
|
inspection_item_type: this.$parent.inspection_item_type,
|
||||||
|
inspection_scheme_id: this.openParam.inspection_scheme_id
|
||||||
|
}
|
||||||
|
crudInspectionSchemeMst.getInspectionSchemeDtl(param).then(res => {
|
||||||
|
this.tableData = res
|
||||||
|
})*/
|
||||||
|
},
|
||||||
|
tableChanged2: function(rows) {
|
||||||
|
// 判断项点是否已存在
|
||||||
|
rows.forEach((item) => {
|
||||||
|
let same_mater = true
|
||||||
|
this.tableData.forEach((row) => {
|
||||||
|
// 对新增的行进行校验不能存在相同项点
|
||||||
|
if (row.inspection_item_id === item.inspection_item_id) {
|
||||||
|
same_mater = false
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if (same_mater) {
|
||||||
|
this.tableData.splice(-1, 0, item)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handleDelete(index, row) {
|
||||||
|
this.tableData.splice(index, 1)
|
||||||
|
},
|
||||||
|
onSubmit: function() {
|
||||||
|
this.openParam.inspection_item_type = this.$parent.inspection_item_type
|
||||||
|
const param = {
|
||||||
|
formData: this.openParam,
|
||||||
|
tableData: this.tableData
|
||||||
|
}
|
||||||
|
crudInspectionSchemeMst.saveInspectionSchemeDtl(param).then(res => {
|
||||||
|
this.notify('操作成功', 'success')
|
||||||
|
this.$parent.hand()
|
||||||
|
this.close()
|
||||||
|
})
|
||||||
|
},
|
||||||
|
notify(title, type) {
|
||||||
|
this.$notify({
|
||||||
|
title: title,
|
||||||
|
type: type,
|
||||||
|
duration: 2500
|
||||||
|
})
|
||||||
|
},
|
||||||
|
close() {
|
||||||
|
this.$emit('update:dialogShow', false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,136 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-dialog
|
||||||
|
title="新增检测项"
|
||||||
|
append-to-body
|
||||||
|
:visible.sync="dialogVisible"
|
||||||
|
fullscreen
|
||||||
|
destroy-on-close
|
||||||
|
@close="close"
|
||||||
|
@open="open"
|
||||||
|
>
|
||||||
|
<el-form :inline="true" :model="openParam" class="demo-form-inline">
|
||||||
|
<el-form-item label="方案编码">
|
||||||
|
<el-input v-model.trim="openParam.inspection_scheme_code" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="方案名称">
|
||||||
|
<el-input v-model.trim="openParam.inspection_scheme_name" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="方案类别">
|
||||||
|
<el-select
|
||||||
|
v-model="openParam.inspection_scheme_type"
|
||||||
|
disabled
|
||||||
|
size="mini"
|
||||||
|
placeholder="方案类别"
|
||||||
|
class="filter-item"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QC_INSPECTION_SCHEME_TYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button icon="el-icon-error" type="info" @click="close">关闭</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
:data="tableData"
|
||||||
|
border
|
||||||
|
stripe
|
||||||
|
style="width: 100%"
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
v-if="false"
|
||||||
|
prop="inspection_item_id"
|
||||||
|
label="项点标识"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_code"
|
||||||
|
label="项点编码"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_name"
|
||||||
|
label="项点名称"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_type_name"
|
||||||
|
label="项点类别"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="workprocedure_name"
|
||||||
|
label="工序名称"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_type_name"
|
||||||
|
label="检测方式"
|
||||||
|
/>
|
||||||
|
</el-table>
|
||||||
|
</el-dialog>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import { crud } from '@crud/crud'
|
||||||
|
export default {
|
||||||
|
name: 'ViewDialog',
|
||||||
|
dicts: ['QC_INSPECTION_SCHEME_TYPE'],
|
||||||
|
mixins: [crud()],
|
||||||
|
props: {
|
||||||
|
visiable1: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
|
openParam: {
|
||||||
|
type: Object
|
||||||
|
},
|
||||||
|
openArray: {
|
||||||
|
type: Array,
|
||||||
|
default: () => { return [] }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
itemDialogVisible: false,
|
||||||
|
dialogVisible: false,
|
||||||
|
inspectionItemType: null,
|
||||||
|
cols: [],
|
||||||
|
tableData: [],
|
||||||
|
formData: {}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
openArray: {
|
||||||
|
handler(newValue) {
|
||||||
|
this.tableData = newValue
|
||||||
|
}
|
||||||
|
},
|
||||||
|
visiable1: {
|
||||||
|
handler(newValue, oldValue) {
|
||||||
|
this.dialogVisible = newValue
|
||||||
|
if (newValue) {
|
||||||
|
// this.inspectionItemType = this.$parent.inspection_item_type
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
open() {
|
||||||
|
// const param = {
|
||||||
|
// inspection_scheme_id: this.openParam.inspection_scheme_id
|
||||||
|
// }
|
||||||
|
// crudInspectionSchemeMst.getInspectionSchemeDtl(param).then(res => {
|
||||||
|
// this.tableData = res
|
||||||
|
// })
|
||||||
|
},
|
||||||
|
close() {
|
||||||
|
this.tableData = []
|
||||||
|
this.$emit('update:visiable1', false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@@ -0,0 +1,260 @@
|
|||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<!--工具栏-->
|
||||||
|
<div class="head-container">
|
||||||
|
<div v-if="crud.props.searchToggle">
|
||||||
|
<el-form
|
||||||
|
:inline="true"
|
||||||
|
class="demo-form-inline"
|
||||||
|
label-position="right"
|
||||||
|
label-width="80px"
|
||||||
|
label-suffix=":"
|
||||||
|
>
|
||||||
|
<el-form-item label="模糊搜索">
|
||||||
|
<el-input
|
||||||
|
v-model="query.name"
|
||||||
|
clearable
|
||||||
|
placeholder="方案编码、名称"
|
||||||
|
@keyup.enter.native="crud.toQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="方案类别">
|
||||||
|
<el-select
|
||||||
|
v-model="query.inspection_scheme_type"
|
||||||
|
clearable
|
||||||
|
size="mini"
|
||||||
|
placeholder="方案类别"
|
||||||
|
class="filter-item"
|
||||||
|
@change="hand"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QC_INSPECTION_SCHEME_TYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<rrOperation />
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||||
|
|
||||||
|
<crudOperation :permission="permission">
|
||||||
|
<el-button
|
||||||
|
slot="right"
|
||||||
|
class="filter-item"
|
||||||
|
type="success"
|
||||||
|
icon="el-icon-position"
|
||||||
|
size="mini"
|
||||||
|
:disabled="crud.selections.length !== 1"
|
||||||
|
@click="maintenance('01',crud.selections[0])"
|
||||||
|
>
|
||||||
|
质保项维护
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
slot="right"
|
||||||
|
class="filter-item"
|
||||||
|
type="info"
|
||||||
|
icon="el-icon-position"
|
||||||
|
:disabled="crud.selections.length !== 1"
|
||||||
|
size="mini"
|
||||||
|
@click="maintenance('02',crud.selections[0])"
|
||||||
|
>
|
||||||
|
工序自检项
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
slot="right"
|
||||||
|
class="filter-item"
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-position"
|
||||||
|
:disabled="crud.selections.length !== 1"
|
||||||
|
size="mini"
|
||||||
|
@click="maintenance('03',crud.selections[0])"
|
||||||
|
>
|
||||||
|
理化项维护
|
||||||
|
</el-button>
|
||||||
|
</crudOperation>
|
||||||
|
<!--表单组件-->
|
||||||
|
<el-dialog
|
||||||
|
:close-on-click-modal="false"
|
||||||
|
:before-close="crud.cancelCU"
|
||||||
|
:visible.sync="crud.status.cu > 0"
|
||||||
|
:title="crud.status.title"
|
||||||
|
width="500px"
|
||||||
|
>
|
||||||
|
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
|
||||||
|
<el-form-item label="方案编码" prop="inspection_scheme_code">
|
||||||
|
<el-input v-model.trim="form.inspection_scheme_code" style="width: 370px;" :disabled="true" placeholder="系统生成" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="方案名称" prop="inspection_scheme_name">
|
||||||
|
<el-input v-model.trim="form.inspection_scheme_name" style="width: 370px;" />
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="方案类别" prop="inspection_scheme_type">
|
||||||
|
<el-select
|
||||||
|
v-model="form.inspection_scheme_type"
|
||||||
|
size="mini"
|
||||||
|
placeholder="方案类别"
|
||||||
|
class="filter-item"
|
||||||
|
style="width: 370px;"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QC_INSPECTION_SCHEME_TYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="备注">
|
||||||
|
<el-input v-model.trim="form.remark" style="width: 370px;" rows="2" type="textarea" />
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||||
|
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
ref="table"
|
||||||
|
v-loading="crud.loading"
|
||||||
|
:data="crud.data"
|
||||||
|
size="mini"
|
||||||
|
style="width: 100%;"
|
||||||
|
@selection-change="crud.selectionChangeHandler"
|
||||||
|
>
|
||||||
|
<el-table-column type="selection" width="55" />
|
||||||
|
<el-table-column v-if="false" prop="inspection_scheme_id" label="检验方案标识" />
|
||||||
|
<el-table-column prop="inspection_scheme_code" label="方案编码">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-link type="warning" @click="view(scope.row)">{{ scope.row.inspection_scheme_code }}</el-link>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="inspection_scheme_name" label="方案名称" />
|
||||||
|
<el-table-column prop="inspection_scheme_type" label="方案类别" :formatter="format_inspection_scheme_type" />
|
||||||
|
<el-table-column prop="factory_qty" label="质保项数" />
|
||||||
|
<el-table-column prop="workprocedure_qty" label="自检项数" />
|
||||||
|
<el-table-column prop="physical_qty" label="理化项数" />
|
||||||
|
<el-table-column prop="remark" label="备注" />
|
||||||
|
<el-table-column v-if="false" prop="is_used" label="是否启用" />
|
||||||
|
<el-table-column prop="update_optname" label="修改人" />
|
||||||
|
<el-table-column prop="update_time" label="修改时间" width="135" />
|
||||||
|
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<udOperation
|
||||||
|
:data="scope.row"
|
||||||
|
:permission="permission"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!--分页组件-->
|
||||||
|
<pagination />
|
||||||
|
</div>
|
||||||
|
<MaintenanceDialog :dialog-show.sync="maintenanceShow" :open-param="openParam" :open-array="openArray" />
|
||||||
|
<ViewDialog :visiable1.sync="visiable1" :open-param="openParam" :open-array="openArray" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import crudInspectionSchemeMst from '@/views/wms/masterdata_manage/ql/inspectionSchemeMst/inspectionSchemeMst'
|
||||||
|
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||||
|
import rrOperation from '@crud/RR.operation'
|
||||||
|
import crudOperation from '@crud/CRUD.operation'
|
||||||
|
import udOperation from '@crud/UD.operation'
|
||||||
|
import pagination from '@crud/Pagination'
|
||||||
|
import MaintenanceDialog from './MaintenanceDialog'
|
||||||
|
import ViewDialog from './ViewDialog'
|
||||||
|
|
||||||
|
const defaultForm = {
|
||||||
|
inspection_scheme_id: null,
|
||||||
|
inspection_scheme_code: '',
|
||||||
|
inspection_scheme_name: null,
|
||||||
|
inspection_scheme_type: null,
|
||||||
|
factory_qty: null,
|
||||||
|
workprocedure_qty: null,
|
||||||
|
physical_qty: null,
|
||||||
|
remark: null,
|
||||||
|
is_used: 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: 'InspectionSchemeMst',
|
||||||
|
dicts: ['QC_INSPECTION_SCHEME_TYPE'],
|
||||||
|
components: { pagination, crudOperation, rrOperation, udOperation, MaintenanceDialog, ViewDialog },
|
||||||
|
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||||
|
cruds() {
|
||||||
|
return CRUD({
|
||||||
|
title: '检测方案',
|
||||||
|
url: 'api/inspectionSchemeMst',
|
||||||
|
idField: 'inspection_scheme_id',
|
||||||
|
sort: 'inspection_scheme_id,desc',
|
||||||
|
optShow: {
|
||||||
|
add: true,
|
||||||
|
edit: true,
|
||||||
|
del: true,
|
||||||
|
download: false,
|
||||||
|
reset: true
|
||||||
|
},
|
||||||
|
crudMethod: { ...crudInspectionSchemeMst }
|
||||||
|
})
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
openParam: {},
|
||||||
|
maintenanceShow: false,
|
||||||
|
visiable1: false,
|
||||||
|
openArray: [],
|
||||||
|
inspection_item_type: null,
|
||||||
|
permission: {},
|
||||||
|
rules: {
|
||||||
|
inspection_scheme_name: [
|
||||||
|
{ required: true, message: '检验方案名称不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_scheme_type: [
|
||||||
|
{ required: true, message: '检验方案类别不能为空', trigger: 'blur' }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||||
|
[CRUD.HOOK.beforeRefresh]() {
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
hand(value) {
|
||||||
|
this.crud.toQuery()
|
||||||
|
},
|
||||||
|
view(row) {
|
||||||
|
crudInspectionSchemeMst.getInspectionSchemeDtl({ inspection_scheme_id: row.inspection_scheme_id }).then(res => {
|
||||||
|
this.openArray = res
|
||||||
|
this.visiable1 = true
|
||||||
|
this.openParam = row
|
||||||
|
})
|
||||||
|
},
|
||||||
|
format_inspection_scheme_type(row, column) {
|
||||||
|
return this.dict.label.QC_INSPECTION_SCHEME_TYPE[row.inspection_scheme_type]
|
||||||
|
},
|
||||||
|
maintenance(type, data) {
|
||||||
|
crudInspectionSchemeMst.getInspectionSchemeDtl({ inspection_scheme_id: data.inspection_scheme_id, inspection_item_type: type }).then(res => {
|
||||||
|
this.openArray = res
|
||||||
|
this.inspection_item_type = type
|
||||||
|
this.openParam = data
|
||||||
|
this.maintenanceShow = true
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
export function add(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionSchemeMst',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function del(ids) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionSchemeMst/',
|
||||||
|
method: 'delete',
|
||||||
|
data: ids
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function edit(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionSchemeMst',
|
||||||
|
method: 'put',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function saveInspectionSchemeDtl(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionSchemeMst/saveInspectionSchemeDtl',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getInspectionSchemeDtl(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionSchemeMst/getInspectionSchemeDtl',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function selectList() {
|
||||||
|
return request({
|
||||||
|
url: 'api/inspectionSchemeMst/selectList'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export default { add, edit, del, saveInspectionSchemeDtl, getInspectionSchemeDtl, selectList }
|
||||||
@@ -0,0 +1,320 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-dialog
|
||||||
|
title="物料检测方案设置"
|
||||||
|
append-to-body
|
||||||
|
:visible.sync="crud.status.cu > 0"
|
||||||
|
fullscreen
|
||||||
|
destroy-on-close
|
||||||
|
:before-close="crud.cancelCU"
|
||||||
|
@open="open"
|
||||||
|
>
|
||||||
|
<el-form :inline="true" :model="form" class="demo-form-inline">
|
||||||
|
|
||||||
|
<el-form-item label="物料" prop="material_name">
|
||||||
|
<el-input
|
||||||
|
v-model="form.material_name"
|
||||||
|
style="width: 280px;"
|
||||||
|
placeholder="请选择物料"
|
||||||
|
clearable
|
||||||
|
prefix-icon="el-icon-search"
|
||||||
|
@focus="materShow=true"
|
||||||
|
@clear="form.material_id=''"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item v-if="false" label="物料" prop="material_id">
|
||||||
|
<el-input v-model.trim="form.material_id" style="width: 280px;" />
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item label="方案名称">
|
||||||
|
<el-select
|
||||||
|
v-model="form.inspection_scheme_id"
|
||||||
|
filterable
|
||||||
|
clearable
|
||||||
|
size="mini"
|
||||||
|
placeholder="方案名称"
|
||||||
|
class="filter-item"
|
||||||
|
@change="handDtl"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in selectList"
|
||||||
|
:label="item.inspection_scheme_name"
|
||||||
|
:value="item.inspection_scheme_id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
|
||||||
|
<el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button icon="el-icon-check" type="success" @click="onSubmit">保存</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item>
|
||||||
|
<el-button icon="el-icon-error" type="info" @click="crud.cancelCU">关闭</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
:data="form.tableData"
|
||||||
|
border
|
||||||
|
size="mini"
|
||||||
|
stripe
|
||||||
|
style="width: 100%"
|
||||||
|
>
|
||||||
|
<el-table-column
|
||||||
|
v-if="false"
|
||||||
|
prop="inspection_item_id"
|
||||||
|
label="项点标识"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="order_index"
|
||||||
|
width="60"
|
||||||
|
label="序号"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ scope.$index + 1 }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_code"
|
||||||
|
label="项点编码"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_name"
|
||||||
|
show-overflow-tooltip
|
||||||
|
label="项点名称"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_item_type_name"
|
||||||
|
label="项点类别"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="workprocedure_name"
|
||||||
|
label="工序名称"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="inspection_type_name"
|
||||||
|
label="检测方式"
|
||||||
|
/>
|
||||||
|
<el-table-column
|
||||||
|
prop="down_limit"
|
||||||
|
label="合格下限(≥)"
|
||||||
|
width="155"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number
|
||||||
|
v-if="form.tableData[scope.$index].inspection_type==='02'"
|
||||||
|
v-model="form.tableData[scope.$index].down_limit"
|
||||||
|
:precision="4"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column
|
||||||
|
prop="up_limit"
|
||||||
|
label="合格上限(≤)"
|
||||||
|
width="155"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number
|
||||||
|
v-if="form.tableData[scope.$index].inspection_type==='02'"
|
||||||
|
v-model="form.tableData[scope.$index].up_limit"
|
||||||
|
:precision="4"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column
|
||||||
|
prop="down_limit_value"
|
||||||
|
label="下限临界值(≤)"
|
||||||
|
width="155"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number
|
||||||
|
v-if="form.tableData[scope.$index].inspection_type==='02'"
|
||||||
|
v-model="form.tableData[scope.$index].down_limit_value"
|
||||||
|
:precision="4"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
|
||||||
|
<el-table-column
|
||||||
|
prop="up_limit_value"
|
||||||
|
label="上限临界值(≥)"
|
||||||
|
width="155"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input-number
|
||||||
|
v-if="form.tableData[scope.$index].inspection_type==='02'"
|
||||||
|
v-model="form.tableData[scope.$index].up_limit_value"
|
||||||
|
:precision="4"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
prop="remark"
|
||||||
|
label="备注"
|
||||||
|
>
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-input v-model.trim="form.tableData[scope.$index].remark" size="mini" class="edit-input" />
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!-- <span slot="footer" class="dialog-footer">
|
||||||
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||||
|
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
|
||||||
|
</span>-->
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
|
<MaterDtl
|
||||||
|
:dialog-show.sync="materShow"
|
||||||
|
:is-single="true"
|
||||||
|
:mater-opt-code="'00'"
|
||||||
|
@tableChanged2="tableChanged2"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import CRUD, { crud, form } from '@crud/crud'
|
||||||
|
import crudInspectionSchemeMst from '@/views/wms/masterdata_manage/ql/inspectionSchemeMst/inspectionSchemeMst'
|
||||||
|
import MaterDtl from '@/views/wms/pub/MaterDialog'
|
||||||
|
import crudProductStandard from '@/views/wms/masterdata_manage/ql/productStandard/productStandard'
|
||||||
|
|
||||||
|
const defaultForm = {
|
||||||
|
material_id: '',
|
||||||
|
material_code: '',
|
||||||
|
material_name: '',
|
||||||
|
inspection_scheme_id: '',
|
||||||
|
tableData: []
|
||||||
|
}
|
||||||
|
export default {
|
||||||
|
name: 'AddDialog',
|
||||||
|
components: { MaterDtl },
|
||||||
|
mixins: [crud(), form(defaultForm)],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
selectList: [],
|
||||||
|
materShow: false,
|
||||||
|
dialogVisible: false,
|
||||||
|
inspectionItemType: null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
open() {
|
||||||
|
crudInspectionSchemeMst.selectList().then(res => {
|
||||||
|
this.selectList = res
|
||||||
|
})
|
||||||
|
this.handDtl2()
|
||||||
|
},
|
||||||
|
handDtl2() { // 修改的时候有物料标识
|
||||||
|
const param = {
|
||||||
|
inspection_scheme_id: this.form.inspection_scheme_id,
|
||||||
|
material_id: this.form.material_id
|
||||||
|
}
|
||||||
|
crudProductStandard.getInspectionSchemeDtl(param).then(res => {
|
||||||
|
const map1 = res.map(function(item) {
|
||||||
|
if (!item.down_limit_value) item.down_limit_value = undefined
|
||||||
|
if (!item.up_limit_value) item.up_limit_value = undefined
|
||||||
|
if (!item.down_limit) item.down_limit = undefined
|
||||||
|
if (!item.up_limit) item.up_limit = undefined
|
||||||
|
return item
|
||||||
|
})
|
||||||
|
this.form.tableData = map1
|
||||||
|
})
|
||||||
|
},
|
||||||
|
handDtl() {
|
||||||
|
const param = {
|
||||||
|
inspection_scheme_id: this.form.inspection_scheme_id
|
||||||
|
}
|
||||||
|
crudProductStandard.getInspectionSchemeDtl(param).then(res => {
|
||||||
|
const map1 = res.map(function(item) {
|
||||||
|
if (!item.down_limit_value) item.down_limit_value = undefined
|
||||||
|
if (!item.up_limit_value) item.up_limit_value = undefined
|
||||||
|
if (!item.down_limit) item.down_limit = undefined
|
||||||
|
if (!item.up_limit) item.up_limit = undefined
|
||||||
|
return item
|
||||||
|
})
|
||||||
|
this.form.tableData = map1
|
||||||
|
})
|
||||||
|
},
|
||||||
|
hand() {
|
||||||
|
|
||||||
|
},
|
||||||
|
onSubmit() {
|
||||||
|
let optType = null
|
||||||
|
|
||||||
|
const isCopyAdd = this.$parent.isCopyAdd
|
||||||
|
debugger
|
||||||
|
if (isCopyAdd === '1') {
|
||||||
|
optType = '01' // 复制新增
|
||||||
|
} else if (this.crud.status.add === 1) {
|
||||||
|
optType = '02' // 新增
|
||||||
|
} else {
|
||||||
|
this.crud.status.add
|
||||||
|
optType = '03' // 修改
|
||||||
|
}
|
||||||
|
// 判断是新增还是修改还是复制新增
|
||||||
|
this.form.optType = optType
|
||||||
|
const arr = this.form.tableData
|
||||||
|
const that = this
|
||||||
|
const errMsgList = []
|
||||||
|
const data = arr.map(function(item) {
|
||||||
|
debugger
|
||||||
|
// 合格上下限同时为填入的数字或同时为空
|
||||||
|
if ((!isNaN(item.up_limit) && !isNaN(item.down_limit)) || (isNaN(item.up_limit) && isNaN(item.down_limit))) {
|
||||||
|
// 临界上下限同时为填入的数字或同时为空
|
||||||
|
if ((!isNaN(item.up_limit_value) && !isNaN(item.down_limit_value)) || (isNaN(item.up_limit_value) && isNaN(item.down_limit_value))) {
|
||||||
|
if (isNaN(item.up_limit) && !isNaN(item.up_limit_value)) {
|
||||||
|
errMsgList.push(item.order_index)
|
||||||
|
}
|
||||||
|
return item
|
||||||
|
} else {
|
||||||
|
errMsgList.push(item.order_index)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
errMsgList.push(item.order_index)
|
||||||
|
return item
|
||||||
|
}
|
||||||
|
})
|
||||||
|
if (errMsgList.length > 0) {
|
||||||
|
that.crud.notify(errMsgList.toString() + '行格式错误,请检查!', CRUD.NOTIFICATION_TYPE.INFO)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.form.tableData = data
|
||||||
|
crudProductStandard.saveData(this.form).then(res => {
|
||||||
|
this.crud.cancelCU()
|
||||||
|
this.$parent.isCopyAdd = null
|
||||||
|
this.crud.toQuery()
|
||||||
|
this.notify('操作成功', 'success')
|
||||||
|
})
|
||||||
|
},
|
||||||
|
notify(title, type) {
|
||||||
|
this.$notify({
|
||||||
|
title: title,
|
||||||
|
type: type,
|
||||||
|
duration: 2500
|
||||||
|
})
|
||||||
|
},
|
||||||
|
tableChanged2(data) {
|
||||||
|
// 新增一行物料时，给行进行赋值
|
||||||
|
this.form.material_id = data.material_id
|
||||||
|
this.form.material_code = data.material_code
|
||||||
|
this.form.material_name = data.material_name + '##' + data.material_code
|
||||||
|
},
|
||||||
|
close() {
|
||||||
|
this.$emit('update:visiable1', false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style rel="stylesheet/scss" lang="scss">
|
||||||
|
.edit-input {
|
||||||
|
.el-input__inner {
|
||||||
|
border: 1px solid #e5e6e7;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,204 @@
|
|||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<!--工具栏-->
|
||||||
|
<div class="head-container">
|
||||||
|
<div v-if="crud.props.searchToggle">
|
||||||
|
<el-form
|
||||||
|
:inline="true"
|
||||||
|
class="demo-form-inline"
|
||||||
|
label-position="right"
|
||||||
|
label-width="80px"
|
||||||
|
label-suffix=":"
|
||||||
|
>
|
||||||
|
<el-form-item label="方案">
|
||||||
|
<el-input
|
||||||
|
v-model="query.inspection_scheme_name"
|
||||||
|
clearable
|
||||||
|
placeholder="方案编码、名称"
|
||||||
|
@keyup.enter.native="crud.toQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="物料">
|
||||||
|
<el-input
|
||||||
|
v-model="query.material_name"
|
||||||
|
clearable
|
||||||
|
placeholder="物料编码、名称"
|
||||||
|
@keyup.enter.native="crud.toQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="方案类别">
|
||||||
|
<el-select
|
||||||
|
v-model="query.inspection_scheme_type"
|
||||||
|
clearable
|
||||||
|
size="mini"
|
||||||
|
placeholder="方案类别"
|
||||||
|
class="filter-item"
|
||||||
|
@change="crud.toQuery"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in dict.QC_INSPECTION_SCHEME_TYPE"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<rrOperation />
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
|
||||||
|
<crudOperation :permission="permission">
|
||||||
|
<el-button
|
||||||
|
slot="right"
|
||||||
|
class="filter-item"
|
||||||
|
type="success"
|
||||||
|
icon="el-icon-position"
|
||||||
|
size="mini"
|
||||||
|
:disabled="crud.selections.length !== 1"
|
||||||
|
@click="copyAdd(crud.selections[0])"
|
||||||
|
>
|
||||||
|
复制新增
|
||||||
|
</el-button>
|
||||||
|
</crudOperation>
|
||||||
|
<!--表单组件-->
|
||||||
|
<!--表格渲染-->
|
||||||
|
<el-table
|
||||||
|
ref="table"
|
||||||
|
v-loading="crud.loading"
|
||||||
|
:data="crud.data"
|
||||||
|
size="mini"
|
||||||
|
style="width: 100%;"
|
||||||
|
@selection-change="crud.selectionChangeHandler"
|
||||||
|
>
|
||||||
|
<el-table-column type="selection" width="55" />
|
||||||
|
<el-table-column v-if="false" prop="inspection_standard_dtl_id" label="检验方案明细标准标识" />
|
||||||
|
<el-table-column v-if="false" prop="material_uuid" label="物料标识" />
|
||||||
|
<el-table-column prop="material_code" label="物料编码" width="200" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="material_name" label="物料名称" width="200" show-tooltip-when-overflow />
|
||||||
|
<el-table-column prop="inspection_scheme_code" label="方案编码" />
|
||||||
|
<el-table-column prop="inspection_scheme_name" label="方案名称" min-width="120" show-overflow-tooltip />
|
||||||
|
<el-table-column prop="inspection_scheme_type_name" label="方案类别" />
|
||||||
|
<el-table-column prop="zb_num" label="质保项数" />
|
||||||
|
<el-table-column prop="zj_num" label="质检项数" />
|
||||||
|
<el-table-column prop="lh_num" label="理化项数" />
|
||||||
|
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<udOperation
|
||||||
|
:data="scope.row"
|
||||||
|
:permission="permission"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
<!--分页组件-->
|
||||||
|
<pagination />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<AddDialog :visiable1.sync="visiable1" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import crudProductStandard from '@/views/wms/masterdata_manage/ql/productStandard/productStandard'
|
||||||
|
import CRUD, { crud, form, header, presenter } from '@crud/crud'
|
||||||
|
import rrOperation from '@crud/RR.operation'
|
||||||
|
import crudOperation from '@crud/CRUD.operation'
|
||||||
|
import udOperation from '@crud/UD.operation'
|
||||||
|
import pagination from '@crud/Pagination'
|
||||||
|
import AddDialog from './AddDialog'
|
||||||
|
|
||||||
|
const defaultForm = {
|
||||||
|
inspection_standard_dtl_id: null,
|
||||||
|
material_uuid: null,
|
||||||
|
inspection_scheme_id: null,
|
||||||
|
inspection_scheme_code: null,
|
||||||
|
inspection_scheme_name: null,
|
||||||
|
inspection_item_id: null,
|
||||||
|
inspection_item_code: null,
|
||||||
|
inspection_item_name: null,
|
||||||
|
up_limit: null,
|
||||||
|
down_limit: null,
|
||||||
|
up_limit_value: null,
|
||||||
|
down_limit_value: null,
|
||||||
|
remark: null
|
||||||
|
}
|
||||||
|
export default {
|
||||||
|
name: 'ProductStandard',
|
||||||
|
dicts: ['QC_INSPECTION_SCHEME_TYPE'],
|
||||||
|
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation },
|
||||||
|
mixins: [presenter(), header(), form(defaultForm), crud()],
|
||||||
|
cruds() {
|
||||||
|
return CRUD({
|
||||||
|
title: '产品方案标准',
|
||||||
|
url: 'api/productStandard',
|
||||||
|
idField: 'inspection_standard_dtl_id',
|
||||||
|
sort: 'inspection_standard_dtl_id,desc',
|
||||||
|
optShow: {
|
||||||
|
add: true,
|
||||||
|
edit: true,
|
||||||
|
del: true,
|
||||||
|
download: false,
|
||||||
|
reset: true
|
||||||
|
},
|
||||||
|
crudMethod: { ...crudProductStandard }
|
||||||
|
})
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
isCopyAdd: null,
|
||||||
|
visiable1: false,
|
||||||
|
permission: {},
|
||||||
|
rules: {
|
||||||
|
inspection_standard_dtl_id: [
|
||||||
|
{ required: true, message: '检验方案明细标准标识不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_scheme_id: [
|
||||||
|
{ required: true, message: '检验方案标识不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_scheme_code: [
|
||||||
|
{ required: true, message: '检验方案编码不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_scheme_name: [
|
||||||
|
{ required: true, message: '检验方案名称不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_item_id: [
|
||||||
|
{ required: true, message: '项点标识不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_item_code: [
|
||||||
|
{ required: true, message: '项点编码不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
inspection_item_name: [
|
||||||
|
{ required: true, message: '项点名称不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
up_limit: [
|
||||||
|
{ required: true, message: '合格上限不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
down_limit: [
|
||||||
|
{ required: true, message: '合格下限不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
up_limit_value: [
|
||||||
|
{ required: true, message: '上限临界值不能为空', trigger: 'blur' }
|
||||||
|
],
|
||||||
|
down_limit_value: [
|
||||||
|
{ required: true, message: '下限临界值不能为空', trigger: 'blur' }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
|
||||||
|
[CRUD.HOOK.beforeRefresh]() {
|
||||||
|
return true
|
||||||
|
},
|
||||||
|
copyAdd(data) {
|
||||||
|
this.isCopyAdd = '1'
|
||||||
|
this.crud.toEdit(data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
export function add(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/productStandard',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function del(ids) {
|
||||||
|
return request({
|
||||||
|
url: 'api/productStandard/',
|
||||||
|
method: 'delete',
|
||||||
|
data: ids
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function edit(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/productStandard',
|
||||||
|
method: 'put',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
export function saveData(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/productStandard/saveData',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
export function copyAdd(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/productStandard/copyAdd',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getInspectionSchemeDtl(data) {
|
||||||
|
return request({
|
||||||
|
url: 'api/productStandard/getInspectionSchemeDtl',
|
||||||
|
method: 'post',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
export default { add, edit, del, saveData, copyAdd,getInspectionSchemeDtl }
|
||||||
Reference in New Issue
Block a user