#986车间日志填写的不合格原因错误

This commit is contained in:
shijing 2023-12-27 09:35:26 +08:00
parent 598e461d0d
commit 4bd9b311cf
4 changed files with 190 additions and 39 deletions

View File

@ -139,30 +139,45 @@
<div class="formTitle">不合格原因及数量:</div> <div class="formTitle">不合格原因及数量:</div>
<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 <el-input-number
v-model="form.count_n_wq" v-model="form.count_n_hs"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="椭圆/弯曲" placeholder="划伤"
@change="countNotOkSun" @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 <el-input-number
v-model="form.count_n_zw" v-model="form.count_n_cs"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="炸纹" 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_zz"
controls-position="right"
:min="0"
:step="1"
:step-strictly="true"
style="width: 100%"
placeholder="杂质"
@change="countNotOkSun" @change="countNotOkSun"
> >
</el-input-number> </el-input-number>
@ -183,6 +198,39 @@
</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-number
v-model="form.count_n_zdd"
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_d"
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-row>
<!-- <el-row v-if="material_name=='光纤预制棒'"> -->
<el-row v-if="material_name.indexOf('棒')>-1">
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="气泡"> <el-form-item label="气泡">
<el-input-number <el-input-number
@ -199,45 +247,93 @@
</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 <el-input-number
v-model="form.count_n_dl" v-model="form.count_n_bl"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="断裂" placeholder="不亮"
@change="countNotOkSun" @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 <el-input-number
v-model="form.count_n_pb" v-model="form.count_n_hw"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="偏壁" placeholder="横纹"
@change="countNotOkSun" @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 <el-input-number
v-model="form.count_n_dxt" v-model="form.count_n_yp"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="大小头" 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_bp"
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_sc"
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-row>
<!-- <el-row v-if="material_name=='光纤预制管'"> -->
<el-row v-if="material_name.indexOf('管')>-1">
<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" @change="countNotOkSun"
> >
</el-input-number> </el-input-number>
@ -259,47 +355,80 @@
</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 <el-input-number
v-model="form.count_n_qx" v-model="form.count_n_tydd"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="气线" placeholder="椭圆度大"
@change="countNotOkSun" @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 <el-input-number
v-model="form.count_n_qt" v-model="form.count_n_sw"
controls-position="right" controls-position="right"
:min="0" :min="0"
:step="1" :step="1"
:step-strictly="true" :step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="其他" placeholder="水雾"
@change="countNotOkSun" @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 <el-input-number
v-model="form.count_notok" v-model="form.count_n_bhpcd"
controls-position="right" controls-position="right"
:min="0"
:step="1"
:step-strictly="true"
style="width: 100%" style="width: 100%"
placeholder="合计" placeholder="壁厚偏差大"
disabled @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-form-item label="弯">
<el-input-number
v-model="form.count_n_w"
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-row>
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="合计">
<el-input-number
v-model="form.count_notok"
controls-position="right"
style="width: 100%"
placeholder="合计"
disabled
>
</el-input-number>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-footer> <el-footer>
@ -317,6 +446,7 @@ export default {
mtask: { type: String, default: "" }, mtask: { type: String, default: "" },
handledate: { type: String, default: "" }, handledate: { type: String, default: "" },
material_out: { type: String, default: "" }, material_out: { type: String, default: "" },
material_name: { type: String, default: "" },
}, },
data() { data() {
return { return {

View File

@ -97,6 +97,7 @@
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table_mlog" :data="mlogs" row-key="id" stripe hidePagination hideDo> <scTable ref="table_mlog" :data="mlogs" row-key="id" stripe hidePagination hideDo>
<el-table-column label="班次" prop="shift_name"> </el-table-column> <el-table-column label="班次" prop="shift_name"> </el-table-column>
<el-table-column label="批次号" prop="batch"></el-table-column>
<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">

View File

@ -31,26 +31,43 @@
<el-main style="padding: 0;"> <el-main style="padding: 0;">
<scTable ref="mtaskMlogs" :apiObj="apiObj" row-key="id" :params="params" stripe hidePagination hideDo> <scTable ref="mtaskMlogs" :apiObj="apiObj" row-key="id" :params="params" stripe hidePagination hideDo>
<el-table-column label="工序" prop="mgroup_name"></el-table-column> <el-table-column label="工序" prop="mgroup_name"></el-table-column>
<el-table-column label="产品编号"> <el-table-column label="产品名称" prop="material_out_" min-width="120">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.material_out_">{{ scope.row.material_out_.number }}</span> <span v-if="scope.row.material_out_">{{scope.row.material_out_.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="批次号" prop="batch"></el-table-column>
<el-table-column label="加工设备" prop="equipment_name"></el-table-column> <el-table-column label="加工设备" prop="equipment_name"></el-table-column>
<el-table-column label="领用数量" prop="count_use"> </el-table-column> <el-table-column label="领用数量" prop="count_use"> </el-table-column>
<el-table-column label="加工数量" prop="count_real"> </el-table-column> <el-table-column label="加工数量" prop="count_real"> </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="不合格数量" align="center"> <el-table-column label="不合格数量" align="center">
<el-table-column prop="count_n_wq" label="弯曲" /> <el-table-column prop="count_n_hs" label="划伤" />
<el-table-column prop="count_n_zw" label="炸纹" /> <el-table-column prop="count_n_zs" label="挫伤" />
<el-table-column prop="count_n_zz" label="杂质" />
<el-table-column prop="count_n_tw" label="条纹" /> <el-table-column prop="count_n_tw" label="条纹" />
<el-table-column prop="count_n_qp" label="气泡" /> <el-table-column prop="count_n_zdd" label="锥度大" />
<el-table-column prop="count_n_dl" label="断裂" /> <el-table-column prop="count_n_d" label="短" />
<el-table-column prop="count_n_pb" label="偏壁" /> <!-- -->
<el-table-column prop="count_n_dxt" label="大小头" /> <!-- <template v-if="currentMtask.material_out_.name=='光纤预制棒'"> -->
<el-table-column prop="count_n_js" label="结石" /> <template v-if="material_name.indexOf('棒')>-1">
<el-table-column prop="count_n_qx" label="气线" /> <el-table-column prop="count_n_qp" label="气泡"/>
<el-table-column prop="count_n_qt" label="其他" /> <el-table-column prop="count_n_bl" label="不亮" />
<el-table-column prop="count_n_hw" label="横纹" />
<el-table-column prop="count_n_yp" label="有皮" />
<el-table-column prop="count_n_bp" label="爆皮" />
<el-table-column prop="count_n_sc" label="色差" />
</template>
<!-- -->
<!-- <template v-if="currentMtask.material_out_.name=='光纤预制管'"> -->
<template v-if="material_name.indexOf('管')>-1">
<el-table-column prop="count_n_qx" label="气线"/>
<el-table-column prop="count_n_js" label="结石" />
<el-table-column prop="count_n_tydd" label="椭圆度大" />
<el-table-column prop="count_n_sw" label="水雾" />
<el-table-column prop="count_n_bhpcd" label="壁厚偏差大" />
<el-table-column prop="count_n_w" label="弯" />
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="update_by_name"></el-table-column> <el-table-column label="操作人" prop="update_by_name"></el-table-column>
<el-table-column label="操作" fixed="right" width="130"> <el-table-column label="操作" fixed="right" width="130">
@ -77,7 +94,7 @@
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="mtask" :mgroup="mgroup" :handledate="handledate" <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="mtask" :mgroup="mgroup" :handledate="handledate"
:material_out="material_out" @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog> :material_out="material_out" :material_name="material_name" @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false"> <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
</showDrawer> </showDrawer>
</el-container> </el-container>
@ -127,6 +144,7 @@ export default {
this.mgroup = res.mgroup; this.mgroup = res.mgroup;
this.mtask = res.id; this.mtask = res.id;
this.material_out = res.material_out_.id; this.material_out = res.material_out_.id;
this.material_name = res.material_out_.name;
this.handledate = res.start_date; this.handledate = res.start_date;
this.params.mtask = this.mtaskId; this.params.mtask = this.mtaskId;

View File

@ -99,6 +99,8 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="批次号" prop="batch">
</el-table-column>
<el-table-column label="规格" prop="material_out_"> <el-table-column label="规格" prop="material_out_">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.material_out_">{{ <span v-if="scope.row.material_out_">{{