From 49c99c8e4d608a6ac6b6cdb5d13f492fe5c77dd2 Mon Sep 17 00:00:00 2001
From: tzy1042411602 <1042411602@qq.com>
Date: Tue, 7 Jan 2025 09:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=A8=A1=E5=9D=97=EF=BC=8C?=
=?UTF-8?q?=E6=8E=A8=E9=80=81bom=20=E6=8E=A8=E9=80=81=E5=B7=A5=E8=89=BA?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=AD=89=20=EF=BC=9A=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=AE=8C=E5=85=A8=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/system/materials.js | 44 +++
src/api/system/newMaterials.js | 44 +++
src/views/login.vue | 2 +-
src/views/system/details/index.vue | 11 +-
src/views/system/materials/index.vue | 373 +++++++++++++++++++++
src/views/system/newMaterials/index.vue | 417 ++++++++++++++++++++++++
src/views/system/route/index.vue | 22 +-
src/views/system/stockData/index.vue | 27 +-
8 files changed, 922 insertions(+), 18 deletions(-)
create mode 100644 src/api/system/materials.js
create mode 100644 src/api/system/newMaterials.js
create mode 100644 src/views/system/materials/index.vue
create mode 100644 src/views/system/newMaterials/index.vue
diff --git a/src/api/system/materials.js b/src/api/system/materials.js
new file mode 100644
index 0000000..8f44371
--- /dev/null
+++ b/src/api/system/materials.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电器物料管理列表
+export function listMaterials(query) {
+ return request({
+ url: '/system/materials/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询电器物料管理详细
+export function getMaterials(id) {
+ return request({
+ url: '/system/materials/' + id,
+ method: 'get'
+ })
+}
+
+// 新增电器物料管理
+export function addMaterials(data) {
+ return request({
+ url: '/system/materials',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改电器物料管理
+export function updateMaterials(data) {
+ return request({
+ url: '/system/materials',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除电器物料管理
+export function delMaterials(id) {
+ return request({
+ url: '/system/materials/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/api/system/newMaterials.js b/src/api/system/newMaterials.js
new file mode 100644
index 0000000..4baa1ca
--- /dev/null
+++ b/src/api/system/newMaterials.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询金蝶物料管理列表
+export function listMaterials(query) {
+ return request({
+ url: '/system/newMaterials/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询金蝶物料管理详细
+export function getMaterials(id) {
+ return request({
+ url: '/system/newMaterials/' + id,
+ method: 'get'
+ })
+}
+
+// 新增金蝶物料管理
+export function addMaterials(data) {
+ return request({
+ url: '/system/newMaterials',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改金蝶物料管理
+export function updateMaterials(data) {
+ return request({
+ url: '/system/newMaterials',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除金蝶物料管理
+export function delMaterials(id) {
+ return request({
+ url: '/system/newMaterials/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/login.vue b/src/views/login.vue
index ddbfb09..f2328d6 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -73,7 +73,7 @@ export default {
codeUrl: "",
loginForm: {
username: "admin",
- password: "123456",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
diff --git a/src/views/system/details/index.vue b/src/views/system/details/index.vue
index e145da5..ba5ffbe 100644
--- a/src/views/system/details/index.vue
+++ b/src/views/system/details/index.vue
@@ -136,7 +136,7 @@
icon="el-icon-upload2"
size="mini"
@click="updateFBMaterial"
- v-hasPermi="['system:details:updateMaterial']"
+ v-hasPermi="['system:details:updateFBMaterial']"
>更新物料清单
@@ -235,7 +235,10 @@
-
+
+
+
+
@@ -459,7 +462,7 @@ export default {
updateFBMaterial(row) {
this.loading = true;
this.reset();
-
+
// 获取选中行的数据
const selectedData = this.ids.map(id => {
const item = this.detailsList.find(row => row.id === id);
@@ -470,7 +473,7 @@ export default {
});
console.log('发送数据:', selectedData);
-
+
// 调用接口
updateFBl(selectedData).then(response => {
this.form = response;
diff --git a/src/views/system/materials/index.vue b/src/views/system/materials/index.vue
new file mode 100644
index 0000000..9510237
--- /dev/null
+++ b/src/views/system/materials/index.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/newMaterials/index.vue b/src/views/system/newMaterials/index.vue
new file mode 100644
index 0000000..759f1dd
--- /dev/null
+++ b/src/views/system/newMaterials/index.vue
@@ -0,0 +1,417 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 修改
+
+
+ 删除
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/route/index.vue b/src/views/system/route/index.vue
index 9f8fbb4..5c021e4 100644
--- a/src/views/system/route/index.vue
+++ b/src/views/system/route/index.vue
@@ -95,16 +95,19 @@
-->
-
+
+
+
+
+ {{ scope.row.firstBatchQuantity }}
+
+
+
+
+
+
+ {{ scope.row.materialCode }}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.triggerTime, '{y}-{m}-{d}') }}
-
+