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"

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

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

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

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

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

File diff suppressed because it is too large Load Diff