From da38da94ddf34f39d7f6d458314a4415488c3212 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 29 Nov 2024 10:40:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=AF=B7=E6=B1=82?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/http/api/usercenter/goodsmang.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/http/api/usercenter/goodsmang.ts b/src/http/api/usercenter/goodsmang.ts
index 11b80f5..fdd9e3e 100644
--- a/src/http/api/usercenter/goodsmang.ts
+++ b/src/http/api/usercenter/goodsmang.ts
@@ -4,7 +4,7 @@ import { get, post, put } from '../../index'
// 获取装备列表
export const getEquipmentListApi = (data: any) => {
- return post('/material-mall/dev/devList', data)
+ return get('/material-mall/dev/devList', data)
}
//获取装备详情
From 171f694db1a2a9a924d9b3e41518d1d3c5f48d8c Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 29 Nov 2024 13:24:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/http/api/usercenter/goodsmang.ts | 2 +-
src/views/user/goodsManagement/index.vue | 52 +++++++++++++-----------
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/src/http/api/usercenter/goodsmang.ts b/src/http/api/usercenter/goodsmang.ts
index fdd9e3e..11b80f5 100644
--- a/src/http/api/usercenter/goodsmang.ts
+++ b/src/http/api/usercenter/goodsmang.ts
@@ -4,7 +4,7 @@ import { get, post, put } from '../../index'
// 获取装备列表
export const getEquipmentListApi = (data: any) => {
- return get('/material-mall/dev/devList', data)
+ return post('/material-mall/dev/devList', data)
}
//获取装备详情
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 52fc9e1..ac6d204 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -482,6 +482,10 @@
} else {
equipmentDeploymentParams.value.typeId = ""
}
+ if(equipmentDeploymentParams.value.deviceName==""||equipmentDeploymentParams.value.companyId==""){
+ ElMessage({type: 'error',message: '保存草稿请至少填写装备名称及所属公司!'})
+ return
+ }
// if(mainFileList.value.length==0||mainFileList.value.length>6){
// ElMessage({type: 'error',message: '主展示图不得少于1张,不得多于6张'})
// return
@@ -676,7 +680,7 @@
-
+
@@ -726,7 +730,7 @@
-
+
{{ row.firstName }} > {{ row.secondName }}>{{ row.thirdName }}
@@ -801,6 +805,19 @@
v-model="equipmentDeploymentParams.deviceName" clearable />
+
+
+
+
+
+
+
+
(equipmentDeploymentParams.deviceCount=v.replace(/[^\d.]/g,''))"
@@ -824,8 +844,6 @@
style="width: 350px;" :disabled="countDisabled"
/>
-
-
-
-
-
+
@@ -849,18 +861,12 @@
v-model="equipmentDeploymentParams.code"
clearable />
-
-
-
-
+
+
From 99ec2d950a06cbdfc1c3e86e6b2015c4e1d67bf3 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Fri, 29 Nov 2024 13:29:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A3=85=E5=A4=87=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/user/goodsManagement/index.vue | 29 ++++++++++++------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index ac6d204..7d543de 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -804,20 +804,7 @@
-
-
-
-
-
-
+
-
+
+
+
+
+