From 0fded348401ad3636a1137703426a68531fd0fa6 Mon Sep 17 00:00:00 2001 From: wangmeng <1620161711@qq.com> Date: Mon, 29 Dec 2025 10:55:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=86=B2=E7=AA=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/firstOrder/inbound.vue | 70 ------------------------------- src/views/firstOrder/outbound.vue | 38 ----------------- 2 files changed, 108 deletions(-) diff --git a/src/views/firstOrder/inbound.vue b/src/views/firstOrder/inbound.vue index b689b73..4eafe72 100644 --- a/src/views/firstOrder/inbound.vue +++ b/src/views/firstOrder/inbound.vue @@ -134,7 +134,6 @@ export default { { label: "采购单名称", prop: "purchaseEndInfo", -<<<<<<< HEAD width: 150, align: "center", formatter: (row, column) => { @@ -144,23 +143,12 @@ export default { } return value; // 有值时显示原内容 } -======= - width: 180, - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "入库单号", prop: "orderNo", -<<<<<<< HEAD width: 160, align: "center" -======= - width: 110, - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "入库日期", @@ -170,18 +158,10 @@ export default { searchRange: true, startPlaceholder: "开始时间", endPlaceholder: "结束时间", -<<<<<<< HEAD format: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss', width: 160, align: "center" -======= - format: "yyyy-MM-dd HH:mm:ss", - valueFormat: "yyyy-MM-dd HH:mm:ss", - width: 140, - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 // searchParam: 'startTime', // searchEndParam: 'endTime' }, @@ -189,42 +169,25 @@ export default { label: "入库人", prop: "inOperatorName", search: true, -<<<<<<< HEAD searchParam: 'inOperator', align: "center" -======= - searchParam: "inOperator", - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "来源", prop: "source", search: false, -<<<<<<< HEAD align: "center" -======= - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "事由", prop: "reason", search: false, -<<<<<<< HEAD align: "center" -======= - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "物资类型", prop: "materialType", search: false, -<<<<<<< HEAD type: 'select', align: "center", dicData: [{ @@ -235,41 +198,16 @@ export default { label: '其他物资', value: '2' }] -======= - type: "select", - headerAlign: "center", - align: "center", - dicData: [ - { - label: "办公物资", - value: "1", - }, - { - label: "其他物资", - value: "2", - }, - ], ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "审批人员", prop: "approvers", -<<<<<<< HEAD align: "center" -======= - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "状态", prop: "status", -<<<<<<< HEAD type: 'select', -======= - type: "select", - headerAlign: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 align: "center", dicData: [ { @@ -310,19 +248,11 @@ export default { }, // 详情 handleDetails(row) { -<<<<<<< HEAD this.inDialogVisible = true this.inDialogType = 'details' this.inDialogTiltle = '详情' this.id = row.id console.log(this.id, 'id') -======= - this.inDialogVisible = true; - this.inDialogType = "details"; - this.inDialogTiltle = "详情"; - this.id = row.id; - console.log(this.id, "id"); ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, // 编辑 handleEdit(row) { diff --git a/src/views/firstOrder/outbound.vue b/src/views/firstOrder/outbound.vue index 92760dd..c1e216a 100644 --- a/src/views/firstOrder/outbound.vue +++ b/src/views/firstOrder/outbound.vue @@ -86,26 +86,14 @@ export default { { label: "需求单名称", prop: "demandEndInfo", -<<<<<<< HEAD width: 150, align: "center" -======= - width: 180, - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "出库单号", prop: "orderNo", -<<<<<<< HEAD width: 160, align: "center" -======= - width: 110, - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "出库日期", @@ -117,14 +105,8 @@ export default { endPlaceholder: "结束时间", format: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss', -<<<<<<< HEAD width: 160, align: "center" -======= - width: 140, - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 // searchParam: 'startTime', // searchEndParam: 'endTime' }, @@ -132,22 +114,13 @@ export default { label: "事由", prop: "reason", search: false, -<<<<<<< HEAD align: "center" -======= - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "物资类型", prop: "materialType", search: false, type: 'select', -<<<<<<< HEAD -======= - headerAlign: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 align: "center", dicData: [{ label: '办公物资', @@ -161,25 +134,14 @@ export default { { label: "部门", prop: "department", -<<<<<<< HEAD align: "center" -======= - headerAlign: "center", - align: "center", ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, { label: "出库人", prop: "shipperName", search: true, -<<<<<<< HEAD searchParam: 'inOperator', align: "center" -======= - headerAlign: "center", - align: "center", - searchParam: 'inOperator' ->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817 }, // { From 9d0bb4dd087b747ec5f9539fc825c593417769f2 Mon Sep 17 00:00:00 2001 From: wangmeng <1620161711@qq.com> Date: Tue, 30 Dec 2025 17:57:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dict.js | 18 +++++++++--------- src/api/system/menu.js | 18 +++++++++--------- src/api/system/role.js | 12 ++++++------ src/views/authority/role.vue | 10 +++++----- src/views/system/dict.vue | 5 +++-- src/views/system/menu.vue | 9 +++++---- 6 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/api/system/dict.js b/src/api/system/dict.js index 572f1da..b972d90 100644 --- a/src/api/system/dict.js +++ b/src/api/system/dict.js @@ -2,7 +2,7 @@ import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ - url: '/api/blade-system/dict/list', + url: '/smartpark/dict/list', method: 'get', params: { ...params, @@ -14,7 +14,7 @@ export const getList = (current, size, params) => { export const getParentList = (current, size, params) => { return request({ - url: '/api/blade-system/dict/parent-list', + url: '/smartpark/dict/parent-list', method: 'get', params: { ...params, @@ -26,7 +26,7 @@ export const getParentList = (current, size, params) => { export const getChildList = (current, size, parentId, params) => { return request({ - url: '/api/blade-system/dict/child-list', + url: '/smartpark/dict/child-list', method: 'get', params: { ...params, @@ -39,7 +39,7 @@ export const getChildList = (current, size, parentId, params) => { export const remove = (ids) => { return request({ - url: '/api/blade-system/dict/remove', + url: '/smartpark/dict/remove', method: 'post', params: { ids, @@ -49,7 +49,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/api/blade-system/dict/submit', + url: '/smartpark/dict/submit', method: 'post', data: row }) @@ -57,7 +57,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/blade-system/dict/submit', + url: '/smartpark/dict/submit', method: 'post', data: row }) @@ -66,7 +66,7 @@ export const update = (row) => { export const getDict = (id) => { return request({ - url: '/api/blade-system/dict/detail', + url: '/smartpark/dict/detail', method: 'get', params: { id, @@ -75,14 +75,14 @@ export const getDict = (id) => { } export const getDictTree = () => { return request({ - url: '/api/blade-system/dict/tree?code=DICT', + url: '/smartpark/dict/tree?code=DICT', method: 'get' }) } export const getDictionary = (params) => { return request({ - url: '/api/blade-system/dict/dictionary', + url: '/smartpark/dict/dictionary', method: 'get', params, }) diff --git a/src/api/system/menu.js b/src/api/system/menu.js index 0b6382d..77d38b7 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -2,7 +2,7 @@ import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ - url: '/api/blade-system/menu/list', + url: '/smartpark/menu/list', method: 'get', params: { ...params, @@ -14,7 +14,7 @@ export const getList = (current, size, params) => { export const getLazyList = (parentId, params) => { return request({ - url: '/api/blade-system/menu/lazy-list', + url: '/smartpark/menu/lazy-list', method: 'get', params: { ...params, @@ -25,7 +25,7 @@ export const getLazyList = (parentId, params) => { export const getLazyMenuList = (parentId, params) => { return request({ - url: '/api/blade-system/menu/lazy-menu-list', + url: '/smartpark/menu/lazy-menu-list', method: 'get', params: { ...params, @@ -36,7 +36,7 @@ export const getLazyMenuList = (parentId, params) => { export const getMenuList = (current, size, params) => { return request({ - url: '/api/blade-system/menu/menu-list', + url: '/smartpark/menu/menu-list', method: 'get', params: { ...params, @@ -48,7 +48,7 @@ export const getMenuList = (current, size, params) => { export const getMenuTree = (tenantId) => { return request({ - url: '/api/blade-system/menu/tree', + url: '/smartpark/menu/tree', method: 'get', params: { tenantId, @@ -58,7 +58,7 @@ export const getMenuTree = (tenantId) => { export const remove = (ids) => { return request({ - url: '/api/blade-system/menu/remove', + url: '/smartpark/menu/remove', method: 'post', params: { ids, @@ -68,7 +68,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/api/blade-system/menu/submit', + url: '/smartpark/menu/submit', method: 'post', data: row }) @@ -76,7 +76,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/blade-system/menu/submit', + url: '/smartpark/menu/submit', method: 'post', data: row }) @@ -84,7 +84,7 @@ export const update = (row) => { export const getMenu = (id) => { return request({ - url: '/api/blade-system/menu/detail', + url: '/smartpark/menu/detail', method: 'get', params: { id, diff --git a/src/api/system/role.js b/src/api/system/role.js index 13bf8cc..be4d4d3 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -2,7 +2,7 @@ import request from '@/router/axios'; export const getList = (current, size, params) => { return request({ - url: '/api/blade-system/role/list', + url: '/smartpark/role/list', method: 'get', params: { ...params, @@ -33,7 +33,7 @@ export const grant = (roleIds, menuIds, dataScopeIds, apiScopeIds) => { export const remove = (ids) => { return request({ - url: '/api/blade-system/role/remove', + url: '/smartpark/role/remove', method: 'post', params: { ids, @@ -43,7 +43,7 @@ export const remove = (ids) => { export const add = (row) => { return request({ - url: '/api/blade-system/role/submit', + url: '/smartpark/role/submit', method: 'post', data: row }) @@ -51,7 +51,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/blade-system/role/submit', + url: '/smartpark/role/submit', method: 'post', data: row }) @@ -80,7 +80,7 @@ export const getRoleTree = (tenantId) => { export const getRoleTreeById = (roleId) => { return request({ - url: '/api/blade-system/role/tree-by-id', + url: '/smartpark/role/tree-by-id', method: 'get', params: { roleId, @@ -90,7 +90,7 @@ export const getRoleTreeById = (roleId) => { export const getRoleAlias = () => { return request({ - url: '/api/blade-system/role/alias', + url: '/smartpark/role/alias', method: 'get', params: {}, }); diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index 6006311..f2df694 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -69,7 +69,7 @@ > - + @@ -308,7 +308,7 @@ export default { initData(roleId) { getRoleTreeById(roleId).then((res) => { const column = this.findObject(this.option.column, "parentId"); - column.dicData = res.data.data; + column.dicData = res.data.result; }); }, submit() { @@ -398,7 +398,7 @@ export default { } getRoleAlias().then((res) => { const column = this.findObject(this.option.column, "currentAlias"); - column.dicData = res.data.data; + column.dicData = res.data.result; }); done(); }, @@ -477,7 +477,7 @@ export default { page.pageSize, Object.assign(params, this.query) ).then((res) => { - this.data = res.data.data; + this.data = res.data.result; this.loading = false; this.selectionClear(); }); diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue index 7b136f4..1771b2f 100644 --- a/src/views/system/dict.vue +++ b/src/views/system/dict.vue @@ -420,7 +420,8 @@ export default { page.pageSize, Object.assign(params, this.query) ).then(res => { - const data = res.data.data; + const data = res.data.result; + // console.log("data", data) this.pageParent.total = data.total; this.dataParent = data.records; this.loading = false; @@ -435,7 +436,7 @@ export default { this.parentId, Object.assign(params, this.query) ).then(res => { - this.dataChild = res.data.data; + this.dataChild = res.data.result; this.loadingChild = false; this.selectionClear(); }); diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue index eb15fa7..4873825 100644 --- a/src/views/system/menu.vue +++ b/src/views/system/menu.vue @@ -271,7 +271,7 @@ initData() { getMenuTree().then(res => { const column = this.findObject(this.option.column, "parentId"); - column.dicData = res.data.data; + column.dicData = res.data.result; }); }, handleAdd(row) { @@ -284,7 +284,7 @@ rowSave(row, done, loading) { add(row).then((res) => { // 获取新增数据的相关字段 - const data = res.data.data; + const data = res.data.result; row.id = data.id; this.$message({ type: "success", @@ -404,7 +404,7 @@ onLoad(page, params = {}) { this.loading = true; getLazyList(this.parentId, Object.assign(params, this.query)).then(res => { - this.data = res.data.data; + this.data = res.data.result; this.loading = false; this.selectionClear(); }); @@ -412,7 +412,8 @@ treeLoad(tree, treeNode, resolve) { const parentId = tree.id; getLazyList(parentId).then(res => { - resolve(res.data.data); + + resolve(res.data.result); }); } } From c267ad940afde946ac5e047d7dde1a63743a16de Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Wed, 31 Dec 2025 09:39:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=90=E7=94=A8=E5=93=81=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=92=8C=E5=BD=92=E8=BF=98=E9=80=BB=E8=BE=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/materials/components/returnDialog.vue | 14 ++++++++++++++ src/views/materials/components/scrapDialog.vue | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/views/materials/components/returnDialog.vue b/src/views/materials/components/returnDialog.vue index 3d9ed9d..4739c16 100644 --- a/src/views/materials/components/returnDialog.vue +++ b/src/views/materials/components/returnDialog.vue @@ -60,6 +60,20 @@ export default { }, ], }, + { + label: "归还时间", + prop: "sex", + span: 24, + type:'textarea', + rows:5, + rules: [ + { + required: true, + message: "请选择", + trigger: "blur", + }, + ], + }, ], }, }; diff --git a/src/views/materials/components/scrapDialog.vue b/src/views/materials/components/scrapDialog.vue index 5722abb..e11df15 100644 --- a/src/views/materials/components/scrapDialog.vue +++ b/src/views/materials/components/scrapDialog.vue @@ -61,6 +61,20 @@ export default { }, ], }, + { + label: "报废时间", + prop: "sex", + span: 24, + type:'textarea', + rows:5, + rules: [ + { + required: true, + message: "请选择", + trigger: "blur", + }, + ], + }, ], }, };