From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/ledger/inventoryQuery/index.vue | 129 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 64 deletions(-)
diff --git a/admin-web/src/views/stock/ledger/inventoryQuery/index.vue b/admin-web/src/views/stock/ledger/inventoryQuery/index.vue
index 178681a..fd575fa 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 {
// 鎼滅储妗�
@@ -44,8 +40,8 @@
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',
@@ -61,13 +57,28 @@
},
},
{
+ 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:'goodsTemplateId',queryKey: 'categoryId'}],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- cascader: [{key:'categoryId',queryKey: 'goodsTemplatesId'}],
+ cascader: [{key: 'categoryId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -76,36 +87,27 @@
},
{
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: [],
// 鎼滅储鏉′欢
filterFrom: {
- warehouseType:0
+ warehouseType: 0
},
// 琛ㄦ牸鏁版嵁
table: {
@@ -135,14 +137,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, // 鏄剧ず鍒嗛〉
@@ -158,7 +160,6 @@
};
},
created() {
- // this.initQuery();
},
methods: {
// 瀵煎嚭
@@ -170,30 +171,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鍒楄〃
--
Gitblit v1.9.1