From 85055ed7d5133f8710981562078fde5af8300377 Mon Sep 17 00:00:00 2001 From: Dayu <1010@qq.com> Date: Mon, 15 Jul 2024 17:23:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=89=A9=E8=B5=84=20=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/spares/inbound.js | 4 +-- src/api/spares/material.js | 2 +- src/api/spares/outbound.js | 4 +-- src/views/spares/material.vue | 56 +++++++++++++++++++++++++++++++++-- 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/src/api/spares/inbound.js b/src/api/spares/inbound.js index 3a0670b..baa5dbd 100644 --- a/src/api/spares/inbound.js +++ b/src/api/spares/inbound.js @@ -32,7 +32,7 @@ export const remove = (ids) => { }) } -export const add = (row) => { +export const in_add = (row) => { return request({ url: '/api/spares/inbound/submit', method: 'post', @@ -42,7 +42,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/spares/inbound/submit', + url: '/api/spares/inbound/update', method: 'post', data: row }) diff --git a/src/api/spares/material.js b/src/api/spares/material.js index 0ee0c57..cd82f83 100644 --- a/src/api/spares/material.js +++ b/src/api/spares/material.js @@ -42,7 +42,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/spares/material/submit', + url: '/api/spares/material/update', method: 'post', data: row }) diff --git a/src/api/spares/outbound.js b/src/api/spares/outbound.js index 9782032..c08b232 100644 --- a/src/api/spares/outbound.js +++ b/src/api/spares/outbound.js @@ -32,7 +32,7 @@ export const remove = (ids) => { }) } -export const add = (row) => { +export const out_add = (row) => { return request({ url: '/api/spares/outbound/submit', method: 'post', @@ -42,7 +42,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/spares/outbound/submit', + url: '/api/spares/outbound/update', method: 'post', data: row }) diff --git a/src/views/spares/material.vue b/src/views/spares/material.vue index 9a8ab13..350f63d 100644 --- a/src/views/spares/material.vue +++ b/src/views/spares/material.vue @@ -94,12 +94,14 @@ import {mapGetters} from "vuex"; import expUtil from "@/util/exportUtil"; import {getToken} from "@/util/auth"; + import request from "@/router/axios"; export default { data() { return { form: {}, query: {}, + search:{}, loading: true, inBox: false, outBox: false, @@ -254,6 +256,29 @@ prop: "materialNo", type:"select", span: 22, + dicUrl: "/api/spares/material/getNoList", + props: { + label: "materialNo", + value: "materialNo", + }, + event: { + change: (val) => { + if (!val) return + if (val) { + request({ + url: '/api/spares/material/getDetailList', + method: 'get', + params: { + materialNo: val + } + }).then((res) => { + this.inForm.materialName = res.data.data.materialName; + this.inForm.model = res.data.data.model; + // this.inForm.warehouse = res.data.data.warehouseName; + }) + } + }, + }, rules: [{ required: true, message: "请输入物资编号", @@ -322,6 +347,29 @@ label: "物资编号", prop: "materialNo", span: 22, + dicUrl: "/api/spares/material/getNoList", + props: { + label: "materialNo", + value: "materialNo", + }, + event: { + change: (val) => { + if (!val) return + if (val) { + request({ + url: '/api/spares/material/getDetailList', + method: 'get', + params: { + materialNo: val + } + }).then((res) => { + this.inForm.materialName = res.data.data.materialName; + this.inForm.model = res.data.data.model; + // this.inForm.warehouse = res.data.data.warehouseName; + }) + } + }, + }, rules: [{ required: true, message: "请输入物资编号", @@ -455,13 +503,14 @@ }, handleIn(){ this.inBox = true; + this.$refs.inForm.resetForm(); }, submitIn(row, done, loading) { this.$refs.inForm.validate((valid, done, msg) => { if (valid) { done() in_add(this.inForm).then(() => { - this.$refs.inForm.inForm(); + this.$refs.inForm.resetForm(); this.inBox = false; this.onLoad(this.page); this.$message({ @@ -482,13 +531,14 @@ }, handleOut(){ this.outBox = true; + this.$refs.outForm.resetForm(); }, submitOut(row, done, loading) { this.$refs.outForm.validate((valid, done, msg) => { if (valid) { done() out_add(this.outForm).then(() => { - this.$refs.outForm.outForm(); + this.$refs.outForm.resetForm(); this.outBox = false; this.onLoad(this.page); this.$message({ @@ -513,7 +563,7 @@ cancelButtonText: "取消", type: "warning" }).then(() => { - expUtil.excelExport(`/api/spares/export?daf-auth=${getToken()}`, this.search, ['station', 'iStatus']); + expUtil.excelExport(`/api/spares/material/export?daf-auth=${getToken()}`, this.search, ['station']); }); }, handleDetailSearch(row) { From e06616eee1e33af0de723d49857368433fac75ef Mon Sep 17 00:00:00 2001 From: zhen <1173776308@qq.com> Date: Mon, 15 Jul 2024 17:26:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=A5=A8=EF=BC=88?= =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/release/productioninformation.js | 87 ++++ src/views/release/productioninformation.vue | 506 ++++++++++++++++++++ 2 files changed, 593 insertions(+) create mode 100644 src/api/release/productioninformation.js create mode 100644 src/views/release/productioninformation.vue diff --git a/src/api/release/productioninformation.js b/src/api/release/productioninformation.js new file mode 100644 index 0000000..dc66619 --- /dev/null +++ b/src/api/release/productioninformation.js @@ -0,0 +1,87 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/release/productioninformation/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/release/productioninformation/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/release/productioninformation/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/release/productioninformation/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/release/productioninformation/update', + method: 'post', + data: row + }) +} +export const auditing = (ids) => { + return request({ + url: '/api/release/productioninformation/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/release/productioninformation/reject', + method: 'post', + params: { + ids, + } + }) +} +export const release = (ids) => { + return request({ + url: '/api/release/productioninformation/release', + method: 'post', + params: { + ids, + } + }) +} + +export const stop = (ids) => { + return request({ + url: '/api/release/productioninformation/stop', + method: 'post', + params: { + ids, + } + }) +} diff --git a/src/views/release/productioninformation.vue b/src/views/release/productioninformation.vue new file mode 100644 index 0000000..ba4d812 --- /dev/null +++ b/src/views/release/productioninformation.vue @@ -0,0 +1,506 @@ + + + + + From ae6b431a4f859535fdc23bab4cfffbb1a47a6bfb Mon Sep 17 00:00:00 2001 From: liuyiliang Date: Mon, 15 Jul 2024 18:55:29 +0800 Subject: [PATCH 3/3] =?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 --- src/api/spares/manufacturerinfo.js | 69 ++++ src/api/spares/materialclassification.js | 49 +++ src/api/spares/supplierinfo.js | 70 ++++ src/api/spares/warehouse.js | 69 ++++ src/views/leger/equipmentledgerDetail.vue | 12 + src/views/smart/workorder.vue | 10 +- src/views/smart/workorderDetail.vue | 13 +- src/views/spares/manufacturerinfo.vue | 325 +++++++++++++++++++ src/views/spares/materialclassification.vue | 246 +++++++++++++++ src/views/spares/supplierinfo.vue | 333 ++++++++++++++++++++ src/views/spares/warehouse.vue | 309 ++++++++++++++++++ 11 files changed, 1493 insertions(+), 12 deletions(-) create mode 100644 src/api/spares/manufacturerinfo.js create mode 100644 src/api/spares/materialclassification.js create mode 100644 src/api/spares/supplierinfo.js create mode 100644 src/api/spares/warehouse.js create mode 100644 src/views/spares/manufacturerinfo.vue create mode 100644 src/views/spares/materialclassification.vue create mode 100644 src/views/spares/supplierinfo.vue create mode 100644 src/views/spares/warehouse.vue diff --git a/src/api/spares/manufacturerinfo.js b/src/api/spares/manufacturerinfo.js new file mode 100644 index 0000000..eca297f --- /dev/null +++ b/src/api/spares/manufacturerinfo.js @@ -0,0 +1,69 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/manufacturerinfo/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/manufacturerinfo/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/manufacturerinfo/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/manufacturerinfo/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/manufacturerinfo/submit', + method: 'post', + data: row + }) +} + +export const auditing = (ids) => { + return request({ + url: '/api/manufacturerinfo/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/manufacturerinfo/reject', + method: 'post', + params: { + ids, + } + }) +} diff --git a/src/api/spares/materialclassification.js b/src/api/spares/materialclassification.js new file mode 100644 index 0000000..c9db673 --- /dev/null +++ b/src/api/spares/materialclassification.js @@ -0,0 +1,49 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/materialclassification/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/materialclassification/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/materialclassification/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/materialclassification/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/materialclassification/submit', + method: 'post', + data: row + }) +} diff --git a/src/api/spares/supplierinfo.js b/src/api/spares/supplierinfo.js new file mode 100644 index 0000000..38a0d04 --- /dev/null +++ b/src/api/spares/supplierinfo.js @@ -0,0 +1,70 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/supplierinfo/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/supplierinfo/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/supplierinfo/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/supplierinfo/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/supplierinfo/submit', + method: 'post', + data: row + }) +} + +export const auditing = (ids) => { + return request({ + url: '/api/supplierinfo/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/supplierinfo/reject', + method: 'post', + params: { + ids, + } + }) +} + diff --git a/src/api/spares/warehouse.js b/src/api/spares/warehouse.js new file mode 100644 index 0000000..d5a66d5 --- /dev/null +++ b/src/api/spares/warehouse.js @@ -0,0 +1,69 @@ +import request from '@/router/axios'; + +export const getList = (current, size, params) => { + return request({ + url: '/api/warehouse/list', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + +export const getDetail = (id) => { + return request({ + url: '/api/warehouse/detail', + method: 'get', + params: { + id + } + }) +} + +export const remove = (ids) => { + return request({ + url: '/api/warehouse/remove', + method: 'post', + params: { + ids, + } + }) +} + +export const add = (row) => { + return request({ + url: '/api/warehouse/submit', + method: 'post', + data: row + }) +} + +export const update = (row) => { + return request({ + url: '/api/warehouse/submit', + method: 'post', + data: row + }) +} + +export const auditing = (ids) => { + return request({ + url: '/api/warehouse/auditing', + method: 'post', + params: { + ids, + } + }) +} + +export const reject = (ids) => { + return request({ + url: '/api/warehouse/reject', + method: 'post', + params: { + ids, + } + }) +} diff --git a/src/views/leger/equipmentledgerDetail.vue b/src/views/leger/equipmentledgerDetail.vue index 9768d34..f4d05b2 100644 --- a/src/views/leger/equipmentledgerDetail.vue +++ b/src/views/leger/equipmentledgerDetail.vue @@ -56,6 +56,7 @@ @row-update="document_rowUpdate" @row-save="document_rowSave" @row-del="document_rowDel" + :upload-before="uploadBefore" :upload-after="uploadAfter" :upload-preview="(file) => handleUploadPreview(file)" :upload-delete="(file) => handleUploadDelete(file)"> @@ -624,7 +625,9 @@ dataType: 'object', fileType: 'img',//img/video/audio type: 'upload', + accept: '.pdf', // hide: true, + tip: '仅能支持上传pdf文件格式', limit: 1, propsHttp: { res: 'data', @@ -950,6 +953,15 @@ handleDownload(row) { window.open(`/api/system/file/download?daf-auth=${getToken()}&fileName=${row.accessoryName}`); }, + uploadBefore(file, done, loading) { + if (file && file.name && file.name.toLowerCase().endsWith('.pdf')) { + done(); + } else { + this.$message.error('只能上传 PDF 格式的文件'); + loading(); + return false; + } + }, uploadAfter(response, done) { // response 是服务器响应 this.document_form.accessoryName = response.fileName; diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue index cec0ade..5b01df2 100644 --- a/src/views/smart/workorder.vue +++ b/src/views/smart/workorder.vue @@ -22,10 +22,10 @@ 批量删除