Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

来料抽样规则修改

Browse Source
yangwl
shaoyong 10 months ago
parent 9b7670b941
commit 9adeb55c98
4 changed files with 57 additions and 654 deletions
Show Stats Download Patch File Download Diff File

93
src/api/quality/firstReport.js
Unescape Escape View File

@ -1,93 +0,0 @@
import request from '@/utils/request'
// 查询来料报告列表
export function listIncome(query) {
return request({
url: '/quality/qcFirstReport/list',
method: 'get',
params: query
});
}
// 查询来料报告详细
export function getIncome(recordId) {
return request({
url: '/quality/qcFirstReport/' + recordId,
method: 'get'
});
}
// 新增来料报告
export function addIncome(data) {
return request({
url: '/quality/qcFirstReport',
method: 'post',
data: data
});
}
// 修改来料报告
export function updateIncome(data) {
return request({
url: '/quality/qcFirstReport',
method: 'put',
data: data
});
}
// 删除来料报告
export function delIncome(recordId) {
return request({
url: '/quality/qcFirstReport/' + recordId,
method: 'delete'
});
}
// 查询BOM物料管理列表
export function getQcListBom(query) {
return request({
url: '/quality/qcFirstReport/getQcListBom',
method: 'get',
params: query
});
}
// 查询供应商管理列表
export function getQcListSupplier(query) {
return request({
url: '/quality/qcFirstReport/getQcListSupplier',
method: 'get',
params: query
});
}
// 查询人员列表
export function getQcListUser(query) {
return request({
url: '/quality/qcFirstReport/getQcListUser',
method: 'get',
params: query
});
}
//状态修改
export function changeIncomeStatus(recordId, status) {
const data = {
recordId,
status
}
return request({
url: '/quality/qcFirstReport/changeIncomeStatus',
method: 'put',
data: data
})
}
// 查询检测项列表
export function getCkeckProjectList(query) {
return request({
url: '/quality/qcFirstReport/getCkeckProjectList',
method: 'get',
params: query
});
}

8
src/api/quality/qcSampleRule.js
Unescape Escape View File

@ -42,3 +42,11 @@ export function delQcSampleRule(id) {
method: 'delete' method: 'delete'
}); });
} }
// 根据大节点获取检验节点类型
export function getCheckType(typeCode) {
return request({
url: '/quality/qcSampleRule/getCheckType/' + typeCode,
method: 'get',
})
}

516
src/views/quality/firstReport/index.vue
Unescape Escape View File

