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

View File

@ -1,6 +1,21 @@
<template>
<div class="widgets-home" ref="main">
<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-col :span="8">
<div class="retangleWrap">
@ -10,65 +25,33 @@
</div>
<div class="retangleTable">
<el-table
:data="equipList"
:data="tableData"
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-column prop="name" label="物料名称"/>
<el-table-column prop="model" label="型号"/>
<el-table-column prop="specification" label="规格"/>
<el-table-column prop="count" label="数量"/>
</el-table>
</div>
</div>
</div>
</el-col>
<el-col :span="8">
<div class="retangleWrap">
<div class="retangleWrap" style="padding: 25px 0 0 0;">
<div class="retangleContainer">
<div class="retangleTitle">
<div class="title">接收的物料</div>
<div class="title">待填日志的物料</div>
</div>
<div class="retangleTable">
<el-table
:data="equipList"
:data="tableData"
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-column prop="name" label="物料名称"/>
<el-table-column prop="model" label="型号"/>
<el-table-column prop="specification" label="规格"/>
<el-table-column prop="count" label="数量"/>
</el-table>
</div>
</div>
@ -78,33 +61,17 @@
<div class="retangleWrap">
<div class="retangleContainer">
<div class="retangleTitle">
<div class="title">接收的物料</div>
<div class="title">交送的物料</div>
</div>
<div class="retangleTable" style="">
<div class="retangleTable">
<el-table
:data="equipList"
:data="tableData"
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-column prop="name" label="物料名称"/>
<el-table-column prop="model" label="型号"/>
<el-table-column prop="specification" label="规格"/>
<el-table-column prop="count" label="数量"/>
</el-table>
</div>
</div>
@ -112,74 +79,34 @@
</el-col>
</el-row>
<el-row>
<el-col :span="15">
<div class="retangleWrap">
<el-col :span="9">
<div class="retangleWrap" style="padding: 25px 0 0 20px;">
<div class="retangleContainer">
<div class="retangleTitle">
<div class="title">待接收的物料</div>
<div class="title">生产任务列表</div>
</div>
<div class="retangleTable">
<el-table
:data="equipList"
:data="tableData"
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-column prop="name" label="物料名称"/>
<el-table-column prop="model" label="型号"/>
<el-table-column prop="specification" label="规格"/>
<el-table-column prop="count" label="数量"/>
</el-table>
</div>
</div>
</div>
</el-col>
<el-col :span="9">
<el-col :span="15">
<div class="retangleWrap">
<div class="retangleContainer">
<div class="retangleTitle">
<div class="title">待接收的物料</div>
<div class="title">生产统计</div>
</div>
<div class="retangleTable">
<el-table
: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>
<scEcharts height="285px" :width="'100%'" :option="option"></scEcharts>
</div>
</div>
</div>
@ -193,38 +120,68 @@ import * as echarts from "echarts";
export default {
data() {
return {
time: "",
day: "",
year_s: "",
day_s: "",
month_s: "",
yesterday: "",
eqState_: {
10: "完好",
20: "限用",
30: "在修",
40: "禁用",
},
equipList: [],
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() {
this.$emit("on-mounted");
let that = this;
var myDate = new Date();
let year = myDate.getFullYear();
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();
//1
this.getEquipmentList();
//2
this.getMaterialList();
this.getMaterialRecive();//
this.getMaterialMlog();//
this.getMaterialSend();//
this.getMtaskLists();//
},
methods: {
// Class
@ -241,42 +198,33 @@ export default {
}
return classInfo;
},
//
getEquipList() {
this.$API.em.equipment.list
.req({ page: 0, type: 10 })
.then((res) => {
this.equipList = res;
});
},
materialTypeChange() {
this.getMaterialList();
},
//
//
getEquipmentList(){},
//
getMaterialList() {
let that = this;
that.$API.mtm.material.list
.req({ page: 0, type: that.materialType })
.then((res) => {
that.tableData = res.filter((item) => {
return item.count > 0;
});
});
},
//
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 {
let nameList = [], countList = [];
that.$API.mtm.material.list.req({ page: 0, type: that.materialType,count__gt:0 }).then((res) => {
that.tableData = res;
res.forEach(item => {
let index = nameList.indexOf(item.name);
if(index<0){
nameList.push(item.name);
countList.push(item.count);
}
});
that.option.xAxis.data = nameList;
that.option.series.data = countList;
});
},
//
getMaterialRecive(){},
//
getMaterialMlog(){},
//
getMaterialSend(){},
//
getMtaskLists(){},
},
};
</script>
@ -286,7 +234,13 @@ export default {
padding: 25px 20px 0 20px;
box-sizing: border-box;
}
.retangle {
width: 100%;
border-radius: 15px;
box-sizing: border-box;
position: relative;
background: #ffffff;
}
.retangleContainer {
width: 100%;
border-radius: 15px;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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