From e3c6420b5c5ada891ff9721e574fe61d67226612 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 26 May 2025 10:20:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?2025-05-26=20BM=E7=9A=84Dead=E3=80=81Re-Sam?= =?UTF-8?q?ple=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technicalSpecificationList.js | 7 +++ .../processManagement/processFlowInfo.vue | 1 + .../technicalSpecificationList.vue | 52 +++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index 3f667af..f0d14fd 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -130,3 +130,10 @@ export const copyBm= data => createAPI(`/technicalSpecification/copyBm`,'post',d // 2025-05-14 查询变更信息 export const queryChangeLogList = data => createAPI("/technicalSpecification/change/log",'post',data) + +export const bmStatusToDead = data => createAPI("/technicalSpecification/bmStatusToDead",'post',data) + +export const bmStatusToCg = data => createAPI("/technicalSpecification/bmStatusToCg",'post',data) + + + diff --git a/src/views/modules/processManagement/processFlowInfo.vue b/src/views/modules/processManagement/processFlowInfo.vue index 54f4b31..ee48846 100644 --- a/src/views/modules/processManagement/processFlowInfo.vue +++ b/src/views/modules/processManagement/processFlowInfo.vue @@ -28,6 +28,7 @@ + diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index d273d52..7765020 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -25,6 +25,7 @@ + @@ -92,6 +93,15 @@ 删除 下达 拷贝 + + + 更多 + + + Dead + Re-Sample + + @@ -459,6 +469,8 @@ issueChange, // 下达 searchCopyPart, copyBm, + bmStatusToDead, // Dead + bmStatusToCg, // Re-Sample } from "@/api/sampleManagement/technicalSpecificationList.js" import Chooselist from '@/views/modules/common/Chooselist' import AddOrUpdate from './com_technical-add-or-update' @@ -1276,6 +1288,46 @@ }).catch(() => { }) }, + + // Dead + bmStatusToDead (row) { + this.$confirm('确定将技术参数卡设置为【Dead】?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + row.username = this.$store.state.user.name + bmStatusToDead(row).then(({data}) => { + if (data && data.code === 0) { + this.$message.success( '操作成功') + this.search() + } else { + this.$message.error(data.msg) + } + }) + }) + }, + + // Re-Sample + bmStatusToCg (row) { + this.$confirm('确定将技术参数卡设置为【草稿】?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + row.username = this.$store.state.user.name + bmStatusToCg(row).then(({data}) => { + if (data && data.code === 0) { + this.$message.success( '操作成功') + this.search() + } else { + this.$message.error(data.msg) + } + }) + }) + }, + + }, } From 4bee178df77e197ff6b078825f1d55a8836b6264 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 26 May 2025 10:53:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?2025-05-26=20=E5=BD=92=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technicalSpecificationList.js | 2 ++ .../technicalSpecificationList.vue | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js index f0d14fd..e160026 100644 --- a/src/api/sampleManagement/technicalSpecificationList.js +++ b/src/api/sampleManagement/technicalSpecificationList.js @@ -135,5 +135,7 @@ export const bmStatusToDead = data => createAPI("/technicalSpecification/bmStatu export const bmStatusToCg = data => createAPI("/technicalSpecification/bmStatusToCg",'post',data) +export const bmStatusToFinish = data => createAPI("/technicalSpecification/bmStatusToFinish",'post',data) + diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 7765020..a09e356 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -100,6 +100,7 @@ Dead Re-Sample + 归档 @@ -471,6 +472,7 @@ copyBm, bmStatusToDead, // Dead bmStatusToCg, // Re-Sample + bmStatusToFinish, // 归档 } from "@/api/sampleManagement/technicalSpecificationList.js" import Chooselist from '@/views/modules/common/Chooselist' import AddOrUpdate from './com_technical-add-or-update' @@ -1327,6 +1329,24 @@ }) }, + // 归档 + bmStatusToFinish (row) { + this.$confirm('确定将技术参数卡归档?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + row.username = this.$store.state.user.name + bmStatusToFinish(row).then(({data}) => { + if (data && data.code === 0) { + this.$message.success( '操作成功') + this.search() + } else { + this.$message.error(data.msg) + } + }) + }) + }, }, } From c73e12bcc96baee127c9f51c9fd9156bd584a805 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 26 May 2025 16:51:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?2025-05-26=20=E6=8A=80=E6=9C=AF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8D=A1copy=E4=BC=98=E5=8C=96=20masterPart=20invento?= =?UTF-8?q?ryPart=20=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/part/partCatalogInformation.vue | 8 +- src/views/modules/part/partInformation.vue | 20 +- .../technicalSpecificationList.vue | 217 ++++++++++++------ 3 files changed, 156 insertions(+), 89 deletions(-) diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue index 6498104..71c182a 100644 --- a/src/views/modules/part/partCatalogInformation.vue +++ b/src/views/modules/part/partCatalogInformation.vue @@ -10,7 +10,7 @@ 查询 - 新增 + 新增 @@ -178,9 +178,9 @@ - 新增 + 新增 - {{ attributeDialog?'编辑':'保存' }} + {{ attributeDialog?'编辑':'保存' }}
查询 - 新增 - 删除 + 新增 + 删除 @@ -495,22 +512,25 @@ }, data() { return { - approvalList:[], - activeName:'info', - addOrUpdateVisible:false, - height:200, + approvalList: [], + activeName: 'info', + addOrUpdateVisible: false, + height: 200, dataList1: [], - partList:[], - copyData:{ - site:'', - codeNo:'', - oriCodeNo:'', - testPartNo:'', - projectId:'', - revNo:'', - newPartNo:'', + partList: [], + copyData: { + site: '', + buNo: '', + codeNo: '', + oriCodeNo: '', + testPartNo: '', + projectId: '', + revNo: '', + newPartNo: '', + page: 1, + limit: 20 }, - partModelFlag:false, + partModelFlag: false, searchData: { page: 1, limit: 20, @@ -519,14 +539,17 @@ testPartNo: '', oriCodeNo: '', statusDesc: '', - codeNo:'', + codeNo: '', ecnFlag: '', - buNo:'', - customerDesc:'', + buNo: '', + customerDesc: '', }, pageIndex: 1, pageSize: 20, totalPage: 0, + pageIndex2: 1, + pageSize2: 20, + totalPage2: 0, dataListLoading: false, currentRow:'', exportList:[], @@ -1033,12 +1056,27 @@ this.pageIndex = 1 this.search() }, + // 当前页 currentChangeHandle (val) { this.pageIndex = val this.search() }, - search(){ + + // 每页数 + sizeChangeHandle2 (val) { + this.pageSize2 = val + this.pageIndex2 = 1 + this.searchCopyPart() + }, + + // 当前页 + currentChangeHandle2 (val) { + this.pageIndex2 = val + this.searchCopyPart() + }, + + search () { this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex this.dataListLoading = true; @@ -1055,15 +1093,17 @@ } this.dataListLoading = false }).catch((error)=>{ - this.$message.error(error); - this.dataListLoading = false; + this.$message.error(error) + this.dataListLoading = false }) }, - changeData(row) { - this.currentRow = JSON.parse(JSON.stringify(row)); - this.infoData=row; - this.refreshCurrentTabTable (); + + changeData (row) { + this.currentRow = JSON.parse(JSON.stringify(row)) + this.infoData = row + this.refreshCurrentTabTable() }, + // 获取基础数据列表S getBaseList (val, type) { this.tagNo = val @@ -1088,6 +1128,7 @@ this.$refs.baseList.init(val, strVal) }) }, + refreshCurrentTabTable () { if (this.activeName == 'customerInfo') { this.getTechnicalCustomerInfoData(); @@ -1096,19 +1137,21 @@ this.getApprovalList() } }, - getTechnicalCustomerInfoData(){ - let inData={ - id:this.currentRow.id + + getTechnicalCustomerInfoData () { + let inData = { + id: this.currentRow.id } getTechnicalCustomerInfoData(inData).then(({data}) => { //区分请求成功和失败的状况 if (data && data.code == 0) { - this.customerData = data.row; + this.customerData = data.row } else { - this.customerData = []; + this.customerData = [] } - }); + }) }, + /* 列表方法的回调 */ getBaseData (val) { if (this.tagNo === 1013) { @@ -1245,49 +1288,73 @@ }) } }, - copyBM(row){ - this.copyData={ - site:row.site, - codeNo:row.codeNo, - oriCodeNo:row.oriCodeNo, - testPartNo:row.testPartNo, - projectId:row.projectId, - revNo:row.revNo, - newPartNo:'', + + copyBM (row) { + this.copyData = { + site: row.site, + buNo: '', + codeNo: row.codeNo, + oriCodeNo: row.oriCodeNo, + testPartNo: row.testPartNo, + projectId: row.projectId, + revNo: row.revNo, + newPartNo: '', + limit: this.pageSize2, + page: this.pageIndex2 } searchCopyPart(this.copyData).then(({data}) => { - if (data.code == 0) { - this.partList=data.rows + if (data.code === 0) { + this.partList = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount } this.dataListLoading = false }) - this.partModelFlag=true + this.partModelFlag = true + }, + + // copy part 列表查询 + searchCopyPart () { + this.copyData.limit = this.pageSize2 + this.copyData.page = this.pageIndex2 + searchCopyPart(this.copyData).then(({data}) => { + if (data.code === 0) { + this.partList = data.page.list + this.pageIndex2 = data.page.currPage + this.pageSize2 = data.page.pageSize + this.totalPage2 = data.page.totalCount + } else { + this.partList = [] + } + }) }, - choosePartNo(row){ - let saveData={ - site:this.copyData.site, - codeNo:this.copyData.codeNo, - testPartNo:this.copyData.testPartNo, - projectId:this.copyData.projectId, - revNo:this.copyData.revNo, - newPartNo:row.testPartNo, - username:this.$store.state.user.name + + // 双击选择 + choosePartNo (row) { + let tempData = { + site: this.copyData.site, + codeNo: this.copyData.codeNo, + testPartNo: this.copyData.testPartNo, + projectId: this.copyData.projectId, + revNo: this.copyData.revNo, + newPartNo: row.testPartNo, + username: this.$store.state.user.name } this.$confirm('确定要拷贝?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { - copyBm(saveData).then(({data}) => { + copyBm(tempData).then(({data}) => { if (data && data.code === 0) { this.$message.success( '操作成功') - this.partModelFlag=false; - this.search(); + this.partModelFlag = false + this.search() } else { this.$message.error(data.msg) } }) - }).catch(() => { }) },