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-25 12:48:09 +08:00
parent 29bd6ac6a2
commit e355fcedc7
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/views/wpm/mlog_dept6.vue
View File

@ -7,30 +7,17 @@
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-date-picker v-model="queryMtask.start_date" type="date" value-format="YYYY-MM-DD" /> <el-date-picker v-model="queryMtask.start_date" type="date" value-format="YYYY-MM-DD"
<el-button type="primary" icon="el-icon-search" @click="handleQueryMtask">查询</el-button> @change="handleQueryMtask" />
</div> </div>
</el-header> </el-header>
<el-main> <el-main>
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsMtask" :query="queryMtask" <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsMtask" :query="queryMtask"
@row-click="rowClick"> @row-click="rowClick">
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="任务编号" prop="number"> <el-table-column label="任务编号" prop="number" width="130">
</el-table-column> </el-table-column>
<el-table-column label="产品名称" prop="material" show-overflow-tooltip> <el-table-column label="产品全名" prop="material_out_name" show-overflow-tooltip width="250">
<template #default="scope">
<span v-if="scope.row.material_out_">{{ scope.row.material_out_.name }}</span>
</template>
</el-table-column>
<el-table-column label="规格" prop="material">
<template #default="scope">
<span v-if="scope.row.material_out_">{{ scope.row.material_out_.specification }}</span>
</template>
</el-table-column>
<el-table-column label="型号" prop="material">
<template #default="scope">
<span v-if="scope.row.material_out_">{{ scope.row.material_out_.model }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="计划数量" prop="count"> <el-table-column label="计划数量" prop="count">
</el-table-column> </el-table-column>
@ -59,7 +46,6 @@
</el-header> </el-header>
<el-main> <el-main>
<scTable ref="tableprocess" row-key="id" stripe :hideDo="hideDo" :data="processList" @row-click="itemClick"> <scTable ref="tableprocess" row-key="id" stripe :hideDo="hideDo" :data="processList" @row-click="itemClick">
<el-table-column type="index" width="50" />
<el-table-column label="任务编号" prop="number" width="150"> <el-table-column label="任务编号" prop="number" width="150">
</el-table-column> </el-table-column>
<el-table-column label="日期" prop="start_date" width="120"> <el-table-column label="日期" prop="start_date" width="120">
@ -98,7 +84,6 @@
</el-header> </el-header>
<el-main> <el-main>
<scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover"> <scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
<el-table-column type="index" width="50" />
<el-table-column label="送料日期" prop="send_date"> <el-table-column label="送料日期" prop="send_date">
</el-table-column> </el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip> <el-table-column label="产物" prop="material" show-overflow-tooltip>
@ -162,10 +147,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已到工序" prop="material"> <el-table-column label="已到工序" prop="material">
<template #default="scope">{{ <template #default="scope">{{
scope.row.material_.process_name scope.row.material_.process_name
}}</template> }}</template>
</el-table-column> </el-table-column>
<el-table-column label="批次" prop="batch"> </el-table-column> <el-table-column label="批次" prop="batch"> </el-table-column>
<el-table-column label="数量" prop="count" width="80"> <el-table-column label="数量" prop="count" width="80">
</el-table-column> </el-table-column>
@ -245,7 +230,7 @@ export default {
}); });
}, },
handleQueryMtask() { handleQueryMtask() {
this.$refs.table.refresh(this.queryMtask); this.$refs.table.queryData(this.queryMtask);
}, },
table_submit(row) { table_submit(row) {
this.$API.pm.mtask.submit.req(row.id).then(res => { this.$API.pm.mtask.submit.req(row.id).then(res => {