zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:检验加备注

This commit is contained in:
shijing 2024-04-01 15:45:17 +08:00
parent 142233e6c0
commit 8ae196b9e3
5 changed files with 1603 additions and 1185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/inm/mioitem_check.vue
View File

@ -719,6 +719,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input v-model="form.note"> </el-input>
</el-form-item>
</el-col>
<el-col> <el-col>
<el-form-item label="称重记录/Kg"> <el-form-item label="称重记录/Kg">
<el-button <el-button
@ -728,7 +733,6 @@
></el-button> ></el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col
:md="12" :md="12"
:sm="24" :sm="24"

220
src/views/qm/first_check.vue
View File

@ -1,12 +1,28 @@
<template> <template>
<el-dialog title="首件检验" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')"> <el-dialog
title="首件检验"
v-model="visible"
:size="1000"
destroy-on-close
@closed="$emit('closed')"
>
<el-container v-loading="loading"> <el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px"> <el-main style="padding: 0 20px 20px 20px">
<el-form ref="dialogForm" :model="form" :rules="rules" label-width="100px"> <el-form
ref="dialogForm"
:model="form"
:rules="rules"
label-width="100px"
>
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="检验日期" prop="test_date"> <el-form-item label="检验日期" prop="test_date">
<el-date-picker v-model="form.test_date" type="date" value-format="YYYY-MM-DD" style="width:100%" /> <el-date-picker
v-model="form.test_date"
type="date"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
@ -15,21 +31,50 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="form.ftestitems" border placeholder="暂无数据"> <el-table
<el-table-column prop="testitem" label="检测项" min-width="100" align="center"> :data="form.ftestitems"
border
placeholder="暂无数据"
>
<el-table-column
prop="testitem"
label="检测项"
min-width="100"
align="center"
>
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.testitem_name }}</span> <span>{{ scope.row.testitem_name }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="test_val" label="操作人检测值" min-width="120" align="center"> <el-table-column
prop="test_val"
label="操作人检测值"
min-width="120"
align="center"
>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.test_val" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="scope.row.test_val"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="check_val" label="专检人测量值" min-width="120" align="center"> <el-table-column
prop="check_val"
label="专检人测量值"
min-width="120"
align="center"
>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.check_val" :min="0" style="width:100%" controls-position="right"> <el-input-number
v-model="scope.row.check_val"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</template> </template>
</el-table-column> </el-table-column>
@ -37,15 +82,30 @@
<el-row style="margin-top: 14px"> <el-row style="margin-top: 14px">
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="检验工序集" prop="test_group"> <el-form-item label="检验工序集" prop="test_group">
<el-select v-model="form.test_group" placeholder="检验工序集" clearable style="width:100%"> <el-select
<el-option v-for="item in processOptions" :key="item" :label="item" :value="item"> v-model="form.test_group"
placeholder="检验工序集"
clearable
style="width: 100%"
>
<el-option
v-for="item in processOptions"
:key="item"
:label="item"
:value="item"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" prop="is_ok"> <el-col :md="12" :sm="24" prop="is_ok">
<el-form-item label="合格判定" prop="is_ok"> <el-form-item label="合格判定" prop="is_ok">
<el-select v-model="form.is_ok" placeholder="合格判定" clearable style="width:100%"> <el-select
v-model="form.is_ok"
placeholder="合格判定"
clearable
style="width: 100%"
>
<el-option label="合格" :value="true" /> <el-option label="合格" :value="true" />
<el-option label="不合格" :value="false" /> <el-option label="不合格" :value="false" />
</el-select> </el-select>
@ -53,28 +113,55 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="操作人" prop="test_user"> <el-form-item label="操作人" prop="test_user">
<el-select v-model="form.test_user" placeholder="操作人" clearable filterable style="width:100%"> <el-select
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" /> v-model="form.test_user"
placeholder="操作人"
clearable
filterable
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="专检人" prop="check_user"> <el-form-item label="专检人" prop="check_user">
<el-select v-model="form.check_user" placeholder="专检人" clearable filterable style="width:100%"> <el-select
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" /> v-model="form.check_user"
placeholder="专检人"
clearable
filterable
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.note" placeholder="备注"/> <el-input
v-model="form.note"
placeholder="备注"
/>
</el-form-item> </el-form-item>
</el-col> --> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-main> </el-main>
<el-footer> <el-footer>
<el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button> <el-button type="primary" :loading="isSaveing" @click="submit"
>保存</el-button
>
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
</el-footer> </el-footer>
</el-container> </el-container>
@ -87,22 +174,58 @@ export default {
return { return {
loading: false, loading: false,
form: { form: {
type: 'first', type: "first",
ftestitems: [], ftestitems: [],
}, },
rules: { rules: {
belong_dept: [{ required: true, message: "请选择所属部门", trigger: "blur" }], belong_dept: [
test_date: [{ required: true, message: "请选择检验日期", trigger: "blur" }], {
test_user: [{ required: true, message: "请选择操作人", trigger: "blur" }], required: true,
check_user: [{ required: true, message: "请选择专检人", trigger: "blur" }], message: "请选择所属部门",
test_group: [{ required: true, message: "请选择检测工序集", trigger: "blur" }], trigger: "blur",
is_ok: [{ required: true, message: "请选择是否合格", trigger: "blur" }], },
],
test_date: [
{
required: true,
message: "请选择检验日期",
trigger: "blur",
},
],
test_user: [
{
required: true,
message: "请选择操作人",
trigger: "blur",
},
],
check_user: [
{
required: true,
message: "请选择专检人",
trigger: "blur",
},
],
test_group: [
{
required: true,
message: "请选择检测工序集",
trigger: "blur",
},
],
is_ok: [
{
required: true,
message: "请选择是否合格",
trigger: "blur",
},
],
}, },
visible: false, visible: false,
isSaveing: false, isSaveing: false,
userList: [], userList: [],
options: [], options: [],
processOptions: ['粗中细磨', '抛光', '半抛光'], processOptions: ["粗中细磨", "抛光", "半抛光"],
deptOptions: [], deptOptions: [],
selectionFilters: [], selectionFilters: [],
setFiltersVisible: false, setFiltersVisible: false,
@ -128,31 +251,37 @@ export default {
//获取检验项目 //获取检验项目
getTextItem() { getTextItem() {
let that = this; let that = this;
that.$API.qm.getTestItem.get({ tag: 'first', page: 0 }).then(res => { that.$API.qm.getTestItem
console.log(res) .get({ tag: "first", page: 0 })
.then((res) => {
console.log(res);
let ftestitems = []; let ftestitems = [];
res.forEach(item => { res.forEach((item) => {
let obj = {}; let obj = {};
obj.testitem = item.id; obj.testitem = item.id;
obj.testitem_name = item.name; obj.testitem_name = item.name;
obj.test_val = 0; obj.test_val = 0;
obj.check_val = 0; obj.check_val = 0;
ftestitems.push(obj) ftestitems.push(obj);
}) });
console.log(ftestitems) console.log(ftestitems);
that.form.ftestitems = ftestitems; that.form.ftestitems = ftestitems;
}) });
}, },
//获取部门列表 //获取部门列表
getDeptOptions() { getDeptOptions() {
this.$API.system.dept.list.req({ page: 0, type__in: 'dept' }).then((res) => { this.$API.system.dept.list
.req({ page: 0, type__in: "dept" })
.then((res) => {
this.deptOptions = res; this.deptOptions = res;
}); });
}, },
//获取员工 //获取员工
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list.req({ page: 0, depts__name: '检验管理部' }).then(res => { this.$API.system.user.list
.req({ page: 0, depts__name: "检验管理部" })
.then((res) => {
that.userList = res.results; that.userList = res.results;
}); });
}, },
@ -170,28 +299,31 @@ export default {
// }, // },
//提交 //提交
submit() { submit() {
console.log('111111') console.log("111111");
let that = this; let that = this;
that.$refs.dialogForm.validate(async (valid) => { that.$refs.dialogForm.validate(async (valid) => {
if (valid) { if (valid) {
that.isSaveing = true; that.isSaveing = true;
try { try {
if (that.mode == "add") { if (that.mode == "add") {
that.$API.qm.ftest.create.req(that.form).then(res => { that.$API.qm.ftest.create
.req(that.form)
.then((res) => {
that.$emit("success"); that.$emit("success");
that.isSaveing = false; that.isSaveing = false;
that.visible = false; that.visible = false;
that.$message.success("操作成功"); that.$message.success("操作成功");
}) });
} else if (that.mode == "edit") { } else if (that.mode == "edit") {
that.$API.qm.ftest.update.req(that.form.id, that.form).then(res => { that.$API.qm.ftest.update
.req(that.form.id, that.form)
.then((res) => {
that.$emit("success"); that.$emit("success");
that.isSaveing = false; that.isSaveing = false;
that.visible = false; that.visible = false;
that.$message.success("操作成功"); that.$message.success("操作成功");
}) });
} }
} catch (err) { } catch (err) {
//可以处理校验错误 //可以处理校验错误
this.isSaveing = false; this.isSaveing = false;
@ -203,7 +335,7 @@ export default {
//表单注入数据 //表单注入数据
setData(data) { setData(data) {
Object.assign(this.form, data); Object.assign(this.form, data);
console.log('this.form', this.form) console.log("this.form", this.form);
// this.form.test_group = this.form.split(',') // this.form.test_group = this.form.split(',')
}, },
//设置过滤项 //设置过滤项

376
src/views/qm/productCheck.vue
View File

@ -3,9 +3,15 @@
<div> <div>
<el-card style="width: 100%" header="基本信息" shadow="hover"> <el-card style="width: 100%" header="基本信息" shadow="hover">
<el-descriptions> <el-descriptions>
<el-descriptions-item label="日期">{{ workObj.test_date }}</el-descriptions-item> <el-descriptions-item label="日期">{{
<el-descriptions-item label="批次号">{{ workObj.batch }}</el-descriptions-item> workObj.test_date
<el-descriptions-item label="总数">{{ workObj.count }}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="批次号">{{
workObj.batch
}}</el-descriptions-item>
<el-descriptions-item label="总数">{{
workObj.count
}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
</div> </div>
@ -13,101 +19,276 @@
<div> <div>
<el-card style="width: 100%" header="检验记录" shadow="hover"> <el-card style="width: 100%" header="检验记录" shadow="hover">
<!-- 预制棒 --> <!-- 预制棒 -->
<sc-form-table ref="formTable" v-if="type == 'bang'" v-model="formTableData" :addTemplate="addTemplate" <sc-form-table
placeholder="暂无数据"> ref="formTable"
<el-table-column prop="val" label="抽检编号" min-width="180"> v-if="type == 'bang'"
v-model="formTableData"
:addTemplate="addTemplate"
placeholder="暂无数据"
>
<el-table-column
prop="val"
label="抽检编号"
min-width="180"
>
<template #default="scope"> <template #default="scope">
<!-- <span v-if="scope.row.id">{{ scope.row.test_numer }}</span> --> <!-- <span v-if="scope.row.id">{{ scope.row.test_numer }}</span> -->
<el-input :disabled="!scope.row.isEdit" v-model="scope.row.test_numer" placeholder="抽检编号"></el-input> <el-input
:disabled="!scope.row.isEdit"
v-model="scope.row.test_numer"
placeholder="抽检编号"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验记录" align="center"> <el-table-column label="检验记录" align="center">
<template v-for="(item0, $index) in ftestitems" :key="item0.id"> <template
<el-table-column prop="test_val" :label="item0.name" min-width="130"> v-for="(item0, $index) in ftestitems"
:key="item0.id"
>
<el-table-column
prop="test_val"
:label="item0.name"
min-width="130"
>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.ftestitems[$index].test_val" <el-input-number
:disabled="!scope.row.isEdit" :min="0" style="width:100%" controls-position="right"> v-model="
scope.row.ftestitems[$index]
.test_val
"
:disabled="!scope.row.isEdit"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="test_val" label="合格判定" min-width="90"> <el-table-column
prop="test_val"
label="合格判定"
min-width="90"
>
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.is_ok" placeholder="是否合格" clearable :disabled="!scope.row.isEdit" <el-select
style="width:100%"> v-model="scope.row.is_ok"
placeholder="是否合格"
clearable
:disabled="!scope.row.isEdit"
style="width: 100%"
>
<el-option label="是" :value="true" /> <el-option label="是" :value="true" />
<el-option label="否" :value="false" /> <el-option label="否" :value="false" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="test_user" label="检验人" width="120"> <el-table-column
prop="test_user"
label="检验人"
width="120"
>
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.test_user" placeholder="检验人" clearable filterable <el-select
:disabled="!scope.row.isEdit" style="width:100%"> v-model="scope.row.test_user"
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" /> placeholder="检验人"
clearable
filterable
:disabled="!scope.row.isEdit"
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="open" label="操作" fixed="right" width="90" align="center"> <el-table-column prop="val" label="备注">
<template #default="scope"> <template #default="scope">
<el-link type="primary" v-if="scope.row.isEdit" @click="saveCheck(scope.row)">保存</el-link> <el-input
<el-link type="primary" v-else @click="editCheck(scope.row)">编辑</el-link> :disabled="!scope.row.isEdit"
<el-link type="danger" @click="delCheck(scope.row.id)" style="margin-left: 2px;">删除</el-link> v-model="scope.row.note"
placeholder="备注"
></el-input>
</template>
</el-table-column>
<el-table-column
prop="open"
label="操作"
fixed="right"
width="90"
align="center"
>
<template #default="scope">
<el-link
type="primary"
v-if="scope.row.isEdit"
@click="saveCheck(scope.row)"
>保存</el-link
>
<el-link
type="primary"
v-else
@click="editCheck(scope.row)"
>编辑</el-link
>
<el-link
type="danger"
@click="delCheck(scope.row.id)"
style="margin-left: 2px"
>删除</el-link
>
</template> </template>
</el-table-column> </el-table-column>
</sc-form-table> </sc-form-table>
<!-- 预制管 --> <!-- 预制管 -->
<sc-form-table ref="formTable" v-else-if="type == 'guan'" v-model="formTableData" :addTemplate="addTemplate" <sc-form-table
placeholder="暂无数据"> ref="formTable"
<el-table-column prop="val" label="抽检编号" min-width="180"> v-else-if="type == 'guan'"
v-model="formTableData"
:addTemplate="addTemplate"
placeholder="暂无数据"
>
<el-table-column
prop="val"
label="抽检编号"
min-width="180"
>
<template #default="scope"> <template #default="scope">
<!-- <span v-if="scope.row.id">{{ scope.row.test_numer }}</span> --> <!-- <span v-if="scope.row.id">{{ scope.row.test_numer }}</span> -->
<el-input :disabled="!scope.row.isEdit" v-model="scope.row.test_numer" placeholder="抽检编号"></el-input> <el-input
:disabled="!scope.row.isEdit"
v-model="scope.row.test_numer"
placeholder="抽检编号"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验记录" align="center"> <el-table-column label="检验记录" align="center">
<template v-for="(item, $index) in ftestitems" :key="item.id"> <template
<el-table-column prop="test_val" :label="item.name" min-width="130"> v-for="(item, $index) in ftestitems"
:key="item.id"
>
<el-table-column
prop="test_val"
:label="item.name"
min-width="130"
>
<template #default="scope"> <template #default="scope">
<el-input-number v-model="scope.row.ftestitems[$index].test_val" <el-input-number
:disabled="!scope.row.isEdit" :min="0" style="width:100%" controls-position="right"> v-model="
scope.row.ftestitems[$index]
.test_val
"
:disabled="!scope.row.isEdit"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number> </el-input-number>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="test_val" label="合格判定" min-width="90" align="center"> <el-table-column
prop="test_val"
label="合格判定"
min-width="90"
align="center"
>
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.is_ok" placeholder="是否合格" clearable :disabled="!scope.row.isEdit" <el-select
style="width:100%"> v-model="scope.row.is_ok"
placeholder="是否合格"
clearable
:disabled="!scope.row.isEdit"
style="width: 100%"
>
<el-option label="是" :value="true" /> <el-option label="是" :value="true" />
<el-option label="否" :value="false" /> <el-option label="否" :value="false" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="test_user" label="检验人" min-width="120" align="center"> <el-table-column
prop="test_user"
label="检验人"
min-width="120"
align="center"
>
<template #default="scope"> <template #default="scope">
<el-select v-model="scope.row.test_user" placeholder="检验人" clearable filterable <el-select
:disabled="!scope.row.isEdit" style="width:100%"> v-model="scope.row.test_user"
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" /> placeholder="检验人"
clearable
filterable
:disabled="!scope.row.isEdit"
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="open" label="操作" fixed="right" width="90" align="center"> <el-table-column prop="val" label="备注">
<template #default="scope"> <template #default="scope">
<el-link type="primary" v-if="scope.row.isEdit" @click="saveCheck(scope.row)">保存</el-link> <el-input
<el-link type="primary" v-else @click="editCheck(scope.row)">编辑</el-link> :disabled="!scope.row.isEdit"
<el-link type="danger" v-if="scope.row.id" @click="delCheck(scope.row.id)" style="margin-left: 2px;">删除</el-link> v-model="scope.row.note"
placeholder="备注"
></el-input>
</template>
</el-table-column>
<el-table-column
prop="open"
label="操作"
fixed="right"
width="90"
align="center"
>
<template #default="scope">
<el-link
type="primary"
v-if="scope.row.isEdit"
@click="saveCheck(scope.row)"
>保存</el-link
>
<el-link
type="primary"
v-else
@click="editCheck(scope.row)"
>编辑</el-link
>
<el-link
type="danger"
v-if="scope.row.id"
@click="delCheck(scope.row.id)"
style="margin-left: 2px"
>删除</el-link
>
</template> </template>
</el-table-column> </el-table-column>
</sc-form-table> </sc-form-table>
</el-card> </el-card>
</div> </div>
</div> </div>
<save-dialog v-if="dialog.save" ref="saveDialog" :mioId="mioId" :belongDeptId="belongDeptId" <save-dialog
:belongDeptName="mioObj.belong_dept_name" :mioObj="mioObj" :cate="cate" @success="handleSaveSuccess" v-if="dialog.save"
@closed="dialog.save = false"> ref="saveDialog"
:mioId="mioId"
:belongDeptId="belongDeptId"
:belongDeptName="mioObj.belong_dept_name"
:mioObj="mioObj"
:cate="cate"
@success="handleSaveSuccess"
@closed="dialog.save = false"
>
</save-dialog> </save-dialog>
</template> </template>
<script> <script>
@ -115,21 +296,19 @@ import saveDialog from "./product_check.vue";
export default { export default {
name: "mioitem", name: "mioitem",
components: { components: {
saveDialog saveDialog,
}, },
data() { data() {
return { return {
addTemplate: { addTemplate: {
ftestitems: [ ftestitems: [{ test_val: "", check_val: "", testitem: "" }],
{ test_val: '', check_val: '', testitem: '' }, test_date: "", //work获取
], test_numer: "",
test_date: '',//work获取
test_numer: '',
is_ok: true, is_ok: true,
test_user: '', test_user: "",
ftest_work: '',//work获取 ftest_work: "", //work获取
isEdit: true, isEdit: true,
type: 'prod' type: "prod",
}, },
ftestitems: [], ftestitems: [],
dialog: { dialog: {
@ -139,17 +318,17 @@ export default {
apiObj: null, apiObj: null,
params: {}, params: {},
formTableData: null, formTableData: null,
ftestWork: '', ftestWork: "",
type: '', type: "",
userList: [], userList: [],
workObj: {}, workObj: {},
}; };
}, },
watch: { watch: {
formTableData(newValue, oldValue) { formTableData(newValue, oldValue) {
console.log('值发生了变化:', newValue); console.log("值发生了变化:", newValue);
this.testNumberChange(); this.testNumberChange();
} },
}, },
mounted() { mounted() {
let that = this; let that = this;
@ -159,10 +338,10 @@ export default {
that.$API.qm.ftestwork.item.req(that.ftestWork).then((res) => { that.$API.qm.ftestwork.item.req(that.ftestWork).then((res) => {
that.workObj = res; that.workObj = res;
that.addTemplate.test_date = res.test_date; that.addTemplate.test_date = res.test_date;
that.addTemplate.test_numer = res.batch + '_1'; that.addTemplate.test_numer = res.batch + "_1";
that.getCheckList(); that.getCheckList();
}) });
let tag = that.type == 'bang' ? 'prod_bang' : 'prod_guan'; let tag = that.type == "bang" ? "prod_bang" : "prod_guan";
that.getTestItem(tag, that.ftestWork); that.getTestItem(tag, that.ftestWork);
that.getUserList(that.ftestWork); that.getUserList(that.ftestWork);
}, },
@ -170,23 +349,25 @@ export default {
//获取检验项目 //获取检验项目
getTestItem(tag, ftestWork) { getTestItem(tag, ftestWork) {
let that = this; let that = this;
that.$API.qm.getTestItem.get({ tag: tag, page: 0, ftest_work: ftestWork }).then(res => { that.$API.qm.getTestItem
.get({ tag: tag, page: 0, ftest_work: ftestWork })
.then((res) => {
let arr = res; let arr = res;
that.ftestitems = res; that.ftestitems = res;
let ftestitems = []; let ftestitems = [];
arr.forEach(item => { arr.forEach((item) => {
let obj = {}; let obj = {};
obj.test_val = 0; obj.test_val = 0;
obj.testitem = item.id; obj.testitem = item.id;
ftestitems.push(obj); ftestitems.push(obj);
}); });
that.addTemplate.ftestitems = ftestitems; that.addTemplate.ftestitems = ftestitems;
}) });
}, },
//获取员工 //获取员工
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list.req({ page: 0 }).then(res => { this.$API.system.user.list.req({ page: 0 }).then((res) => {
that.userList = res; that.userList = res;
}); });
}, },
@ -194,65 +375,84 @@ export default {
getCheckList(ftestwork) { getCheckList(ftestwork) {
let that = this; let that = this;
that.formTableData = []; that.formTableData = [];
this.$API.qm.ftest.list.req({ page: 0, type: 'prod', ftest_work: ftestwork }).then(res => { this.$API.qm.ftest.list
.req({ page: 0, type: "prod", ftest_work: ftestwork })
.then((res) => {
if (res.length > 0) { if (res.length > 0) {
that.addTemplate.test_numer = that.workObj.batch + '_' + (res.length + 1); that.addTemplate.test_numer =
console.log('that.addTemplate.test_numer', that.addTemplate.test_numer) that.workObj.batch + "_" + (res.length + 1);
res.forEach(item => { console.log(
"that.addTemplate.test_numer",
that.addTemplate.test_numer
);
res.forEach((item) => {
let obj = {}; let obj = {};
obj = item; obj = item;
obj.isEdit = false; obj.isEdit = false;
that.formTableData.push(obj); that.formTableData.push(obj);
}) });
} }
}) });
}, },
testNumberChange() { testNumberChange() {
this.addTemplate.test_numer = this.workObj.batch + '_' + (this.formTableData.length + 1); this.addTemplate.test_numer =
this.workObj.batch + "_" + (this.formTableData.length + 1);
}, },
editCheck(row) { editCheck(row) {
this.formTableData.forEach((item, index) => { this.formTableData.forEach((item, index) => {
if (item.id == row.id) { if (item.id == row.id) {
this.formTableData[index].isEdit = true; this.formTableData[index].isEdit = true;
} }
}) });
}, },
//删除 //删除
delCheck(id) { delCheck(id) {
this.$confirm(`确定删除吗？`, "提示", { this.$confirm(`确定删除吗？`, "提示", {
type: "warning", type: "warning",
}).then(() => { })
this.$API.qm.ftest.delete.req(id).then((res) => { .then(() => {
this.$API.qm.ftest.delete
.req(id)
.then((res) => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.$refs.table.refresh(); this.$refs.table.refresh();
return res; return res;
}).catch((err) => { })
.catch((err) => {
return err; return err;
}); });
}).catch(() => { }); })
.catch(() => {});
}, },
saveCheck(row) { saveCheck(row) {
console.log(row); console.log(row);
let index = this.formTableData.findIndex(item => item.id == row.id); let index = this.formTableData.findIndex(
(item) => item.id == row.id
);
if (row.id && row.id !== '') { if (row.id && row.id !== "") {
this.$API.qm.ftest.update.req(row.id, row).then((res) => { this.$API.qm.ftest.update
.req(row.id, row)
.then((res) => {
this.formTableData[index].isEdit = false; this.formTableData[index].isEdit = false;
this.$message.success("操作成功"); this.$message.success("操作成功");
this.$refs.formTable.refresh(); this.$refs.formTable.refresh();
}).catch((err) => { })
.catch((err) => {
return err; return err;
}); });
} else { } else {
this.$API.qm.ftest.create.req(row).then((res) => { this.$API.qm.ftest.create
.req(row)
.then((res) => {
this.formTableData[index].isEdit = false; this.formTableData[index].isEdit = false;
this.$message.success("操作成功"); this.$message.success("操作成功");
this.$refs.formTable.refresh(); this.$refs.formTable.refresh();
}).catch((err) => { })
.catch((err) => {
return err; return err;
}); });
} }
}, },
//本地更新数据 //本地更新数据
handleSaveSuccess(data, mode) { handleSaveSuccess(data, mode) {
@ -262,17 +462,17 @@ export default {
this.$refs.table.refresh(); this.$refs.table.refresh();
}, },
handleQuery() { handleQuery() {
this.$refs.table.queryData(this.query) this.$refs.table.queryData(this.query);
}, },
resetQuery() { resetQuery() {
this.query = {}; this.query = {};
}, },
mioSubmit() { mioSubmit() {
this.$API.inm.mio.submit.req(this.mioObj.id).then(res => { this.$API.inm.mio.submit.req(this.mioObj.id).then((res) => {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.mioObj = res this.mioObj = res;
}) });
} },
}, },
}; };
</script> </script>

4
src/views/statistics/product_check.vue
View File

@ -249,6 +249,8 @@
</el-table-column> </el-table-column>
<el-table-column label="气线" prop="气线"> <el-table-column label="气线" prop="气线">
</el-table-column> </el-table-column>
<el-table-column label="相中破" prop="相中破">
</el-table-column>
<el-table-column label="合计" prop="不合格数"> <el-table-column label="合计" prop="不合格数">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -430,7 +432,7 @@ export default {
query: { query: {
start_date: this.start_date, start_date: this.start_date,
end_date: this.end_date, end_date: this.end_date,
dept_name: "8车间", mgroup_name: "管料退火",
group_bys_material: "", group_bys_material: "",
order_bys_material: "", order_bys_material: "",
select_cols_material: "", select_cols_material: "",

164
src/views/wpm/mlog6_form.vue
View File

@ -16,13 +16,18 @@
<el-row> <el-row>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="批次号"> <el-form-item label="批次号">
<el-input disabled v-if="mode=='edit'" v-model="form.batch"></el-input> <el-input
disabled
v-if="mode == 'edit'"
v-model="form.batch"
></el-input>
<el-select <el-select
v-else v-else
v-model="form.batch" v-model="form.batch"
style="width: 100%" style="width: 100%"
filterable filterable
:disabled="mode=='edit'"> :disabled="mode == 'edit'"
>
<el-option <el-option
v-for="item in wmaterialOptions" v-for="item in wmaterialOptions"
:key="item" :key="item"
@ -34,7 +39,11 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item prop="type" label="操作人"> <el-form-item prop="type" label="操作人">
<el-input disabled v-if="mode=='edit'" v-model="form.handle_user_name"></el-input> <el-input
disabled
v-if="mode == 'edit'"
v-model="form.handle_user_name"
></el-input>
<el-select <el-select
v-else v-else
v-model="form.handle_user" v-model="form.handle_user"
@ -248,7 +257,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="断裂"> <el-form-item label="断裂">
<el-input-number <el-input-number
v-model="form.count_n_dl" v-model="form.count_n_dl"
@ -263,7 +276,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="气泡"> <el-form-item label="气泡">
<el-input-number <el-input-number
v-model="form.count_n_qp" v-model="form.count_n_qp"
@ -278,7 +295,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="不亮"> <el-form-item label="不亮">
<el-input-number <el-input-number
v-model="form.count_n_bl" v-model="form.count_n_bl"
@ -293,7 +314,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="横纹"> <el-form-item label="横纹">
<el-input-number <el-input-number
v-model="form.count_n_hw" v-model="form.count_n_hw"
@ -308,7 +333,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="有皮"> <el-form-item label="有皮">
<el-input-number <el-input-number
v-model="form.count_n_yp" v-model="form.count_n_yp"
@ -323,7 +352,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="爆皮"> <el-form-item label="爆皮">
<el-input-number <el-input-number
v-model="form.count_n_bp" v-model="form.count_n_bp"
@ -338,7 +371,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('棒')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('棒') > -1"
>
<el-form-item label="色差"> <el-form-item label="色差">
<el-input-number <el-input-number
v-model="form.count_n_sc" v-model="form.count_n_sc"
@ -353,7 +390,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('管') > -1"
>
<el-form-item label="气线"> <el-form-item label="气线">
<el-input-number <el-input-number
v-model="form.count_n_qx" v-model="form.count_n_qx"
@ -368,7 +409,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('管') > -1"
>
<el-form-item label="结石"> <el-form-item label="结石">
<el-input-number <el-input-number
v-model="form.count_n_js" v-model="form.count_n_js"
@ -383,7 +428,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('管') > -1"
>
<el-form-item label="椭圆度大"> <el-form-item label="椭圆度大">
<el-input-number <el-input-number
v-model="form.count_n_tydd" v-model="form.count_n_tydd"
@ -398,7 +447,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('管') > -1"
>
<el-form-item label="水雾"> <el-form-item label="水雾">
<el-input-number <el-input-number
v-model="form.count_n_sw" v-model="form.count_n_sw"
@ -413,7 +466,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('管') > -1"
>
<el-form-item label="壁厚偏差大"> <el-form-item label="壁厚偏差大">
<el-input-number <el-input-number
v-model="form.count_n_bhpcd" v-model="form.count_n_bhpcd"
@ -428,7 +485,11 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" v-if="material_name.indexOf('管')>-1"> <el-col
:md="12"
:sm="24"
v-if="material_name.indexOf('管') > -1"
>
<el-form-item label="弯"> <el-form-item label="弯">
<el-input-number <el-input-number
v-model="form.count_n_wq" v-model="form.count_n_wq"
@ -455,6 +516,15 @@
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注">
<el-input
v-model="form.note"
tyle="width:100%"
placeholder="备注"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<!-- <el-row v-if="material_name=='光纤预制棒'"> --> <!-- <el-row v-if="material_name=='光纤预制棒'"> -->
<!-- <el-row v-if="material_name.indexOf('棒')>-1"> <!-- <el-row v-if="material_name.indexOf('棒')>-1">
@ -465,7 +535,8 @@
</el-form> </el-form>
<el-footer> <el-footer>
<el-button type="primary" v-loading="isSaveing" @click="submit" <el-button type="primary" v-loading="isSaveing" @click="submit"
>确定</el-button> >确定</el-button
>
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
@ -489,13 +560,13 @@ export default {
edit: "编辑记录", edit: "编辑记录",
}, },
form: { form: {
shift:'', shift: "",
batch:'', batch: "",
count_ok: 0, count_ok: 0,
count_real: 0, count_real: 0,
count_use: 0, count_use: 0,
count_notok: 0, count_notok: 0,
handle_date:'', handle_date: "",
//共有 //共有
count_n_hs: 0, //划伤 count_n_hs: 0, //划伤
count_n_cs: 0, //挫伤 count_n_cs: 0, //挫伤
@ -520,7 +591,7 @@ export default {
count_n_bhpcd: 0, //壁厚偏差大 count_n_bhpcd: 0, //壁厚偏差大
count_n_wq: 0, //弯 count_n_wq: 0, //弯
handle_user:'' handle_user: "",
}, },
mlogb: [], mlogb: [],
userList: [], userList: [],
@ -535,9 +606,7 @@ export default {
handle_name: "", handle_name: "",
leader_name: "", leader_name: "",
count_n_all: null, count_n_all: null,
rules:{ rules: {},
},
}; };
}, },
mounted() { mounted() {
@ -557,18 +626,23 @@ export default {
}, },
methods: { methods: {
getRouteOptions() { getRouteOptions() {
this.$API.mtm.route.list.req({ page: 0, mgroup: this.mgroup}).then(res => { this.$API.mtm.route.list
.req({ page: 0, mgroup: this.mgroup })
.then((res) => {
for (var i = 0; i < res.length; i++) { for (var i = 0; i < res.length; i++) {
if (res[i].material_in == null) { if (res[i].material_in == null) {
res[i].material_in_name = '' res[i].material_in_name = "";
} }
if (res[i].material_out == null) { if (res[i].material_out == null) {
res[i].material_out_name = '' res[i].material_out_name = "";
} }
res[i].label = res[i].material_in_name + '->' + res[i].material_out_name res[i].label =
res[i].material_in_name +
"->" +
res[i].material_out_name;
} }
this.routeOptions = res; this.routeOptions = res;
}) });
}, },
getShiftOptions() { getShiftOptions() {
this.$API.mtm.shift.list.req({ page: 0 }).then((res) => { this.$API.mtm.shift.list.req({ page: 0 }).then((res) => {
@ -576,28 +650,32 @@ export default {
}); });
}, },
getWMaterial() { getWMaterial() {
this.$API.wpm.wmaterial.list.req({belong_dept__name: '6车间',page:0}).then(res=>{ this.$API.wpm.wmaterial.list
.req({ belong_dept__name: "6车间", page: 0 })
.then((res) => {
if (res.length > 0) { if (res.length > 0) {
let arr = []; let arr = [];
res.forEach(item => { res.forEach((item) => {
// if(item.count>0){} // if(item.count>0){}
arr.push(item.batch) arr.push(item.batch);
}); });
this.wmaterialOptions = arr; this.wmaterialOptions = arr;
} }
}) });
}, },
//获取车间物料批次号 //获取车间物料批次号
getBatchs() { getBatchs() {
let that = this; let that = this;
this.$API.wpm.wmaterial.batchs.req({belong_dept_name:"6车间"}).then(res=>{ this.$API.wpm.wmaterial.batchs
.req({ belong_dept_name: "6车间" })
.then((res) => {
that.batchOptions = res; that.batchOptions = res;
}); });
}, },
getUserList() { getUserList() {
let that = this; let that = this;
this.$API.system.user.list this.$API.system.user.list
.req({ belong_dept__name: '6车间', page: 0 }) .req({ belong_dept__name: "6车间", page: 0 })
.then((res) => { .then((res) => {
that.userList = res; that.userList = res;
}); });
@ -605,7 +683,9 @@ export default {
//获取设备列表 //获取设备列表
getEquipment() { getEquipment() {
this.$API.em.equipment.list.req({ page: 0, type: 10 }).then((res) => { this.$API.em.equipment.list
.req({ page: 0, type: 10 })
.then((res) => {
this.equipmentOptions = res; this.equipmentOptions = res;
}); });
}, },
@ -636,8 +716,7 @@ export default {
Number(this.form.count_n_sw) + Number(this.form.count_n_sw) +
Number(this.form.count_n_bhpcd) + Number(this.form.count_n_bhpcd) +
Number(this.form.count_n_wq) + Number(this.form.count_n_wq) +
Number(this.form.count_n_zw) Number(this.form.count_n_zw);
;
}, },
//提交 //提交
submit() { submit() {
@ -670,7 +749,8 @@ export default {
this.$emit("success", this.form, this.mode); this.$emit("success", this.form, this.mode);
this.visible = false; this.visible = false;
this.$message.success("操作成功"); this.$message.success("操作成功");
}).catch((err) => { })
.catch((err) => {
//可以处理校验错误 //可以处理校验错误
this.isSaveing = false; this.isSaveing = false;
return err; return err;
@ -678,9 +758,10 @@ export default {
} }
} else { } else {
this.isSaveing = false; this.isSaveing = false;
this.$message.error("合格总数与不合格总数与加工数量不对等"); this.$message.error(
"合格总数与不合格总数与加工数量不对等"
);
} }
} }
}); });
}, },
@ -724,4 +805,3 @@ export default {
font-weight: 600; font-weight: 600;
} }
</style> </style>