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

检验报告

Browse Source
yangwl
zhaoxiaolin 11 months ago
parent 993fdee52c
commit c970ffdfef
7 changed files with 87 additions and 62 deletions
Show Stats Download Patch File Download Diff File

10
src/api/quality/produceReport.js
Unescape Escape View File

@ -1,6 +1,6 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询来料报告列表 // 查询生产过程报告列表
export function listProduce(query) { export function listProduce(query) {
return request({ return request({
url: '/quality/qcProduceReport/list', url: '/quality/qcProduceReport/list',
@ -9,7 +9,7 @@ export function listProduce(query) {
}); });
} }
// 查询来料报告详细 // 查询生产过程报告详细
export function getProduce(recordId) { export function getProduce(recordId) {
return request({ return request({
url: '/quality/qcProduceReport/' + recordId, url: '/quality/qcProduceReport/' + recordId,
@ -17,7 +17,7 @@ export function getProduce(recordId) {
}); });
} }
// 新增来料报告 // 新增生产过程报告
export function addProduce(data) { export function addProduce(data) {
return request({ return request({
url: '/quality/qcProduceReport', url: '/quality/qcProduceReport',
@ -26,7 +26,7 @@ export function addProduce(data) {
}); });
} }
// 修改来料报告 // 修改生产过程报告
export function updateProduce(data) { export function updateProduce(data) {
return request({ return request({
url: '/quality/qcProduceReport', url: '/quality/qcProduceReport',
@ -35,7 +35,7 @@ export function updateProduce(data) {
}); });
} }
// 删除来料报告 // 删除生产过程报告
export function delProduce(recordId) { export function delProduce(recordId) {
return request({ return request({
url: '/quality/qcProduceReport/' + recordId, url: '/quality/qcProduceReport/' + recordId,

28
src/views/quality/incomeReport/index.vue
Unescape Escape View File

@ -93,7 +93,11 @@
<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" /> <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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -121,7 +125,7 @@
<el-col :span="20"> <el-col :span="20">
<el-button <el-button
class="print-btn" class="print-btn"
size="midle" size="mini"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handlePrint(form)" @click="handlePrint(form)"
@ -228,7 +232,11 @@
<el-table-column label="下差值" align="center" prop="downDiff" /> <el-table-column label="下差值" align="center" prop="downDiff" />
<el-table-column label="单位" align="center" prop="unitCode" /> <el-table-column label="单位" align="center" prop="unitCode" />
<el-table-column label="检验值" align="center" prop="actualValue" /> <el-table-column label="检验值" align="center" prop="actualValue" />
<el-table-column label="结果" align="center" prop="status" /> <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-table>
</el-col> </el-col>
</el-row> </el-row>
@ -329,7 +337,7 @@ export default {
}; };
}, },
created() { created() {
//this.getDate(); this.getDate();
this.getList(); this.getList();
this.getCheckTypes(); this.getCheckTypes();
}, },
@ -341,12 +349,12 @@ export default {
}); });
}, },
/**获取默认查询时间段**/ /**获取默认查询时间段**/
//getDate() { getDate() {
//let start = this.Fungetdate (0) let start = this.Fungetdate (0)
//let end = this.Fungetdate (1) let end = this.Fungetdate (1)
//this.queryParams.incomeTimeArray.push(start,end) //this.queryParams.incomeTimeArray.push(start,end)
//this.queryParams.checkTimeArray.push(start,end) this.queryParams.checkTimeArray.push(start,end)
//}, },
Fungetdate (num) { Fungetdate (num) {
var dd = new Date(); var dd = new Date();
dd.setDate(dd.getDate() + num); dd.setDate(dd.getDate() + num);
@ -500,7 +508,7 @@ export default {
type: params.type || 'html', type: params.type || 'html',
maxWidth: 1500, // 最大宽度 maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小 font_size: "",// 设置字体大小
header: params.header, // '表单', header: "来料检验结果报告",//params.header, // '表单',
targetStyles: ['*'], targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾 style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print'] ignoreElements: params.ignore || [], // ['no-print']

31
src/views/quality/produceReport/index.vue
Unescape Escape View File

@ -93,7 +93,11 @@
<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" /> <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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -121,7 +125,7 @@
<el-col :span="20"> <el-col :span="20">
<el-button <el-button
class="print-btn" class="print-btn"
size="midle" size="mini"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handlePrint(form)" @click="handlePrint(form)"
@ -228,7 +232,11 @@
<el-table-column label="下差值" align="center" prop="downDiff" /> <el-table-column label="下差值" align="center" prop="downDiff" />
<el-table-column label="单位" align="center" prop="unitCode" /> <el-table-column label="单位" align="center" prop="unitCode" />
<el-table-column label="检验值" align="center" prop="actualValue" /> <el-table-column label="检验值" align="center" prop="actualValue" />
<el-table-column label="结果" align="center" prop="status" /> <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-table>
</el-col> </el-col>
</el-row> </el-row>
@ -293,6 +301,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
checkTimeArray: [], checkTimeArray: [],
incomeTimeArray: [],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
checkNo: null, checkNo: null,
@ -330,7 +339,7 @@ export default {
}; };
}, },
created() { created() {
//this.getDate(); this.getDate();
this.getList(); this.getList();
this.getCheckTypes(); this.getCheckTypes();
}, },
@ -342,12 +351,12 @@ export default {
}); });
}, },
/**获取默认查询时间段**/ /**获取默认查询时间段**/
//getDate() { getDate() {
//let start = this.Fungetdate (0) let start = this.Fungetdate (0)
//let end = this.Fungetdate (1) let end = this.Fungetdate (1)
//this.queryParams.incomeTimeArray.push(start,end) this.queryParams.incomeTimeArray.push(start,end)
//this.queryParams.checkTimeArray.push(start,end) this.queryParams.checkTimeArray.push(start,end)
//}, },
Fungetdate (num) { Fungetdate (num) {
var dd = new Date(); var dd = new Date();
dd.setDate(dd.getDate() + num); dd.setDate(dd.getDate() + num);
@ -501,7 +510,7 @@ export default {
type: params.type || 'html', type: params.type || 'html',
maxWidth: 1500, // 最大宽度 maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小 font_size: "",// 设置字体大小
header: params.header, // '表单', header: "生产过程检验结果报告",//params.header, // '表单',
targetStyles: ['*'], targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾 style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print'] ignoreElements: params.ignore || [], // ['no-print']

32
src/views/quality/productReport/index.vue
Unescape Escape View File

@ -93,7 +93,11 @@
<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验结果" align="center" prop="checkResult" /> <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"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -121,7 +125,7 @@
<el-col :span="20"> <el-col :span="20">
<el-button <el-button
class="print-btn" class="print-btn"
size="midle" size="mini"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handlePrint(form)" @click="handlePrint(form)"
@ -228,7 +232,11 @@
<el-table-column label="下差值" align="center" prop="downDiff" /> <el-table-column label="下差值" align="center" prop="downDiff" />
<el-table-column label="单位" align="center" prop="unitCode" /> <el-table-column label="单位" align="center" prop="unitCode" />
<el-table-column label="检验值" align="center" prop="actualValue" /> <el-table-column label="检验值" align="center" prop="actualValue" />
<el-table-column label="结果" align="center" prop="status" /> <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-table>
</el-col> </el-col>
</el-row> </el-row>
@ -330,7 +338,7 @@ export default {
}; };
}, },
created() { created() {
//this.getDate(); this.getDate();
this.getList(); this.getList();
this.getCheckTypes(); this.getCheckTypes();
}, },
@ -342,12 +350,12 @@ export default {
}); });
}, },
/**获取默认查询时间段**/ /**获取默认查询时间段**/
//getDate() { getDate() {
//let start = this.Fungetdate (0) let start = this.Fungetdate (0)
//let end = this.Fungetdate (1) let end = this.Fungetdate (1)
//this.queryParams.incomeTimeArray.push(start,end) this.queryParams.incomeTimeArray.push(start,end)
//this.queryParams.checkTimeArray.push(start,end) this.queryParams.checkTimeArray.push(start,end)
//}, },
Fungetdate (num) { Fungetdate (num) {
var dd = new Date(); var dd = new Date();
dd.setDate(dd.getDate() + num); dd.setDate(dd.getDate() + num);
@ -444,7 +452,7 @@ export default {
this.form.printable = 'printFrom'; //打印时需要 this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要 this.form.ignore = ['no-print'];//打印时需要
this.open = true; this.open = true;
this.title = "查看来料报告"; this.title = "查看成品入库报告";
}); });
this.getCheckedProjectList(); this.getCheckedProjectList();
}, },
@ -501,7 +509,7 @@ export default {
type: params.type || 'html', type: params.type || 'html',
maxWidth: 1500, // 最大宽度 maxWidth: 1500, // 最大宽度
font_size: "",// 设置字体大小 font_size: "",// 设置字体大小
header: params.header, // '表单', header: "成品入库检验结果报告",//params.header, // '表单',
targetStyles: ['*'], targetStyles: ['*'],
style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾 style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
ignoreElements: params.ignore || [], // ['no-print'] ignoreElements: params.ignore || [], // ['no-print']

16
src/views/quality/qcProduce/index.vue
Unescape Escape View File

@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="批次号" prop="batchNo"> <el-form-item label="批次号" prop="incomeBatchNo">
<el-input <el-input
v-model="queryParams.batchNo" v-model="queryParams.incomeBatchNo"
placeholder="请输入批次号" placeholder="请输入批次号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -161,7 +161,7 @@
<el-table-column label="id" align="center" prop="recordId" v-if="false"/> <el-table-column label="id" align="center" prop="recordId" v-if="false"/>
<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/> <el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
<el-table-column label="任务编号" align="center" prop="checkNo" width="120"/> <el-table-column label="任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="批次号" align="center" prop="batchNo" width="120"/> <el-table-column label="批次号" align="center" prop="incomeBatchNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/> <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
<el-table-column label="物料号" align="center" prop="materialCode" width="170"/> <el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/> <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
@ -240,8 +240,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号" prop="batchNo"> <el-form-item label="批次号" prop="incomeBatchNo">
<el-input v-model="form.batchNo" placeholder="请输入批次号" /> <el-input v-model="form.incomeBatchNo" placeholder="请输入批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -406,7 +406,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
checkNo: null, checkNo: null,
batchNo: null, incomeBatchNo: null,
orderNo: null, orderNo: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,
@ -435,7 +435,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
batchNo: [ incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" } { required: true, message: "批次号不能为空", trigger: "blur" }
], ],
orderNo: [ orderNo: [
@ -526,7 +526,7 @@ export default {
this.form = { this.form = {
recordId: null, recordId: null,
checkNo: null, checkNo: null,
batchNo: null, incomeBatchNo: null,
orderNo: null, orderNo: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,

16
src/views/quality/qcProduce/selectWorkCenter.vue
Unescape Escape View File

@ -11,7 +11,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
<el-form-item label="车间编码"> <el-form-item label="车间编码">
<el-input <el-input
v-model="queryParams.carCode" v-model="queryParams.supplierCode"
placeholder="车间编码" placeholder="车间编码"
clearable clearable
style="width: 240px" style="width: 240px"
@ -20,7 +20,7 @@
</el-form-item> </el-form-item>
<el-form-item label="车间名称"> <el-form-item label="车间名称">
<el-input <el-input
v-model="queryParams.carName" v-model="queryParams.supplierName"
placeholder="车间名称" placeholder="车间名称"
clearable clearable
style="width: 240px" style="width: 240px"
@ -36,8 +36,8 @@
<el-table-column width="50" align="center" type="selection"> <el-table-column width="50" align="center" type="selection">
</el-table-column> </el-table-column>
<!-- 序号 --> <!-- 序号 -->
<el-table-column label="车间编码" align="left" key="carCode" prop="carCode" :show-overflow-tooltip="true" /> <el-table-column label="车间编码" align="left" key="supplierCode" prop="supplierCode" :show-overflow-tooltip="true" />
<el-table-column label="车间名称" align="left" key="carName" prop="carName" :show-overflow-tooltip="true" /> <el-table-column label="车间名称" align="left" key="supplierName" prop="supplierName" :show-overflow-tooltip="true" />
</el-table> </el-table>
<pagination <pagination
@ -86,8 +86,8 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
carCode: '', supplierCode: '',
carName : '' supplierName : ''
} }
}; };
}, },
@ -128,8 +128,8 @@ export default {
this.$modal.msgSuccess("只能选一个"); this.$modal.msgSuccess("只能选一个");
} }
this.ids = selection[0].carCode; this.ids = selection[0].supplierCode;
this.idsName = selection[0].carName; this.idsName = selection[0].supplierName;
}, },

