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

fix:coding#840#841

This commit is contained in:
shijing 2025-05-29 17:13:35 +08:00
parent 51a38d87ed
commit ca7cee95c0
8 changed files with 188 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

306
src/views/home/widgets/index_bx.vue
View File

@ -1,6 +1,21 @@
<template> <template>
<div class="widgets-home" ref="main"> <div class="widgets-home" ref="main">
<div class="widgets-content"> <div class="widgets-content">
<div class="retangleWrap retangleWrapTop">
<div class="retangle retangleImg">
<div class="companyName">玻纤生产管理</div>
<div class="companyDesc">
公司秉承“善用资源，服务建设”的核心理念，践行“材料创造美
</div>
<div class="companyDesc">
好世界”的企业使命，坚持“创新、绩效、和谐、责任”的核心价
</div>
<div class="companyDesc">
值观，努力成长为具有创新精神和全球视野的光芯材料领先企业。
</div>
<img class="topCardImg" src="img/topCard.png" />
</div>
</div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="retangleWrap"> <div class="retangleWrap">
@ -10,65 +25,33 @@
</div> </div>
<div class="retangleTable"> <div class="retangleTable">
<el-table <el-table
:data="equipList" :data="tableData"
style="width: 100%; height: 285px" style="width: 100%; height: 285px"
> >
<el-table-column <el-table-column prop="name" label="物料名称"/>
prop="number" <el-table-column prop="model" label="型号"/>
label="设备编号" <el-table-column prop="specification" label="规格"/>
/> <el-table-column prop="count" label="数量"/>
<el-table-column
prop="name"
label="设备名称"
/>
<el-table-column
prop="belong_dept_name"
label="所在车间"
/>
<el-table-column
prop="state"
label="设备状态"
>
<template #default="scope">
{{eqState_[scope.row.state]}}
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="retangleWrap"> <div class="retangleWrap" style="padding: 25px 0 0 0;">
<div class="retangleContainer"> <div class="retangleContainer">
<div class="retangleTitle"> <div class="retangleTitle">
<div class="title">待接收的物料</div> <div class="title">待填日志的物料</div>
</div> </div>
<div class="retangleTable"> <div class="retangleTable">
<el-table <el-table
:data="equipList" :data="tableData"
style="width: 100%; height: 285px" style="width: 100%; height: 285px"
> >
<el-table-column <el-table-column prop="name" label="物料名称"/>
prop="number" <el-table-column prop="model" label="型号"/>
label="设备编号" <el-table-column prop="specification" label="规格"/>
/> <el-table-column prop="count" label="数量"/>
<el-table-column
prop="name"
label="设备名称"
/>
<el-table-column
prop="belong_dept_name"
label="所在车间"
/>
<el-table-column
prop="state"
label="设备状态"
>
<template #default="scope">
{{eqState_[scope.row.state]}}
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
@ -78,33 +61,17 @@
<div class="retangleWrap"> <div class="retangleWrap">
<div class="retangleContainer"> <div class="retangleContainer">
<div class="retangleTitle"> <div class="retangleTitle">
<div class="title">待接收的物料</div> <div class="title">待交送的物料</div>
</div> </div>
<div class="retangleTable" style=""> <div class="retangleTable">
<el-table <el-table
:data="equipList" :data="tableData"
style="width: 100%; height: 285px" style="width: 100%; height: 285px"
> >
<el-table-column <el-table-column prop="name" label="物料名称"/>
prop="number" <el-table-column prop="model" label="型号"/>
label="设备编号" <el-table-column prop="specification" label="规格"/>
/> <el-table-column prop="count" label="数量"/>
<el-table-column
prop="name"
label="设备名称"
/>
<el-table-column
prop="belong_dept_name"
label="所在车间"
/>
<el-table-column
prop="state"
label="设备状态"
>
<template #default="scope">
{{eqState_[scope.row.state]}}
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
@ -112,74 +79,34 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="15"> <el-col :span="9">
<div class="retangleWrap"> <div class="retangleWrap" style="padding: 25px 0 0 20px;">
<div class="retangleContainer"> <div class="retangleContainer">
<div class="retangleTitle"> <div class="retangleTitle">
<div class="title">待接收的物料</div> <div class="title">生产任务列表</div>
</div> </div>
<div class="retangleTable"> <div class="retangleTable">
<el-table <el-table
:data="equipList" :data="tableData"
style="width: 100%; height: 285px" style="width: 100%; height: 285px"
> >
<el-table-column <el-table-column prop="name" label="物料名称"/>
prop="number" <el-table-column prop="model" label="型号"/>
label="设备编号" <el-table-column prop="specification" label="规格"/>
/> <el-table-column prop="count" label="数量"/>
<el-table-column
prop="name"
label="设备名称"
/>
<el-table-column
prop="belong_dept_name"
label="所在车间"
/>
<el-table-column
prop="state"
label="设备状态"
>
<template #default="scope">
{{eqState_[scope.row.state]}}
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="15">
<div class="retangleWrap"> <div class="retangleWrap">
<div class="retangleContainer"> <div class="retangleContainer">
<div class="retangleTitle"> <div class="retangleTitle">
<div class="title">待接收的物料</div> <div class="title">生产统计</div>
</div> </div>
<div class="retangleTable"> <div class="retangleTable">
<el-table <scEcharts height="285px" :width="'100%'" :option="option"></scEcharts>
:data="equipList"
style="width: 100%; height: 285px"
>
<el-table-column
prop="number"
label="设备编号"
/>
<el-table-column
prop="name"
label="设备名称"
/>
<el-table-column
prop="belong_dept_name"
label="所在车间"
/>
<el-table-column
prop="state"
label="设备状态"
>
<template #default="scope">
{{eqState_[scope.row.state]}}
</template>
</el-table-column>
</el-table>
</div> </div>
</div> </div>
</div> </div>
@ -193,38 +120,68 @@ import * as echarts from "echarts";
export default { export default {
data() { data() {
return { return {
time: "",
day: "",
year_s: "",
day_s: "",
month_s: "",
yesterday: "",
eqState_: {
10: "完好",
20: "限用",
30: "在修",
40: "禁用",
},
equipList: [],
tableData: [], tableData: [],
warningMaterial: [], materialType: 20,
materialType: "20", option: {
tooltip: {
trigger: "axis",
axisPointer: {
type: "cross",
label: {
backgroundColor: "#6a7985",
},
},
},
grid: {
top: "5%",
left: "1%",
right: "1%",
bottom: "5%",
containLabel: true,
},
xAxis: {
type: "category",
axisLabel: {
// show: false, // X 轴标签文字旋转角度
},
data: [],
},
yAxis: {
type: "value",
axisLabel: {
show: false, // X 轴标签文字旋转角度
},
},
series: {
data: [],
type: "bar",
barMaxWidth: 30,
emphasis: {
focus: "series",
},
label: {
show: true,
position: "top",
color: "#000",
},
itemStyle: {
borderRadius: [5, 5, 0, 0],
normal: { color: "rgb(20, 141, 255)" },
},
},
},
}; };
}, },
mounted() { mounted() {
this.$emit("on-mounted"); this.$emit("on-mounted");
let that = this; //1、生产设备
var myDate = new Date(); this.getEquipmentList();
let year = myDate.getFullYear(); //2、半成品库车间库存
let month = myDate.getMonth() + 1;
let day = myDate.getDate();
that.year_s = year;
that.month_s = month;
that.day_s = day;
this.getEquipList();
this.getMaterialWarning();
this.getMaterialList(); this.getMaterialList();
this.getMaterialRecive();//待接收
this.getMaterialMlog();//待加工
this.getMaterialSend();//已加工
this.getMtaskLists();//任务列表
}, },
methods: { methods: {
// 动态绑定Class // 动态绑定Class
@ -241,42 +198,33 @@ export default {
} }
return classInfo; return classInfo;
}, },
//设备列表 //生产设备
getEquipList() { getEquipmentList(){},
this.$API.em.equipment.list //半成品库车间库存
.req({ page: 0, type: 10 })
.then((res) => {
this.equipList = res;
});
},
materialTypeChange() {
this.getMaterialList();
},
//获取库存
getMaterialList() { getMaterialList() {
let that = this; let that = this;
that.$API.mtm.material.list let nameList = [], countList = [];
.req({ page: 0, type: that.materialType }) that.$API.mtm.material.list.req({ page: 0, type: that.materialType,count__gt:0 }).then((res) => {
.then((res) => { that.tableData = res;
that.tableData = res.filter((item) => { res.forEach(item => {
return item.count > 0; let index = nameList.indexOf(item.name);
}); if(index<0){
}); nameList.push(item.name);
}, countList.push(item.count);
//库存警告
getMaterialWarning() {
let that = this;
that.$API.mtm.material.list
.req({ page: 0, type__in: "10,20", count__lte: 1 })
.then((res) => {
if (res.length > 0) {
console.log("getMaterialWarning", res);
that.warningMaterial = res;
} else {
} }
}); });
that.option.xAxis.data = nameList;
that.option.series.data = countList;
});
}, },
//待接收
getMaterialRecive(){},
//待加工
getMaterialMlog(){},
//已加工
getMaterialSend(){},
//任务列表
getMtaskLists(){},
}, },
}; };
</script> </script>
@ -286,7 +234,13 @@ export default {
padding: 25px 20px 0 20px; padding: 25px 20px 0 20px;
box-sizing: border-box; box-sizing: border-box;
} }
.retangle {
width: 100%;
border-radius: 15px;
box-sizing: border-box;
position: relative;
background: #ffffff;
}
.retangleContainer { .retangleContainer {
width: 100%; width: 100%;
border-radius: 15px; border-radius: 15px;

20
src/views/mtm/materials_form_gx.vue
View File

@ -41,8 +41,8 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24" prop="name"> <el-col :md="12" :sm="24">
<el-form-item label="物料名称"> <el-form-item label="物料名称" prop="name">
<el-input <el-input
v-model="form.name" v-model="form.name"
placeholder="物料名称" placeholder="物料名称"
@ -92,7 +92,7 @@
</el-col> </el-col>
<!-- 玻纤 --> <!-- 玻纤 -->
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="追踪方式"> <el-form-item label="追踪方式" prop="tracking">
<el-select <el-select
v-model="form.tracking" v-model="form.tracking"
placeholder="追踪方式" placeholder="追踪方式"
@ -184,6 +184,20 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
process: [
{
required: true,
message: "请选择已到工序",
trigger: "blur",
},
],
tracking: [
{
required: true,
message: "请选择追踪方式",
trigger: "blur",
},
],
}, },
visible: false, visible: false,
isSaveing: false, isSaveing: false,

