mt-fe-group/yudao-init
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mescc/zhp #108

Merged
juzi merged 3 commits from projects/mescc/zhp into projects/mescc/develop 2024-07-26 11:17:35 +08:00
Conversation 0 Commits 3 Files Changed 3 +16 -18
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d8300d213 - Show all commits

18
src/views/cost/accounting.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-26 11:06:58
* @LastEditTime: 2024-07-26 11:14:37
* @LastEditors: zhp
* @Description:
-->
@@ -30,12 +30,12 @@
</el-form-item>
</el-form>
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
:max-height="tableH">
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
:method-list="tableBtn" @clickBtn="handleClick" /> -->
</base-table>
<pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
<pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" />
</div>
@@ -101,8 +101,8 @@ export default {
// selectedValues: [],
options,
listQuery: {
// size: 10,
// current: 1,
pageSize: 20,
pageNo: 1,
total: 0,
center: undefined,
start: undefined,
@@ -509,8 +509,8 @@ export default {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) {
case 'search':
this.listQuery.current = 1;
this.listQuery.size = 10;
this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10;
this.getDataList();
break;
case 'export':
@@ -523,8 +523,8 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.listQuery;
queryParams.current = 1
queryParams.size = 999
// queryParams.current = 1
// queryParams.size = 999
// if (this.facType === 0) {
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true;

16
src/views/warehouse/index.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-26 11:05:17
* @LastEditTime: 2024-07-26 11:14:34
* @LastEditors: zhp
* @Description:
-->
@@ -54,12 +54,12 @@
</el-form-item>
</el-form>
<!-- <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" /> -->
<base-table :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size" :table-data="tableData"
<base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
:max-height="tableH">
<!-- <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
:method-list="tableBtn" @clickBtn="handleClick" /> -->
</base-table>
<pagination :limit.sync="listQuery.size" :page.sync="listQuery.current" :total="listQuery.total"
<pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
@pagination="getDataList" />
</div>
@@ -100,8 +100,8 @@ export default {
start: undefined,
end: undefined,
listQuery: {
size: 10,
current: 1,
pageSize: 20,
pageNo: 1,
total: 0,
mDType:0,
wDType: 0,
@@ -299,8 +299,8 @@ export default {
this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;
switch (val.btnName) {
case 'search':
this.listQuery.current = 1;
this.listQuery.size = 10;
this.listQuery.pageNo = 1;
this.listQuery.pageSize = 10;
this.getDataList();
break;
case 'export':
@@ -313,8 +313,6 @@ export default {
/** 导出按钮操作 */
handleExport() {
const queryParams = this.listQuery;
queryParams.current = 1
queryParams.size = 999
// if (this.facType === 0) {
this.$modal.confirm('是否确认导出所有数据项?').then(() => {
this.exportLoading = true;