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

fix:禅道392、393

This commit is contained in:
shijing 2026-05-07 09:55:00 +08:00
parent 72a9f0eef3
commit ce49b9f9c4
2 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/wpm_gx/f_mlogs_form.vue
View File

@ -53,6 +53,7 @@
<el-table-column label="批次号" prop="batch"></el-table-column>
<el-table-column label="名称" prop="material_name"></el-table-column>
<el-table-column label="数量" prop="count"></el-table-column>
<el-table-column label="不良项" prop="defect_name"></el-table-column>
</xtSelect>
</el-form-item>
</el-col>

189
src/views/wpm_gx/inm_record.vue
View File

@ -189,100 +189,103 @@
<el-button v-else @click="table_submit" type="warning">提交</el-button>
</el-footer>
</el-container>
<el-card v-else shadow="never" style="height: 100%;">
<el-button type="primary" @click="handlePrint" style="position: absolute;right: 20px;">打印</el-button>
<el-descriptions title="基本信息" :column="3" style="width: 100%">
<el-descriptions-item label="编号">
{{form.number}}
</el-descriptions-item>
<el-descriptions-item label="出入库类型">
{{typeDict[form.type]}}
</el-descriptions-item>
<el-descriptions-item label="状态">
{{stateDict[form.state]}}
</el-descriptions-item>
<el-descriptions-item label="部门/车间">
{{form.belong_dept_name}}-{{ form.mgroup_name }}
</el-descriptions-item>
<el-descriptions-item label="执行人">
{{form.do_user_name}}
</el-descriptions-item>
<el-descriptions-item label="创建时间">
{{form.create_time}}
</el-descriptions-item>
</el-descriptions>
<div style="height: 8px"></div>
<scTable
ref="table"
:data="tableData"
row-key="id"
stripe
hidePagination
hideDo
>
<el-table-column type="index" width="50" />
<el-table-column
label="物料"
prop="material"
show-overflow-tooltip
>
<template #default="scope"
>{{ scope.row.material_name }}
</template>
</el-table-column>
<el-table-column label="批次号" prop="batch">
</el-table-column>
<el-table-column label="仓库" prop="warehouse_name">
</el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column
label="组合件信息"
v-if="cate == 'good'"
width="300"
>
<template #default="scope">
<div v-if="scope.row.assemb.length > 0">
<div
v-for="item in scope.row.assemb"
:key="item.id"
>
<div>
{{ item.material_name }}
<span
style="
color: gray;
font-size: 12px;
"
>批:</span
>{{ item.batch }}
<span
style="
color: gray;
font-size: 12px;
"
>比:</span
>{{ item.rate }}
<el-container v-else style="height: 100%;">
<el-header style="height: 110px;">
<el-button type="primary" @click="handlePrint" style="position: absolute;right: 20px;">打印</el-button>
<el-descriptions title="基本信息" :column="3" style="width: 100%">
<el-descriptions-item label="编号">
{{form.number}}
</el-descriptions-item>
<el-descriptions-item label="出入库类型">
{{typeDict[form.type]}}
</el-descriptions-item>
<el-descriptions-item label="状态">
{{stateDict[form.state]}}
</el-descriptions-item>
<el-descriptions-item label="部门/车间">
{{form.belong_dept_name}}-{{ form.mgroup_name }}
</el-descriptions-item>
<el-descriptions-item label="执行人">
{{form.do_user_name}}
</el-descriptions-item>
<el-descriptions-item label="创建时间">
{{form.create_time}}
</el-descriptions-item>
</el-descriptions>
</el-header>
<el-main>
<scTable
ref="table"
:data="tableData"
row-key="id"
stripe
hidePagination
hideDo
>
<el-table-column type="index" width="50" />
<el-table-column
label="物料"
prop="material"
show-overflow-tooltip
>
<template #default="scope"
>{{ scope.row.material_name }}
</template>
</el-table-column>
<el-table-column label="批次号" prop="batch">
</el-table-column>
<el-table-column label="仓库" prop="warehouse_name">
</el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column
label="组合件信息"
v-if="cate == 'good'"
width="300"
>
<template #default="scope">
<div v-if="scope.row.assemb.length > 0">
<div
v-for="item in scope.row.assemb"
:key="item.id"
>
<div>
{{ item.material_name }}
<span
style="
color: gray;
font-size: 12px;
"
>批:</span
>{{ item.batch }}
<span
style="
color: gray;
font-size: 12px;
"
>比:</span
>{{ item.rate }}
</div>
</div>
</div>
</div>
</div>
</template>
</el-table-column>
<el-table-column label="备注" prop="note">
</el-table-column>
<el-table-column
label="创建时间"
prop="create_time"
show-overflow-tooltip
>
</el-table-column>
<el-table-column width="90" v-if="cate=='do_in'|| cate=='do_out'">
<template #default="scope">
<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
</template>
</el-table-column>
</scTable>
</el-card>
</template>
</el-table-column>
<el-table-column label="备注" prop="note">
</el-table-column>
<el-table-column
label="创建时间"
prop="create_time"
show-overflow-tooltip
>
</el-table-column>
<el-table-column width="90" v-if="cate=='do_in'|| cate=='do_out'">
<template #default="scope">
<el-button @click="printMaterial(scope.row)" type="text">打签</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
<save-dialog
v-if="dialog.save"
ref="saveDialog"