From bc24efcb32f5b2272060e76e3a544973489fa7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com> Date: Tue, 26 Aug 2025 17:12:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=BA=8F=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E6=9C=BA=E5=8F=B0=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/OperationForResource.vue | 324 ++++++++++++++---- 1 file changed, 257 insertions(+), 67 deletions(-) diff --git a/src/views/modules/qc/OperationForResource.vue b/src/views/modules/qc/OperationForResource.vue index eddf2c8..fd4cd8a 100644 --- a/src/views/modules/qc/OperationForResource.vue +++ b/src/views/modules/qc/OperationForResource.vue @@ -38,14 +38,19 @@ export default { resourceId:'', resourceDesc:'' }, + itemList1:[], + itemSelections1:[], + itemList2:[], + itemSelections2:[], operationList:[], - resourceList:[], + // resourceList:[], userBuList: [], modalData: { page: 1, pageCount: 50, operation: '', - resource:'' + resource: '', + resourceList: [] }, columns: [ { @@ -207,7 +212,8 @@ export default { page: 1, pageCount: 50, resource: '', - operation:'' + operation: '', + resourceList: [] } this.addResourceDataFlag = false this.modalFlag = true @@ -224,7 +230,6 @@ export default { this.modalFlag = true }, async saveModalData(){ - this.ifexist=0 if (this.modalData.bu==null ||this.modalData.bu==''){ this.$message.warning("请选择BU！") return @@ -233,19 +238,19 @@ export default { this.$message.warning("工序类别不能为空！") return } - if (this.modalData.resource==null ||this.modalData.resource==''){ - this.$message.warning("机台编码不能为空！") - return - } - await queryOperationForResourceList(this.modalData).then(({data})=>{ - if (data.code==3){ - this.$message.warning("该工序和机台存在记录") - this.ifexist = data.code - } - }).catch() - if (this.ifexist==3){ + if (this.modalData.resourceList.length < 1){ + this.$message.warning("请添加机台！") return } + // await queryOperationForResourceList(this.modalData).then(({data})=>{ + // if (data.code==3){ + // this.$message.warning("该工序和机台存在记录") + // this.ifexist = data.code + // } + // }).catch() + // if (this.ifexist==3){ + // return + // } saveOperationForResource(this.modalData).then(({data})=>{ if (data.code==0){ this.$message.success("保存成功") @@ -275,20 +280,93 @@ export default { console.log(error) }) }, + deleteData3(row){ + this.modalData.resourceList = this.modalData.resourceList.filter(item => row.resourceId != item.resourceId) + }, queryResourceList(){ - // 原下拉列表查询 - // queryResourceList().then(({data})=>{ - // if (data.code==0){ - // this.resourceList = data.rows - // } - // }).catch() - this.resourceFlag = true + let resourceDataList; + if (this.modalData.bu==null ||this.modalData.bu==''){ + this.$message.warning("请选择BU！") + return + } + if (this.modalData.operation==null ||this.modalData.operation==''){ + this.$message.warning("工序类别不能为空！") + return + } + this.resourceData.bu = this.modalData.bu + this.resourceData.operation = this.modalData.operation + getResourceDataOperationForResource(this.resourceData).then(({data})=>{ + if (data && data.code==0) { + resourceDataList = data.rows + // this.itemList2 = resourceDataList + } + }) + this.resourData.site = this.modalData.bu.split('_')[0] queryResourceList2(this.resourData).then(({data}) => { if (data.code == 0) { - this.resourceList = data.rows + let itemList = data.rows + if (this.itemList2.length > 0) { + itemList = itemList.filter(item => + !this.itemList2.some(i => i.resourceId === item.resourceId) + ) + } + if (resourceDataList != null && resourceDataList.length > 0){ + itemList = itemList.filter(item => + !resourceDataList.some(i => i.resourceId === item.resourceId) + ) + } + this.itemList1 = itemList + this.itemList2 = this.modalData.resourceList + this.resourceFlag = true } }).catch() }, + // 添加矩阵 + addItem () { + if (this.itemSelections1 == null || this.itemSelections1.length === 0) { + this.$message.warning('请选择可选机台！') + return + } + let resourceId = [] + this.itemSelections1.forEach(data => { + resourceId.push(data.resourceId) + }) + this.itemList1 = this.itemList1.filter(item => + !resourceId.includes(item.resourceId) + ) + this.itemList2.push(...this.itemSelections1) + this.$set(this.modalData, 'resourceList', this.itemList2) + }, + + // 删除矩阵 + deleteItem () { + if (this.itemSelections2 == null || this.itemSelections2.length === 0) { + this.$message.warning('请选择已有机台！') + return + } + this.itemList1.push(...this.itemSelections2) + this.itemList2 = this.itemList2.filter(item => !this.itemSelections2.includes(item)) + this.modalData.resourceList = this.itemList2 + }, + // 可选项目 + itemClickRow1 (row) { + this.$refs.itemTable1.toggleRowSelection(row) + }, + + // 已有项目 + itemClickRow2 (row) { + this.$refs.itemTable2.toggleRowSelection(row) + }, + selectionItem1 (val) { + this.itemSelections1 = val + }, + + selectionItem2 (val) { + this.itemSelections2 = val + }, + selectFlag () { + return true + }, getRowData (row) { this.modalData.resource = row.resourceId this.modalData.resourceDesc = row.resourceDesc @@ -389,7 +467,7 @@ export default { - - 机台编码 - - - - - - - - - - - - + + + + + + + + + 添加机台 + + + + + + + + + 保 存 取 消 - - -
+ + +
@@ -478,34 +570,132 @@ export default { 查询 - - - - -
+ + + 可选机台： + + + + + + + + + + +
+ 添加>> +
+
+ 删除<< +
+ + + 选中机台： + + + + + + + + + + - 关闭 + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -519,9 +709,9 @@ export default { - - 新增 - + + +