fix: mlog不显示产品名称
This commit is contained in:
parent
962dae3fde
commit
28a4e77ab3
|
|
@ -16,15 +16,16 @@
|
||||||
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
|
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.material_out_">{{
|
<span v-if="scope.row.material_out_">{{
|
||||||
scope.row.material_out_.name
|
scope.row.material_out_.name
|
||||||
}}</span>
|
}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="型号规格" prop="">
|
<el-table-column label="型号规格" prop="" width="160">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.material_out_">{{
|
<span v-if="scope.row.material_out_">{{
|
||||||
scope.row.material_out_.specification
|
scope.row.material_out_.specification
|
||||||
}}|{{ scope.row.material_out_.model }}</span>
|
}}|{{ scope.row.material_out_.model }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="任务编号" prop="number" width="140" show-overflow-tooltip>
|
<el-table-column label="任务编号" prop="number" width="140" show-overflow-tooltip>
|
||||||
|
|
@ -34,6 +35,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="合格数" prop="count_ok"> </el-table-column>
|
<el-table-column label="合格数" prop="count_ok"> </el-table-column>
|
||||||
<el-table-column label="状态" prop="state">
|
<el-table-column label="状态" prop="state">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tag v-if="scope.row.state !== 40">
|
<el-tag v-if="scope.row.state !== 40">
|
||||||
{{ state_[scope.row.state] }}
|
{{ state_[scope.row.state] }}
|
||||||
|
|
@ -44,6 +46,7 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" fixed="right" width="60">
|
<el-table-column label="操作" fixed="right" width="60">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-link type="primary" @click="table_submit(scope.row)" v-auth="'mtask.submit'"
|
<el-link type="primary" @click="table_submit(scope.row)" v-auth="'mtask.submit'"
|
||||||
v-if="scope.row.state != 40">提交
|
v-if="scope.row.state != 40">提交
|
||||||
|
|
@ -58,6 +61,7 @@
|
||||||
<el-container>
|
<el-container>
|
||||||
<el-header style="height: 30%; padding: 0;">
|
<el-header style="height: 30%; padding: 0;">
|
||||||
<el-card style="width: 100%; height: 100%; overflow-y: auto;">
|
<el-card style="width: 100%; height: 100%; overflow-y: auto;">
|
||||||
|
|
||||||
<template #header>
|
<template #header>
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<span>任务信息</span>
|
<span>任务信息</span>
|
||||||
|
|
@ -69,17 +73,18 @@
|
||||||
</template>
|
</template>
|
||||||
<el-descriptions>
|
<el-descriptions>
|
||||||
<el-descriptions-item label="任务编号">{{ currentMtask.number }}</el-descriptions-item>
|
<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="产品名称">
|
<el-descriptions-item label="产品名称">
|
||||||
<span v-if="currentMtask.material_out_">{{ currentMtask.material_out_.name
|
<span v-if="currentMtask.material_out_">{{ currentMtask.material_out_.name
|
||||||
}}</span></el-descriptions-item>
|
}}</span></el-descriptions-item>
|
||||||
<el-descriptions-item label="规格型号"><span v-if="currentMtask.material_out_">{{
|
<el-descriptions-item label="规格型号"><span v-if="currentMtask.material_out_">{{
|
||||||
currentMtask.material_out_.specification
|
currentMtask.material_out_.specification
|
||||||
}}</span></el-descriptions-item>
|
}}</span></el-descriptions-item>
|
||||||
<el-descriptions-item label="合格数">{{ currentMtask.count_ok
|
<el-descriptions-item label="合格数">{{ currentMtask.count_ok
|
||||||
}}</el-descriptions-item>
|
}}</el-descriptions-item>
|
||||||
<el-descriptions-item label="不合格数">{{ currentMtask.count_notok
|
<el-descriptions-item label="不合格数">{{ currentMtask.count_notok
|
||||||
}}</el-descriptions-item>
|
}}</el-descriptions-item>
|
||||||
<!-- <el-descriptions-item label="配粉料数">{{ currentMtask.peifen_kg
|
<!-- <el-descriptions-item label="配粉料数">{{ currentMtask.peifen_kg
|
||||||
}}</el-descriptions-item> -->
|
}}</el-descriptions-item> -->
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
|
|
@ -101,20 +106,23 @@
|
||||||
<el-table-column label="出管总数" prop="count_real">
|
<el-table-column label="出管总数" prop="count_real">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="规格" prop="mlogb" width="300">
|
<el-table-column label="规格" prop="mlogb" width="300">
|
||||||
|
|
||||||
<template #default="scope">
|
<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>{{ item.material_out_name }}|</span>
|
||||||
<span style="color:darkblue; font-weight: bold;">{{ item.count_ok
|
<span style="color:darkblue; font-weight: bold;">{{ item.count_ok
|
||||||
}}</span>
|
}}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="合格总数" prop="count_ok">
|
<el-table-column label="合格总数" prop="count_ok">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="合格率" prop="count">
|
<el-table-column label="合格率" prop="count">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real * 100)
|
<span>{{ Math.floor(scope.row.count_ok / scope.row.count_real * 100)
|
||||||
}}%</span>
|
}}%</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="不合格原因及数量" align="center">
|
<el-table-column label="不合格原因及数量" align="center">
|
||||||
|
|
@ -141,6 +149,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="碎料" prop="count_break"> </el-table-column>
|
<el-table-column label="碎料" prop="count_break"> </el-table-column>
|
||||||
<el-table-column label="操作" fixed="right" width="120" align="center">
|
<el-table-column label="操作" fixed="right" width="120" align="center">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button link type="primary" @click="table_edit(scope.row)"
|
<el-button link type="primary" @click="table_edit(scope.row)"
|
||||||
v-auth="'mlog.update'" v-if="scope.row.submit_time == null">编辑
|
v-auth="'mlog.update'" v-if="scope.row.submit_time == null">编辑
|
||||||
|
|
@ -185,9 +194,10 @@
|
||||||
<el-table-column label="送料日期" prop="send_date">
|
<el-table-column label="送料日期" prop="send_date">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="产物" prop="material" show-overflow-tooltip>
|
<el-table-column label="产物" prop="material" show-overflow-tooltip>
|
||||||
|
|
||||||
<template #default="scope"><span v-if="scope.row.material_">{{
|
<template #default="scope"><span v-if="scope.row.material_">{{
|
||||||
scope.row.material_.name
|
scope.row.material_.name
|
||||||
}}</span>
|
}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="批次" prop="batch"> </el-table-column>
|
<el-table-column label="批次" prop="batch"> </el-table-column>
|
||||||
|
|
@ -198,12 +208,14 @@
|
||||||
<el-table-column label="接收人" prop="recive_user_name">
|
<el-table-column label="接收人" prop="recive_user_name">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="是否确认" prop="submit_time">
|
<el-table-column label="是否确认" prop="submit_time">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span v-if="scope.row.submit_time">是</span>
|
<span v-if="scope.row.submit_time">是</span>
|
||||||
<span v-else>否</span>
|
<span v-else>否</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" fixed="right" align="left">
|
<el-table-column label="操作" fixed="right" align="left">
|
||||||
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button link type="primary" @click.stop="handover_submit(scope.row)"
|
<el-button link type="primary" @click.stop="handover_submit(scope.row)"
|
||||||
v-auth="'handover.submit'" v-if="scope.row.submit_time == null">
|
v-auth="'handover.submit'" v-if="scope.row.submit_time == null">
|
||||||
|
|
@ -230,24 +242,28 @@
|
||||||
<scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
|
<scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
|
||||||
hidePagination>
|
hidePagination>
|
||||||
<el-table-column label="物料名" prop="material">
|
<el-table-column label="物料名" prop="material">
|
||||||
|
|
||||||
<template #default="scope">{{
|
<template #default="scope">{{
|
||||||
scope.row.material_.name
|
scope.row.material_.name
|
||||||
}}</template>
|
}}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="规格" prop="material">
|
<el-table-column label="规格" prop="material">
|
||||||
|
|
||||||
<template #default="scope">{{
|
<template #default="scope">{{
|
||||||
scope.row.material_.specification
|
scope.row.material_.specification
|
||||||
}}</template>
|
}}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="型号" prop="material">
|
<el-table-column label="型号" prop="material">
|
||||||
|
|
||||||
<template #default="scope">{{
|
<template #default="scope">{{
|
||||||
scope.row.material_.model
|
scope.row.material_.model
|
||||||
}}</template>
|
}}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="已到工序" prop="material">
|
<el-table-column label="已到工序" prop="material">
|
||||||
|
|
||||||
<template #default="scope">{{
|
<template #default="scope">{{
|
||||||
scope.row.material_.process_name
|
scope.row.material_.process_name
|
||||||
}}</template>
|
}}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="批次" prop="batch"> </el-table-column>
|
<el-table-column label="批次" prop="batch"> </el-table-column>
|
||||||
<el-table-column label="数量" prop="count" width="80">
|
<el-table-column label="数量" prop="count" width="80">
|
||||||
|
|
@ -279,6 +295,7 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</el-container>
|
</el-container>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import saveDialog from "./worktask_form.vue";
|
import saveDialog from "./worktask_form.vue";
|
||||||
import showDrawer from "./mlog_drawer.vue";
|
import showDrawer from "./mlog_drawer.vue";
|
||||||
|
|
|
||||||
|
|
@ -47,8 +47,8 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24">
|
<el-col :md="12" :sm="24">
|
||||||
<el-form-item label="数量(桶数)" width="100">
|
<el-form-item label="数量(桶数)" width="100">
|
||||||
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="请输入数量">
|
:step-strictly="true" style="width: 100%" placeholder="请输入数量">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -168,50 +168,50 @@
|
||||||
<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-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="条纹" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="条纹" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="断裂" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="断裂" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="大小头" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="大小头" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="结石" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="结石" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="气线" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="气线" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -305,8 +305,8 @@
|
||||||
</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-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="生产量" @change="countChange">
|
:step-strictly="true" style="width: 100%" placeholder="生产量" @change="countChange">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -368,36 +368,36 @@
|
||||||
<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-number v-model="form.count_n_zw" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_zw" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="炸纹" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="炸纹" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="条纹" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="条纹" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_qp" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_qp" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="气泡" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="气泡" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="弯曲" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="弯曲" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_qt" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_qt" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="其他" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="其他" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -434,8 +434,8 @@
|
||||||
</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-number v-model="form.count_real" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_real" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="出管总数" @change="countChange">
|
:step-strictly="true" style="width: 100%" placeholder="出管总数" @change="countChange">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -467,8 +467,8 @@
|
||||||
</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-number v-model="form.count_break" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_break" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="碎料">
|
:step-strictly="true" style="width: 100%" placeholder="碎料">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -491,8 +491,8 @@
|
||||||
</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-number v-model="item.count_ok" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="item.count_ok" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="合格数" @change="countOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="合格数" @change="countOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -503,50 +503,50 @@
|
||||||
<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-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_wq" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="椭圆/弯曲" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_tw" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="条纹" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="条纹" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_dl" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="断裂" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="断裂" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_pb" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="偏壁" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_dxt" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="大小头" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="大小头" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_js" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="结石" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="结石" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</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-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1" :step-strictly="true"
|
<el-input-number v-model="form.count_n_qx" controls-position="right" :min="0" :step="1"
|
||||||
style="width: 100%" placeholder="气线" @change="countNotOkSun">
|
:step-strictly="true" style="width: 100%" placeholder="气线" @change="countNotOkSun">
|
||||||
</el-input-number>
|
</el-input-number>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
@ -570,6 +570,7 @@
|
||||||
</el-footer>
|
</el-footer>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
emits: ["success", "closed"],
|
emits: ["success", "closed"],
|
||||||
|
|
@ -663,7 +664,7 @@ export default {
|
||||||
if (this.activeType == "10车间" || this.activeType == "7车间") {
|
if (this.activeType == "10车间" || this.activeType == "7车间") {
|
||||||
this.form.batch = this.material_model + '-' + batchDate;
|
this.form.batch = this.material_model + '-' + batchDate;
|
||||||
}
|
}
|
||||||
this.getMaterial();
|
// this.getMaterial();
|
||||||
this.getUserList();
|
this.getUserList();
|
||||||
this.getEquipment();
|
this.getEquipment();
|
||||||
this.getShiftOptions();
|
this.getShiftOptions();
|
||||||
|
|
@ -784,6 +785,7 @@ export default {
|
||||||
for (var i = 0; i < res.length; i++) {
|
for (var i = 0; i < res.length; i++) {
|
||||||
mOptions.push({
|
mOptions.push({
|
||||||
id: res[i].material_out,
|
id: res[i].material_out,
|
||||||
|
name: res[i].material_out_name,
|
||||||
full_name: res[i].material_out_name,
|
full_name: res[i].material_out_name,
|
||||||
material_in: res[i].material_in
|
material_in: res[i].material_in
|
||||||
});
|
});
|
||||||
|
|
@ -995,10 +997,10 @@ export default {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.formTitle {
|
.formTitle {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
Loading…
Reference in New Issue