From 064f4321177e683dfb3482b27a7d8279208a2307 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Wed, 3 Dec 2025 14:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- .npmrc | 5 + src/api/processManagement/addQuantity.js | 45 + src/api/processManagement/bathRefineTask.js | 31 + src/api/processManagement/inPlantProcess.js | 15 + src/api/processManagement/planClass.js | 45 + src/api/processManagement/similarParts.js | 56 + src/api/processManagement/workCenterDevice.js | 56 + .../processManagement/basicProcesses.vue | 2 +- .../bathRefine/accumulateClass.vue | 1443 +++++++-------- .../bathRefine/addQuantity.vue | 1102 +++++------- .../bathRefine/bathRefineTask.vue | 1480 ++++++--------- .../bathRefine/periodicalClass.vue | 1597 +++++++++-------- .../bathRefine/planClass.vue | 1088 +++-------- .../bathRefine/workCenterDevice.vue | 953 +++------- .../processManagement/components/setCrew.vue | 37 +- .../processManagement/inPlantProcess.vue | 442 +++-- .../qualityManagement/similarParts/index.vue | 81 +- 18 files changed, 3452 insertions(+), 5028 deletions(-) create mode 100644 .npmrc create mode 100644 src/api/processManagement/addQuantity.js create mode 100644 src/api/processManagement/bathRefineTask.js create mode 100644 src/api/processManagement/inPlantProcess.js create mode 100644 src/api/processManagement/planClass.js create mode 100644 src/api/processManagement/similarParts.js create mode 100644 src/api/processManagement/workCenterDevice.js diff --git a/.gitignore b/.gitignore index e7b06e7..8f14828 100644 --- a/.gitignore +++ b/.gitignore @@ -23,5 +23,5 @@ yarn-error.log* *.sln *.sw* -.npmrc +# .npmrc /src/views/plugin/lowcode \ No newline at end of file diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..0acee4d --- /dev/null +++ b/.npmrc @@ -0,0 +1,5 @@ +@saber:registry=https://center.javablade.com/api/packages/blade/npm/ +//center.javablade.com/api/packages/blade/npm/:_authToken=ea2747473ebc1c0887ec9604fd4c565a4a5f3ecf +@nutflow:registry=https://git.nutflow.vip/api/packages/blade-workflow/npm/ +//git.nutflow.vip/api/packages/blade-workflow/npm/:_authToken=ee821016f7aa7257a448b7548e30f011676727a0 + diff --git a/src/api/processManagement/addQuantity.js b/src/api/processManagement/addQuantity.js new file mode 100644 index 0000000..54f88da --- /dev/null +++ b/src/api/processManagement/addQuantity.js @@ -0,0 +1,45 @@ +import request from '@/axios'; + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/dsMainSaltAddQuantity/list', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +// 保存 +export const add = row => { + return request({ + url: '/blade-desk/dsMainSaltAddQuantity/save', + method: 'post', + data: row, + }); +}; + + + +// 修改 +export const update = row => { + return request({ + url: '/blade-desk/dsMainSaltAddQuantity/update', + method: 'post', + data: row, + }); +}; + +// 删除 +export const remove = ids => { + return request({ + url: '/blade-desk/dsMainSaltAddQuantity/remove', + method: 'post', + params: { + ids, + }, + }); +}; diff --git a/src/api/processManagement/bathRefineTask.js b/src/api/processManagement/bathRefineTask.js new file mode 100644 index 0000000..c396c3a --- /dev/null +++ b/src/api/processManagement/bathRefineTask.js @@ -0,0 +1,31 @@ +import request from '@/axios'; + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/dsBatchPreserveTask/list', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +// 批量维护 +export const dsBatchTask = row => { + return request({ + url: '/blade-desk/dsBatchPreserveTask/update', + method: 'post', + data: row, + }); +}; +// 批量审核 +export const dsBatchReview = row => { + return request({ + url: '/blade-desk/dsBatchPreserveTask/update', + method: 'post', + data: row, + }); +}; \ No newline at end of file diff --git a/src/api/processManagement/inPlantProcess.js b/src/api/processManagement/inPlantProcess.js new file mode 100644 index 0000000..1ac4eff --- /dev/null +++ b/src/api/processManagement/inPlantProcess.js @@ -0,0 +1,15 @@ +import request from '@/axios'; + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/dsTaskBill/list', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + diff --git a/src/api/processManagement/planClass.js b/src/api/processManagement/planClass.js new file mode 100644 index 0000000..0b334bc --- /dev/null +++ b/src/api/processManagement/planClass.js @@ -0,0 +1,45 @@ +import request from '@/axios'; + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/dsBatchPreservePlan/list', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +// 保存 +export const add = row => { + return request({ + url: '/blade-desk/dsBatchPreservePlan/save', + method: 'post', + data: row, + }); +}; + + + +// 修改 +export const update = row => { + return request({ + url: '/blade-desk/dsBatchPreservePlan/update', + method: 'post', + data: row, + }); +}; + +// 删除 +export const remove = ids => { + return request({ + url: '/blade-desk/dsBatchPreservePlan/remove', + method: 'post', + params: { + ids, + }, + }); +}; \ No newline at end of file diff --git a/src/api/processManagement/similarParts.js b/src/api/processManagement/similarParts.js new file mode 100644 index 0000000..88600f0 --- /dev/null +++ b/src/api/processManagement/similarParts.js @@ -0,0 +1,56 @@ +import request from '@/axios'; + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/dsSimilarParts/list', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +// 保存 +export const add = row => { + return request({ + url: '/blade-desk/dsSimilarParts/save', + method: 'post', + data: row, + }); +}; + + + +// 修改 +export const update = row => { + return request({ + url: '/blade-desk/dsSimilarParts/update', + method: 'post', + data: row, + }); +}; + +// 删除 +export const remove = ids => { + return request({ + url: '/blade-desk/dsSimilarParts/remove', + method: 'post', + params: { + ids, + }, + }); +}; + +// 详情 +export const getDetail = Id => { + return request({ + url: '/blade-desk/dsSimilarParts/detail', + method: 'get', + params: { + Id, + }, + }); +}; \ No newline at end of file diff --git a/src/api/processManagement/workCenterDevice.js b/src/api/processManagement/workCenterDevice.js new file mode 100644 index 0000000..45167a8 --- /dev/null +++ b/src/api/processManagement/workCenterDevice.js @@ -0,0 +1,56 @@ +import request from '@/axios'; + +// 获取列表数据 bsCraftAbility/queryAllCa +export const getList = (current, size, params) => { + return request({ + url: '/blade-desk/dsBatchWorkCenterSet/list', + method: 'get', + params: { + ...params, + current, + size, + }, + }); +}; + +// 保存 +export const add = row => { + return request({ + url: '/blade-desk/dsBatchWorkCenterSet/save', + method: 'post', + data: row, + }); +}; + + + +// 修改 +export const update = row => { + return request({ + url: '/blade-desk/dsBatchWorkCenterSet/update', + method: 'post', + data: row, + }); +}; + +// 删除 +export const remove = ids => { + return request({ + url: '/blade-desk/dsBatchWorkCenterSet/remove', + method: 'post', + params: { + ids, + }, + }); +}; + +// 详情 +export const getDetail = Id => { + return request({ + url: '/blade-desk/dsSimilarParts/detail', + method: 'get', + params: { + Id, + }, + }); +}; \ No newline at end of file diff --git a/src/views/processManagement/basicProcesses.vue b/src/views/processManagement/basicProcesses.vue index 278d61a..42dc1a9 100644 --- a/src/views/processManagement/basicProcesses.vue +++ b/src/views/processManagement/basicProcesses.vue @@ -379,7 +379,7 @@ export default { // 设置班组人员弹框关闭 setCrewOpeSancel(isRefresh) { if (isRefresh) { - this.$refs.myTable.load(); + this.onLoad(this.page, this.query); } this.setCrewOpen = false; }, diff --git a/src/views/processManagement/bathRefine/accumulateClass.vue b/src/views/processManagement/bathRefine/accumulateClass.vue index 7f46837..ae82667 100644 --- a/src/views/processManagement/bathRefine/accumulateClass.vue +++ b/src/views/processManagement/bathRefine/accumulateClass.vue @@ -1,82 +1,117 @@ - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/addQuantity.vue b/src/views/processManagement/bathRefine/addQuantity.vue index d038917..ebae8de 100644 --- a/src/views/processManagement/bathRefine/addQuantity.vue +++ b/src/views/processManagement/bathRefine/addQuantity.vue @@ -1,644 +1,482 @@ - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/bathRefineTask.vue b/src/views/processManagement/bathRefine/bathRefineTask.vue index e367908..4f52c14 100644 --- a/src/views/processManagement/bathRefine/bathRefineTask.vue +++ b/src/views/processManagement/bathRefine/bathRefineTask.vue @@ -1,984 +1,522 @@ - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/periodicalClass.vue b/src/views/processManagement/bathRefine/periodicalClass.vue index a160299..1d20155 100644 --- a/src/views/processManagement/bathRefine/periodicalClass.vue +++ b/src/views/processManagement/bathRefine/periodicalClass.vue @@ -1,811 +1,818 @@ - \ No newline at end of file + diff --git a/src/views/processManagement/bathRefine/planClass.vue b/src/views/processManagement/bathRefine/planClass.vue index 253a40a..9e61359 100644 --- a/src/views/processManagement/bathRefine/planClass.vue +++ b/src/views/processManagement/bathRefine/planClass.vue @@ -1,821 +1,285 @@ \ No newline at end of file + ); + }, + searchReset() { + this.query = {}; + this.onLoad(this.page); + }, + searchChange(params, done) { + // this.query = params; + // this.page.currentPage = 1; + // this.onLoad(this.page, params); + done(); + }, + currentChange(currentPage) { + this.page.currentPage = currentPage; + }, + sizeChange(pageSize) { + this.page.pageSize = pageSize; + }, + refreshChange() { + this.onLoad(this.page, this.query); + }, + onLoad(page, params = {}) { + this.loading = true; + getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + this.data = res.data.data.records; + this.loading = false; + this.page.total = res.data.data.total; + this.selectionClear(); + }); + }, + }, +}; + diff --git a/src/views/processManagement/bathRefine/workCenterDevice.vue b/src/views/processManagement/bathRefine/workCenterDevice.vue index 47fbab4..7722fb1 100644 --- a/src/views/processManagement/bathRefine/workCenterDevice.vue +++ b/src/views/processManagement/bathRefine/workCenterDevice.vue @@ -1,744 +1,229 @@ \ No newline at end of file + ); + }, + searchReset() { + this.query = {}; + this.onLoad(this.page); + }, + searchChange(params, done) { + // this.query = params; + // this.page.currentPage = 1; + // this.onLoad(this.page, params); + done(); + }, + currentChange(currentPage) { + this.page.currentPage = currentPage; + }, + sizeChange(pageSize) { + this.page.pageSize = pageSize; + }, + refreshChange() { + this.onLoad(this.page, this.query); + }, + onLoad(page, params = {}) { + this.loading = true; + getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + this.data = res.data.data.records; + this.loading = false; + this.page.total = res.data.data.total; + this.selectionClear(); + }); + }, + }, +}; + diff --git a/src/views/processManagement/components/setCrew.vue b/src/views/processManagement/components/setCrew.vue index 6739907..7aa9b7d 100644 --- a/src/views/processManagement/components/setCrew.vue +++ b/src/views/processManagement/components/setCrew.vue @@ -13,12 +13,16 @@ :filter-method="filterMethod" filter-placeholder="输入关键字进行确认" :titles="['未选择', '已选择']" - :data="data" + :data="dataList" + :props="{ + key: 'id', + label: 'tsName' + }" /> @@ -46,28 +50,24 @@ export default { return { url: "", setCrewShow: false, - data: [], + dataList: [], + value: [], }; }, mounted() { this.setCrewShow = this.setCrewOpen; - console.log(9999, this.pId); this.getTeams(); }, methods: { getTeams() { getProcessesTeams(this.pId).then((res) => { - console.log(9999999, res); + this.dataList = res.data.data.teamSetEntityList + if(res.data.data.processTeamVOList.length > 0){ + this.value = res.data.data.processTeamVOList.map(item => item.id) + } }); }, open() { - // if (this.type === 'teamSet') { - // this.url = 'teamSet/findUserByTeam/' + this.id; - // } else if (this.type === 'platingAssort') { - // this.url = 'bsPlatingAssort/findUserByPlatingAssort/' + this.id; - // } else if (this.type === 'abnormalConfig') { - // this.url = 'bsBasicClass/findUserByAbnormalConfig/' + this.id; - // } }, submit() { // const keyIds = this.$refs["tree-transfer"].getChecked(); @@ -94,6 +94,17 @@ export default { // this.$message.success(this.$t("videaVueLib.publics.message.success")); // this.cancel(true); // }); + let ids = this.value; + let query = { + // BsTeamSetDTO:{ + pid: this.pId, + tsIdList: ids, + // } + }; + setTeams(query).then(() => { + this.$message.success("设置班组成功"); + this.cancel(true); + }); }, opened() { // this.$refs["tree-transfer"].axios(); diff --git a/src/views/processManagement/inPlantProcess.vue b/src/views/processManagement/inPlantProcess.vue index ee2cd09..9b0b951 100644 --- a/src/views/processManagement/inPlantProcess.vue +++ b/src/views/processManagement/inPlantProcess.vue @@ -1,230 +1,226 @@ + + + + - \ No newline at end of file + diff --git a/src/views/qualityManagement/similarParts/index.vue b/src/views/qualityManagement/similarParts/index.vue index f17ccf3..c4db5f7 100644 --- a/src/views/qualityManagement/similarParts/index.vue +++ b/src/views/qualityManagement/similarParts/index.vue @@ -7,7 +7,7 @@ + @refresh-change="refreshChange" @on-load="onLoad" @rowSave="rowSave" @rowUpdate="rowUpdate"> @@ -32,15 +32,15 @@