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

1025

This commit is contained in:
shijing 2023-10-25 17:44:12 +08:00
parent 8837579a5d
commit e7c4832ac0
5 changed files with 413 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/wpm/flog_form.vue
View File

@ -225,8 +225,9 @@
if (this.mode == "add") {
res = await this.$API.wpm.mlog.create.req(this.formList);
} else if (this.mode == "edit") {
res = await this.$API.wpm.mlog.update.req(this.recordId,this.formList);
res = await this.$API.wpm.mlog.update.req('bulk',this.formList);
}
this.$emit('success')
this.isSaveing = false;
this.visible = false;
this.$message.success("操作成功");

341
src/views/wpm/task2flog_form.vue
View File

@ -7,59 +7,283 @@
destroy-on-close
@closed="$emit('closed')"
>
<el-form ref="ruleForm" :model="form" :rules="rules" label-width="80px">
<el-form-item label="产品规格" prop="material">
<el-select
v-model="form.cate"
placeholder="产品规格"
clearable
style="width:100%"
>
<el-option
v-for="item in cateOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="产品班次" prop="material">
<el-select
v-model="form.shift"
placeholder="产品班次"
clearable
style="width:100%"
>
<el-option
v-for="item in shiftOptions"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="合格数量" width="100">
<el-input-number
v-model="form.count_use"
controls-position="right"
:min="0" step="1"
:step-strictly="true"
style="width:100%"
placeholder="请输入合格数量">
</el-input-number>
</el-form-item>
<el-form-item prop="type" label="成型人">
<span style="display:flex">
<el-input readonly v-model="handle_name"></el-input>
<ehsUserSelect :multiple="false" @submit="getReceptionist"/>
</span>
</el-form-item>
<el-form-item prop="type" label="带班人">
<span style="display:flex">
<el-input readonly v-model="leader_name"></el-input>
<ehsUserSelect :multiple="false" @submit="getLeader"/>
</span>
</el-form-item>
<!-- 混料工序 -->
<el-form v-if="activeType=='混料工序'" ref="ruleForm" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="产品规格" prop="material">
<el-select
v-model="form.cate"
placeholder="产品规格"
clearable
style="width:100%"
>
<el-option
v-for="item in cateOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="合格数量" width="100">
<el-input-number
v-model="form.count_use"
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-form v-if="activeType=='7车间'" ref="ruleForm" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="炉号">
<el-select
v-model="form.cate"
placeholder="炉号"
clearable
style="width:100%"
>
<el-option
v-for="item in 8"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="第几锅">
<el-input-number
v-model="form.count_use"
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="material">
<el-select
v-model="form.cate"
placeholder="产品规格"
clearable
style="width:100%"
>
<el-option
v-for="item in cateOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="配粉料数(kg)">
<el-input-number
v-model="form.count_use"
controls-position="right"
:min="0"
step="1"
:precision="2"
style="width:100%"
placeholder="请输入配粉料数（kg）">
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="产出数量">
<el-input-number
v-model="form.count_use"
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="合格数量">
<el-input-number
v-model="form.count_use"
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="退火炉号">
<el-select
v-model="form.cate"
placeholder="退火炉号"
clearable
style="width:100%"
>
<el-option
v-for="item in 8"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="是否加氧">
<el-select
v-model="form.o2"
placeholder="是否加氧"
clearable
style="width:100%"
>
<el-option
v-for="item in yseorno"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item prop="type" label="成型人">
<el-select
v-model="form.shift"
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 prop="type" label="切料人">
<el-select
v-model="form.shift"
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-row>
</el-form>
<!-- 十车间 -->
<el-form v-if="activeType=='10车间'" ref="ruleForm" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :md="12" :sm="24">
<el-form-item label="产品规格" prop="material">
<el-select
v-model="form.cate"
placeholder="产品规格"
clearable
style="width:100%"
>
<el-option
v-for="item in cateOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="班次" prop="material">
<el-select
v-model="form.shift"
placeholder="班次"
clearable
style="width:100%"
>
<el-option
v-for="item in shiftOptions"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="合格数量" width="100">
<el-input-number
v-model="form.count_use"
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 prop="type" label="成型人">
<el-select
v-model="form.cxr"
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 prop="type" label="带班人">
<el-select
v-model="form.shift"
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-row>
</el-form>
<el-footer>
<el-button @click="resetForm">取消</el-button>
@ -74,9 +298,11 @@ import { index } from 'd3';
emits: ["success", "closed"],
props:{
mtask: { type: String, default: '' },
activeType:{ type: String, default: '' },
},
data() {
return {
yseorno:['是','否'],
loading: false,
mode: "add",
titleMap: {
@ -86,6 +312,7 @@ import { index } from 'd3';
},
form:{},
options:[],
userList:[],
cateOptions:[],
shiftOptions:['白班','夜班'],
visible: false,
@ -96,8 +323,15 @@ import { index } from 'd3';
};
},
mounted() {
this.getUserList();
},
methods: {
getUserList(){
let that = this;
this.$API.system.user.list.req({belong_dept__name:this.activeType,page:0}).then(res=>{
that.userList = res;
});
},
getReceptionist(data) {
this.form.handle_user=data.id;
this.handle_name=data.name
@ -110,6 +344,7 @@ import { index } from 'd3';
open(mode = "add") {
this.mode = mode;
this.visible = true;
return this;
},
getList(){

131
src/views/wpm/worktask.vue
View File

@ -2,44 +2,100 @@
<el-container style="flex-direction: column">
<el-main id="topContainer" class="nopadding" style="position: relative;height: 50%;margin-bottom: 10px;">
<el-row :gutter="10">
<el-col :span="10" style="border-right: 1px solid #eeeeee;position: relative;">
<el-col :span="12" style="border-right: 1px solid #eeeeee;position: relative;">
<div class="right-panel" style=" display: inline-block;position: absolute;right: 20px;margin-top: 4px;z-index:100">
<el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
<el-button type="primary" @click="add">任务下达</el-button>
<el-button type="primary" @click="handleQuery" >导出</el-button>
</div>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="10车间" name="first">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:height="tableHeight"
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
</el-table-column>
<el-table-column label="型号" prop="number">
</el-table-column>
<el-table-column label="规格" prop="number">
</el-table-column>
<el-table-column label="计划量" prop="count">
</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="end_date">
</el-table-column>
<el-table-column label="完成量" prop="count">
</el-table-column>
</scTable>
<el-tab-pane label="混料工序" name="混料工序">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:height="tableHeight"
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
</el-table-column>
<el-table-column label="型号" prop="number">
</el-table-column>
<el-table-column label="规格" prop="number">
</el-table-column>
<el-table-column label="计划量" prop="count">
</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="end_date">
</el-table-column>
<el-table-column label="完成量" prop="count">
</el-table-column>
</scTable>
</el-tab-pane>
<el-tab-pane label="7车间" name="7车间">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:height="tableHeight"
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
</el-table-column>
<el-table-column label="型号" prop="number">
</el-table-column>
<el-table-column label="规格" prop="number">
</el-table-column>
<el-table-column label="计划量" prop="count">
</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="end_date">
</el-table-column>
<el-table-column label="完成量" prop="count">
</el-table-column>
</scTable>
</el-tab-pane>
<el-tab-pane label="10车间" name="10车间">
<scTable
ref="table"
:apiObj="apiObj"
row-key="id"
stripe
:height="tableHeight"
:params="query"
>
<el-table-column type="index" width="50"/>
<el-table-column label="产品名称" prop="material" show-overflow-tooltip>
</el-table-column>
<el-table-column label="型号" prop="number">
</el-table-column>
<el-table-column label="规格" prop="number">
</el-table-column>
<el-table-column label="计划量" prop="count">
</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="end_date">
</el-table-column>
<el-table-column label="完成量" prop="count">
</el-table-column>
</scTable>
</el-tab-pane>
</el-tabs>
</el-col>
<el-col :span="14">
<el-col :span="12">
<el-form label-width="100px" style="border-bottom: 1px solid #eeeeee;padding: 4px 0;">
<el-row>
<el-col :md="8" :sm="12" :xs="24">
@ -58,7 +114,7 @@
</el-form>
<div style="margin-top: 10px;">
<el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
<el-button type="primary" @click="sum">合计</el-button>
<el-button type="primary" @click="sum" v-if="activeName=='10车间'">合计</el-button>
</div>
<scTable
ref="table"
@ -70,6 +126,8 @@
>
<el-table-column type="index" width="40"/>
<el-table-column type="selection" width="40"/>
<el-table-column v-if="activeName=='7车间'" label="锅号" prop="material">
</el-table-column>
<el-table-column label="产品编号" prop="material">
</el-table-column>
<el-table-column label="产品名称" prop="number">
@ -80,13 +138,13 @@
</el-table-column>
<el-table-column label="领料数量" prop="count">
</el-table-column>
<el-table-column label="操作" fixed="right" align="left" width="120">
<el-table-column label="操作" fixed="right" align="left" width="100">
<template #default="scope">
<el-link
type="primary"
@click="table_edit(scope.row)"
v-if="scope.row.status==10"
v-auth="'equipment.update'"
v-auth="'equipment'"
>编辑
</el-link>
<!-- 提交后变查看 -->
@ -94,7 +152,7 @@
v-else
type="primary"
@click="table_edit(scope.row)"
v-auth="'equipment.update'"
v-auth="'equipment'"
>查看
</el-link>
<el-link
@ -112,6 +170,7 @@
stripe
:height="rightHeight"
:params="query"
v-if="activeName=='10车间'"
>
<el-table-column type="index" width="40"/>
<el-table-column label="班组" prop="material">
@ -132,7 +191,7 @@
type="primary"
@click="table_edit(scope.row)"
v-if="scope.row.status==10"
v-auth="'equipment.update'"
v-auth="'equipment'"
>编辑
</el-link>
<!-- 提交后变查看 -->
@ -158,6 +217,7 @@
v-if="dialog.save"
ref="saveDialog"
:mtask = "mtask"
:activeType = "activeName"
@success="handleSaveSuccess"
@closed="dialog.save = false"
></save-dialog>
@ -257,8 +317,7 @@ export default {
{ header: 'Name', key: 'name', wch: 15 },
{ header: 'D.O.B.', key: 'dob', width: 32 }
],
activeName:'first',
activeNameSub:'order',
activeName:'10车间',
selection: [],
state_: {
10: '完好',

22
src/views/wpm/worktask2.vue
View File

@ -66,7 +66,7 @@
<el-col :span="13" style="border-right: 1px solid #eeeeee;">
<div class="tableTitle">工序进度</div>
<scTable
ref="table"
ref="tableprocess"
row-key="id"
stripe
:hideDo="hideDo"
@ -86,16 +86,22 @@
</el-table-column>
<el-table-column label="计划数量" prop="count">
</el-table-column>
<el-table-column label="合格数量" prop="count">
<el-table-column label="合格数量" prop="count_ok">
</el-table-column>
<el-table-column label="操作人" prop="count">
<el-table-column label="操作人" prop="">
</el-table-column>
</scTable>
</el-col>
<el-col :span="11">
<div class="tableTitle">车间物料</div>
<div class="tableTitle" style="display:flex;justify-content: space-between;">
<div>车间物料</div>
<div class="btnsContainer" style=" ">
<el-button type="primary" @click="tomio">车间入库</el-button>
<el-button type="primary" @click="tomio">车间出库</el-button>
</div>
</div>
<scTable
ref="table"
ref="tableMaterial"
row-key="id"
stripe
:hideDo="hideDo"
@ -138,7 +144,7 @@ export default {
dialog: {
save: false,
},
apiObj: this.$API.pm.mtask.daylist,
apiObj: "",
query: {
page:1,
page_size:20,
@ -170,6 +176,7 @@ export default {
let NowDate = new Date();
let month = NowDate.getMonth()>8?NowDate.getMonth()+1:'0'+(NowDate.getMonth()+1)
this.query.date = NowDate.getFullYear()+'-'+(NowDate.getMonth()+1)+'-'+NowDate.getDate();
this.apiObj = this.$API.pm.mtask.daylist;
},
methods: {
//车间物料
@ -250,6 +257,9 @@ export default {
resetQuery() {
this.query = {};
},
tomio(){
this.$router.push('/inm/mio')
},
},
};
</script>

26
src/views/wpm/worktaskFlog.vue
View File

@ -18,19 +18,19 @@
<el-col :xl="4" :lg="6" :md="8" :sm="12" :xs="24">
<el-form-item class="infoForm" label="计划日期：">{{ orderObj.start_date }}</el-form-item>
</el-col>
<el-button type="primary" @click="submitForm">提交</el-button>
<el-button v-if="orderObj.state!==40" type="primary" @click="submitForm">提交</el-button>
</el-row>
</el-form>
</el-card>
<el-header>
<div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="add">新增记录</el-button>
<el-button type="primary" icon="el-icon-plus" @click="add" :disabled="orderObj.state==40">新增记录</el-button>
</div>
<div class="right-panel"></div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
ref="mlogTable"
:apiObj="apiObj"
row-key="id"
stripe
@ -68,7 +68,7 @@
<el-divider direction="vertical"></el-divider>
<el-link
type="danger"
@click="table_edit(scope.row)"
@click="table_del(scope.row)"
>删除
</el-link>
</template>
@ -144,11 +144,13 @@
//删除
table_del(row) {
this.$confirm(`确定删除该计划详情吗？`, "提示", {
this.$confirm(`确定删除吗？`, "提示", {
type: "warning",
}).then(() => {
this.$API.pum.planitem.delete.req(row.id).then((res) => {
debugger;
this.$API.wpm.mlog.delete.req(row.id).then((res) => {
this.$message.success("删除成功");
this.$refs.mlogTable.refresh();
return res;
}).catch((err) => {
return err;
@ -157,22 +159,18 @@
},
//本地更新数据
handleSaveSuccess(data, mode) {
if (mode == "add") {
this.$refs.table.refresh();
} else if (mode == "edit") {
this.$refs.table.refresh();
}
handleSaveSuccess() {
this.$refs.mlogTable.refresh();
},
handleQuery() {
this.$refs.table.queryData(this.query)
this.$refs.mlogTable.queryData(this.query)
},
resetQuery() {
this.query = {};
},
submitForm(){
this.$API.pm.mtask.submitSameDay.req(this.orderObj.id).then(re=>{
console.log(res)
// console.log(res)
})
},
},