fix:#413---成品检验

This commit is contained in:
shijing 2024-05-22 16:23:57 +08:00
parent a777e06d4b
commit b28eb27d77
2 changed files with 186 additions and 132 deletions

View File

@ -1,132 +1,175 @@
<template>
<el-container>
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
</div>
<div class="right-panel">
<el-date-picker
v-model="query.date"
type="date"
value-format="YYYY-MM-DD"
/>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
>查询</el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="日期" prop="test_date" show-overflow-tooltip>
</el-table-column>
<el-table-column label="批次号" prop="batch">
</el-table-column>
<el-table-column label="总数" prop="count">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template #default="scope">
<el-link type="primary" @click="table_edit(scope.row)">编辑</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="primary" @click="table_check(scope.row)">检验</el-link>
<el-divider direction="vertical"></el-divider>
<el-link type="danger" @click="table_del(scope.row)">删除</el-link>
</template>
</el-table-column>
</scTable>
</el-main>
<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleCheckSuccess" @closed="dialog.check = false">
</save-dialog>
</el-container>
<el-container>
<el-header>
<div class="left-panel">
<el-button
type="primary"
icon="el-icon-plus"
@click="add"
></el-button>
</div>
<div class="right-panel">
<el-date-picker
v-model="query.date"
type="date"
value-format="YYYY-MM-DD"
/>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
>查询</el-button
>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:params="query"
>
<el-table-column type="index" width="50" />
<el-table-column
label="日期"
prop="test_date"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="批次号" prop="batch"> </el-table-column>
<el-table-column label="总数" prop="count"> </el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template #default="scope">
<el-link type="primary" @click="table_edit(scope.row)"
>编辑</el-link
>
<el-divider direction="vertical"></el-divider>
<el-link type="primary" @click="table_check(scope.row)"
>检验</el-link
>
<el-divider direction="vertical"></el-divider>
<el-link type="danger" @click="table_del(scope.row)"
>删除</el-link
>
</template>
</el-table-column>
</scTable>
</el-main>
<save-dialog
v-if="dialog.save"
ref="saveDialog"
@success="handleSaveSuccess"
@closed="dialog.save = false"
>
</save-dialog>
<el-drawer title="成品检验" v-model="dialog.check" :size="'90%'">
<check-dialog
ref="checkDialogs"
:type="product_type"
:ftestWork="ftestWork"
>
</check-dialog>
</el-drawer>
</el-container>
</template>
<script>
import saveDialog from "./product_form.vue";
export default {
name: "rparty",
components:{
saveDialog
},
data() {
return {
apiObj: this.$API.qm.ftestwork.list,
dialog:{
check:false,
},
query: {
page:1,
page_size:20,
type:10
},
selection: [],
};
},
methods: {
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
table_del(row){
this.$confirm(`确定删除吗?`, "提示", {
type: "warning",
}).then(() => {
this.$API.qm.ftestwork.delete.req(row.id).then((res) => {
this.$message.success("删除成功");
this.$refs.table.refresh();
return res;
}).catch((err) => {
return err;
});
}).catch(() => { });
},
//
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show",10).setData(row);
});
},
table_check(row){
// console.log('ftestWork',row)
let type = '';
if(row.material_name.indexOf('棒')>-1){
type = 'bang';
}else{
type='guan';
}
this.$router.push({
name: "productDetail",
query: {
type:type,
ftestWork:row.id
},
});
},
handleQuery() {
this.$refs.table.queryData(this.query)
},
resetQuery() {
this.query = {};
},
handleCheckSuccess(){
this.dialog.save = false;
this.$refs.table.refresh();
},
},
};
</script>
import checkDialog from "./productCheck.vue";
export default {
name: "rparty",
components: {
saveDialog,
checkDialog,
},
data() {
return {
apiObj: this.$API.qm.ftestwork.list,
dialog: {
save: false,
check: false,
},
query: {
page: 1,
page_size: 20,
type: 10,
},
selection: [],
};
},
methods: {
add() {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("add");
});
},
table_edit(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
},
table_del(row) {
this.$confirm(`确定删除吗?`, "提示", {
type: "warning",
})
.then(() => {
this.$API.qm.ftestwork.delete
.req(row.id)
.then((res) => {
this.$message.success("删除成功");
this.$refs.table.refresh();
return res;
})
.catch((err) => {
return err;
});
})
.catch(() => {});
},
//
table_show(row) {
this.dialog.save = true;
this.$nextTick(() => {
this.$refs.saveDialog.open("show", 10).setData(row);
});
},
table_check(row) {
debugger;
console.log(row);
let that = this;
let type = "";
if (row.material_name.indexOf("棒") > -1) {
type = "bang";
} else {
type = "guan";
}
that.product_type = type;
that.ftestWork = row.id;
that.dialog.check = true;
// this.$router.push({
// name: "productDetail",
// query: {
// type: type,
// ftestWork: row.id,
// },
// });
},
handleQuery() {
this.$refs.table.queryData(this.query);
},
resetQuery() {
this.query = {};
},
handleSaveSuccess() {
this.dialog.save = false;
this.$refs.table.refresh();
},
handleCheckSuccess() {
this.dialog.check = false;
},
},
};
</script>

View File

@ -295,6 +295,17 @@
import saveDialog from "./product_check.vue";
export default {
name: "mioitem",
emits: ["success", "closed"],
props: {
ftestWork: {
type: String,
default: "",
},
type: {
type: String,
default: "",
},
},
components: {
saveDialog,
},
@ -318,8 +329,8 @@ export default {
apiObj: null,
params: {},
formTableData: [],
ftestWork: "",
type: "",
// ftestWork: "",
// type: "",
userList: [],
workObj: {},
};
@ -332,8 +343,8 @@ export default {
},
mounted() {
let that = this;
that.type = that.$route.query.type;
that.ftestWork = that.$route.query.ftestWork;
// that.type = that.$route.query.type;
// that.ftestWork = that.$route.query.ftestWork;
that.addTemplate.ftest_work = that.ftestWork;
that.$API.qm.ftestwork.item.req(that.ftestWork).then((res) => {
that.workObj = res;