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

fix: 6车间日志输出物料全名以及显示不合格合计数

This commit is contained in:
caoqianming 2023-12-24 18:58:43 +08:00
parent 99413a3fef
commit f8f8569e94
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@
<span>任务信息</span> <span>任务信息</span>
<span> <span>
<el-button type="primary" link @click="addMtaskInfo" <el-button type="primary" link @click="addMtaskInfo"
v-if="currentMtask &&currentMtask.peifen_kg===0&& (currentMtask.state == 20 || currentMtask.state == 10)">配粉料数</el-button> v-if="currentMtask && currentMtask.peifen_kg === 0 && (currentMtask.state == 20 || currentMtask.state == 10)">配粉料数</el-button>
</span> </span>
</div> </div>
</template> </template>
@ -91,7 +91,8 @@
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="addMlog" <el-button type="primary" icon="el-icon-plus" @click="addMlog"
v-if="currentMtask && currentMtask.state == 20" v-auth="'mlog.create'">新增</el-button> v-if="currentMtask && currentMtask.state == 20"
v-auth="'mlog.create'">新增</el-button>
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
@ -99,11 +100,12 @@
<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="count_real"> <el-table-column label="出管总数" prop="count_real">
</el-table-column> </el-table-column>
<el-table-column label="规格" prop="mlogb" width="150"> <el-table-column label="规格" prop="mlogb" width="250">
<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>{{ item.count_ok }}</span> <span style="color:darkblue; font-weight: bold;">{{ item.count_ok
}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -130,7 +132,7 @@
</el-table-column> </el-table-column>
<el-table-column label="气线" prop="count_n_qx"> <el-table-column label="气线" prop="count_n_qx">
</el-table-column> </el-table-column>
<el-table-column label="合计" prop="count_n_qt"> <el-table-column label="合计" prop="count_notok">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="成型人" prop="handle_user_name"> <el-table-column label="成型人" prop="handle_user_name">
@ -257,10 +259,8 @@
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
:material_out="material_out" :brothersList="brothersList" :material_out="material_out" :brothersList="brothersList" :material_in="material_in" :activeType="activeName"
:material_in="material_in" @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
:activeType="activeName" @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-dialog title="编辑任务" v-model="addMtaskInfoVisible"> <el-dialog title="编辑任务" v-model="addMtaskInfoVisible">