From 7ab6414d2bc943671f989a12bbce767bc6604ce6 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 15 Jul 2024 10:29:15 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A4=87=E4=BB=B6=20=E7=89=A9=E8=B5=84=20?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/spares/inbound.js | 50 ++++ src/api/spares/material.js | 50 ++++ src/api/spares/materialclasscode.js | 50 ++++ src/api/spares/outbound.js | 50 ++++ src/views/views/spares/inbound.vue | 270 +++++++++++++++++ src/views/views/spares/material.vue | 297 +++++++++++++++++++ src/views/views/spares/materialclasscode.vue | 225 ++++++++++++++ src/views/views/spares/outbound.vue | 270 +++++++++++++++++ 8 files changed, 1262 insertions(+) create mode 100644 src/api/spares/inbound.js create mode 100644 src/api/spares/material.js create mode 100644 src/api/spares/materialclasscode.js create mode 100644 src/api/spares/outbound.js create mode 100644 src/views/views/spares/inbound.vue create mode 100644 src/views/views/spares/material.vue create mode 100644 src/views/views/spares/materialclasscode.vue create mode 100644 src/views/views/spares/outbound.vue diff --git a/src/api/spares/inbound.js b/src/api/spares/inbound.js new file mode 100644 index 0000000..09ac2f2 --- /dev/null +++ b/src/api/spares/inbound.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/spares/inbound/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/spares/inbound/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/spares/inbound/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/spares/inbound/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/spares/inbound/submit', + method: 'post', + data: row + }) +} + diff --git a/src/api/spares/material.js b/src/api/spares/material.js new file mode 100644 index 0000000..a409f1c --- /dev/null +++ b/src/api/spares/material.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/spares/material/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/spares/material/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/spares/material/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/spares/material/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/spares/material/submit', + method: 'post', + data: row + }) +} + diff --git a/src/api/spares/materialclasscode.js b/src/api/spares/materialclasscode.js new file mode 100644 index 0000000..314d5c4 --- /dev/null +++ b/src/api/spares/materialclasscode.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/spares/materialclasscode/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/spares/materialclasscode/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/spares/materialclasscode/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/spares/materialclasscode/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/spares/materialclasscode/submit', + method: 'post', + data: row + }) +} + diff --git a/src/api/spares/outbound.js b/src/api/spares/outbound.js new file mode 100644 index 0000000..e014bd2 --- /dev/null +++ b/src/api/spares/outbound.js @@ -0,0 +1,50 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/spares/outbound/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/spares/outbound/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/spares/outbound/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/spares/outbound/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/spares/outbound/submit', + method: 'post', + data: row + }) +} + diff --git a/src/views/views/spares/inbound.vue b/src/views/views/spares/inbound.vue new file mode 100644 index 0000000..bd2e359 --- /dev/null +++ b/src/views/views/spares/inbound.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/src/views/views/spares/material.vue b/src/views/views/spares/material.vue new file mode 100644 index 0000000..cf5cd9e --- /dev/null +++ b/src/views/views/spares/material.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/views/views/spares/materialclasscode.vue b/src/views/views/spares/materialclasscode.vue new file mode 100644 index 0000000..fcc6311 --- /dev/null +++ b/src/views/views/spares/materialclasscode.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/views/spares/outbound.vue b/src/views/views/spares/outbound.vue new file mode 100644 index 0000000..9a4a205 --- /dev/null +++ b/src/views/views/spares/outbound.vue @@ -0,0 +1,270 @@ + + + + + From c66e9354f0e20af3658aae364575109f73e0c5c9 Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Mon, 15 Jul 2024 10:33:10 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BF=90=E8=A1=8C=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/spares/inbound.js | 2 +- src/api/spares/material.js | 2 +- src/api/spares/materialclasscode.js | 2 +- src/api/spares/outbound.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/spares/inbound.js b/src/api/spares/inbound.js index 09ac2f2..4f03845 100644 --- a/src/api/spares/inbound.js +++ b/src/api/spares/inbound.js @@ -1,4 +1,4 @@ -import request from '@/axios'; +import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ diff --git a/src/api/spares/material.js b/src/api/spares/material.js index a409f1c..0ee0c57 100644 --- a/src/api/spares/material.js +++ b/src/api/spares/material.js @@ -1,4 +1,4 @@ -import request from '@/axios'; +import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ diff --git a/src/api/spares/materialclasscode.js b/src/api/spares/materialclasscode.js index 314d5c4..d68adc8 100644 --- a/src/api/spares/materialclasscode.js +++ b/src/api/spares/materialclasscode.js @@ -1,4 +1,4 @@ -import request from '@/axios'; +import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ diff --git a/src/api/spares/outbound.js b/src/api/spares/outbound.js index e014bd2..a51a7be 100644 --- a/src/api/spares/outbound.js +++ b/src/api/spares/outbound.js @@ -1,4 +1,4 @@ -import request from '@/axios'; +import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ From a55bc24c3a82719138962d5a5083e00c34db5a4a Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Mon, 15 Jul 2024 10:38:34 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/smart/workorder.vue | 2 +- src/views/smart/workorderDetail.vue | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue index a786bfc..cec0ade 100644 --- a/src/views/smart/workorder.vue +++ b/src/views/smart/workorder.vue @@ -33,7 +33,7 @@ 删除 - + diff --git a/src/views/smart/workorderDetail.vue b/src/views/smart/workorderDetail.vue index d59113d..9458f6c 100644 --- a/src/views/smart/workorderDetail.vue +++ b/src/views/smart/workorderDetail.vue @@ -102,7 +102,7 @@ }, event: { change: (val) => { - if (this.$route.query.frameMode == "add") { + if (this.addupdateShowButton) { this.tab1_form.kksDescriptdion = ''; this.tab1_form.station = ''; if (val) { @@ -129,7 +129,7 @@ // offset:6, span: 8, maxlength: 400, - disabled: this.$route.query.frameMode != 'search' + disabled: true }, { label: "场站", prop: "station", @@ -145,7 +145,7 @@ message: "请选择场站", trigger: "blur" }], - disabled: this.$route.query.frameMode != 'search' + disabled: true }, { label: "工单编号", prop: "workOrderNo", @@ -310,6 +310,8 @@ created() { this.type = this.option.column[0]; if (this.$route.query.frameMode == "add") { + this.tab1_option.column[1].disabled = true; + this.tab1_option.column[2].disabled = true; this.readonlyForm = false; this.shouldShowButton = false; this.addupdateShowButton = true; @@ -317,6 +319,8 @@ this.checkStatusValue = this.$route.query.checkstatus; this.searchDetail(); } else if (this.$route.query.frameMode == "search") { + this.tab1_option.column[1].disabled = false; + this.tab1_option.column[2].disabled = false; this.readonlyForm = true; this.shouldShowButton = true; this.addupdateShowButton = false; @@ -348,6 +352,8 @@ } }, updateToSearch() { + this.tab1_option.column[1].disabled = false; + this.tab1_option.column[2].disabled = false; this.readonlyForm = true; this.shouldShowButton = true; this.addupdateShowButton = false; @@ -432,8 +438,7 @@ }); }, submitRejectOrauditing(status) { - var formData = {...this.tab1_form}; - formData.approvalStatus = status; + var formData = {id: this.tab1_form.id, approvalStatus: status}; update(formData).then(() => { this.$router.push({ path: "/smart/workorder", @@ -452,6 +457,8 @@ }); }, seachToUpdate() { + this.tab1_option.column[1].disabled = true; + this.tab1_option.column[2].disabled = true; this.shouldShowButton = false; this.addupdateShowButton = true; this.readonlyForm = false; From 80593f7a3f83bd4b142f352d5027693600f8131b Mon Sep 17 00:00:00 2001 From: yangzhicheng Date: Mon, 15 Jul 2024 10:47:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/views/spares/inbound.vue | 270 ----------------- src/views/views/spares/material.vue | 297 ------------------- src/views/views/spares/materialclasscode.vue | 225 -------------- src/views/views/spares/outbound.vue | 270 ----------------- 4 files changed, 1062 deletions(-) delete mode 100644 src/views/views/spares/inbound.vue delete mode 100644 src/views/views/spares/material.vue delete mode 100644 src/views/views/spares/materialclasscode.vue delete mode 100644 src/views/views/spares/outbound.vue diff --git a/src/views/views/spares/inbound.vue b/src/views/views/spares/inbound.vue deleted file mode 100644 index bd2e359..0000000 --- a/src/views/views/spares/inbound.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - - diff --git a/src/views/views/spares/material.vue b/src/views/views/spares/material.vue deleted file mode 100644 index cf5cd9e..0000000 --- a/src/views/views/spares/material.vue +++ /dev/null @@ -1,297 +0,0 @@ - - - - - diff --git a/src/views/views/spares/materialclasscode.vue b/src/views/views/spares/materialclasscode.vue deleted file mode 100644 index fcc6311..0000000 --- a/src/views/views/spares/materialclasscode.vue +++ /dev/null @@ -1,225 +0,0 @@ - - - - - diff --git a/src/views/views/spares/outbound.vue b/src/views/views/spares/outbound.vue deleted file mode 100644 index 9a4a205..0000000 --- a/src/views/views/spares/outbound.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - - - From 0e6572b2a6052d16f7219d84db57024e7367d232 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 15 Jul 2024 10:54:24 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=87=E4=BB=B6=20=E7=89=A9=E8=B5=84=20?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spares/inbound.vue | 270 ++++++++++++++++++++++ src/views/spares/material.vue | 297 +++++++++++++++++++++++++ src/views/spares/materialclasscode.vue | 225 +++++++++++++++++++ src/views/spares/outbound.vue | 270 ++++++++++++++++++++++ 4 files changed, 1062 insertions(+) create mode 100644 src/views/spares/inbound.vue create mode 100644 src/views/spares/material.vue create mode 100644 src/views/spares/materialclasscode.vue create mode 100644 src/views/spares/outbound.vue diff --git a/src/views/spares/inbound.vue b/src/views/spares/inbound.vue new file mode 100644 index 0000000..477407a --- /dev/null +++ b/src/views/spares/inbound.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue new file mode 100644 index 0000000..4bdb437 --- /dev/null +++ b/src/views/spares/material.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/views/spares/materialclasscode.vue b/src/views/spares/materialclasscode.vue new file mode 100644 index 0000000..bce5ea6 --- /dev/null +++ b/src/views/spares/materialclasscode.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/spares/outbound.vue b/src/views/spares/outbound.vue new file mode 100644 index 0000000..98ea43e --- /dev/null +++ b/src/views/spares/outbound.vue @@ -0,0 +1,270 @@ + + + + + From c53020694187d22ba791bf16bca471431218a78c Mon Sep 17 00:00:00 2001 From: weitingdong <2480899115@qq.com> Date: Mon, 15 Jul 2024 10:54:52 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/leger/equipmentledgerDetail.vue | 2 +- src/views/leger/toolinventoryrecordDetail.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index f26dd6f..9768d34 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -674,7 +674,7 @@ }, methods: { handleFormSubmit() { - this.$refs.form.validate((valid, done, msg) => { + this.$refs.tab1_form.validate((valid, done, msg) => { if (valid) { done() this.Submit(); diff --git a/src/views/leger/toolinventoryrecordDetail.vue b/src/views/leger/toolinventoryrecordDetail.vue index 874dab4..3d6fe44 100644 --- a/src/views/leger/toolinventoryrecordDetail.vue +++ b/src/views/leger/toolinventoryrecordDetail.vue @@ -510,7 +510,7 @@ export default { }, methods: { handleFormSubmit() { - this.$refs.form.validate((valid, done, msg) => { + this.$refs.tab1_form.validate((valid, done, msg) => { if (valid) { done() this.Submit(); From f4d2b28e30e3d881e53adae79605e4a06142759a Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 15 Jul 2024 11:08:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=87=E4=BB=B6=20=E7=89=A9=E8=B5=84=20?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spares/material.vue | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue index 4bdb437..6b917e0 100644 --- a/src/views/spares/material.vue +++ b/src/views/spares/material.vue @@ -147,6 +147,15 @@ trigger: "blur" }] }, + { + label: "场站", + prop: "station", + rules: [{ + required: true, + message: "请输入场站", + trigger: "blur" + }] + }, { label: "审核状态", prop: "istatus",