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

fix: mlog不显示产品名称

This commit is contained in:
caoqianming 2024-03-04 13:04:03 +08:00
parent 962dae3fde
commit 28a4e77ab3
2 changed files with 94 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/wpm/mlog_dept10.vue
View File

@ -20,7 +20,8 @@
}}</span>
</template>
</el-table-column>
<el-table-column label="型号规格" prop="">
<el-table-column label="型号规格" prop="" width="160">
<template #default="scope">
<span v-if="scope.row.material_out_">{{
scope.row.material_out_.specification
@ -34,6 +35,7 @@
</el-table-column>
<el-table-column label="合格数" prop="count_ok"> </el-table-column>
<el-table-column label="状态" prop="state">
<template #default="scope">
<el-tag v-if="scope.row.state !== 40">
{{ state_[scope.row.state] }}
@ -44,6 +46,7 @@
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="60">
<template #default="scope">
<el-link type="primary" @click="table_submit(scope.row)" v-auth="'mtask.submit'"
v-if="scope.row.state != 40">提交
@ -58,6 +61,7 @@
<el-container>
<el-header style="height: 30%; padding: 0;">
<el-card style="width: 100%; height: 100%; overflow-y: auto;">
<template #header>
<div class="card-header">
<span>任务信息</span>
@ -69,7 +73,8 @@
</template>
<el-descriptions>
<el-descriptions-item label="任务编号">{{ currentMtask.number }}</el-descriptions-item>
<el-descriptions-item label="状态">{{ state_[currentMtask.state] }}</el-descriptions-item>
<el-descriptions-item label="状态">{{ state_[currentMtask.state]
}}</el-descriptions-item>
<el-descriptions-item label="产品名称">
<span v-if="currentMtask.material_out_">{{ currentMtask.material_out_.name
}}</span></el-descriptions-item>
@ -101,8 +106,10 @@
<el-table-column label="出管总数" prop="count_real">
</el-table-column>
<el-table-column label="规格" prop="mlogb" width="300">
<template #default="scope">
<div v-for="item in scope.row.mlogb" :key="item" class="cateItem" style="">
<div v-for="item in scope.row.mlogb" :key="item" class="cateItem"
style="">
<span>{{ item.material_out_name }}|</span>
<span style="color:darkblue; font-weight: bold;">{{ item.count_ok
}}</span>
@ -112,6 +119,7 @@
<el-table-column label="合格总数" prop="count_ok">
</el-table-column>
<el-table-column label="合格率" prop="count">
<template #default="scope">
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real * 100)
}}%</span>
@ -141,6 +149,7 @@
</el-table-column>
<el-table-column label="碎料" prop="count_break"> </el-table-column>
<el-table-column label="操作" fixed="right" width="120" align="center">
<template #default="scope">
<el-button link type="primary" @click="table_edit(scope.row)"
v-auth="'mlog.update'" v-if="scope.row.submit_time == null">编辑
@ -185,6 +194,7 @@
<el-table-column label="送料日期" prop="send_date">
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope"><span v-if="scope.row.material_">{{
scope.row.material_.name
}}</span>
@ -198,12 +208,14 @@
<el-table-column label="接收人" prop="recive_user_name">
</el-table-column>
<el-table-column label="是否确认" prop="submit_time">
<template #default="scope">
<span v-if="scope.row.submit_time">是</span>
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<template #default="scope">
<el-button link type="primary" @click.stop="handover_submit(scope.row)"
v-auth="'handover.submit'" v-if="scope.row.submit_time == null">
@ -230,21 +242,25 @@
<scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
hidePagination>
<el-table-column label="物料名" prop="material">
<template #default="scope">{{
scope.row.material_.name
}}</template>
</el-table-column>
<el-table-column label="规格" prop="material">
<template #default="scope">{{
scope.row.material_.specification
}}</template>
</el-table-column>
<el-table-column label="型号" prop="material">
<template #default="scope">{{
scope.row.material_.model
}}</template>
</el-table-column>
<el-table-column label="已到工序" prop="material">
<template #default="scope">{{
scope.row.material_.process_name
}}</template>
@ -279,6 +295,7 @@
</el-dialog>
</el-container>
</template>
<script>
import saveDialog from "./worktask_form.vue";
import showDrawer from "./mlog_drawer.vue";

