zhanbo.xu

feat: 新增法定单位

...@@ -31,9 +31,16 @@ ...@@ -31,9 +31,16 @@
31 :pageSizes="[20, 30, 50, 100]" 31 :pageSizes="[20, 30, 50, 100]"
32 :totalCount="0" 32 :totalCount="0"
33 :loading="tableLoading" 33 :loading="tableLoading"
34 - :emptyText="(loadingDatas && !rowData.popoverData.length) ? '数据加载中' : $t('portEntry.emptyText')" 34 + :emptyText="
35 - height="350px" 35 + loadingDatas &&
36 - maxHeight="500px" 36 + rowData &&
37 + rowData.popoverData &&
38 + !rowData.popoverData.length
39 + ? '数据加载中'
40 + : $t('portEntry.emptyText')
41 + "
42 + :height="tableHeight + 'px'"
43 + :maxHeight="tableHeight + 'px'"
37 rowKey="id" 44 rowKey="id"
38 > 45 >
39 </Table> 46 </Table>
...@@ -82,20 +89,31 @@ export default { ...@@ -82,20 +89,31 @@ export default {
82 }, 89 },
83 data() { 90 data() {
84 return { 91 return {
85 - tableLoading: false 92 + tableLoading: false,
93 + tableHeight: 350,
86 }; 94 };
87 }, 95 },
88 - computed:{ 96 + computed: {
89 - loadingDatas(){ 97 + loadingDatas() {
90 - return this.$store.state.viewOption.loadingDatas 98 + return this.$store.state.viewOption.loadingDatas;
91 - } 99 + },
100 + },
101 + mounted() {
102 + this.calculateTableHeight();
103 + window.addEventListener("resize", this.calculateTableHeight);
104 + },
105 + beforeDestroy() {
106 + window.removeEventListener("resize", this.calculateTableHeight);
92 }, 107 },
93 methods: { 108 methods: {
109 + calculateTableHeight() {
110 + this.tableHeight = window.innerHeight - 300;
111 + },
94 //弹框关闭 112 //弹框关闭
95 popoverClose() { 113 popoverClose() {
96 this.$emit("popoverClose"); 114 this.$emit("popoverClose");
97 this.parentDom.$refs.tables.$refs.bodyWrapper.style.overflowY = "auto"; 115 this.parentDom.$refs.tables.$refs.bodyWrapper.style.overflowY = "auto";
98 - this.$store.dispatch('setLoadingState', true) 116 + this.$store.dispatch("setLoadingState", true);
99 }, 117 },
100 //弹框状态改版 118 //弹框状态改版
101 popoverChange(data, type) { 119 popoverChange(data, type) {
......
...@@ -868,7 +868,7 @@ export default { ...@@ -868,7 +868,7 @@ export default {
868 }, 868 },
869 methods: { 869 methods: {
870 mapDicDatas(dicArr, code) { 870 mapDicDatas(dicArr, code) {
871 - if (code != "") { 871 + if (code != "" && code) {
872 return dicArr.filter((item) => item.itemCode == code)[0] 872 return dicArr.filter((item) => item.itemCode == code)[0]
873 .itemChineseName; 873 .itemChineseName;
874 } else { 874 } else {
......
This diff is collapsed. Click to expand it.