From 20913c80c3f5fc8e533cb92b90e6f20bcd68e032 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 17:49:32 +0800
Subject: [PATCH] feat: 1、优化导入 2、部门物品台账查询对接
---
admin-web/src/views/stock/ledger/inventoryAlert/index.vue | 174 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 91 insertions(+), 83 deletions(-)
diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
index c4a97a1..034560a 100644
--- a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
+++ b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue
@@ -10,18 +10,18 @@
<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"
+ :import-setting="importSetting"
+ :dialog-show="importSetting.dialogShow"
+ :dialog-title="importSetting.dialogTitle"
/>
</div>
</template>
@@ -31,15 +31,14 @@
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse, getCategorySelectTree } from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
+import {getBaseUrl} from '@/utils/base';
+import {warningConfigGetDel} from '@/api/stock/ledger';
+import {mapGetters} from 'vuex';
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit, myImport },
+ components: {MyButton, MyTableV2, edit, myImport},
data() {
return {
// 鎼滅储妗�
@@ -49,9 +48,13 @@
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',
@@ -60,57 +63,79 @@
placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
- },
- {
- type: 'text',
- dataIndex: 'name',
- label: '鐗╁搧鍚嶇О',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
+ optionsConfig: {
+ label: 'warehouseName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/warehouse/select/tenant_warehouse',
+ },
},
{
type: 'select',
- dataIndex: 'warehouseId',
+ 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: '鍒嗙被',
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',
- dataIndex: 'warehouseId',
+ dataIndex: 'costType',
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,
- },
// 瀵煎叆
importSetting: {
dialogTitle: '瀵煎叆',
dialogShow: false,
fileSettings: {
data: {},
- uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
+ uploadUrl: getBaseUrl() + "/pc/fin/sys/tenant/import", // 涓婁紶鍦板潃
accept: '.xls', // 鏍煎紡
type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
+ loading: false // 瀵煎叆鏁堟灉
},
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate' // 涓嬭浇鍦板潃
},
- onSuccess: null,
+ onSuccess: null
+ },
+ // 鎼滅储鏉′欢
+ filterFrom: {
+ warehouseType: 0,
},
editSetting: {
title: '',
@@ -122,7 +147,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/warehouse/warningConfig/getList', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
@@ -142,23 +167,23 @@
},
},
{
- name: '瀵煎嚭',
+ name: '瀵煎叆',
click: () => {
- this.handleExport();
+ this.importOrg();
},
},
],
},
// 鍒椾俊鎭�
columns: [
- { title: '鏈烘瀯', field: 'name', align: 'left' },
- { title: '浠撳簱', field: 'code', align: 'center' },
- { title: '鍒嗙被', field: 'lv', align: 'center' },
- { title: '鎵�灞炵被鍒�', field: 'lv', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'summary', align: 'left' },
- { title: '瑙勬牸鍨嬪彿', field: 'summary', align: 'left' },
- { title: '淇濆簳搴撳瓨', field: 'summary', align: 'left' },
- { title: '灏侀《搴撳瓨', field: 'summary', 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: {
@@ -192,48 +217,15 @@
},
};
},
+ computed: {
+ ...mapGetters(['userInfo']),
+ },
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.vlaue = item.id;
- return item;
- });
- }
- });
- });
- getDicts('GOODS_PRICE').then((res) => {
- this.items.forEach((v) => {
- if (v.label == '绫诲埆') {
- v.options = res.map((v) => {
- v.label = v.dict_label;
- v.value = v.dict_value;
- return v;
- });
- }
- });
- });
- getCategorySelectTree().then((res) => {
- this.items.forEach((v) => {
- if (v.label == '鍒嗙被') {
- v.options = res.map((item) => {
- item.label = item.label;
- item.vlaue = item.id;
- return item;
- });
- }
- });
- });
- },
del(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�').then(() => {
- finsystenant.del({ id: row.id }).then((res) => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ潯鐨勬暟鎹悧锛�').then(() => {
+ warningConfigGetDel({id: row.id}).then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
this.search();
});
@@ -251,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) {
@@ -261,6 +266,9 @@
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
+ if (this.filterFrom.agencyId && this.filterFrom.agencyId.length) {
+ this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
+ }
this.search(1);
},
},
--
Gitblit v1.9.1