102
src/views/wpm/worktask_form.vue
View File

@ -47,8 +47,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="数量(桶数)" width="100">
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="请输入数量">
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="请输入数量">
</el-input-number>
</el-form-item>
</el-col>
@ -168,50 +168,50 @@
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="椭圆/弯曲">
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="条纹">
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="条纹" @change="countNotOkSun">
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="条纹" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="断裂">
<el-input-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="断裂" @change="countNotOkSun">
<el-input-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="断裂" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="偏壁">
<el-input-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
<el-input-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="大小头">
<el-input-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="大小头" @change="countNotOkSun">
<el-input-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="大小头" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="结石">
<el-input-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="结石" @change="countNotOkSun">
<el-input-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="结石" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气线">
<el-input-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="气线" @change="countNotOkSun">
<el-input-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="气线" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
@ -305,8 +305,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="应出量">
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="生产量" @change="countChange">
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="生产量" @change="countChange">
</el-input-number>
</el-form-item>
</el-col>
@ -368,36 +368,36 @@
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="炸纹">
<el-input-number v-model="form.count_n_zw" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="炸纹" @change="countNotOkSun">
<el-input-number v-model="form.count_n_zw" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="炸纹" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="条纹">
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="条纹" @change="countNotOkSun">
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="条纹" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气泡">
<el-input-number v-model="form.count_n_qp" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="气泡" @change="countNotOkSun">
<el-input-number v-model="form.count_n_qp" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="气泡" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="弯曲">
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="弯曲" @change="countNotOkSun">
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="弯曲" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="其他">
<el-input-number v-model="form.count_n_qt" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="其他" @change="countNotOkSun">
<el-input-number v-model="form.count_n_qt" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="其他" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
@ -434,8 +434,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="出管总数">
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="出管总数" @change="countChange">
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="出管总数" @change="countChange">
</el-input-number>
</el-form-item>
</el-col>
@ -467,8 +467,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="碎料">
<el-input-number v-model="form.count_break" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="碎料">
<el-input-number v-model="form.count_break" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="碎料">
</el-input-number>
</el-form-item>
</el-col>
@ -491,8 +491,8 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="合格数">
<el-input-number v-model="item.count_ok" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="合格数" @change="countOkSun">
<el-input-number v-model="item.count_ok" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="合格数" @change="countOkSun">
</el-input-number>
</el-form-item>
</el-col>
@ -503,50 +503,50 @@
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="椭圆/弯曲">
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="条纹">
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="条纹" @change="countNotOkSun">
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="条纹" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="断裂">
<el-input-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="断裂" @change="countNotOkSun">
<el-input-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="断裂" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="偏壁">
<el-input-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
<el-input-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="大小头">
<el-input-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="大小头" @change="countNotOkSun">
<el-input-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="大小头" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="结石">
<el-input-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="结石" @change="countNotOkSun">
<el-input-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="结石" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="气线">
<el-input-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1" :step-strictly="true"
style="width: 100%" placeholder="气线" @change="countNotOkSun">
<el-input-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1"
:step-strictly="true" style="width: 100%" placeholder="气线" @change="countNotOkSun">
</el-input-number>
</el-form-item>
</el-col>
@ -570,6 +570,7 @@
</el-footer>
</el-dialog>
</template>
<script>
export default {
emits: ["success", "closed"],
@ -663,7 +664,7 @@ export default {
if (this.activeType == "10车间" || this.activeType == "7车间") {
this.form.batch = this.material_model + '-' + batchDate;
}
this.getMaterial();
// this.getMaterial();
this.getUserList();
this.getEquipment();
this.getShiftOptions();
@ -784,6 +785,7 @@ export default {
for (var i = 0; i < res.length; i++) {
mOptions.push({
id: res[i].material_out,
name: res[i].material_out_name,
full_name: res[i].material_out_name,
material_in: res[i].material_in
});
@ -995,10 +997,10 @@ export default {
},
};
</script>
<style scoped>
.formTitle {
margin-bottom: 10px;
font-weight: 600;
}
</style>