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

检验报告显示优化

Browse Source
yangwl
shaoyong 8 months ago
parent 17a929ad9e
commit 9b7ce9dda5
4 changed files with 86 additions and 29 deletions
Show Stats Download Patch File Download Diff File

12
src/api/quality/inventoryReport.js
Unescape Escape View File

@ -1,7 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询来料报告列表 // 查询来料报告列表
export function listIncome(query) { export function listInventory(query) {
return request({ return request({
url: '/quality/qcInventoryReport/list', url: '/quality/qcInventoryReport/list',
method: 'get', method: 'get',
@ -10,7 +10,7 @@ export function listIncome(query) {
} }
// 查询来料报告详细 // 查询来料报告详细
export function getIncome(recordId) { export function getInventory(recordId) {
return request({ return request({
url: '/quality/qcInventoryReport/' + recordId, url: '/quality/qcInventoryReport/' + recordId,
method: 'get' method: 'get'
@ -18,7 +18,7 @@ export function getIncome(recordId) {
} }
// 新增来料报告 // 新增来料报告
export function addIncome(data) { export function addInventory(data) {
return request({ return request({
url: '/quality/qcInventoryReport', url: '/quality/qcInventoryReport',
method: 'post', method: 'post',
@ -27,7 +27,7 @@ export function addIncome(data) {
} }
// 修改来料报告 // 修改来料报告
export function updateIncome(data) { export function updateInventory(data) {
return request({ return request({
url: '/quality/qcInventoryReport', url: '/quality/qcInventoryReport',
method: 'put', method: 'put',
@ -36,7 +36,7 @@ export function updateIncome(data) {
} }
// 删除来料报告 // 删除来料报告
export function delIncome(recordId) { export function delInventory(recordId) {
return request({ return request({
url: '/quality/qcInventoryReport/' + recordId, url: '/quality/qcInventoryReport/' + recordId,
method: 'delete' method: 'delete'
@ -71,7 +71,7 @@ export function getQcListUser(query) {
} }
//状态修改 //状态修改
export function changeIncomeStatus(recordId, status) { export function changeInventoryStatus(recordId, status) {
const data = { const data = {
recordId, recordId,
status status

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

@ -232,19 +232,25 @@
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" > <el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="ruleName" /> <el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/>
<el-table-column label="抽检数" align="center" prop="sampleNum" /> <el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
<el-table-column label="单位" align="center" prop="unitCode" /> <el-table-column label="单位" align="center" prop="unitCode" width="50"/>
<el-table-column label="测量结果" align="center" prop="actualValue" width="160"/> <el-table-column label="测量结果" align="center" prop="actualValue" width="160"/>
<el-table-column label="判定" align="center" prop="status" > <el-table-column label="判定" align="center" prop="status" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/> <dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件" align="center" prop="files" width="200"> <el-table-column label="不良类型" align="center" prop="defectCode" width="80">
<template slot-scope="scope">
<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
</template>
</el-table-column>
<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>
<el-table-column label="附件" align="center" prop="files" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image v-for="(item,index) in scope.row.files" :key="index" <el-image v-for="(item,index) in scope.row.files" :key="index"
:src="item.fileAddress" :src="item.fileAddress"
@ -299,6 +305,7 @@
<script> <script>
import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList} from "@/api/quality/incomeReport"; import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList} from "@/api/quality/incomeReport";
import { getCheckTypes } from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce";
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
import moment from 'moment'; import moment from 'moment';
export default { export default {
name: "Income", name: "Income",
@ -337,6 +344,7 @@ export default {
incomeList: [], incomeList: [],
// 检验项目列表 // 检验项目列表
checkProjectList: [], checkProjectList: [],
defectList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -384,6 +392,7 @@ export default {
this.getDate(); this.getDate();
this.getList(); this.getList();
this.getCheckTypes(); this.getCheckTypes();
this.getDefectType();
}, },
methods: { methods: {
/****/ /****/
@ -559,6 +568,16 @@ export default {
properties: params.properties || null properties: params.properties || null
}) })
}, },
getDefectType() {
const defectType = "material";
getDefectTypeListByDefectType(defectType).then(response => {
this.defectList = response.rows;
});
},
getCodeValue(defectCode) {
const foundDefect = this.defectList.find(defect => defect.defectCode === defectCode);
return foundDefect.defectSubclass;
}
} }
}; };
</script> </script>

41
src/views/quality/inventoryReport/index.vue
Unescape Escape View File

@ -231,19 +231,25 @@
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" > <el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="ruleName" /> <el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/>
<el-table-column label="抽检数" align="center" prop="sampleNum" /> <el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
<el-table-column label="单位" align="center" prop="unitCode" /> <el-table-column label="单位" align="center" prop="unitCode" width="50"/>
<el-table-column label="实测结果" align="center" prop="actualValue" width="160"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="160"/>
<el-table-column label="判定" align="center" prop="status" > <el-table-column label="判定" align="center" prop="status" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/> <dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件" align="center" prop="files" width="200"> <el-table-column label="不良类型" align="center" prop="defectCode" width="80">
<template slot-scope="scope">
<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
</template>
</el-table-column>
<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>
<el-table-column label="附件" align="center" prop="files" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image v-for="(item,index) in scope.row.files" :key="index" <el-image v-for="(item,index) in scope.row.files" :key="index"
:src="item.fileAddress" :src="item.fileAddress"
@ -296,8 +302,9 @@
</template> </template>
<script> <script>
import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList} from "@/api/quality/inventoryReport"; import { listInventory, getInventory, delInventory, addInventory, updateInventory,getCkeckProjectList} from "@/api/quality/inventoryReport";
import { getCheckTypes } from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce";
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
import moment from 'moment'; import moment from 'moment';
export default { export default {
name: "InventoryReport", name: "InventoryReport",
@ -336,6 +343,7 @@ export default {
incomeList: [], incomeList: [],
// 检验项目列表 // 检验项目列表
checkProjectList: [], checkProjectList: [],
defectList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -383,6 +391,7 @@ export default {
this.getDate(); this.getDate();
this.getList(); this.getList();
this.getCheckTypes(); this.getCheckTypes();
this.getDefectType();
}, },
methods: { methods: {
/****/ /****/
@ -416,7 +425,7 @@ export default {
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).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 => { listInventory(this.queryParams).then(response => {
this.incomeList = response.rows; this.incomeList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -489,7 +498,7 @@ export default {
this.reset(); this.reset();
const recordId = row.recordId || this.ids const recordId = row.recordId || this.ids
this.queryParams.recordId = recordId; this.queryParams.recordId = recordId;
getIncome(recordId).then(response => { getInventory(recordId).then(response => {
this.form = response.data; this.form = response.data;
this.form.printable = 'printFrom'; //打印时需要 this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要 this.form.ignore = ['no-print'];//打印时需要
@ -503,13 +512,13 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.recordId != null) { if (this.form.recordId != null) {
updateIncome(this.form).then(response => { updateInventory(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addIncome(this.form).then(response => { addInventory(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -522,7 +531,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const recordIds = row.recordId || this.ids; const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除库存检验编号为"' + recordIds + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除库存检验编号为"' + recordIds + '"的数据项？').then(function() {
return delIncome(recordIds); return delInventory(recordIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
@ -558,6 +567,16 @@ export default {
properties: params.properties || null properties: params.properties || null
}) })
}, },
getDefectType() {
const defectType = "inventory";
getDefectTypeListByDefectType(defectType).then(response => {
this.defectList = response.rows;
});
},
getCodeValue(defectCode) {
const foundDefect = this.defectList.find(defect => defect.defectCode === defectCode);
return foundDefect.defectSubclass;
}
} }
}; };
</script> </script>

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

@ -208,19 +208,25 @@
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" > <el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="ruleName" /> <el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/>
<el-table-column label="抽检数量" align="center" prop="sampleNum" /> <el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
<el-table-column label="单位" align="center" prop="unitCode" /> <el-table-column label="单位" align="center" prop="unitCode" width="50"/>
<el-table-column label="实测结果" align="center" prop="actualValue" width="160"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="160"/>
<el-table-column label="判定" align="center" prop="status" > <el-table-column label="判定" align="center" prop="status" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/> <dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="附件" align="center" prop="files" width="200"> <el-table-column label="不良类型" align="center" prop="defectCode" width="80">
<template slot-scope="scope">
<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
</template>
</el-table-column>
<el-table-column label="不良数量" align="center" prop="defectQuality" width="50"/>
<el-table-column label="附件" align="center" prop="files" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image v-for="(item,index) in scope.row.files" :key="index" <el-image v-for="(item,index) in scope.row.files" :key="index"
:src="item.fileAddress" :src="item.fileAddress"
@ -278,6 +284,7 @@
import { listProduct, getProduct, delProduct, addProduct, updateProduct,getWorkOrders} from "@/api/quality/productReport"; import { listProduct, getProduct, delProduct, addProduct, updateProduct,getWorkOrders} from "@/api/quality/productReport";
import { getCkeckProjectList} from "@/api/quality/incomeReport"; import { getCkeckProjectList} from "@/api/quality/incomeReport";
import { getCheckTypes } from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce";
import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
import moment from 'moment'; import moment from 'moment';
export default { export default {
name: "Income", name: "Income",
@ -316,6 +323,7 @@ export default {
incomeList: [], incomeList: [],
// 检验项目列表 // 检验项目列表
checkProjectList: [], checkProjectList: [],
defectList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -363,6 +371,7 @@ export default {
this.getDate(); this.getDate();
this.getList(); this.getList();
this.getCheckTypes(); this.getCheckTypes();
this.getDefectType();
}, },
methods: { methods: {
/****/ /****/
@ -540,6 +549,16 @@ export default {
properties: params.properties || null properties: params.properties || null
}) })
}, },
getDefectType() {
const defectType = "product";
getDefectTypeListByDefectType(defectType).then(response => {
this.defectList = response.rows;
});
},
getCodeValue(defectCode) {
const foundDefect = this.defectList.find(defect => defect.defectCode === defectCode);
return foundDefect.defectSubclass;
}
} }
}; };
</script> </script>

Write Preview
Loading…
Cancel
Save