From 50b1b07bfa382c3f19c6b23f1cff4dfa50294f07 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 30 十一月 2023 10:58:38 +0800
Subject: [PATCH] feat: 库存管理 增加加载状态
---
admin-web/src/views/stock/ledger/inventoryQuery/index.vue | 175 ++++++++++++++++++++++++---------------------------------
1 files changed, 74 insertions(+), 101 deletions(-)
diff --git a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
index 617ee74..6f5f6d8 100644
--- a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
@@ -10,13 +10,13 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
</el-card>
</el-container>
</el-container>
-
+
</div>
</template>
@@ -24,15 +24,11 @@
import MyTableV2 from '@/components/myTable/myTableV2';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse, getCategorySelectTree, treeList } from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
-import { doExport } from '@/api/stock/ledger';
+import {doExport} from '@/api/stock/ledger';
export default {
name: 'index',
- components: { MyButton, MyTableV2 },
+ components: {MyButton, MyTableV2},
data() {
return {
// 鎼滅储妗�
@@ -42,9 +38,10 @@
dataIndex: 'agencyId',
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
defaultValue: '',
options: [],
+ cascader: [{key: 'warehouseId', queryKey: 'agencyId'}, {key: 'goodsTemplateId', queryKey: 'agencyId'}],
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
},
{
type: 'select',
@@ -53,21 +50,39 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- },
- {
- type: 'text',
- dataIndex: 'goodsTemplateName',
- label: '鐗╁搧鍚嶇О',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
+ optionsConfig: {
+ label: 'warehouseName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse'
+ },
},
{
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: '鍒嗙被',
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
+ optionsConfig: {
+ label: 'label',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree',
+ props: {checkStrictly: false, emitPath: false, value: 'id'}
+ },
},
{
type: 'select',
@@ -75,17 +90,23 @@
label: '绫诲埆',
placeholder: '璇烽�夋嫨',
defaultValue: '',
- options: [],
+ options: [{
+ label: 'A',
+ value: '1'
+ }, {
+ label: 'B',
+ value: '2'
+ }, {
+ label: 'C',
+ value: '3'
+ }],
},
],
// 鏍戞暟鎹�
treeDataList: [],
// 鎼滅储鏉′欢
filterFrom: {
- tenantId: null,
- userName: null,
- userPhone: null,
- status: 1,
+ warehouseType: 0
},
// 琛ㄦ牸鏁版嵁
table: {
@@ -115,14 +136,14 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'center' },
- { title: '浠撳簱', field: 'warehouseName', align: 'center' },
- { title: '鍒嗙被', field: 'categoryName', align: 'center' },
- { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left' },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left' },
- { title: '鍗曚綅', field: 'unit', align: 'left' },
- { title: '褰撳墠搴撳瓨', field: 'kucun', align: 'left' },
+ {title: '鏈烘瀯', field: 'agencyName', align: 'left', minWidth: 130},
+ {title: '浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130},
+ {title: '鍒嗙被', field: 'categoryName', align: 'left', minWidth: 130},
+ {title: '鎵�灞炵被鍒�', field: 'costType', align: 'center', width: 80},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 140},
+ {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', minWidth: 130},
+ {title: '鍗曚綅', field: 'unit', align: 'center', width: 80},
+ {title: '褰撳墠搴撳瓨', field: 'kucun', align: 'center'},
],
paging: {
show: true, // 鏄剧ず鍒嗛〉
@@ -138,53 +159,8 @@
};
},
created() {
- this.initQuery();
},
methods: {
- initQuery() {
- selectTenantWarehouse().then((res) => {
- this.items.forEach((v) => {
- if (v.label == '浠撳簱') {
- v.options = res.map((item) => {
- item.label = item.warehouseName;
- item.value = item.id;
- return item;
- });
- }
- });
- console.log('this.items', this.items);
- });
- getDicts('GOODS_PRICE').then((res) => {
- // 浠峰�肩被鍨�1A 2B 3C
- this.items.forEach((v) => {
- if (v.label == '绫诲埆') {
- v.options = res.map((v) => {
- v.label = v.dict_label;
- if (v.dict_value == 'A') {
- v.value = 1;
- } else if (v.dict_value == 'B') {
- v.value = 2;
- } else {
- v.value = 3;
- }
- return v;
- });
- }
- });
- });
- treeList().then((res) => {
- this.items.forEach((v) => {
- if (v.label == '鍒嗙被') {
- v.options = res.map((item) => {
- item.label = item.categoryName;
- item.value = item.id;
- return item;
- });
- }
- });
- });
- },
-
// 瀵煎嚭
handleExport() {
let loading = this.$loading({
@@ -194,30 +170,30 @@
background: 'rgba(0, 0, 0, 0.7)',
});
// 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
- doExport({ ...this.filterFrom })
- .then((res) => {
- const blob = new Blob([res], { type: 'application/vnd.ms-excel' });
- const fileName = `搴撳瓨鏌ヨ.xls`;
- if ('download' in document.createElement('a')) {
- // 闈濱E涓嬭浇
- const elink = document.createElement('a');
- elink.download = fileName;
- elink.style.display = 'none';
- elink.href = URL.createObjectURL(blob);
- document.body.appendChild(elink);
- elink.click();
- URL.revokeObjectURL(elink.href);
- document.body.removeChild(elink);
- } else {
- // IE10+涓嬭浇
- navigator.msSaveBlob(blob, fileName);
- }
- this.$message.success('瀵煎嚭鎴愬姛锛�');
- loading.close();
- })
- .catch(() => {
- loading.close();
- });
+ doExport({...this.filterFrom})
+ .then((res) => {
+ const blob = new Blob([res], {type: 'application/vnd.ms-excel'});
+ const fileName = `搴撳瓨鏌ヨ.xls`;
+ if ('download' in document.createElement('a')) {
+ // 闈濱E涓嬭浇
+ const elink = document.createElement('a');
+ elink.download = fileName;
+ elink.style.display = 'none';
+ elink.href = URL.createObjectURL(blob);
+ document.body.appendChild(elink);
+ elink.click();
+ URL.revokeObjectURL(elink.href);
+ document.body.removeChild(elink);
+ } else {
+ // IE10+涓嬭浇
+ navigator.msSaveBlob(blob, fileName);
+ }
+ this.$message.success('瀵煎嚭鎴愬姛锛�');
+ loading.close();
+ })
+ .catch(() => {
+ loading.close();
+ });
},
// 鏌ヨtable鍒楄〃
@@ -230,9 +206,6 @@
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
- if (params.agencyId && params.agencyId.length) {
- this.filterFrom.agencyId = params.agencyId[params.agencyId.length - 1];
- }
this.search(1);
},
},
--
Gitblit v1.9.1