From 774e6e650b6235a9e34dfecab65c4322c1767714 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 16:48:15 +0800
Subject: [PATCH] feat: 库存管理 查询条件梳理
---
admin-web/src/views/stock/ledger/alertQuery/index.vue | 2
admin-web/src/views/statisticalreport/itemReport/index.vue | 2
admin-web/src/views/stock/ledger/inventoryAlert/index.vue | 28 +++---
admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 29 ++++---
admin-web/src/views/stock/ledger/inventoryQuery/index.vue | 29 +++---
admin-web/src/views/stock/procure/receiptDetails/index.vue | 19 ++--
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 19 ++--
admin-web/src/views/stock/accessStock/outbound/index.vue | 19 ++--
admin-web/src/views/stock/scrap/itemScrapping/index.vue | 19 ++--
admin-web/src/views/stock/scrap/scrapDetails/index.vue | 20 ++--
admin-web/src/views/stock/accessStock/outboundDetails/index.vue | 19 ++--
admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue | 1
12 files changed, 108 insertions(+), 98 deletions(-)
diff --git a/admin-web/src/views/statisticalreport/itemReport/index.vue b/admin-web/src/views/statisticalreport/itemReport/index.vue
index 8d136da..b82ae8e 100644
--- a/admin-web/src/views/statisticalreport/itemReport/index.vue
+++ b/admin-web/src/views/statisticalreport/itemReport/index.vue
@@ -86,7 +86,7 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- cascader: [{key:'warehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ cascader: [{key:'baseWarehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
},
{
diff --git a/admin-web/src/views/stock/accessStock/outbound/index.vue b/admin-web/src/views/stock/accessStock/outbound/index.vue
index edff820..a40e6d0 100644
--- a/admin-web/src/views/stock/accessStock/outbound/index.vue
+++ b/admin-web/src/views/stock/accessStock/outbound/index.vue
@@ -105,6 +105,16 @@
defaultValue: '',
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -116,15 +126,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
},
{
type: 'text',
diff --git a/admin-web/src/views/stock/accessStock/outboundDetails/index.vue b/admin-web/src/views/stock/accessStock/outboundDetails/index.vue
index 85757c2..095d378 100644
--- a/admin-web/src/views/stock/accessStock/outboundDetails/index.vue
+++ b/admin-web/src/views/stock/accessStock/outboundDetails/index.vue
@@ -80,6 +80,16 @@
},
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -105,15 +115,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
- defaultValue: '',
- options: [],
},
{
type: 'text',
diff --git a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
index 2ba53aa..9925dc5 100644
--- a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
+++ b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
@@ -39,6 +39,7 @@
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ cascader: [{key:'warehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
defaultValue: '',
options: [],
},
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index b315b68..1d3c0ad 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -41,7 +41,6 @@
import edit from './edit';
import inventory from './inventory';
import detail from './detail';
-import {selectTenantWarehouse} from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
import {getBaseUrl} from '@/utils/base';
import {inventoryDel, inventoryListApi} from '@/api/stock/inventory';
@@ -72,12 +71,27 @@
defaultValue: '',
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ cascader: [{key:'warehouseId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'warehouseId',
- label: '鐩樼偣浠撳簱',
+ label: '浠撳簱',
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
+ optionsConfig: {
+ label: 'warehouseName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse'
+ },
},
{
type: 'date-picker',
@@ -296,17 +310,6 @@
...mapGetters(['userInfo']),
},
created() {
- selectTenantWarehouse({agencyId: this.userInfo.tenantId}).then((res) => {
- this.items.forEach((v) => {
- if (v.label == '鐩樼偣浠撳簱') {
- v.options = res.map((item) => {
- item.label = item.warehouseName;
- item.value = item.id;
- return item;
- });
- }
- });
- });
},
methods: {
//瀵煎叆
diff --git a/admin-web/src/views/stock/ledger/alertQuery/index.vue b/admin-web/src/views/stock/ledger/alertQuery/index.vue
index bb2c3eb..9ae6e63 100644
--- a/admin-web/src/views/stock/ledger/alertQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/alertQuery/index.vue
@@ -40,7 +40,7 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
+ cascader: [{key: 'goodsTemplateId', queryKey: 'categoryId'}],
optionsConfig: {
label: 'label',
value: 'id',
diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
index 034560a..21937cd 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
@@ -70,20 +70,6 @@
},
},
{
- type: 'select',
- dataIndex: 'baseGoodsTemplateId',
- label: '鐗╁搧鍚嶇О',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
- options: [],
- cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
- optionsConfig: {
- label: 'goodsName',
- value: 'id',
- url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
- },
- },
- {
type: 'cascader',
dataIndex: 'categoryId',
label: '鍒嗙被',
@@ -96,6 +82,20 @@
url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
props: {checkStrictly: false, emitPath: false, value: 'id'}
},
+ cascader: [{key:'baseGoodsTemplateId',queryKey: 'categoryId'}],
+ },
+ {
+ type: 'select',
+ dataIndex: 'baseGoodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'select',
diff --git a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
index 6f5f6d8..fd575fa 100644
--- a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
@@ -57,20 +57,6 @@
},
},
{
- type: 'select',
- dataIndex: 'goodsTemplateId',
- label: '鐗╁搧鍚嶇О',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
- options: [],
- cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
- optionsConfig: {
- label: 'goodsName',
- value: 'id',
- url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
- },
- },
- {
type: 'cascader',
dataIndex: 'categoryId',
label: '鍒嗙被',
@@ -83,6 +69,21 @@
url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
props: {checkStrictly: false, emitPath: false, value: 'id'}
},
+ cascader: [{key:'goodsTemplateId',queryKey: 'categoryId'}],
+ },
+ {
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'select',
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 9cfba3c..13d4749 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -151,6 +151,16 @@
// defaultValue: '',
// },
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -162,15 +172,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
},
{
type: 'text',
diff --git a/admin-web/src/views/stock/procure/receiptDetails/index.vue b/admin-web/src/views/stock/procure/receiptDetails/index.vue
index 761db8c..b11e83c 100644
--- a/admin-web/src/views/stock/procure/receiptDetails/index.vue
+++ b/admin-web/src/views/stock/procure/receiptDetails/index.vue
@@ -51,6 +51,16 @@
defaultValue: '',
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -76,15 +86,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
},
{
type: 'text',
diff --git a/admin-web/src/views/stock/scrap/itemScrapping/index.vue b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
index 7af5ed1..e41cad4 100644
--- a/admin-web/src/views/stock/scrap/itemScrapping/index.vue
+++ b/admin-web/src/views/stock/scrap/itemScrapping/index.vue
@@ -122,6 +122,16 @@
defaultValue: '',
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -133,15 +143,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
- defaultValue: '',
- options: [],
},
{
type: 'date-picker',
diff --git a/admin-web/src/views/stock/scrap/scrapDetails/index.vue b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
index 7a267ae..5eb5089 100644
--- a/admin-web/src/views/stock/scrap/scrapDetails/index.vue
+++ b/admin-web/src/views/stock/scrap/scrapDetails/index.vue
@@ -53,7 +53,16 @@
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
-
+ {
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
{
type: 'select',
dataIndex: 'goodsTemplateId',
@@ -80,15 +89,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
},
{
type: 'text',
--
Gitblit v1.9.1