From c88176ffcdd73782e1558da29fb45f463b81dd1e Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Tue, 16 Jul 2024 16:16:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/api/Common/dictcommons.js | 20 +-
yxt-as-ui/src/api/storage/allocation.js | 54 +-
.../adjustment/relation/editPriceStrategy.vue | 17 +-
.../storage/allocation/allocationAdd.vue | 390 ++++++++++-----
.../storage/allocation/allocationInfo.vue | 198 ++++++++
.../src/views/storage/allocation/index.vue | 465 +++++++++++++-----
.../storage/deliveryNotice/receiptAdd.vue | 14 +-
7 files changed, 897 insertions(+), 261 deletions(-)
create mode 100644 yxt-as-ui/src/views/storage/allocation/allocationInfo.vue
diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js
index 505aa1fab1..4dc741125c 100644
--- a/yxt-as-ui/src/api/Common/dictcommons.js
+++ b/yxt-as-ui/src/api/Common/dictcommons.js
@@ -26,6 +26,15 @@ export function selectOrgSidList(data) {
})
}
+// 获取分公司
+export function getListOrg(data) {
+ return request({
+ url: '/portal/v1/sysorganization/getListOrg',
+ method: 'get',
+ params: data
+ })
+}
+
// 根据当前登录人orgSidPath(全路径sid)查询分公司
export function getOrgSidByPath(data) {
@@ -39,11 +48,20 @@ export function getOrgSidByPath(data) {
// 根据分公司sid查询分公司名称
export function fetchBySid(sid) {
return request({
- url: 'portal/v1/sysorganization/fetchBySid/' + sid,
+ url: '/portal/v1/sysorganization/fetchBySid/' + sid,
method: 'get'
})
}
+
+// 根据分公司Sid获取分公司下所有的部门
+export function getListDeptByOrgSid(data) {
+ return request({
+ url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
+ method: 'GET'
+ })
+}
+
// 根据当前登录用户sid获取本分公司下的销售部门和销售专员
export function selectOrgList(data) {
return request({
diff --git a/yxt-as-ui/src/api/storage/allocation.js b/yxt-as-ui/src/api/storage/allocation.js
index d36b8585ef..651de970b6 100644
--- a/yxt-as-ui/src/api/storage/allocation.js
+++ b/yxt-as-ui/src/api/storage/allocation.js
@@ -8,17 +8,43 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
method: 'post',
data: params,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
},
+ deleteBySids: function(data) {
+ return request({
+ url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
+ method: 'DELETE',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
+ },
+
+ // 保存物流信息
+ saveLogisticsInfo: function(data) {
+ return request({
+ url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/saveLogisticsInfo',
+ method: 'post',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ });
+ },
// 新增、保存
save: function(data) {
return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
method: 'post',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
});
},
@@ -36,7 +62,9 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
method: 'post',
data: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
});
},
@@ -47,7 +75,9 @@ export default {
url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
method: 'post',
data: params,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
})
},
@@ -55,12 +85,12 @@ export default {
getWarehouses: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
- method: 'post',
- data: params,
- headers: {
- 'Content-Type': 'application/json'
- }
- })
+ method: 'post',
+ data: params,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ })
},
@@ -70,7 +100,9 @@ export default {
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
params: data,
- headers: { 'Content-Type': 'application/json' }
+ headers: {
+ 'Content-Type': 'application/json'
+ }
});
},
diff --git a/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue b/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
index d6590293f4..1904b9bd35 100644
--- a/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/relation/editPriceStrategy.vue
@@ -40,7 +40,8 @@
* 加价比例(%)
-
@@ -66,7 +67,7 @@
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -74,7 +75,7 @@
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -82,7 +83,7 @@
+ oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -133,9 +134,9 @@
}
},
methods: {
- gdMarkupRateInput(val){
- console.log("gdMarkupRateInput》》》》", val)
- console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
+ gdMarkupRateInput(val) {
+ console.log("gdMarkupRateInput》》》》", val)
+ console.log("gdMarkupRateInput》》》》", this.formobj.gdMarkupRate)
},
indexMethod(index) {
return index + 1
@@ -151,7 +152,7 @@
this.$message({
showClose: true,
type: 'error',
- message: '加价比例不能为空222'
+ message: '加价比例不能为空'
})
return
diff --git a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
index cb394b045a..34313701e0 100644
--- a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
+++ b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
@@ -10,8 +10,9 @@