mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

bug --

Browse Source
This commit is contained in:
helloDy
2024-03-14 20:19:42 +08:00
parent 149ec4c844
commit 67948c10cb
20 changed files with 299 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/base/coreAlarmLog/index.vue
View File

@@ -32,7 +32,7 @@ import { parseTime } from '../../core/mixins/code-filter';
import {
getcoreAlarmLogPage
} from '@/api/base/coreAlarmLog';
import {DICT_TYPE, getDictDatas} from "@/utils/dict";
import {DICT_TYPE, getDictDatas, publicFormatter } from "@/utils/dict";
const tableProps = [
{
@@ -50,7 +50,8 @@ const tableProps = [
},
{
prop: 'alarmGrade',
label: '报警级别'
label: '报警级别',
filter: publicFormatter(DICT_TYPE.EQU_ALARM_LEVEL)
},
{
prop: 'alarmReason',

24
src/views/base/coreEquipment/components/EquipmentDrawer.vue
View File

@@ -7,10 +7,11 @@
<template>
<el-drawer
:visible="visible"
:visible.sync="visible"
:show-close="false"
:wrapper-closable="false"
:wrapper-closable="true"
class="drawer"
:before-close="beforeClose"
custom-class="mes-drawer"
size="60%"
@closed="$emit('destroy')">
@@ -81,12 +82,12 @@
</section>
</div>
<div class="drawer-body__footer">
<div v-if="mode == 'edit'" class="drawer-body__footer">
<el-button style="" @click="handleCancel">取消</el-button>
<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
<!-- <el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
编辑
</el-button>
<el-button v-else type="primary" @click="handleConfirm">保存</el-button>
</el-button> -->
<el-button type="primary" @click="handleConfirm">保存</el-button>
<!-- sections的第二项必须是 属性列表 -->
<!-- <el-button
v-if="sections[1].allowAdd"
@@ -298,6 +299,17 @@ export default {
}
},
methods: {
beforeClose(done) {
if (this.mode.includes('edit')) {
this.$confirm('确认关闭？')
.then(_ => {
done();
})
.catch(_ => {});
} else {
done()
}
},
handleTableBtnClick({ type, data }) {
switch (type) {
case 'edit':

1
src/views/base/coreEquipment/index.vue
View File

@@ -486,6 +486,7 @@ export default {
pageSize: 10,
code: '',
name: '',
special: false
},
// 表单参数
form: {

4
src/views/base/coreEquipmentLineBind/index.vue
View File

@@ -298,9 +298,9 @@ export default {
// 工段排序
sort: undefined,
// 产线统计类型
lineDataType: undefined,
lineDataType: 0,
// 工段统计类型
sectionDataType: undefined,
sectionDataType: 0,
};
this.resetForm('form');
},

6
src/views/base/coreHotMaterial/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2023-12-14 13:52:42
* @LastEditTime: 2024-03-14 10:02:53
* @Description:
-->
<template>
@@ -169,7 +169,7 @@ export default {
// 修改的提交
if (this.dataForm.id) {
this.urlOptions.updateURL(this.dataForm).then(response => {
if (this.test.length > 1 || this.test[0].name) {
if (this.test.length > 1 || this.test[0]?.name) {
this.test.forEach(check => {
check.hotMaterialId = this.dataForm.id
if (check.id) {
@@ -191,7 +191,7 @@ export default {
}
// 添加的提交
this.urlOptions.createURL(this.dataForm).then(response => {
if (this.test.length > 1 || this.test[0].name) {
if (this.test.length > 1 || this.test[0]?.name) {
this.test.forEach(check => {
check.hotMaterialId = response.data
createHotMaterialCheck(check).then(res => {

4
src/views/base/coreProduct/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-02-29 15:01:25
* @LastEditTime: 2024-03-13 13:54:01
* @Description:
-->
<template>
@@ -254,7 +254,7 @@ export default {
dataRule: {
code: [{ required: true, message: "产品编码不能为空", trigger: "blur" }],
name: [{ required: true, message: "产品名称不能为空", trigger: "blur" }],
specifications: [{ required: true, message: "规格不能为空", trigger: "blur" }],
specifications: [{ required: false, message: "规格不能为空", trigger: "blur" }],
materialType: [{ required: true, message: "物料类型不能为空", trigger: "change" }],
productType: [{ required: true, message: "产品类型不能为空", trigger: "change" }]
}

3
src/views/base/coreProductionLine/add-or-updata.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-03-01 19:52:55
* @LastEditTime: 2024-03-13 13:54:48
* @Description:
-->
<template>
@@ -33,6 +33,7 @@
<el-select
v-model="dataForm.roomNameDict"
filterable
clearable
style="width: 100%"
placeholder="请选择车间名称">
<el-option

14
src/views/base/coreWorkOrder/addWorkOrder.vue
View File

@@ -84,7 +84,7 @@
<el-radio :label="1">产品基础BOM</el-radio>
<el-radio :label="2">工艺扩展BOM</el-radio>
</el-radio-group> -->
<el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" @change="materialMethodChange">
<el-select v-model="dataForm.materialMethod" placeholder="请选择物料计算方式" style="width: 100%;" clearable @change="materialMethodChange">
<el-option key="1" label="产品基础BOM" :value="1" />
<el-option key="2" label="工艺扩展BOM" :value="2" />
</el-select>
@@ -92,7 +92,7 @@
</el-col>
<el-col :span='8'>
<el-form-item label="优先级" prop="priority">
<el-select v-model="dataForm.priority" placeholder="请选择优先级" style="width: 100%;">
<el-select v-model="dataForm.priority" clearable placeholder="请选择优先级" style="width: 100%;">
<el-option
v-for="item in getDictDatas(DICT_TYPE.ORDER_PRIORITY)"
:key="item.value"
@@ -104,7 +104,7 @@
</el-col>
<el-col :span='8'>
<el-form-item label="工单类型" prop="type">
<el-select v-model="dataForm.type" placeholder="请选择工单类型" style="width: 100%;">
<el-select v-model="dataForm.type" clearable placeholder="请选择工单类型" style="width: 100%;">
<el-option
v-for="item in workOrderTypeList"
:key="item.id"
@@ -121,6 +121,7 @@
<el-select
v-model="dataForm.roomNameDict"
filterable
clearable
style="width: 100%"
placeholder="请选择车间名称">
<el-option
@@ -133,7 +134,7 @@
</el-col>
<el-col :span='8'>
<el-form-item label="关联产线" prop="productLineIds">
<el-select v-model="dataForm.productLineIds" placeholder="请选择关联产线" multiple style="width: 100%;">
<el-select v-model="dataForm.productLineIds" clearable placeholder="请选择关联产线" multiple style="width: 100%;">
<el-option
v-for="item in productLineList"
:key="item.id"
@@ -145,7 +146,7 @@
</el-col>
<el-col :span='8'>
<el-form-item label="负责人" prop="workers">
<el-input v-model="dataForm.workers" placeholder="请输入负责人"></el-input>
<el-input v-model="dataForm.workers" clearable placeholder="请输入负责人"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -204,7 +205,8 @@ export default {
planAssignQuantity: [{ required: true, message: "计划投入数量不能为空", trigger: "blur" }],
planQuantity: [{ required: true, message: "计划生产数量不能为空", trigger: "blur" }],
roomNameDict: [{ required: true, message: "车间名称不能为空", trigger: "blur" }],
productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }]
productLineIds: [{ required: true, message: "关联产线不能为空", trigger: "change" }],
materialMethod: [{ required: true, message: "物料计算方式不能为空", trigger: "change" }]
},
productList: [],
processFlowList: [],

43
src/views/base/coreWorkOrder/allocation.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-02-29 10:01:52
* @LastEditTime: 2024-03-13 14:47:44
* @Description:
-->
<template>
@@ -18,15 +18,28 @@
<div class="content">
<div class="formContent">
<el-row :gutter="20">
<el-col :span="12">工单名称:{{ dataForm.name }}</el-col>
<el-col :span="12">工单编码:{{ dataForm.code }}</el-col>
<el-col :span="8">
<div class="blodTip">工单名称</div>
<div class="lightTip">{{ dataForm.name }}</div>
</el-col>
<el-col :span="8">
<div class="blodTip">工单编码</div>
<div class="lightTip">{{ dataForm.code }}</div>
</el-col>
<el-col :span="8">
<div class="blodTip">产品名称</div>
<div class="lightTip">{{ dataForm.productName }}</div>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">产品名称:{{ dataForm.productName }}</el-col>
<el-col :span="12">产品规格:{{ dataForm.specifications }}</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">实际生产数量:{{ dataForm.expectedTime }}</el-col>
<el-col :span="8">
<div class="blodTip">产品规格</div>
<div class="lightTip">{{ dataForm.specifications }}</div>
</el-col>
<el-col :span="8">
<div class="blodTip">实际生产数量</div>
<div class="lightTip">{{ dataForm.expectedTime }}</div>
</el-col>
</el-row>
</div>
@@ -296,4 +309,18 @@ export default {
margin-bottom: 10px;
width: 100%;
}
.blodTip {
height: 16px;
font-size: 14px;
font-weight: 600;
color: rgba(0,0,0,0.85);
margin-bottom: 8px;
}
.lightTip {
/* height: 16px; */
font-size: 14px;
font-weight: 400;
color: rgba(102,102,102,0.75);
margin-bottom: 12px;
}
</style>

6
src/views/base/coreWorkOrder/detail.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: DY
* @LastEditTime: 2024-02-29 15:35:02
* @LastEditTime: 2024-03-13 14:42:32
* @Description:
-->
<template>
@@ -274,6 +274,10 @@ const tableProps1 = [
prop: 'remaining',
label: '剩余生产预计消耗'
},
{
prop: 'num',
label: '库存数量'
}
];
export default {