1
src/views/pm/utask_form.vue
View File

@ -4,6 +4,7 @@
v-model="visible" v-model="visible"
:size="1000" :size="1000"
destroy-on-close destroy-on-close
:close-on-click-modal="false"
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-container v-loading="loading">

28
src/views/wpm_bx/handover.vue
View File

@ -91,7 +91,7 @@
prop="material_name" prop="material_name"
min-width="140" min-width="140"
></el-table-column> ></el-table-column>
<el-table-column label="批次" prop="batch" min-width="80"> <el-table-column label="批次" prop="batch" width="60">
<template #default="scope"> <template #default="scope">
<el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text> <el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text>
</template> </template>
@ -141,61 +141,43 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="140" width="300"
> >
<template #default="scope"> <template #default="scope">
<el-button <el-button
link
size="small"
v-if="scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept" v-if="scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept"
@click="table_print(scope.row)" @click="table_print(scope.row)"
type="success" type="success"
>打印</el-button >打印</el-button
> >
<el-button <el-button
link
size="small"
@click="table_receive(scope.row)" @click="table_receive(scope.row)"
type="success" type="success"
v-if="(scope.row.recive_mgroup == mgroupId||scope.row.recive_dept == deptId)&&scope.row.submit_time == null" v-if="(scope.row.recive_mgroup == mgroupId||scope.row.recive_dept == deptId)&&scope.row.submit_time == null"
>接收</el-button> >接收</el-button>
<el-button <el-button
link
size="small"
@click="table_reBack(scope.row)" @click="table_reBack(scope.row)"
type="danger" type="danger"
v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time!== null&&scope.row.type == 10&&scope.row.mtype == 10" v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time!== null&&scope.row.type == 10&&scope.row.mtype == 10"
>退回</el-button> >退回</el-button>
<el-button <el-button
link
size="small"
@click="table_show(scope.row)" @click="table_show(scope.row)"
type="success" type="warning"
>查看</el-button> >查看</el-button>
<el-button <el-button
link
size="small"
@click="table_edit(scope.row)" @click="table_edit(scope.row)"
v-auth="'handover.update'" v-auth="'handover.update'"
type="primary" type="primary"
v-if=" v-if="(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&scope.row.submit_time == null"
(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
scope.row.submit_time == null
"
>编辑</el-button >编辑</el-button
> >
<el-popconfirm <el-popconfirm
title="确定删除吗？" title="确定删除吗？"
v-if=" v-if="(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&scope.row.submit_time == null"
(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
scope.row.submit_time == null
"
@confirm="table_del(scope.row, scope.$index)" @confirm="table_del(scope.row, scope.$index)"
> >
<template #reference> <template #reference>
<el-button <el-button
link
size="small"
v-auth="'handover.delete'" v-auth="'handover.delete'"
type="danger" type="danger"
>删除</el-button >删除</el-button

40
src/views/wpm_bx/mlog_detail.vue
View File

@ -115,11 +115,10 @@
width="100px" width="100px"
> >
<template #default="scope"> <template #default="scope">
<el-link <el-button
:underline="false"
type="danger" type="danger"
@click="table_muser_del(scope.row)" @click="table_muser_del(scope.row)"
>删除</el-link> ></el-button>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -249,32 +248,29 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="100px" width="160px"
> >
<template #default="scope"> <template #default="scope">
<el-link <el-button
:underline="false"
type="primary" type="primary"
@click="table_in_edit(scope.row)" @click="table_in_edit(scope.row)"
v-if="mlogItem.submit_time== null&&mlogItem.material_in_&&mlogItem.material_in_.tracking==10" v-if="mlogItem.submit_time== null&&mlogItem.material_in_&&mlogItem.material_in_.tracking==10"
> >
编辑 编辑
</el-link> </el-button>
<el-link <el-button
:underline="false" type="warning"
type="primary"
v-if="mlogItem.submit_time == null&&mlogItem.material_in_&&mlogItem.material_in_.tracking==20" v-if="mlogItem.submit_time == null&&mlogItem.material_in_&&mlogItem.material_in_.tracking==20"
@click="table_out_check_single(scope.row,'ins')" @click="table_out_check_single(scope.row,'ins')"
>详情</el-link> >详情</el-button>
<el-link <el-button
:underline="false"
:disabled="mlogItem.submit_time !== null" :disabled="mlogItem.submit_time !== null"
type="danger" type="danger"
style="margin-left: 10px;" style="margin-left: 10px;"
@click="table_in_del(scope.row)" @click="table_in_del(scope.row)"
> >
删除 删除
</el-link> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -354,23 +350,21 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="100px" width="160px"
> >
<template #default="scope"> <template #default="scope">
<el-link <el-button
:underline="false"
type="primary" type="primary"
v-if="mlogItem.submit_time == null" v-if="mlogItem.submit_time == null"
style="margin-right: 10px;" style="margin-right: 10px;"
@click="table_out_check(scope.row)" @click="table_out_check(scope.row)"
>编辑</el-link> >编辑</el-button>
<!-- 单个 --> <!-- 单个 -->
<el-link <el-button
:underline="false" type="warning"
type="primary"
v-if="mlogItem.material_out_&&mlogItem.material_out_.tracking==20||scope.row.material_out_tracking==20" v-if="mlogItem.material_out_&&mlogItem.material_out_.tracking==20||scope.row.material_out_tracking==20"
@click="table_out_check_single(scope.row,'outs')" @click="table_out_check_single(scope.row,'outs')"
>详情</el-link> >详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>
@ -394,7 +388,7 @@
</el-table-column> </el-table-column>
<el-table-column width="100"> <el-table-column width="100">
<template #default="scope"> <template #default="scope">
<el-link :underline="false" @click="printMaterial(scope.row)" type="primary">物料标签</el-link> <el-button :underline="false" @click="printMaterial(scope.row)" type="primary">物料标签</el-button>
</template> </template>
</el-table-column> </el-table-column>
</scTable> </scTable>

1
src/views/wpm_bx/mlog_form.vue
View File

@ -4,6 +4,7 @@
v-model="visible" v-model="visible"
style="width: 80%;" style="width: 80%;"
destroy-on-close destroy-on-close
:close-on-click-modal="false"
@closed="$emit('closed')" @closed="$emit('closed')"
> >
<el-container v-loading="loading"> <el-container v-loading="loading">

38
src/views/wpm_bx/mlogbw_check.vue
View File

@ -187,53 +187,47 @@
<el-input v-else v-model="scope.row.note" placeholder="备注"></el-input> <el-input v-else v-model="scope.row.note" placeholder="备注"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="90" align="center" fixed="right" v-if="!isSubmit"> <el-table-column label="操作" width="160" align="center" fixed="right" v-if="!isSubmit">
<template #default="scope"> <template #default="scope">
<el-link <el-button
v-if="scope.row.isEdit" v-if="scope.row.isEdit"
type="primary" type="success"
size="small"
@click="formTableSave(scope.row)" @click="formTableSave(scope.row)"
>保存</el-link >保存</el-button
> >
<el-link <el-button
v-if="scope.row.isEdit&&scope.row.id" v-if="scope.row.isEdit&&scope.row.id"
type="danger" type="danger"
size="small"
style="margin-left: 5px;" style="margin-left: 5px;"
@click="formTableCancel(scope.row)" @click="formTableCancel(scope.row)"
>取消</el-link >取消</el-button
> >
<el-link <el-button
v-if="scope.row.isEdit&&setForm.cd_req_addr!=null" v-if="scope.row.isEdit&&setForm.cd_req_addr!=null"
type="success" type="warning"
size="small"
style="margin-left: 5px;" style="margin-left: 5px;"
@click="getEqData(scope.$index)" @click="getEqData(scope.$index)"
>重取数据</el-link >重取数据</el-button
> >
<el-link <el-button
v-if="!scope.row.isEdit&&(mode=='outs'||route_code=='niuzhuan')" v-if="!scope.row.isEdit&&(mode=='outs'||route_code=='niuzhuan')"
type="primary" type="primary"
size="small"
@click="formTableEdit(scope.row)" @click="formTableEdit(scope.row)"
>编辑</el-link >编辑</el-button
> >
<el-link <el-button
v-if="scope.row.isEdit&&!scope.row.id" v-if="scope.row.isEdit&&!scope.row.id"
type="danger" type="danger"
size="small"
style="margin-left: 5px;" style="margin-left: 5px;"
@click="formTableDelet(scope.row)" @click="formTableDelet(scope.row)"
>删除</el-link >删除</el-button
> >
<el-link <el-button
v-if="!scope.row.isEdit" v-if="!scope.row.isEdit"
type="danger" type="danger"
size="small"
style="margin-left: 5px;" style="margin-left: 5px;"
@click="formTableDel(scope.row.id)" @click="formTableDel(scope.row.id)"
>删除</el-link >删除</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -376,7 +370,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="90" align="center" fixed="right"> <el-table-column label="操作" width="90" align="center" fixed="right">
<template #default="scope"> <template #default="scope">
<el-link type="danger" size="small" @click="selectWprDel(scope.row)">删除</el-link> <el-button type="danger" size="small" @click="selectWprDel(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

10
src/views/wpm_bx/mlogs.vue
View File

@ -118,27 +118,21 @@
label="操作" label="操作"
fixed="right" fixed="right"
align="center" align="center"
width="150" width="220"
> >
<template #default="scope"> <template #default="scope">
<el-button <el-button
link
size="small"
type="success" type="success"
v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'"
@click.stop="table_monitor(scope.row)" @click.stop="table_monitor(scope.row)"
>监测</el-button >监测</el-button
> >
<el-button <el-button
link
size="small"
@click="table_detail(scope.row)" @click="table_detail(scope.row)"
type="primary" type="primary"
>详情</el-button >详情</el-button
> >
<el-button <el-button
link
size="small"
v-auth="'mlog.delete'" v-auth="'mlog.delete'"
type="danger" type="danger"
v-if="scope.row.submit_time == null" v-if="scope.row.submit_time == null"
@ -146,9 +140,7 @@
>删除</el-button >删除</el-button
> >
<el-button <el-button
link
v-else v-else
size="small"
type="danger" type="danger"
@click.stop="mlogRevert(scope.row)" @click.stop="mlogRevert(scope.row)"
>撤回</el-button >撤回</el-button