fix:6、7、10车间可以显示已终止的任务

This commit is contained in:
shijing 2024-03-28 17:02:10 +08:00
parent d4809de933
commit 4c935cb4a2
3 changed files with 2040 additions and 1220 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,293 +1,446 @@
<template>
<el-container>
<!-- 当天任务列表 -->
<el-header style="height:55%; padding: 0">
<el-container>
<el-aside style="width: 50%">
<el-container>
<el-header>
<div class="left-panel">
<el-date-picker v-model="queryMtask.start_date" type="date" value-format="YYYY-MM-DD"
@change="handleQueryMtask" />
</div>
</el-header>
<el-main>
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="paramsMtask" :query="queryMtask"
@row-click="rowClick">
<el-table-column type="index" width="50" />
<el-table-column label="任务编号" prop="number" width="150">
</el-table-column>
<el-table-column label="产物" prop="material_out_name" show-overflow-tooltip width="250">
</el-table-column>
<el-table-column label="计划数量" prop="count">
</el-table-column>
<el-table-column label="生产日期" prop="start_date">
</el-table-column>
<el-table-column label="状态" prop="state">
<template #default="scope">
<el-tag v-if="scope.row.state !== 40">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-else type="success">
{{ state_[scope.row.state] }}
</el-tag>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
<el-main style="padding: 0;">
<el-container>
<el-header>
<div class="left-panel">
<span style="font-size: 14px">各工序进度</span>
</div>
</el-header>
<el-main>
<scTable ref="tableprocess" row-key="id" stripe :hideDo="hideDo" :data="processList"
@row-click="itemClick">
<el-table-column label="任务编号" prop="number" width="150">
</el-table-column>
<el-table-column label="日期" prop="start_date" width="120">
</el-table-column>
<el-table-column label="工序" prop="mgroup_name">
</el-table-column>
<el-table-column label="计划数量" prop="count">
</el-table-column>
<el-table-column label="合格数量" prop="count_ok">
</el-table-column>
<el-table-column label="提交人" prop="submit_user_name">
</el-table-column>
<el-table-column label="操作" fixed="right" width="60">
<template #default="scope">
<el-link type="primary" @click.stop="table_submit(scope.row)" v-auth="'mtask.submit'"
v-if="scope.row.state != 40">提交
</el-link>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-main>
</el-container>
</el-header>
<!-- 交接记录&车间库存 -->
<el-main class="nopadding">
<el-container>
<el-aside style="width: 50%">
<!-- 交接记录 -->
<el-container>
<el-header>
<div class="left-panel">
<span style="font-size: 14px">交接记录</span>
</div>
</el-header>
<el-main>
<scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
<el-table-column label="送料日期" prop="send_date">
</el-table-column>
<el-table-column label="产物" prop="material_name" show-overflow-tooltip>
</el-table-column>
<el-table-column label="批次" prop="batch"> </el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column label="交送人" prop="send_user_name">
</el-table-column>
<el-table-column label="接收人" prop="recive_user_name">
</el-table-column>
<el-table-column label="是否确认" prop="submit_time">
<template #default="scope">
<span v-if="scope.row.submit_time"></span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<template #default="scope">
<el-button link type="primary" @click.stop="handover_submit(scope.row)" v-auth="'handover.submit'"
v-if="scope.row.submit_time == null">
确认
</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
<el-main style="padding: 0 0 0 8px;">
<!-- 车间库存 -->
<el-container>
<el-header>
<div class="left-panel">
<span style="font-size: 14px">车间库存</span>
</div>
<div class="right-panel">
<el-button type="primary" @click="tomio" v-auth="'mio.do'">领料</el-button>
<el-button type="primary" @click="tomio" v-auth="'mio.do'">入库</el-button>
</div>
</el-header>
<el-main style="padding: 0;">
<scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe hidePagination>
<el-table-column label="物料名" prop="material">
<template #default="scope">
{{ scope.row.material_.name }}
</template>
</el-table-column>
<el-table-column label="规格" prop="material">
<template #default="scope">
{{ scope.row.material_.specification }}
</template>
</el-table-column>
<el-table-column label="型号" prop="material">
<template #default="scope">
{{ scope.row.material_.model }}
</template>
</el-table-column>
<el-table-column label="已到工序" prop="material">
<template #default="scope">{{
scope.row.material_.process_name
}}</template>
</el-table-column>
<el-table-column label="批次" prop="batch"> </el-table-column>
<el-table-column label="数量" prop="count" width="80">
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-main>
</el-container>
</el-main>
</el-container>
<el-container>
<!-- 当天任务列表 -->
<el-header style="height: 55%; padding: 0">
<el-container>
<el-aside style="width: 50%">
<el-container>
<el-header>
<div class="left-panel">
<el-date-picker
v-model="queryMtask.start_date"
type="date"
value-format="YYYY-MM-DD"
@change="handleQueryMtask"
/>
<el-checkbox
style="margin-left: 10px"
v-model="queryMtaskState"
label="已终止"
@change="handleQueryMtask"
/>
</div>
</el-header>
<el-main>
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:params="paramsMtask"
:query="queryMtask"
@row-click="rowClick"
>
<el-table-column type="index" width="50" />
<el-table-column
label="任务编号"
prop="number"
width="150"
>
</el-table-column>
<el-table-column
label="产物"
prop="material_out_name"
show-overflow-tooltip
width="250"
>
</el-table-column>
<el-table-column label="计划数量" prop="count">
</el-table-column>
<el-table-column
label="生产日期"
prop="start_date"
>
</el-table-column>
<el-table-column label="状态" prop="state">
<template #default="scope">
<el-tag v-if="scope.row.state == 20">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag v-if="scope.row.state == 30">
{{ state_[scope.row.state] }}
</el-tag>
<el-tag
v-if="scope.row.state == 34"
type="danger"
>
{{ state_[scope.row.state] }}
</el-tag>
<el-tag
v-if="scope.row.state == 40"
type="success"
>
{{ state_[scope.row.state] }}
</el-tag>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
<el-main style="padding: 0">
<el-container>
<el-header>
<div class="left-panel">
<span style="font-size: 14px">各工序进度</span>
</div>
</el-header>
<el-main>
<scTable
ref="tableprocess"
row-key="id"
stripe
:hideDo="hideDo"
:data="processList"
@row-click="itemClick"
>
<el-table-column
label="任务编号"
prop="number"
width="150"
>
</el-table-column>
<el-table-column
label="日期"
prop="start_date"
width="120"
>
</el-table-column>
<el-table-column
label="工序"
prop="mgroup_name"
>
</el-table-column>
<el-table-column label="计划数量" prop="count">
</el-table-column>
<el-table-column
label="合格数量"
prop="count_ok"
>
</el-table-column>
<el-table-column
label="提交人"
prop="submit_user_name"
>
</el-table-column>
<el-table-column
label="操作"
fixed="right"
width="60"
>
<template #default="scope">
<el-link
type="primary"
@click.stop="
table_submit(scope.row)
"
v-auth="'mtask.submit'"
v-if="
scope.row.state != 40 &&
scope.row.state != 34
"
>提交
</el-link>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-main>
</el-container>
</el-header>
<!-- 交接记录&车间库存 -->
<el-main class="nopadding">
<el-container>
<el-aside style="width: 50%">
<!-- 交接记录 -->
<el-container>
<el-header>
<div class="left-panel">
<span style="font-size: 14px">交接记录</span>
</div>
</el-header>
<el-main>
<scTable
ref="table_handover"
:apiObj="apiObjHandover"
row-key="id"
stripe
:params="paramsHandover"
>
<el-table-column
label="送料日期"
prop="send_date"
>
</el-table-column>
<el-table-column
label="产物"
prop="material_name"
show-overflow-tooltip
>
</el-table-column>
<el-table-column label="批次" prop="batch">
</el-table-column>
<el-table-column label="数量" prop="count">
</el-table-column>
<el-table-column
label="交送人"
prop="send_user_name"
>
</el-table-column>
<el-table-column
label="接收人"
prop="recive_user_name"
>
</el-table-column>
<el-table-column
label="是否确认"
prop="submit_time"
>
<template #default="scope">
<span v-if="scope.row.submit_time"
></span
>
<span v-else></span>
</template>
</el-table-column>
<el-table-column
label="操作"
fixed="right"
align="left"
>
<template #default="scope">
<el-button
link
type="primary"
@click.stop="
handover_submit(scope.row)
"
v-auth="'handover.submit'"
v-if="scope.row.submit_time == null"
>
确认
</el-button>
</template>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-aside>
<el-main style="padding: 0 0 0 8px">
<!-- 车间库存 -->
<el-container>
<el-header>
<div class="left-panel">
<span style="font-size: 14px">车间库存</span>
</div>
<div class="right-panel">
<el-button
type="primary"
@click="tomio"
v-auth="'mio.do'"
>领料</el-button
>
<el-button
type="primary"
@click="tomio"
v-auth="'mio.do'"
>入库</el-button
>
</div>
</el-header>
<el-main style="padding: 0">
<scTable
ref="table_wm"
:apiObj="apiObjWm"
row-key="id"
:params="paramsWm"
stripe
hidePagination
>
<el-table-column label="物料名" prop="material">
<template #default="scope">
{{ scope.row.material_.name }}
</template>
</el-table-column>
<el-table-column label="规格" prop="material">
<template #default="scope">
{{ scope.row.material_.specification }}
</template>
</el-table-column>
<el-table-column label="型号" prop="material">
<template #default="scope">
{{ scope.row.material_.model }}
</template>
</el-table-column>
<el-table-column
label="已到工序"
prop="material"
>
<template #default="scope">{{
scope.row.material_.process_name
}}</template>
</el-table-column>
<el-table-column label="批次" prop="batch">
</el-table-column>
<el-table-column
label="数量"
prop="count"
width="80"
>
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-main>
</el-container>
</el-main>
</el-container>
</template>
<script>
export default {
data() {
return {
dialog: {
save: false,
},
apiObj: null,
query: {},
processList: [],//
state_: {
10: '创建中',
20: '已下达',
30: '生产中',
40: '已提交',
},
hideDo: true,
apiObjWm: this.$API.wpm.wmaterial.list,
paramsMlog: {
mtask: ''
},
apiObjHandover: this.$API.wpm.handover.list,
paramsHandover: {
recive_dept__name: '6车间'
},
paramsWm: {
belong_dept__name: '6车间',
count__gte: 1
},
paramsMtask: {
mgroup__belong_dept__name: '6车间',
is_count_utask: true,
state__in: "20,40"
},
queryMtask: {}
}
},
mounted() {
let NowDate = new Date();
// this.queryMtask.start_date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
this.apiObj = this.$API.pm.mtask.list;
},
methods: {
tomio() {
this.$router.push({ name: "halfgood_mio" });
},
//
rowClick(row) {
let that = this;
this.$API.pm.mtask.list.req({ start_date: row.start_date, end_date: row.end_date, mgroup__belong_dept__name: '6车间', utask: row.utask }).then(res => {
that.processList = res.results;
})
},
//
itemClick(row) {
// this.currentMtask = row;
// this.mgroup = row.mgroup;
// this.mtask = row.id;
// this.material_out = row.material_out_.id;
// this.handledate = row.start_date;
// this.paramsMlog.mtask = this.mtask;
// this.apiObjMlog = this.$API.wpm.mlog.list;
this.$router.push({
name: "mlogDept6Detail",
query: { mtaskId: row.id }
});
},
handleQueryMtask() {
this.$refs.table.queryData(this.queryMtask);
},
table_submit(row) {
let lengths = row.mlogs.length, infoText = '';
if (lengths > 0) {
infoText = '该任务有' + lengths + '条日志,确定提交吗?';
} else {
infoText = '该任务没有日志,确定提交吗?';
}
this.$confirm(infoText, "提示", {
type: "warning",
}).then(() => {
this.$API.pm.mtask.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.table_mtask.refresh()
this.mtaskClick(this.currentMtask)
}).catch(err => { })
})
},
handover_submit(row) {
this.$API.wpm.handover.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.table_handover.refresh();
this.$refs.table_wm.refresh();
}).catch(err => { })
},
}
}
data() {
return {
dialog: {
save: false,
},
apiObj: null,
query: {},
processList: [], //
state_: {
10: "创建中",
20: "已下达",
30: "生产中",
34: "已终止",
40: "已提交",
},
hideDo: true,
queryMtaskState: false,
apiObjWm: this.$API.wpm.wmaterial.list,
paramsMlog: {
mtask: "",
},
apiObjHandover: this.$API.wpm.handover.list,
paramsHandover: {
recive_dept__name: "6车间",
},
paramsWm: {
belong_dept__name: "6车间",
count__gte: 1,
},
paramsMtask: {
mgroup__belong_dept__name: "6车间",
is_count_utask: true,
state__in: "20,30,40",
},
queryMtask: {
state__in: "",
},
};
},
mounted() {
let NowDate = new Date();
// this.queryMtask.start_date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
this.apiObj = this.$API.pm.mtask.list;
},
methods: {
tomio() {
this.$router.push({ name: "halfgood_mio" });
},
//
rowClick(row) {
let that = this;
this.$API.pm.mtask.list
.req({
start_date: row.start_date,
end_date: row.end_date,
mgroup__belong_dept__name: "6车间",
utask: row.utask,
})
.then((res) => {
that.processList = res.results;
});
},
//
itemClick(row) {
// this.currentMtask = row;
// this.mgroup = row.mgroup;
// this.mtask = row.id;
// this.material_out = row.material_out_.id;
// this.handledate = row.start_date;
// this.paramsMlog.mtask = this.mtask;
// this.apiObjMlog = this.$API.wpm.mlog.list;
this.$router.push({
name: "mlogDept6Detail",
query: { mtaskId: row.id },
});
},
handleQueryMtask() {
if (this.queryMtaskState) {
this.queryMtask.state__in = "20,30,34,40";
} else {
this.queryMtask.state__in = "20,30,40";
}
this.$refs.table.queryData(this.queryMtask);
},
table_submit(row) {
let lengths = row.mlogs.length,
infoText = "";
if (lengths > 0) {
infoText = "该任务有" + lengths + "条日志,确定提交吗?";
} else {
infoText = "该任务没有日志,确定提交吗?";
}
this.$confirm(infoText, "提示", {
type: "warning",
}).then(() => {
this.$API.pm.mtask.submit
.req(row.id)
.then((res) => {
this.$message.success("操作成功");
this.$refs.table_mtask.refresh();
this.mtaskClick(this.currentMtask);
})
.catch((err) => {});
});
},
handover_submit(row) {
this.$API.wpm.handover.submit
.req(row.id)
.then((res) => {
this.$message.success("操作成功");
this.$refs.table_handover.refresh();
this.$refs.table_wm.refresh();
})
.catch((err) => {});
},
},
};
</script>
<style scoped>
.tabsHeader {
display: inline-block;
position: absolute;
right: 20px;
margin-top: 4px;
z-index: 100
display: inline-block;
position: absolute;
right: 20px;
margin-top: 4px;
z-index: 100;
}
.right-panel>*+* {
margin-left: 10px;
.right-panel > * + * {
margin-left: 10px;
}
.el-main.nopadding {
padding: 0 20px 0 20px
padding: 0 20px 0 20px;
}
.tableTitle {
height: 40px;
line-height: 40px;
font-size: 14px;
box-sizing: border-box;
border-bottom: 1px solid #eeeeee;
height: 40px;
line-height: 40px;
font-size: 14px;
box-sizing: border-box;
border-bottom: 1px solid #eeeeee;
}
</style>
</style>

File diff suppressed because it is too large Load Diff