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

fix:coding#413生产执行模块

This commit is contained in:
shijing 2024-05-23 09:56:52 +08:00
parent f5d4fc1ced
commit 86be993ba0
2 changed files with 384 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,14 +296,21 @@
</el-container> </el-container>
</el-main> </el-main>
</el-container> </el-container>
<el-drawer title="进度详情" v-model="dialog.detail" :size="'90%'">
<detail-dialog :mtaskId="mtaskId" ref="detailDialogs"> </detail-dialog>
</el-drawer>
</template> </template>
<script> <script>
import detailDialog from "./mlog_dept6_detail.vue";
export default { export default {
components: {
detailDialog,
},
data() { data() {
return { return {
dialog: { dialog: {
save: false, detail: false,
}, },
apiObj: null, apiObj: null,
query: {}, query: {},
@ -337,6 +344,7 @@ export default {
queryMtask: { queryMtask: {
state__in: "", state__in: "",
}, },
mtaskId: "",
}; };
}, },
mounted() { mounted() {
@ -364,17 +372,18 @@ export default {
}, },
//工序详情 //工序详情
itemClick(row) { itemClick(row) {
this.mtaskId = row.id;
this.dialog.detail = true;
// this.currentMtask = row; // this.currentMtask = row;
// this.mgroup = row.mgroup; // this.mgroup = row.mgroup;
// this.mtask = row.id;
// this.material_out = row.material_out_.id; // this.material_out = row.material_out_.id;
// this.handledate = row.start_date; // this.handledate = row.start_date;
// this.paramsMlog.mtask = this.mtask; // this.paramsMlog.mtask = this.mtask;
// this.apiObjMlog = this.$API.wpm.mlog.list; // this.apiObjMlog = this.$API.wpm.mlog.list;
this.$router.push({ // this.$router.push({
name: "mlogDept6Detail", // name: "mlogDept6Detail",
query: { mtaskId: row.id }, // query: { mtaskId: row.id },
}); // });
}, },
handleQueryMtask() { handleQueryMtask() {
if (this.queryMtaskState) { if (this.queryMtaskState) {

300
src/views/wpm/mlog_dept6_detail.vue
View File

@ -9,83 +9,195 @@
</div> </div>
</template> </template>
<el-descriptions> <el-descriptions>
<el-descriptions-item label="任务编号">{{ currentMtask.number }}</el-descriptions-item> <el-descriptions-item label="任务编号">{{
currentMtask.number
}}</el-descriptions-item>
<el-descriptions-item label="产品全称"> <el-descriptions-item label="产品全称">
<span v-if="currentMtask.material_out_">{{ currentMtask.material_out_name }}</span> <span v-if="currentMtask.material_out_">{{
currentMtask.material_out_name
}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="计划数量">{{ currentMtask.count }}</el-descriptions-item> <el-descriptions-item label="计划数量">{{
<el-descriptions-item label="计划日期">{{ currentMtask.start_date }}</el-descriptions-item> currentMtask.count
<el-descriptions-item label="合格数">{{ currentMtask.count_ok }}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="计划日期">{{
currentMtask.start_date
}}</el-descriptions-item>
<el-descriptions-item label="合格数">{{
currentMtask.count_ok
}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
</el-header> </el-header>
<!-- 日志 --> <!-- 日志 -->
<el-main style="padding: 0;"> <el-main style="padding: 0">
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="addMlog" <el-button
v-if="currentMtask && currentMtask.state == 20" v-auth="'mlog.create'">新增</el-button> type="primary"
icon="el-icon-plus"
@click="addMlog"
v-if="currentMtask && currentMtask.state == 20"
v-auth="'mlog.create'"
>新增</el-button
>
</div> </div>
</el-header> </el-header>
<el-main style="padding: 0;"> <el-main style="padding: 0">
<scTable ref="mtaskMlogs" :apiObj="apiObj" row-key="id" :params="params" stripe hidePagination hideDo> <scTable
<el-table-column label="工序" prop="mgroup_name"></el-table-column> ref="mtaskMlogs"
<el-table-column label="产品名称" prop="material_out_" min-width="120"> :apiObj="apiObj"
row-key="id"
:params="params"
stripe
hidePagination
hideDo
>
<el-table-column
label="工序"
prop="mgroup_name"
></el-table-column>
<el-table-column
label="产品名称"
prop="material_out_"
min-width="120"
>
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.material_out_">{{scope.row.material_out_.name}}</span> <span v-if="scope.row.material_out_">{{
scope.row.material_out_.name
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="批次号" prop="batch"></el-table-column> <el-table-column
<el-table-column label="加工设备" prop="equipment_name"></el-table-column> label="批次号"
<el-table-column label="领用数量" prop="count_use"> </el-table-column> prop="batch"
<el-table-column label="加工数量" prop="count_real"> </el-table-column> ></el-table-column>
<el-table-column label="合格数量" prop="count_ok"></el-table-column> <el-table-column
label="加工设备"
prop="equipment_name"
></el-table-column>
<el-table-column label="领用数量" prop="count_use">
</el-table-column>
<el-table-column label="加工数量" prop="count_real">
</el-table-column>
<el-table-column
label="合格数量"
prop="count_ok"
></el-table-column>
<el-table-column label="不合格数量" align="center"> <el-table-column label="不合格数量" align="center">
<el-table-column prop="count_n_hs" label="划伤" /> <el-table-column prop="count_n_hs" label="划伤" />
<el-table-column prop="count_n_zs" label="挫伤" /> <el-table-column prop="count_n_zs" label="挫伤" />
<el-table-column prop="count_n_zz" label="杂质" /> <el-table-column prop="count_n_zz" label="杂质" />
<el-table-column prop="count_n_tw" label="条纹" /> <el-table-column prop="count_n_tw" label="条纹" />
<el-table-column prop="count_n_zdd" label="锥度大" /> <el-table-column
prop="count_n_zdd"
label="锥度大"
/>
<el-table-column prop="count_n_d" label="短" /> <el-table-column prop="count_n_d" label="短" />
<!-- 棒 --> <!-- 棒 -->
<!-- <template v-if="currentMtask.material_out_.name=='光纤预制棒'"> --> <!-- <template v-if="currentMtask.material_out_.name=='光纤预制棒'"> -->
<template v-if="material_name.indexOf('棒')>-1"> <template v-if="material_name.indexOf('棒') > -1">
<el-table-column prop="count_n_dl" label="断裂" /> <el-table-column
<el-table-column prop="count_n_qp" label="气泡"/> prop="count_n_dl"
<el-table-column prop="count_n_bl" label="不亮" /> label="断裂"
<el-table-column prop="count_n_hw" label="横纹" /> />
<el-table-column prop="count_n_yp" label="有皮" /> <el-table-column
<el-table-column prop="count_n_bp" label="爆皮" /> prop="count_n_qp"
<el-table-column prop="count_n_sc" label="色差" /> label="气泡"
/>
<el-table-column
prop="count_n_bl"
label="不亮"
/>
<el-table-column
prop="count_n_hw"
label="横纹"
/>
<el-table-column
prop="count_n_yp"
label="有皮"
/>
<el-table-column
prop="count_n_bp"
label="爆皮"
/>
<el-table-column
prop="count_n_sc"
label="色差"
/>
</template> </template>
<!-- 管 --> <!-- 管 -->
<!-- <template v-if="currentMtask.material_out_.name=='光纤预制管'"> --> <!-- <template v-if="currentMtask.material_out_.name=='光纤预制管'"> -->
<template v-if="material_name.indexOf('管')>-1"> <template v-if="material_name.indexOf('管') > -1">
<el-table-column prop="count_n_qx" label="气线"/> <el-table-column
<el-table-column prop="count_n_js" label="结石" /> prop="count_n_qx"
<el-table-column prop="count_n_tydd" label="椭圆度大" /> label="气线"
<el-table-column prop="count_n_sw" label="水雾" /> />
<el-table-column prop="count_n_bhpcd" label="壁厚偏差大" /> <el-table-column
prop="count_n_js"
label="结石"
/>
<el-table-column
prop="count_n_tydd"
label="椭圆度大"
/>
<el-table-column
prop="count_n_sw"
label="水雾"
/>
<el-table-column
prop="count_n_bhpcd"
label="壁厚偏差大"
/>
<el-table-column prop="count_n_wq" label="弯" /> <el-table-column prop="count_n_wq" label="弯" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作人" prop="update_by_name"></el-table-column> <el-table-column
label="操作人"
prop="update_by_name"
></el-table-column>
<el-table-column label="操作" fixed="right" width="130"> <el-table-column label="操作" fixed="right" width="130">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="table_edit(scope.row)" v-auth="'mlog.update'" <el-button
v-if="scope.row.submit_time == null">编辑 link
type="primary"
@click="table_edit(scope.row)"
v-auth="'mlog.update'"
v-if="scope.row.submit_time == null"
>编辑
</el-button> </el-button>
<el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'" <el-button
v-if="scope.row.submit_time == null">删除 link
type="danger"
@click="table_del(scope.row)"
v-auth="'mlog.delete'"
v-if="scope.row.submit_time == null"
>删除
</el-button> </el-button>
<el-button link type="primary" @click="mlog_submit(scope.row)" v-auth="'mlog.submit'" <el-button
v-if="scope.row.submit_time == null" :loading="mlogHandleLoading">提交 link
type="primary"
@click="mlog_submit(scope.row)"
v-auth="'mlog.submit'"
v-if="scope.row.submit_time == null"
:loading="mlogHandleLoading"
>提交
</el-button> </el-button>
<el-button link type="danger" @click="mlog_revert(scope.row)" v-auth="'mlog.submit'" <el-button
v-if="scope.row.submit_time != null" :loading="mlogHandleLoading">撤回 link
type="danger"
@click="mlog_revert(scope.row)"
v-auth="'mlog.submit'"
v-if="scope.row.submit_time != null"
:loading="mlogHandleLoading"
>撤回
</el-button> </el-button>
<el-button link type="success" @click="table_show(scope.row)"> <el-button
link
type="success"
@click="table_show(scope.row)"
>
日志记录 日志记录
</el-button> </el-button>
</template> </template>
@ -94,9 +206,23 @@
</el-main> </el-main>
</el-container> </el-container>
</el-main> </el-main>
<save-dialog v-if="dialogSave" ref="saveDialog" :mtask="mtask" :mgroup="mgroup" :handledate="handledate" <save-dialog
:material_out="material_out" :material_name="material_name" @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog> v-if="dialogSave"
<showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false"> ref="saveDialog"
:mtask="mtask"
:mgroup="mgroup"
:handledate="handledate"
:material_out="material_out"
:material_name="material_name"
@success="handleSaveSuccess"
@closed="dialogSave = false"
></save-dialog>
<showDrawer
ref="showDrawer"
v-if="visibleDrawer"
:mlogId="mlogId"
@closed="visibleDrawer = false"
>
</showDrawer> </showDrawer>
</el-container> </el-container>
</template> </template>
@ -105,7 +231,14 @@ import saveDialog from "./mlog6_form.vue";
import showDrawer from "./mlog_drawer.vue"; import showDrawer from "./mlog_drawer.vue";
export default { export default {
components: { components: {
saveDialog, showDrawer saveDialog,
showDrawer,
},
props: {
mtaskId: {
type: String,
default: "",
},
}, },
data() { data() {
return { return {
@ -114,33 +247,31 @@ export default {
save: false, save: false,
}, },
state_: { state_: {
10: '创建中', 10: "创建中",
20: '已下达', 20: "已下达",
30: '生产中', 30: "生产中",
40: '已提交', 40: "已提交",
}, },
hideDo: true, hideDo: true,
currentMtask: {}, currentMtask: {},
apiObj: null, apiObj: null,
params: { params: {
mtask: '' mtask: "",
}, },
mlogId: '', mlogId: "",
handledate: '', handledate: "",
dialogSave: false, dialogSave: false,
visibleDrawer: false, visibleDrawer: false,
} };
}, },
mounted() { mounted() {
this.mtaskId = this.$route.query.mtaskId; console.log(this.mtaskId);
console.log(this.$route.query) this.getMtask();
debugger;
this.getMtask(this.mtaskId);
}, },
methods: { methods: {
getMtask(id) { getMtask() {
let that = this; let that = this;
this.$API.pm.mtask.item.req(id).then(res => { this.$API.pm.mtask.item.req(that.mtaskId).then((res) => {
that.currentMtask = res; that.currentMtask = res;
this.mgroup = res.mgroup; this.mgroup = res.mgroup;
this.mtask = res.id; this.mtask = res.id;
@ -150,7 +281,7 @@ export default {
this.params.mtask = this.mtaskId; this.params.mtask = this.mtaskId;
this.apiObj = this.$API.wpm.mlog.list; this.apiObj = this.$API.wpm.mlog.list;
}) });
}, },
table_show(row) { table_show(row) {
this.visibleDrawer = true; this.visibleDrawer = true;
@ -184,15 +315,20 @@ export default {
table_del(row) { table_del(row) {
this.$confirm(`确定删除吗？`, "提示", { this.$confirm(`确定删除吗？`, "提示", {
type: "warning", type: "warning",
}).then(() => { })
this.$API.wpm.mlog.delete.req(row.id).then((res) => { .then(() => {
this.$API.wpm.mlog.delete
.req(row.id)
.then((res) => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.$refs.mtaskMlogs.refresh(); this.$refs.mtaskMlogs.refresh();
return res; return res;
}).catch((err) => { })
.catch((err) => {
return err; return err;
}); });
}).catch(() => { }); })
.catch(() => {});
}, },
//本地更新数据 //本地更新数据
@ -203,23 +339,29 @@ export default {
this.query = {}; this.query = {};
}, },
mlog_submit(row) { mlog_submit(row) {
this.$API.wpm.mlog.submit.req(row.id).then(res => { this.$API.wpm.mlog.submit
this.$message.success('操作成功') .req(row.id)
this.getMtask(row.mtask) .then((res) => {
}).catch(err => { }) this.$message.success("操作成功");
this.getMtask(row.mtask);
})
.catch((err) => {});
}, },
mlog_revert(row) { mlog_revert(row) {
this.mlogHandleLoading = true; this.mlogHandleLoading = true;
this.$API.wpm.mlog.revert.req(row.id).then(res => { this.$API.wpm.mlog.revert
.req(row.id)
.then((res) => {
this.$message.success("撤回成功"); this.$message.success("撤回成功");
this.getMtask(row.mtask) this.getMtask(row.mtask);
this.mlogHandleLoading = false;
}).catch(e => {
this.mlogHandleLoading = false; this.mlogHandleLoading = false;
}) })
.catch((e) => {
this.mlogHandleLoading = false;
});
}, },
} },
} };
</script> </script>
<style scoped> <style scoped>
.tabsHeader { .tabsHeader {
@ -227,15 +369,15 @@ export default {
position: absolute; position: absolute;
right: 20px; right: 20px;
margin-top: 4px; margin-top: 4px;
z-index: 100 z-index: 100;
} }
.right-panel>*+* { .right-panel > * + * {
margin-left: 10px; margin-left: 10px;
} }
.el-main.nopadding { .el-main.nopadding {
padding: 0 20px 0 20px padding: 0 20px 0 20px;
} }
.tableTitle { .tableTitle {