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 | 97 ++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 49 deletions(-) diff --git a/admin-web/src/views/stock/ledger/inventoryAlert/index.vue b/admin-web/src/views/stock/ledger/inventoryAlert/index.vue index 2b38e4b..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> @@ -32,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,myImport }, + components: {MyButton, MyTableV2, edit, myImport}, data() { return { // 鎼滅储妗� @@ -53,10 +51,10 @@ defaultValue: '', options: [], cascader: [ - { key: 'warehouseId', queryKey: 'agencyId' }, - { key: 'goodsTemplateId', queryKey: 'agencyId' }, + {key: 'warehouseId', queryKey: 'agencyId'}, + {key: 'goodsTemplateId', queryKey: 'agencyId'}, ], - optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null }, + optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null}, }, { type: 'select', @@ -78,7 +76,7 @@ placeholder: '璇疯緭鍏�', defaultValue: '', options: [], - cascader: [{ key: 'categoryId', queryKey: 'goodsTemplatesId' }], + cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}], optionsConfig: { label: 'goodsName', value: 'id', @@ -96,7 +94,7 @@ label: 'label', value: 'id', url: SettingIplatform.apiBaseURL + '/pc/base/category/select/tree', - props: { checkStrictly: false }, + props: {checkStrictly: false, emitPath: false, value: 'id'} }, }, { @@ -106,34 +104,34 @@ placeholder: '璇烽�夋嫨', defaultValue: '', options: [{ - label:'A', - value:'1' - },{ - label:'B', - value:'2' - },{ - label:'C', - value:'3' + label: 'A', + value: '1' + }, { + label: 'B', + value: '2' + }, { + label: 'C', + value: '3' }], }, ], // 瀵煎叆 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 + 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: { @@ -178,14 +176,14 @@ }, // 鍒椾俊鎭� columns: [ - { 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 }, + {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: { @@ -222,11 +220,12 @@ computed: { ...mapGetters(['userInfo']), }, - created() {}, + created() { + }, methods: { del(row) { this.$modal.confirm('鏄惁纭鍒犻櫎姝ゆ潯鐨勬暟鎹悧锛�').then(() => { - warningConfigGetDel({ id: row.id }).then((res) => { + warningConfigGetDel({id: row.id}).then((res) => { this.$message.success('鍒犻櫎鎴愬姛锛�'); this.search(); }); -- Gitblit v1.9.1