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

Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

This commit is contained in:
caoqianming 2023-12-17 20:35:18 +08:00
parent 7a4e70626d 4424ce7030
commit b1e2871e03
10 changed files with 347 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/model/wpm.js
View File

@ -195,6 +195,14 @@ export default {
`${config.API_URL}/wpm/mlog/related_first/`,
data);
}
},
submit:{
name: "提交",
req: async function(id){
return await http.post(
`${config.API_URL}/wpm/mlog/${id}/submit/`,
);
}
}
},
handover:{

12
src/config/route.js
View File

@ -1886,6 +1886,16 @@ const routes = [
},
"component": "hrm/attendance"
},
{
"name": "performance",
"path": "/hrm/performance",
"meta": {
"title": "绩效考核",
"icon": "el-icon-check",
"perms": ["attendance_record"]
},
"component": "hrm/performance"
},
{
"name": "certificate",
"path": "/hrm/certificate",
@ -2464,7 +2474,7 @@ const routes = [
"meta": {
"title": "数据集",
"icon": "el-icon-grid",
"perms": ["dataset"]
"perms": ["dataset"]
},
"component": "bi/dataset"
},

112
src/views/hrm/performance.vue Normal file
View File

@ -0,0 +1,112 @@
<template>
<el-container>
<el-header>
<div class="left-panel">
<el-select
v-model="query.belong_dept"
clearable style="width:180px"
placeholder="请选择部门">
<el-option v-for="item in deptData"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
<el-date-picker
v-model="monthV"
type="month"
style="margin-left:5px;width:180px"
placeholder="请选择月份"
/>
<el-input
v-model="query.search"
placeholder="员工姓名"
clearable
style="margin:0 5px;width:180px"
></el-input>
<el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
>
<el-table-column label="#" fixed="left" type="index" width="40"></el-table-column>
<el-table-column label="姓名" prop="user_name">
</el-table-column>
<el-table-column label="部门" prop="belong_dept_name">
</el-table-column>
<el-table-column label="班次" prop="shift_name">
</el-table-column>
<el-table-column label="班组" prop="team_name">
</el-table-column>
<el-table-column label="岗位" prop="post_name">
</el-table-column>
<el-table-column label="工序" >
</el-table-column>
<el-table-column label="工作日期" prop="work_date">
</el-table-column>
<el-table-column label="完成情况">
</el-table-column>
</scTable>
</el-main>
</el-container>
</template>
<script>
export default {
name: "performance",
data() {
return {
// apiObj: this.$API.hrm..list,
apiObj: null,
deptData: [],
query: {
year:'',
month:'',
search:'',
belong_dept:''
},
monthV:''
};
},
mounted() {
this.getDept();
},
methods: {
getDept() {
this.$API.system.dept.list.req({ page: 0,type:'dept'}).then(res=>{
let data = [];
res.forEach(item => {
if(item.parent=='3423856735881117696'){
data.push(item)
}
});
this.deptData = data;
});
},
handleQuery(){
if(this.monthV!=''){
this.query.year = this.monthV.getFullYear();
this.query.month = this.monthV.getMonth() + 1;
}else{
this.query.year = '';
this.query.month = '';
}
this.$refs.table.queryData(this.query)
},
},
};
</script>
<style scoped>
</style>

14
src/views/wpm/mlog_dept10.vue
View File

@ -99,7 +99,7 @@
<el-table-column label="班次" prop="shift_name"> </el-table-column>
<el-table-column label="出管总数" prop="count_real">
</el-table-column>
<el-table-column label="规格" prop="mlogb" width="100">
<el-table-column label="规格" prop="mlogb" width="150">
<template #default="scope">
<div v-for="item in scope.row.mlogb" :key="item" class="cateItem" style="">
<span>{{ item.material_out_.name }}</span>
@ -135,15 +135,17 @@
<el-table-column label="带班长" prop="handle_leader_name">
</el-table-column>
<el-table-column label="碎料" prop="count_break"> </el-table-column>
<el-table-column label="操作" fixed="right" width="100" align="center">
<el-table-column label="操作" fixed="right" width="120" align="center">
<template #default="scope">
<el-link type="primary" @click="table_edit(scope.row)"
v-auth="'mlog.update'" v-if="scope.row.submit_time == null">编辑
</el-link>
<!-- <el-divider direction="vertical"></el-divider> -->
<el-link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
v-if="scope.row.submit_time == null">删除
</el-link>
<el-link type="primary" @click="mlog_submit(scope.row)"
v-auth="'mlog.submit'" v-if="scope.row.submit_time == null">提交
</el-link>
<el-button link type="success" @click="table_show(scope.row)">
日志记录
</el-button>
@ -458,6 +460,12 @@ export default {
handleSaveSuccess(){
this.getMlogs();
},
mlog_submit(row){
this.$API.wpm.mlog.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.table_mlog.refresh()
}).catch(err => {})
},
}
}
</script>

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

