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/inventoryAlert/index.vue | 130 ++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 45 deletions(-)
diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
index bedff7b..21937cd 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
@@ -10,14 +10,19 @@
<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>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search" />
+ <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
</el-card>
</el-container>
</el-container>
+ <my-import
+ :import-setting="importSetting"
+ :dialog-show="importSetting.dialogShow"
+ :dialog-title="importSetting.dialogTitle"
+ />
</div>
</template>
@@ -27,15 +32,13 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse, treeList } from '@/api/baseSetting/finsystenant';
-import {warningConfigGetDel} from '@/api/stock/ledger'
-import { getDicts } from '@/api/system/dict/data';
-import { mapGetters } from 'vuex';
+import {getBaseUrl} from '@/utils/base';
+import {warningConfigGetDel} from '@/api/stock/ledger';
+import {mapGetters} from 'vuex';
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit },
+ components: {MyButton, MyTableV2, edit, myImport},
data() {
return {
// 鎼滅储妗�
@@ -47,8 +50,11 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- cascader: [{key:'warehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [
+ {key: 'warehouseId', queryKey: 'agencyId'},
+ {key: 'goodsTemplateId', queryKey: 'agencyId'},
+ ],
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
},
{
type: 'select',
@@ -60,17 +66,31 @@
optionsConfig: {
label: 'warehouseName',
value: 'id',
- url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse'
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse',
},
},
{
+ 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'}
+ },
+ cascader: [{key:'baseGoodsTemplateId',queryKey: 'categoryId'}],
+ },
+ {
type: 'select',
- dataIndex: 'goodsTemplateId',
+ dataIndex: 'baseGoodsTemplateId',
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- cascader: [{key:'categoryId',queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -79,33 +99,40 @@
},
{
type: 'select',
- dataIndex: 'categoryId',
- label: '鍒嗙被',
- placeholder: '璇烽�夋嫨',
- defaultValue: '',
- options: [],
- optionsConfig: {
- label: 'modelName',
- value: 'id',
- url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel'
- },
- },
- {
- type: 'select',
dataIndex: 'costType',
label: '绫诲埆',
placeholder: '璇烽�夋嫨',
defaultValue: '',
- options: [],
- optionsConfig: {
- label: 'dict_label',
- value: 'dict_value',
- url: SettingIplatform.apiBaseURL + '/permit/dict/data/type/GOODS_PRICE',
- },
+ options: [{
+ label: 'A',
+ value: '1'
+ }, {
+ label: 'B',
+ value: '2'
+ }, {
+ label: 'C',
+ value: '3'
+ }],
},
],
- // 鏍戞暟鎹�
- treeDataList: [],
+ // 瀵煎叆
+ importSetting: {
+ dialogTitle: '瀵煎叆',
+ dialogShow: false,
+ fileSettings: {
+ data: {},
+ uploadUrl: getBaseUrl() + "/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
+ accept: '.xls', // 鏍煎紡
+ type: 'text', // 鍥炴樉褰㈠紡
+ loading: false // 瀵煎叆鏁堟灉
+ },
+ /* 妯℃澘涓嬭浇 */
+ templateSettings: {
+ templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
+ },
+ onSuccess: null
+ },
// 鎼滅储鏉′欢
filterFrom: {
warehouseType: 0,
@@ -140,23 +167,23 @@
},
},
{
- name: '瀵煎嚭',
+ name: '瀵煎叆',
click: () => {
- this.handleExport();
+ this.importOrg();
},
},
],
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'agencyName', align: 'left' },
- { title: '浠撳簱', field: 'warehouseName', align: 'center' },
- { title: '鍒嗙被', field: 'categoryName', align: 'center' },
- { title: '鎵�灞炵被鍒�', field: 'costType', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left' },
- { title: '瑙勬牸鍨嬪彿', field: 'modelName', align: 'left' },
- { title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'left' },
- { title: '灏侀《搴撳瓨', field: 'upperLimit', 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: 'goodsName', align: 'left', minWidth: 130},
+ {title: '瑙勬牸鍨嬪彿', field: 'modelName', align: 'left', minWidth: 130},
+ {title: '淇濆簳搴撳瓨', field: 'lowerLimit', align: 'center', width: 100},
+ {title: '灏侀《搴撳瓨', field: 'upperLimit', align: 'center', width: 100},
],
// 鎿嶄綔淇℃伅
operation: {
@@ -198,7 +225,7 @@
methods: {
del(row) {
this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ潯鐨勬暟鎹悧锛�').then(() => {
- warningConfigGetDel({ id: row.id }).then((res) => {
+ warningConfigGetDel({id: row.id}).then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
this.search();
});
@@ -216,6 +243,19 @@
this.editSetting.title = '缂栬緫';
this.editSetting.show = true;
},
+ // 瀵煎叆
+ importOrg() {
+ this.importSetting.dialogShow = true;
+ this.importSetting.onSuccess = (response, callBack) => {
+ if (response.code === 1) {
+ this.$message.success(response.msg);
+ this.search(1);
+ } else {
+ this.$message.warning(response.msg);
+ }
+ callBack();
+ };
+ },
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
--
Gitblit v1.9.1