From c6d00f04f96ce759c3bbb60433a50819ee31249e Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 26 Jan 2026 15:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bathRefine/accumulateClass.vue | 67 +++++----
.../components/addAccumulateClassDialog.vue | 13 +-
.../bathRefine/components/periodicalBatch.vue | 130 ++++++++++--------
.../components/periodicalClassDevice.vue | 2 +-
.../bathRefine/planClass.vue | 22 ++-
5 files changed, 147 insertions(+), 87 deletions(-)
diff --git a/src/views/processManagement/bathRefine/accumulateClass.vue b/src/views/processManagement/bathRefine/accumulateClass.vue
index 4c2da09..346b34e 100644
--- a/src/views/processManagement/bathRefine/accumulateClass.vue
+++ b/src/views/processManagement/bathRefine/accumulateClass.vue
@@ -24,6 +24,9 @@
批量重置
+
+
+
@@ -39,7 +42,7 @@
:showDialog="showDialog"
@closeDialog="closeDialog"
:moldAddMore="moldAddMore"
- :maintain-data="maintainData"
+ :maintainData="maintainData"
:title="title"
>
@@ -145,20 +148,32 @@ export default {
value: 'id',
},
},
+
{
label: '作业槽',
- prop: 'batchNo',
+ prop: 'batchNoName',
search: false,
sortable: true,
overHidden: true,
headerAlign: 'center',
align: 'center',
width: 120,
- dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`,
- props: {
- label: 'name',
- value: 'id',
- },
+ editDisplay: false,
+ addDisplay: false,
+ },
+ {
+ label: '作业槽',
+ prop: 'batchNo',
+ type: 'select',
+ filterable: true,
+ clearable: true,
+ search: false,
+ sortable: true,
+ overHidden: true,
+ headerAlign: 'center',
+ align: 'center',
+ searchLabelWidth: 80,
+ hide: true,
rules: [
{
required: true,
@@ -166,6 +181,14 @@ export default {
trigger: 'blur',
},
],
+ dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`,
+ props: {
+ label: 'name',
+ value: 'id',
+ },
+ change: value => {
+ this.form.batchNoName = value.item.name;
+ },
},
{
label: '设备名称',
@@ -178,26 +201,7 @@ export default {
width: 120,
editDisplay: false,
},
- {
- label: '设备名称',
- prop: 'device',
- hide: true,
- search: false,
- sortable: true,
- overHidden: true,
- headerAlign: 'center',
- align: 'left',
- width: 120,
- dicUrl: `/blade-desk/equipment/page?used=1&workstationId={{wcId}}&size=99999`,
- props: {
- label: 'deviceName',
- value: 'id',
- res: 'data.records',
- },
- change: val => {
- this.equipmentChange(val.item, 'equipmentId');
- },
- },
+
{
label: '规则类型',
prop: 'ruleType',
@@ -382,6 +386,7 @@ export default {
},
],
},
+ title: '新增',
};
},
mounted() {},
@@ -405,6 +410,14 @@ export default {
this.tableData = [];
this.showDialog = true;
this.moldAddMore = true;
+ this.title = '新增';
+ },
+ // 编辑
+ editRow(row) {
+ this.title = '修改';
+ this.maintainData = [row];
+ this.showDialog = true;
+ this.moldAddMore = false;
},
// 批量维护
handleMaintain() {
diff --git a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
index 2148629..a7f0038 100644
--- a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
+++ b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
@@ -50,7 +50,7 @@
-
+
{
+ this.getTankList(item.wcId, index);
+ this.getEquipmentList(item.wcId, index);
+ });
this.form.tableData = this.maintainData;
}
},
@@ -316,7 +320,6 @@ export default {
changeWorkCenter(index) {
this.form.batchNo = '';
this.form.tableData[index].device = '';
- console.log(this.form.tableData[index]);
this.getTankList(this.form.tableData[index].wcId, index);
this.getEquipmentList(this.form.tableData[index].wcId, index);
}, // 查询作业槽下拉列表
@@ -336,6 +339,12 @@ export default {
);
this.form.tableData[index].deviceName = select[0].deviceName;
},
+ changeBatchNo(index){
+ let select = this.form.tableData[index].batchNoOptions.filter(
+ row => row.id == this.form.tableData[index].batchNo
+ );
+ this.form.tableData[index].batchNoName = select[0].batchNoName;
+ },
getWorkCenterList() {
getWorkCenterList().then(res => {
this.wcData = res.data.data || [];
diff --git a/src/views/processManagement/bathRefine/components/periodicalBatch.vue b/src/views/processManagement/bathRefine/components/periodicalBatch.vue
index 56d4e7f..ebfa3c7 100644
--- a/src/views/processManagement/bathRefine/components/periodicalBatch.vue
+++ b/src/views/processManagement/bathRefine/components/periodicalBatch.vue
@@ -15,8 +15,8 @@
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
- @row-update="rowUpdate"
- @row-del="rowDel"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
>
新增
@@ -62,7 +62,6 @@ export default {
total: 0,
},
-
option: {
height: 'auto',
align: 'center',
@@ -91,7 +90,7 @@ export default {
labelWidth: 120,
searchLabelWidth: 120,
menu: true,
- menuWidth: 220,
+ menuWidth: 120,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@@ -109,7 +108,7 @@ export default {
searchSpan: 6,
searchMenuPosition: 'right',
column: [
- {
+ {
label: '作业中心',
prop: 'wcId',
search: true,
@@ -119,25 +118,39 @@ export default {
align: 'left',
searchLabelWidth: 80,
dicUrl: '/blade-desk/bsWorkCenter/getList',
- type:'select',
+ type: 'select',
cascader: ['batchNo'],
props: {
- label: 'wcName',
- value: 'id',
+ label: 'wcName',
+ value: 'id',
},
rules: [
- {
- required: true,
- message: '请输入作业中心',
- trigger: 'blur',
- },
+ {
+ required: true,
+ message: '请输入作业中心',
+ trigger: 'blur',
+ },
],
- },
- {
+ },
+ {
+ label: '作业槽',
+ prop: 'batchNoName',
+ type: 'select',
+ filterable: true,
+ clearable: true,
+ search: false,
+ sortable: true,
+ overHidden: true,
+ headerAlign: 'center',
+ align: 'center',
+ addDisplay: false,
+ editDisplay: false,
+ },
+ {
label: '作业槽',
prop: 'batchNo',
type: 'select',
- filterable:true,
+ filterable: true,
clearable: true,
search: false,
sortable: true,
@@ -145,20 +158,24 @@ export default {
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
+ hide: true,
rules: [
- {
- required: true,
- message: '请输入作业槽',
- trigger: 'blur',
- },
+ {
+ required: true,
+ message: '请输入作业槽',
+ trigger: 'blur',
+ },
],
dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`,
props: {
label: 'name',
value: 'id',
},
- },
- {
+ change: value => {
+ this.form.batchNoName = value.item.name;
+ },
+ },
+ {
label: '维护内容',
prop: 'preserveContent',
search: true,
@@ -168,19 +185,19 @@ export default {
align: 'left',
searchLabelWidth: 80,
rules: [
- {
- required: true,
- message: '请输入维护内容',
- trigger: 'blur',
- },
+ {
+ required: true,
+ message: '请输入维护内容',
+ trigger: 'blur',
+ },
],
- },
+ },
- {
+ {
label: '审批状态',
prop: 'approvalStatus',
type: 'select',
- filterable:true,
+ filterable: true,
clearable: true,
search: false,
hide: true,
@@ -191,26 +208,28 @@ export default {
searchLabelWidth: 80,
display: false,
rules: [
- {
- required: true,
- message: '请输入审批状态',
- trigger: 'blur',
- },
+ {
+ required: true,
+ message: '请输入审批状态',
+ trigger: 'blur',
+ },
],
dicData: [
- {
- value: -1,
- label: '发送审批'
- }, {
- value: 0,
- label: '审批中'
- }, {
- value: 1,
- label: '审批完毕'
- }
- ]
- },
- {
+ {
+ value: -1,
+ label: '发送审批',
+ },
+ {
+ value: 0,
+ label: '审批中',
+ },
+ {
+ value: 1,
+ label: '审批完毕',
+ },
+ ],
+ },
+ {
label: '维护人',
prop: 'keepManStr',
search: false,
@@ -218,8 +237,8 @@ export default {
headerAlign: 'center',
align: 'center',
display: false,
- },
- {
+ },
+ {
label: '维护时间',
prop: 'keepTime',
search: false,
@@ -227,13 +246,12 @@ export default {
headerAlign: 'center',
align: 'center',
display: false,
- }
- ],
+ },
+ ],
},
};
},
- mounted() {
- },
+ mounted() {},
methods: {
closeDialog() {
this.showDialog = false;
@@ -259,7 +277,7 @@ export default {
});
});
},
- rowUpdate(row, index, done, loading) {
+ rowUpdate(row, index, done, loading) {
update([row]).then(
() => {
this.onLoad(this.page);
diff --git a/src/views/processManagement/bathRefine/components/periodicalClassDevice.vue b/src/views/processManagement/bathRefine/components/periodicalClassDevice.vue
index be8720c..6eda4d6 100644
--- a/src/views/processManagement/bathRefine/components/periodicalClassDevice.vue
+++ b/src/views/processManagement/bathRefine/components/periodicalClassDevice.vue
@@ -89,7 +89,7 @@ export default {
labelWidth: 120,
searchLabelWidth: 120,
menu: true,
- menuWidth: 220,
+ menuWidth: 120,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
diff --git a/src/views/processManagement/bathRefine/planClass.vue b/src/views/processManagement/bathRefine/planClass.vue
index 094ce87..b816c10 100644
--- a/src/views/processManagement/bathRefine/planClass.vue
+++ b/src/views/processManagement/bathRefine/planClass.vue
@@ -97,7 +97,7 @@ export default {
labelWidth: 120,
searchLabelWidth: 120,
menu: true,
- menuWidth: 220,
+ menuWidth: 120,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@@ -154,6 +154,7 @@ export default {
headerAlign: 'center',
align: 'center',
searchLabelWidth: 80,
+ hide:true,
dicUrl: `/blade-desk/BA/WorkTank/listForSelect?workstationId={{wcId}}`,
props: {
label: 'name',
@@ -166,6 +167,10 @@ export default {
trigger: 'blur',
},
],
+ change: (value)=> {
+ this.form.batchNoName = value.item.name;
+ },
+
},
{
label: '维护内容',
@@ -184,6 +189,21 @@ export default {
},
],
},
+ {
+ label: '作业槽',
+ prop: 'batchNoName',
+ type: 'select',
+ filterable: true,
+ clearable: true,
+ search: false,
+ sortable: true,
+ overHidden: true,
+ headerAlign: 'center',
+ align: 'center',
+ searchLabelWidth: 80,
+ addDisplay:false,
+ editDisplay:false,
+ },
{
label: '安排日期',
prop: 'arrangeTime',