16
src/views/quality/qcWarehousing/index.vue
Unescape Escape View File

@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="批次号" prop="batchNo"> <el-form-item label="批次号" prop="incomeBatchNo">
<el-input <el-input
v-model="queryParams.batchNo" v-model="queryParams.incomeBatchNo"
placeholder="请输入批次号" placeholder="请输入批次号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -157,7 +157,7 @@
<el-table-column label="id" align="center" prop="recordId" v-if="false"/> <el-table-column label="id" align="center" prop="recordId" v-if="false"/>
<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/> <el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/> <el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="批次号" align="center" prop="batchNo" width="120"/> <el-table-column label="批次号" align="center" prop="incomeBatchNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/> <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
<el-table-column label="物料号" align="center" prop="materialCode" width="170"/> <el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/> <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
@ -236,8 +236,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="入库批次号" prop="batchNo"> <el-form-item label="入库批次号" prop="incomeBatchNo">
<el-input v-model="form.batchNo" placeholder="请输入入库批次号" /> <el-input v-model="form.incomeBatchNo" placeholder="请输入入库批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -403,7 +403,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
checkNo: null, checkNo: null,
batchNo: null, incomeBatchNo: null,
orderNo: null, orderNo: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,
@ -429,7 +429,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
batchNo: [ incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" } { required: true, message: "批次号不能为空", trigger: "blur" }
], ],
orderNo: [ orderNo: [
@ -519,7 +519,7 @@ export default {
this.form = { this.form = {
recordId: null, recordId: null,
checkNo: null, checkNo: null,
batchNo: null, incomeBatchNo: null,
orderNo: null, orderNo: null,
materialCode: null, materialCode: null,
materialName: null, materialName: null,

Write Preview
Loading…
Cancel
Save