@ -1,15 +1,17 @@
<template>
<el-container>
<!-- 当天任务列表 -->
<el-header style="height:50%; padding: 0">
<el-header style="height:55%; padding: 0">
<el-container>
<el-header>
<el-aside style="width: 50%">
<el-container>
<el-header>
<div class="left-panel">
<el-date-picker v-model="query.date" type="date" value-format="YYYY-MM-DD" />
<el-button type="primary" icon="el-icon-search" @click="handleQueryMtask">查询</el-button>
</div>
</el-header>
<el-main class="nopadding">
<el-main>
<scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" hidePagination
@row-click="rowClick" hideDo>
<el-table-column type="index" width="50" />
@ -46,12 +48,9 @@
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-header>
<!-- 各工序进度 -->
<el-main class="nopadding">
<el-container>
<el-aside style="width: 50%">
</el-container>
</el-aside>
<el-main style="padding: 0;">
<el-container>
<el-header>
<div class="left-panel">
@ -73,45 +72,102 @@
</el-table-column>
<el-table-column label="操作人" prop="">
</el-table-column>
<el-table-column label="操作" fixed="right" width="60">
<template #default="scope">
<el-link type="primary" @click="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 type="index" width="50" />
<el-table-column label="送料日期" prop="send_date">
</el-table-column>
<el-table-column label="产物" prop="material" show-overflow-tooltip>
<template #default="scope"><span v-if="scope.row.material_">{{
scope.row.material_.name
}}</span>
</template>
</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 class="nopadding">
<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 hideDo>
<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="batch"> </el-table-column>
<el-table-column label="数量" prop="count" width="80">
</el-table-column>
</scTable>
</el-main>
<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 hideDo>
<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="batch"> </el-table-column>
<el-table-column label="数量" prop="count" width="80">
</el-table-column>
</scTable>
</el-main>
</el-container>
</el-main>
</el-container>
@ -144,6 +200,10 @@ export default {
paramsMlog:{
mtask:''
},
apiObjHandover:this.$API.wpm.handover.list,
paramsHandover:{
recive_dept__name:'6车间'
},
paramsWm: {
belong_dept__name: '6车间'
},
@ -189,6 +249,18 @@ export default {
resetQuery() {
this.query = {};
},
table_submit(row) {
this.$API.pm.mtask.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.rowClick(row);
}).catch(err => { })
},
handover_submit(row){
this.$API.wpm.handover.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.table_handover.refresh();
}).catch(err => { })
},
}
}
</script>

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

@ -63,6 +63,9 @@
<el-link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
v-if="scope.row.submit_time == null">删除
</el-link>
<el-link type="primary" @click="mlog_submit(scope.row)"
v-auth="'mlog.submit'" v-if="scope.row.submit_time == null">提交
</el-link>
<el-button link type="success" @click="table_show(scope.row)">
日志记录
</el-button>
@ -191,6 +194,12 @@ export default {
resetQuery() {
this.query = {};
},
mlog_submit(row){
this.$API.wpm.mlog.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.mtaskMlogs.refresh()
}).catch(err => {})
},
}
}
</script>

16
src/views/wpm/mlog_dept7.vue
View File

