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