@ -1,516 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="任务编号" prop="checkNo">
<el-input
v-model="queryParams.checkNo"
placeholder="请输入检验任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验结果" prop="checkResult">
<el-select
v-model="queryParams.checkResult"
placeholder="检验结果"
clearable
>
<el-option
v-for="dict in dict.type.check_result"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="检测地点" prop="checkLoc">
<el-input
v-model="queryParams.checkLoc"
placeholder="请输入检测地点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="检验时间" prop="checkTimeArray">
<el-date-picker
v-model="queryParams.checkTimeArray"
format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['quality:qcIncome:add']"
>新增</el-button>
</el-col> -->
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['quality:incomeReport:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="150"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="收货数量" align="center" prop="quality" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleLook(scope.row)"
v-hasPermi="['quality:incomeReport:edit']"
>查看</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 打印首检对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-row>
<el-col :span="20">
<el-button
class="print-btn"
size="mini"
type="primary"
icon="el-icon-edit"
@click="handlePrint(form)"
>打印</el-button>
</el-col>
</el-row>
<!-- 打印整个printFrom区域 -->
<div id="printFrom">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :offset="8" :span="8">
<h1 style="align-content: center;">中山榄菊日化实业有限公司</h1>
</el-col>
</el-row>
<el-row>
<el-col :offset="8" :span="8">
<h2 style="align-content: center;">（黑蚊香）首检确认表</h2>
</el-col>
</el-row>
<el-row>
<el-col :offset="16" :span="8">
<el-form-item label="检验标准" prop="incomeBatchNo">
<el-input v-model="form.incomeBatchNo" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="产品名称" prop="materialName">
<el-input v-model="form.materialName" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品编码" prop="materialCode">
<el-input v-model="form.materialCode" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="首检日期" prop="checkTime">
<el-input v-model="form.checkTime" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="首检原因" >
<el-input disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" width="100"/>
<el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="内容" align="center" prop="checkStandard" width="200"/>
<el-table-column label="实际检验结果" align="center" prop="propertyCode" width="200">
<template slot-scope="scope">
<dict-tag
:options="dict.type.qc_rule_prop"
:value="scope.row.propertyCode"
/>
</template>
</el-table-column>
<el-table-column label="判定" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
<el-row style="margin-top: 10px;">
<el-col :span="20">
<el-form-item label="备注：" label-width="160px">
<el-input type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="综合结论：" label-width="160px">
<el-input type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="车间组长/机管员签名" label-width="160px">
<el-input disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-form-item label="质量管理部品管员签名" prop="checkManName" label-width="160px">
<el-input disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList} from "@/api/quality/firstReport";
import { getCheckTypes } from "@/api/quality/qcProduce";
import moment from 'moment';
export default {
name: "First",
dicts: ["unit","check_status","check_result","qc_rule_prop"],
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
//打印
formRef: 'form',
validateRules: [],
printData: {
printable: 'printFrom',
ignore: ['no-print'],
workCenter: "暂无数据",
SAPNo: null,
manufacture: null,
auditor: null,
printDate: null,
factory: null,
productDate: null,
workTable: [],
},
printDialogVisible: false,
// 首检表格数据
incomeList: [],
// 检验项目列表
checkProjectList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
checkTimeArray: [],
pageNum: 1,
pageSize: 10,
checkNo: null,
incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
quality: null,
unit: null,
supplierCode: null,
supplierName: null,
incomeTime: null,
checkLoc: null,
checkStatus: null,
checkManCode: null,
checkManName: null,
checkTime: null,
checkResult: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
factoryCode: null,
},
// 表单参数
form: {},
checkTypes:[],
// 表单校验
rules: {
/* incomeBatchNo: [
{ required: true, message: "来料批次号不能为空", trigger: "blur" }
], */
}
};
},
created() {
this.getDate();
this.getList();
this.getCheckTypes();
},
methods: {
/****/
getCheckTypes() {
getCheckTypes('material').then(response => {
this.checkTypes = response;
});
},
/**获取默认查询时间段**/
getDate() {
let start = this.Fungetdate (0)
let end = this.Fungetdate (1)
//this.queryParams.incomeTimeArray.push(start,end)
this.queryParams.checkTimeArray.push(start,end)
},
Fungetdate (num) {
var dd = new Date();
dd.setDate(dd.getDate() + num);
var y = dd.getFullYear();
var m = dd.getMonth() + 1;//获取当前月份的日期
var d = dd.getDate();
return y + "-" + m + "-" + d+" 00:00:00";
},
/** 查询首检列表 */
getList() {
this.loading = true;
if(this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}
listIncome(this.queryParams).then(response => {
this.incomeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
recordId: null,
checkNo: null,
incomeBatchNo: null,
orderNo: null,
materialCode: null,
materialName: null,
quality: null,
unit: null,
supplierCode: null,
supplierName: null,
incomeTime: null,
checkLoc: null,
checkStatus: null,
checkManCode: null,
checkManName: null,
checkTime: null,
checkResult: null,
status: null,
attr1: null,
attr2: null,
attr3: null,
attr4: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
factoryCode: null,
delFlag: null,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加首检";
},
/** 查看按钮操作 */
handleLook(row) {
this.reset();
const recordId = row.recordId || this.ids
this.queryParams.recordId = recordId;
getIncome(recordId).then(response => {
this.form = response.data;
this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
this.title = "查看首检报告";
});
this.getCheckedProjectList();
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.recordId != null) {
updateIncome(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addIncome(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除首检编号为"' + recordIds + '"的数据项？').then(function() {
return delIncome(recordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('quality/qcIncome/export', {
...this.queryParams
}, `income_${new Date().getTime()}.xlsx`)
},
/**获取检验项目列表 */
getCheckedProjectList(){
this.loading = true;
getCkeckProjectList(this.queryParams).then((response) => {
this.checkProjectList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 打印预览-浏览器打印
handlePrint(params) {
console.log(this.form);
printJS({
printable: params.printable, // 'printFrom', // 标签元素id
type: params.type || 'html',
maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小
header: "首检结果报告",//params.header, // '表单',
targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print']
properties: params.properties || null
})
},
}
};
</script>
<style scoped>
.print-btn{
margin-bottom: 15px;
margin-left: 10px;
}
</style>

94
src/views/quality/qcSampleRule/index.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
<el-form-item label="开始值" prop="startValue"> <el-form-item label="开始值" prop="startValue">
<el-input <el-input
v-model="queryParams.startValue" v-model="queryParams.startValue"
@ -26,7 +26,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="检验类型" prop="typeCode"> <el-form-item label="检验类型" prop="typeCode">
<el-select v-model="form.typeCode" placeholder="请选择检验类型" clearable style="width:100%"> <el-select v-model="queryParams.typeCode" placeholder="请选择检验类型" clearable style="width:100%">
<el-option <el-option
v-for="dict in dict.type.check_type" v-for="dict in dict.type.check_type"
:key="dict.value" :key="dict.value"
@ -35,16 +35,6 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验类型子项目" prop="checkType">
<el-select v-model="form.checkType" placeholder="请选择检验类型子项目" clearable style="width:100%">
<el-option
v-for="item in checkTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -143,16 +133,17 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="开始值" prop="startValue"> <el-form-item label="开始值" prop="startValue">
<el-input v-model="form.startValue" placeholder="请输入开始值" /> <el-input v-model="form.startValue" placeholder="请输入数字" />
</el-form-item> </el-form-item>
<el-form-item label="结束值" prop="endValue"> <el-form-item label="结束值" prop="endValue">
<el-input v-model="form.endValue" placeholder="请输入检测项方案名称" /> <el-input v-model="form.endValue" placeholder="请输入数字" />
</el-form-item> </el-form-item>
<el-form-item label="抽样数量" prop="sampleQuality"> <el-form-item label="抽样数量" prop="sampleQuality">
<el-input v-model="form.sampleQuality" placeholder="请输入抽样数量" /> <el-input v-model="form.sampleQuality" placeholder="请输入抽样数量" />
</el-form-item> </el-form-item>
<el-form-item label="检验类型" prop="typeCode"> <el-form-item label="检验类型" prop="typeCode">
<el-select v-model="form.typeCode" placeholder="请选择检验类型" style="width:100%"> <el-select v-model="form.typeCode" placeholder="请选择检验类型"
@change="handleGetCheckType" clearable style="width:100%">
<el-option <el-option
v-for="dict in dict.type.check_type" v-for="dict in dict.type.check_type"
:key="dict.value" :key="dict.value"
@ -162,12 +153,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="检验类型子项目" prop="checkType"> <el-form-item label="检验类型子项目" prop="checkType">
<el-select v-model="form.checkType" placeholder="请选择检验类型子项目" style="width:100%"> <el-select v-model="form.checkType" placeholder="请先选择检验类型" :disabled="!(form.typeCode)" style="width:100%">
<el-option <el-option
v-for="item in checkTypeList" v-for="item in addCheckTypeList"
:key="item.value" :key="item.id"
:label="item.label" :label="item.checkName"
:value="item.value" :value="item.id"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -181,8 +172,8 @@
</template> </template>
<script> <script>
import { listQcSampleRule, getQcSampleRule, delQcSampleRule, addQcSampleRule, updateQcSampleRule } from "@/api/quality/qcSampleRule"; import { listQcSampleRule, getQcSampleRule, delQcSampleRule, addQcSampleRule, updateQcSampleRule, getCheckType } from "@/api/quality/qcSampleRule";
import { listCheckType,} from "@/api/quality/checkType";
export default { export default {
name: "QcSampleRule", name: "QcSampleRule",
dicts: ["check_type"], dicts: ["check_type"],
@ -206,24 +197,8 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
checkTypeList: [ checkTypeList: [],
{ addCheckTypeList: [],
value: 'checkTypeCP',
label: '成品入库检验',
},
{
value: 'checkTypeLL',
label: '来料检验',
},
{
value: 'checkTypeSC',
label: '首件检验',
},
{
value: 'checkTypeSCXJ',
label: '过程巡检',
},
],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
@ -240,14 +215,31 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
factoryCode: [ startValue: [
{ required: true, message: "工厂编码不能为空", trigger: "blur" } { required: true, message: "开始值不能为空", trigger: "blur" },
{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
], ],
endValue: [
{ required: true, message: "结束值不能为空", trigger: "blur" },
{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
],
sampleQuality: [
{ required: true, message: "抽样数量不能为空", trigger: "blur" },
{ pattern: /^[1-9]\d*$/, message: "请输入正整数,且开头不能为0", trigger: "blur"}
],
typeCode: [
{ required: true, message: "检验类型不能为空", trigger: "blur" }
],
checkType: [
{ required: true, message: "检验类型子项目不能为空", trigger: "blur" }
],
} }
}; };
}, },
created() { created() {
this.getList(); this.getList();
this.getCheckTypeList();
}, },
methods: { methods: {
/** 查询来料抽样规则列表 */ /** 查询来料抽样规则列表 */
@ -259,6 +251,11 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
getCheckTypeList() {
listCheckType().then(response => {
this.checkTypeList = response.rows
});
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
@ -313,6 +310,7 @@ export default {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改来料抽样规则"; this.title = "修改来料抽样规则";
this.handleGetCheckType(this.form.typeCode);
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -352,9 +350,15 @@ export default {
}, `qcSampleRule_${new Date().getTime()}.xlsx`) }, `qcSampleRule_${new Date().getTime()}.xlsx`)
}, },
formatCheckType(checkType) { formatCheckType(checkType) {
const checkTypeBody = this.checkTypeList.find((item) => item.value === checkType); const checkTypeBody = this.checkTypeList.find((item) => item.id === checkType);
return checkTypeBody ? checkTypeBody.label : '——'; return checkTypeBody ? checkTypeBody.checkName : '';
} },
handleGetCheckType(value) {
this.form.checkType = '';
getCheckType(value).then(response => {
this.addCheckTypeList = response.rows
});
},
} }
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save