@ -91,7 +91,7 @@
<scTable ref="table_mlog" :data="mlogs" row-key="id" stripe hidePagination hideDo>
<el-table-column label="锅号" prop="equipment_name">
</el-table-column>
<el-table-column label="产品名称" prop="material_out_">
<el-table-column label="产品名称" prop="material_out_" min-width="120">
<template #default="scope">
<span v-if="scope.row.material_out_">{{
scope.row.material_out_.name
@ -134,15 +134,17 @@
</el-table-column>
<el-table-column label="切料人" prop="handle_user_2_name">
</el-table-column>
<el-table-column label="操作" fixed="right" width="100" align="center">
<el-table-column label="操作" fixed="right" width="120" align="center">
<template #default="scope">
<el-link type="primary" @click="table_edit(scope.row)"
v-auth="'mlog.update'" v-if="scope.row.submit_time == null">编辑
</el-link>
<!-- <el-divider direction="vertical"></el-divider> -->
<el-link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
v-if="scope.row.submit_time == null">删除
</el-link>
<el-link type="primary" @click="mlog_submit(scope.row)"
v-auth="'mlog.submit'" v-if="scope.row.submit_time == null">提交
</el-link>
<el-button link type="success" @click="table_show(scope.row)">
日志记录
</el-button>
@ -306,8 +308,6 @@ export default {
//添加
addMlog() {
let that = this;
console.log(that.currentMtask);
debugger;
if (that.currentMtask && that.currentMtask.id) {
that.mgroup = that.currentMtask.mgroup;
that.material_out = that.currentMtask.material_out;
@ -399,6 +399,12 @@ export default {
this.$refs.showDrawer.open();
});
},
mlog_submit(row){
this.$API.wpm.mlog.submit.req(row.id).then(res => {
this.$message.success('操作成功')
this.$refs.table_mlog.refresh()
}).catch(err => {})
},
}
}
</script>

1
src/views/wpm/mlog_drawer.vue
View File

@ -13,6 +13,7 @@
<template #default="scope">
<span v-if="scope.row.action=='create'">新建</span>
<span v-if="scope.row.action=='update'">更改</span>
<span v-if="scope.row.action=='submit'">提交</span>
</template>
</el-table-column>
<el-table-column label="变更人" fixed="left" prop="change_user_name">

99
src/views/wpm/mlog_tui.vue
View File

@ -53,9 +53,10 @@
<el-container>
<el-header>
<div class="left-panel">
<div class="left-panel">
<span style="font-size: 14px">交接记录</span>
</div>
<span style="font-size: 14px">交接记录</span>
</div>
<div class="right-panel">
<el-button type="primary" @click="addHandover">新增</el-button>
</div>
</el-header>
<el-main>
@ -83,7 +84,7 @@
<span v-else>否</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="left">
<el-table-column label="操作" fixed="right" align="left" width="100">
<template #default="scope">
<el-button link type="primary" @click="handover_edit(scope.row)"
v-auth="'handover.update'" v-if="scope.row.submit_time == null">
@ -138,20 +139,42 @@
</el-container>
</el-main>
</el-container>
<el-dialog title="交接单" ref="handoverDialog" v-model="handoverVisible" :size="1000" destroy-on-close
<el-dialog :title="titleOptions[handoverType]" ref="handoverDialog" v-model="handoverVisible" :size="1000" destroy-on-close
@closed="handoverVisible = false">
<el-form ref="dialogForm" :model="handoverForm" :rules="rules" label-width="120px">
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="送料日期" prop="send_date">
<el-date-picker v-model="handoverForm.send_date" type="date" value-format="YYYY-MM-DD"
style="width: 100%" />
style="width: 100%" :disabled="handoverType=='edit'"/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送物料" prop="wm">
<el-select v-model="handoverForm.wm" placeholder="交送物料" clearable style="width: 100%" :disabled="handoverType=='edit'">
<el-option v-for="item in wmaterialList" :key="item.id" :label="item.material_.name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送数量" prop="count">
<el-input-number v-model="handoverForm.count" controls-position="right" :min="0" step="1"
:step-strictly="true" style="width:100%" placeholder="数量">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送人" prop="send_user">
<el-select v-model="handoverForm.send_user" placeholder="交送人" clearable style="width: 100%" :disabled="handoverType=='edit'">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="接收部门" prop="recive_dept">
<el-select v-model="handoverForm.recive_dept" placeholder="接收部门" clearable style="width: 100%"
@change="getUserList2">
@change="getUserList2" :disabled="handoverType=='edit'">
<el-option v-for="item in deptOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option>
</el-select>
@ -159,25 +182,11 @@
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="接收人" prop="recive_user">
<el-select v-model="handoverForm.recive_user" placeholder="接收人" clearable style="width: 100%">
<el-select v-model="handoverForm.recive_user" placeholder="接收人" clearable style="width: 100%" :disabled="handoverType=='edit'">
<el-option v-for="item in userList2" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="交送人" prop="send_user">
<el-select v-model="handoverForm.send_user" placeholder="交送人" clearable style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="数量" prop="count">
<el-input-number v-model="handoverForm.count" controls-position="right" :min="0" step="1"
:step-strictly="true" style="width:100%" placeholder="数量">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-footer>
@ -201,6 +210,11 @@ export default {
data() {
return {
activeName:'退火',
handoverType:'add',
titleOptions:{
'add':'新增',
'edit':'编辑',
},
currentMgroup: {},
apiObj: null,
params: {},
@ -218,7 +232,8 @@ export default {
},
mounted() {
this.initMgroup()
this.getDepts()
this.getDepts();
this.getWmaterial();
},
methods: {
add() {
@ -256,12 +271,12 @@ export default {
this.$refs.table.refresh();
},
getDepts() {
this.$API.system.dept.list.req({ page: 0, name__in: '7车间,10车间' }).then(res => {
this.$API.system.dept.list.req({ page: 0, name__in: '6车间,7车间,10车间' }).then(res => {
this.deptOptions = res
})
},
getUserList2(val) {
this.$API.system.user.list.req({ belong_dept: val, page: 0 }).then(res => {
getUserList2() {
this.$API.system.user.list.req({ belong_dept: this.handoverForm.recive_dept, page: 0 }).then(res => {
this.userList2 = res
})
},
@ -288,20 +303,31 @@ export default {
},
//从生产日志生成交接记录
addHandover(row) {
console.log('currentMgroup',this.currentMgroup.id)
this.handoverForm.wm = '';
this.handoverForm.send_date = "";
this.handoverForm.mlog = row.id;
this.handoverForm.batch = row.batch;
this.handoverForm.count = row.count_real;
this.handoverForm.material = row.material_out;
this.handoverForm.count_eweight = row.count_real_eweight;
this.handoverForm.send_dept = row.belong_dept;
this.handoverForm.recive_dept = "";
this.handoverForm.send_user = "";
this.handoverForm.recive_user = "";
this.handoverForm.count = 1;
this.handoverForm.recive_user = '';//接收人
this.handoverForm.recive_dept = '';//接收车间
this.handoverForm.send_mgroup = this.currentMgroup.id;
this.handoverType='add';
this.handoverVisible = true;
},
getWmaterial(){
let obj = {};
obj.belong_dept__name = "8车间";
obj.page = 0;
obj.count__gte = 1;
this.$API.wpm.wmaterial.list.req(obj).then(res=>{
debugger;
console.log(res);
this.wmaterialList = res;
})
},
submitHandover() {
this.$API.wpm.handover.create.req(this.handoverForm).then((res) => {
this.$API.wpm.handover.genByWm.req(this.handoverForm).then((res) => {
this.$message.success("创建成功");
this.handoverVisible = false;
this.$refs.table2.refresh();
@ -309,7 +335,8 @@ export default {
},
handover_edit(row) {
Object.assign(this.handoverForm, row);
this.getUserList2(row.recive_dept)
this.getUserList2(row.recive_dept);
this.handoverType='edit';
this.handoverVisible = true;
},
handover_delete(row) {

8
src/views/wpm/worktask_form.vue
View File

@ -1090,7 +1090,13 @@ export default {
},
methods: {
getRouteOptions() {
this.$API.mtm.route.list.req({ page: 0, mgroup: this.form.mgroup}).then(res => {
let mgroup__name = '';
if(this.activeType=='8车间'){
mgroup__name = '混料';
}else if(this.activeType=='退火'){
mgroup__name = '管料退火';
}else{return}
this.$API.mtm.route.list.req({ page: 0, mgroup__name:mgroup__name}).then(res => {
for (var i = 0; i < res.length; i++) {
if (res[i].material_in == null) {
res[i].material_in_name = ''