From 08193b7e1e12feef582930abb456606ef7f8cf10 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Sat, 9 May 2020 10:00:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/StatusQuery.js | 36 +- .../ManufacturingCenter/StatusQuery/index.vue | 33 +- .../TraceabilityOfParts/index.vue | 265 ++--------- .../TraceabilityOfParts/零件追溯备份.vue | 445 ++++++++++++++++++ 4 files changed, 537 insertions(+), 242 deletions(-) create mode 100644 src/views/ManufacturingCenter/TraceabilityOfParts/零件追溯备份.vue diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js index b19b8c49..531229f9 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/api/ManufacturingCenter/StatusQuery.js @@ -2,16 +2,6 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' -// export function initProject() { -// return request({ -// url: '', -// method: 'post', -// data: { -// type: '1', -// name: 'PDM_项目名称_查询数据_按时间排序' -// } -// }) -// } export function intPartState() { return request({ url: '', @@ -62,3 +52,29 @@ export function searchTable(check1, machine, check2, groupNum, check3, partNumbe } }) } +export function gettabledata1(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_追溯加工过程_查询工序', + param: '工艺计划流水号=' + num + '=int' + } + }) +} +export function getPersons(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间生产管理工艺_自制件状态查询_每阶段操作者查询', + param: '工艺计划流水号=' + num + } + }) +} diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index eaccdc46..89af9c40 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -73,6 +73,11 @@ + + +
+ +
+ +
+
+ + + From 58e7a3b7cc048a0f4f99594657966d8832596262 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Sat, 9 May 2020 10:24:04 +0800 Subject: [PATCH 2/5] a --- src/views/PurchasingCenter/CreateInquirySheet/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index a4788b33..51df0a95 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -2615,7 +2615,8 @@ export default { flex-wrap: wrap; } .sudoku_item{ - margin-bottom: 20px; + margin-bottom: 15px; + margin-top: 15px; margin-left: 20px; /*border: 1px solid red;*/ display: flex; From 4002a50dd0edeca609ce63c2c5ce45fd913aa56f Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Sat, 9 May 2020 11:32:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=92=A4=E9=94=80=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScrappedSupplementaryInvestment.js | 13 +++++ .../ScrappedSupplementaryInvestment/index.vue | 51 ++++++++++++++++--- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js index 6eae8111..0b5c34e8 100644 --- a/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js +++ b/src/api/ManufacturingCenter/ScrappedSupplementaryInvestment.js @@ -55,3 +55,16 @@ export function editSpare(CutCode, number, id, Unqualified, remarkGroup, people, } }) } +export function reSpare(CutCode) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '2', + name: '报废补投_撤销报废_循环执行', + param: '工艺计划流水号组=' + CutCode + } + }) +} diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue index b3fb3310..bbf19259 100644 --- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue +++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue @@ -22,7 +22,6 @@ style="width:240px;margin-left: 10px" start-placeholder="开始日期" end-placeholder="结束日期"/> - 查询 - - 提交补投 + + 提交补投 + 撤销补投 @@ -72,7 +72,6 @@ - @@ -179,11 +178,12 @@