suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

过程项问题修改

Browse Source
dev-scheduling
zhangdi 2 months ago
parent 58bf9c5b8f
commit c492203f73
2 changed files with 86 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 137
      src/views/processManagement/components/addinPlantMaintenanceDialog.vue
  2. 6
      src/views/processManagement/components/inPlantMaintenance.vue

137
src/views/processManagement/components/addinPlantMaintenanceDialog.vue
Unescape View File

@ -16,14 +16,19 @@
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<!-- 作业中心（绑定数组字段） --> <!-- 作业中心（绑定数组字段） -->
<el-table-column align="center" label="作业中心" > <el-table-column align="center" label="作业中心">
<template #header> <template #header>
<span><i style="color: red">*</i>作业中心</span> <span><i style="color: red">*</i>作业中心</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<!-- prop 格式：数组名[索引].字段名 --> <!-- prop 格式：数组名[索引].字段名 -->
<el-form-item :prop="`tableData[${scope.$index}].wcId`" :rules="formRules.wcId"> <el-form-item :prop="`tableData[${scope.$index}].wcId`" :rules="formRules.wcId">
<el-select v-model="scope.row.wcId" placeholder="请选择" > <el-select
v-model="scope.row.wcId"
placeholder="请选择"
@change="workCenterChange"
filterable
>
<el-option <el-option
v-for="item in wcData" v-for="item in wcData"
:key="item.id" :key="item.id"
@ -41,16 +46,28 @@
<span><i style="color: red">*</i>产线</span> <span><i style="color: red">*</i>产线</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].batchNo`" :rules="formRules.batchNo"> <el-form-item
<el-select v-model="scope.row.batchNo" placeholder="请选择" > :prop="`tableData[${scope.$index}].equipmentId`"
<el-option label="#21" value="1"></el-option> :rules="formRules.equipmentId"
<el-option label="11" value="11"></el-option> >
<el-option label="#22" value="3"></el-option> <el-select
v-model="scope.row.equipmentId"
placeholder="请选择"
:disabled="!scope.row.wcId"
filterable
@change="equipmentChange(scope.row, scope.$index)"
>
<el-option
v-for="item in equipmentData"
:key="item.id"
:value="item.id"
:label="item.deviceName"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="确认名称" > <el-table-column align="center" label="确认名称">
<template #header> <template #header>
<span><i style="color: red">*</i>确认名称</span> <span><i style="color: red">*</i>确认名称</span>
</template> </template>
@ -64,7 +81,7 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="确认编号" > <el-table-column align="center" label="确认编号">
<template #header> <template #header>
<span><i style="color: red">*</i>确认编号</span> <span><i style="color: red">*</i>确认编号</span>
</template> </template>
@ -81,51 +98,58 @@
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="确认到期日期" > <el-table-column align="center" label="确认到期日期">
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].lastDueTime`"> <el-form-item :prop="`tableData[${scope.$index}].lastDueTime`">
<el-date-picker <el-date-picker
v-model="scope.row.lastDueTime" v-model="scope.row.lastDueTime"
placeholder="请输入" placeholder="请输入"
style="width: 100%" style="width: 100%"
value-format="YYYY-MM-DD HH:mm:ss"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="提醒天数" > <el-table-column align="center" label="提醒天数">
<template #header> <template #header>
<span><i style="color: red">*</i>提醒天数</span> <span><i style="color: red">*</i>提醒天数</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].remDays`" :rules="formRules.remDays"> <el-form-item :prop="`tableData[${scope.$index}].remDays`" :rules="formRules.remDays">
<el-input <el-input-number
v-model="scope.row.batchNo" v-model="scope.row.remDays"
placeholder="请输入" controls-position="right"
style="width: 100%" @change="handleChange"
></el-input> :min="1"
></el-input-number>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工艺员" > <el-table-column align="center" label="工艺员">
<template #header> <template #header>
<span><i style="color: red">*</i>工艺员</span> <span><i style="color: red">*</i>工艺员</span>
</template> </template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].proMan`" :rules="formRules.proMan"> <el-form-item :prop="`tableData[${scope.$index}].proMan`" :rules="formRules.proMan">
<el-select v-model="scope.row.proMan" placeholder="请选择" style="width: 100%"> <el-select
<el-option label="#21" value="1"></el-option> v-model="scope.row.proMan"
<el-option label="11" value="11"></el-option> placeholder="请选择"
<el-option label="#22" value="3"></el-option> style="width: 100%"
filterable
>
<el-option
v-for="item in userData"
:key="item.id"
:label="item.realName"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注" > <el-table-column align="center" label="备注">
<template #header>
<span><i style="color: red">*</i>备注</span>
</template>
<template #default="scope"> <template #default="scope">
<el-form-item :prop="`tableData[${scope.$index}].remark`" :rules="formRules.remark"> <el-form-item :prop="`tableData[${scope.$index}].remark`">
<el-input <el-input
v-model="scope.row.remark" v-model="scope.row.remark"
placeholder="请输入" placeholder="请输入"
@ -149,7 +173,8 @@
<script> <script>
import { getWorkCenterList } from '@/api/processManagement/addQuantity.js'; import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
// import { submitBatchData } from '@/api/processManagement/periodical.js'; // 实际提交接口 // import { submitBatchData } from '@/api/processManagement/periodical.js'; // 实际提交接口
import { getEquipmentList } from '@/api/processManagement/specialProcess';
import { getRoleUserList } from '@/api/processManagement/taskDispatch';
export default { export default {
props: { props: {
showDialog: { type: Boolean, default: false }, showDialog: { type: Boolean, default: false },
@ -160,6 +185,7 @@ export default {
return { return {
openShow: false, openShow: false,
wcData: [], wcData: [],
equipmentData: [],
formError: '', // 全局错误提示 formError: '', // 全局错误提示
// 单个表单模型：包含表格所有行数据 // 单个表单模型：包含表格所有行数据
@ -188,43 +214,47 @@ export default {
trigger: 'submit', trigger: 'submit',
}, },
], ],
// 数组中每一项的 wcId 字段校验
wcId: [{ required: true, message: '请选择作业中心', trigger: ['change', 'submit'] }], wcId: [{ required: true, message: '请选择作业中心', trigger: ['change', 'submit'] }],
equipmentId: [{ required: true, message: '请选择产线', trigger: ['change', 'submit'] }],
// 数组中每一项的 batchNo 字段校验 proItem: [{ required: true, message: '请输入确认名称', trigger: ['blur', 'submit'] }],
batchNo: [ condition: [{ required: true, message: '请输入确认编号', trigger: ['blur', 'submit'] }],
{ remDays: [{ required: true, message: '请输入提醒天数', trigger: ['blur', 'submit'] }],
required: true, proMan: [{ required: true, message: '请选择工艺员', trigger: ['change', 'submit'] }],
message: `请${this.tabPosition === 'bathInspection' ? '选择' : '输入'}${
this.tabPosition === 'bathInspection' ? '槽号槽名' : '设备检查项'
}`,
trigger: ['change', 'submit'],
},
],
// 数组中每一项的 preserveContent 字段校验
preserveContent: [
{ required: true, message: '请填写维护内容', trigger: ['blur', 'submit'] },
{ max: 200, message: '维护内容不能超过200个字符', trigger: ['input', 'submit'] },
],
}, },
}; };
}, },
mounted() { mounted() {
this.openShow = this.showDialog; this.openShow = this.showDialog;
this.getWorkCenterList(); this.getWorkCenterList();
this.getRoleUserList();
// 初始添加一行（可选） // 初始添加一行（可选）
if (this.moldAddMore && this.form.tableData.length === 0) { if (this.moldAddMore && this.form.tableData.length === 0) {
this.addTable(); this.addTable();
} }
}, },
methods: { methods: {
getRoleUserList() {
getRoleUserList({ current: 1, size: 9999999 }).then(res => {
this.userData = res.data.data.records || [];
});
},
getWorkCenterList() { getWorkCenterList() {
getWorkCenterList().then(res => { getWorkCenterList().then(res => {
this.wcData = res.data.data || []; this.wcData = res.data.data || [];
}); });
}, },
workCenterChange() {
getEquipmentList({ wcId: this.form.wcId }).then(res => {
this.equipmentData = res.data.data.records || [];
});
},
equipmentChange(row, index) {
let selectedEquipment = this.equipmentData.find(item => item.id === row.equipmentId);
if (selectedEquipment) {
row.equipmentName = selectedEquipment.deviceName;
row.equipmentCode = selectedEquipment.deviceCode;
}
},
selectChange(list, row) { selectChange(list, row) {
row._select = !row._select; row._select = !row._select;
@ -235,8 +265,6 @@ export default {
this.form.tableData.push({ this.form.tableData.push({
_select: false, // 选择状态 _select: false, // 选择状态
wcId: '', // 作业中心ID wcId: '', // 作业中心ID
batchNo: '', // 槽号/检查项
preserveContent: '', // 维护内容
}); });
}, },
@ -282,7 +310,12 @@ export default {
// 调用接口提交（实际项目替换） // 调用接口提交（实际项目替换）
try { try {
// const res = await submitBatchData(submitData); console.log('提交数据：', submitData);
add(submitData).then(res => {
this.$message.success('操作成功');
this.closeDialog();
});
// const res = add(submitData);
// if (res.code === 200) { // if (res.code === 200) {
// this.$message.success('提交成功'); // this.$message.success('提交成功');
// this.closeDialog(); // this.closeDialog();
@ -292,9 +325,9 @@ export default {
// } // }
// 演示用 // 演示用
this.$message.success('提交成功'); // this.$message.success('提交成功');
this.closeDialog(); // this.closeDialog();
this.$emit('submitSuccess', submitData); // this.$emit('submitSuccess', submitData);
} catch (err) { } catch (err) {
this.$message.error('网络错误，请稍后重试'); this.$message.error('网络错误，请稍后重试');
console.error('提交失败：', err); console.error('提交失败：', err);

6
src/views/processManagement/components/inPlantMaintenance.vue
Unescape View File

@ -79,13 +79,9 @@ export default {
index: true, index: true,
selection: true, selection: true,
viewBtn: false, viewBtn: false,
addBtn: true, addBtn: false,
delBtn: true, delBtn: true,
editBtnText: '修改', editBtnText: '修改',
addBtnIcon: ' ',
viewBtnIcon: ' ',
delBtnIcon: ' ',
editBtnIcon: ' ',
viewBtnText: '详情', viewBtnText: '详情',
labelWidth: 120, labelWidth: 120,
menuWidth: 180, menuWidth: 180,

Write Preview
Loading…
Cancel
Save