feat:禅道443

This commit is contained in:
shijing 2026-07-06 14:45:57 +08:00
parent 5f47ef62c6
commit 44cc291540
2 changed files with 40 additions and 1 deletions

View File

@ -63,6 +63,12 @@
placeholder="结束时间" placeholder="结束时间"
style="margin-left: 2px; width: 150px" style="margin-left: 2px; width: 150px"
/> />
<el-input
v-model="query.material_name"
placeholder="物料名"
clearable
style="width: 200px; margin-left: 2px;"
/>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -96,6 +102,8 @@
<span>{{ scope.row.data.装炉压板出炉_装炉_日期?scope.row.data.装炉压板出炉_装炉_日期:'' }}</span> <span>{{ scope.row.data.装炉压板出炉_装炉_日期?scope.row.data.装炉压板出炉_装炉_日期:'' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名称" prop="material_name" fixed="left">
</el-table-column>
<el-table-column label="板号" prop="number" fixed="left"> <el-table-column label="板号" prop="number" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="压前对边" align="center"> <el-table-column label="压前对边" align="center">
@ -201,6 +209,8 @@
<el-table-column label="序号" type="index" width="50" fixed="left"/> <el-table-column label="序号" type="index" width="50" fixed="left"/>
<el-table-column label="板号" prop="number" fixed="left"> <el-table-column label="板号" prop="number" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="物料名称" prop="material_name" fixed="left">
</el-table-column>
<el-table-column label="炉号" fixed="left"> <el-table-column label="炉号" fixed="left">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.data.装炉压板出炉_设备编号">{{ scope.row.data.装炉压板出炉_设备编号 }}</span> <span v-if="scope.row.data.装炉压板出炉_设备编号">{{ scope.row.data.装炉压板出炉_设备编号 }}</span>
@ -372,6 +382,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="设备编号" prop="设备编号"> <el-table-column label="设备编号" prop="设备编号">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数"> <el-table-column label="总数">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.总切片数" @click="handleNumClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span> <span v-if="scope.row.总切片数" @click="handleNumClick(scope.row)" style="color:#0052d9;">{{ scope.row.总切片数 }}</span>
@ -425,6 +437,8 @@
<span v-if="scope.row.横压!==null">{{scope.row.横压}}</span> <span v-if="scope.row.横压!==null">{{scope.row.横压}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数" prop="总切片数"> <el-table-column label="总数" prop="总切片数">
</el-table-column> </el-table-column>
<el-table-column label="长点"> <el-table-column label="长点">
@ -470,6 +484,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="操作人" prop="员工"> <el-table-column label="操作人" prop="员工">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数" prop="总切片数"> <el-table-column label="总数" prop="总切片数">
</el-table-column> </el-table-column>
<el-table-column label="长点"> <el-table-column label="长点">
@ -515,6 +531,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="丝高" prop="丝高"> <el-table-column label="丝高" prop="丝高">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数" prop="总切片数"> <el-table-column label="总数" prop="总切片数">
</el-table-column> </el-table-column>
<el-table-column label="长点"> <el-table-column label="长点">
@ -629,6 +647,9 @@ export default {
}else{ }else{
query.end_date = that.query.end_date; query.end_date = that.query.end_date;
} }
if(that.query.material_name!=''&&that.query.material_name!=null){
query.material_name = that.query.material_name;
}
if(that.activeName=='luhao'){ if(that.activeName=='luhao'){
query.select_cols = that.query.select_cols; query.select_cols = that.query.select_cols;
params.query = query; params.query = query;

View File

@ -31,6 +31,12 @@
placeholder="结束时间" placeholder="结束时间"
style="margin-left: 2px; width: 150px" style="margin-left: 2px; width: 150px"
/> />
<el-input
v-model="query.material_name"
placeholder="物料名"
clearable
style="width: 200px; margin-left: 2px;"
/>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-search" icon="el-icon-search"
@ -55,6 +61,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="炉号" prop="设备编号"> <el-table-column label="炉号" prop="设备编号">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数"> <el-table-column label="总数">
<template #default="scope"> <template #default="scope">
<!-- @click="handleNumClick(scope.row)" --> <!-- @click="handleNumClick(scope.row)" -->
@ -133,6 +141,8 @@
<span v-if="scope.row.横压!==null">{{scope.row.横压}}</span> <span v-if="scope.row.横压!==null">{{scope.row.横压}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数" prop="总切片数"> <el-table-column label="总数" prop="总切片数">
</el-table-column> </el-table-column>
<el-table-column label="黑网重"> <el-table-column label="黑网重">
@ -202,6 +212,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="操作人" prop="员工"> <el-table-column label="操作人" prop="员工">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数" prop="总切片数"> <el-table-column label="总数" prop="总切片数">
</el-table-column> </el-table-column>
<el-table-column label="黑网重"> <el-table-column label="黑网重">
@ -271,6 +283,8 @@
<el-table-column type="index" width="50" fixed="left"/> <el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="丝高" prop="丝高"> <el-table-column label="丝高" prop="丝高">
</el-table-column> </el-table-column>
<el-table-column label="物料名" prop="物料名">
</el-table-column>
<el-table-column label="总数" prop="总切片数"> <el-table-column label="总数" prop="总切片数">
</el-table-column> </el-table-column>
<el-table-column label="黑网重"> <el-table-column label="黑网重">
@ -352,7 +366,8 @@ export default {
query:{ query:{
end_date:'', end_date:'',
start_date:'', start_date:'',
select_cols: "" select_cols: "",
material_name:'',
}, },
end_date:'', end_date:'',
start_date:'', start_date:'',
@ -384,6 +399,9 @@ export default {
}else{ }else{
query.end_date = that.query.end_date; query.end_date = that.query.end_date;
} }
if(that.query.material_name!=''&&that.query.material_name!=null){
query.material_name = that.query.material_name;
}
if(that.activeName=='luhao'){ if(that.activeName=='luhao'){
query.select_cols = that.query.select_cols; query.select_cols = that.query.select_cols;
query.mgroup_name = '装炉压板出炉'; query.mgroup_name = '装炉压板出炉';