From b8765af77f587c528f07ec67b89240d231b60166 Mon Sep 17 00:00:00 2001 From: lb Date: Wed, 5 Jul 2023 14:52:04 +0800 Subject: [PATCH] bufix 0705 zentao --- src/components/DialogCarPayload.vue | 6 + src/components/DialogJustForm.vue | 8 +- src/components/uploadBtn/index.vue | 2 +- src/views/atomViews/ListView.vue | 44 +++-- src/views/atomViews/ListViewWithHead.vue | 29 ++- .../components/ListViewWithHead.vue | 8 +- src/views/modules/pms/blenderOrder/config.js | 2 +- .../components/ListViewWithHead.vue | 25 ++- .../components/ListViewWithHead.vue | 9 +- .../components/temperatureDialog.vue | 5 +- .../components/ListViewWithHead.vue | 28 ++- .../components/ListViewWithHead.vue | 6 +- .../components/tabs/carDetail.vue | 9 +- src/views/modules/pms/finishedOrder/config.js | 8 +- .../components/ListViewWithHead.vue | 23 +-- .../pms/material/components/BaseListTable.vue | 27 +-- .../material/components/ListViewWithHead.vue | 5 +- .../pms/order/components/BaseListTable.vue | 31 +-- .../order/components/ListSectionWithHead.vue | 4 + .../pms/order/components/ListViewWithHead.vue | 36 ++-- .../pms/order/components/tabs/carDetail.vue | 9 +- src/views/modules/pms/order/config.js | 176 +++++++++--------- .../components/ListViewWithHead.vue | 23 +-- 23 files changed, 287 insertions(+), 236 deletions(-) diff --git a/src/components/DialogCarPayload.vue b/src/components/DialogCarPayload.vue index 61860f9..0ecacec 100644 --- a/src/components/DialogCarPayload.vue +++ b/src/components/DialogCarPayload.vue @@ -75,6 +75,7 @@ export default { inject: ["urls"], data() { return { + // dialogVisible: false, loadingStatus: false, page: 1, size: 20, @@ -203,6 +204,11 @@ export default { }, handleClose() { + // clear list + setTimeout(() => { + this.dataList.splice(0); + this.totalPage = 0; + }, 300); this.$emit("update:dialogVisible", false); }, }, diff --git a/src/components/DialogJustForm.vue b/src/components/DialogJustForm.vue index 64b1ba8..f3d2a28 100644 --- a/src/components/DialogJustForm.vue +++ b/src/components/DialogJustForm.vue @@ -481,7 +481,7 @@ export default { IsNotAvaliable(col) { return this.detailMode || (col.disableOnEdit && this.editMode); }, - handleFilelistUpdate(newFilelist) { + handleFilelistUpdate(newFilelist, isDelete=false) { // TODO: 直接访问 .files 可能不太合适 this.dataForm.files = newFilelist.map((file) => ({ id: file.id, @@ -490,9 +490,9 @@ export default { typeCode: file.typeCode, })); // 更新请求 - if ("id" in this.dataForm && this.dataForm.id !== null && this.dataForm.id !== undefined) this.addOrUpdate("PUT"); - else - this.$notify({ + // if ("id" in this.dataForm && this.dataForm.id != null) this.addOrUpdate("PUT"); + // else + !isDelete && this.$notify({ title: "等待保存", message: "已添加文件，请手动点击保存！", type: "warning", diff --git a/src/components/uploadBtn/index.vue b/src/components/uploadBtn/index.vue index 2d47b34..dd04cef 100644 --- a/src/components/uploadBtn/index.vue +++ b/src/components/uploadBtn/index.vue @@ -90,7 +90,7 @@ export default { }) .then(() => { this.uploadedFileList = this.uploadedFileList.filter((file) => file.id.toString() !== fileId.toString()); - this.$emit("update-file-list", this.uploadedFileList); + this.$emit("update-file-list", this.uploadedFileList, true); // is delete, set to true this.$message({ type: "success", message: "删除成功!", diff --git a/src/views/atomViews/ListView.vue b/src/views/atomViews/ListView.vue index b32b092..b546b9d 100644 --- a/src/views/atomViews/ListView.vue +++ b/src/views/atomViews/ListView.vue @@ -2,9 +2,25 @@ @@ -221,6 +233,7 @@ export default { // payload: { type: string, data: string | number | object } switch (type) { case "delete": { + let currenPageListLength = this.dataList.length // 确认是否删除 return this.$confirm(`确定要删除记录 "${data.name ?? data.id}" 吗?`, "提示", { confirmButtonText: "确认", @@ -237,8 +250,9 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ @@ -302,10 +316,10 @@ export default { // console.log('to-bom-detail', data.name) // 查看配方详情 return this.$router.push({ - name: 'pms-bomDetails', + name: "pms-bomDetails", query: { - name: data.name - } + name: data.name, + }, }); } case "copy": { diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index 1b37083..4486b26 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -19,8 +19,8 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" + :page-size.sync="size" :page-sizes="[10, 20, 50, 100]" - :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> @@ -126,6 +126,12 @@ export default { this.refreshLayoutKey = this.layoutTable(); }, watch: { + page: val => { + console.log('page changed:', val) + }, + size: val => { + console.log('size changed:', val) + }, triggerUpdate(val, oldVal) { if (val && val !== oldVal) { // get list @@ -171,7 +177,7 @@ export default { ? { ...queryParams, page: this.page, limit: this.size } : { page: this.page, - limit: this.size, + limit: this.size }; if (!queryParams && this.listQueryExtra && this.listQueryExtra.length) { @@ -183,6 +189,7 @@ export default { }); } }); + this.cachedSearchCondition = Object.assign({}, params) } this.$http[this.urls.pageIsPostApi ? "post" : "get"]( @@ -201,6 +208,14 @@ export default { if (res.code === 0) { // page 场景: if ("list" in res.data) { + // if (res.data.list.length == 0 && res.data.total != 0) { + // // refresh list + // if (this.page > 1) { + // this.page -= 1 + // this.getList() + // return + // } else return + // } /** 破碎记录的特殊需求：数据要结合单位 material + materialUnitDictValue */ if ("attachDictValue" in this.tableConfig.column) { this.dataList = res.data.list.map((row) => { @@ -257,6 +272,8 @@ export default { if (deleteConfig && "promptField" in deleteConfig) { promptName = data[deleteConfig.promptField]; } + + let currenPageListLength = this.dataList.length // 确认是否删除 return this.$confirm(`确定要删除记录 "${promptName}" 吗?`, "提示", { confirmButtonText: "确认", @@ -276,9 +293,11 @@ export default { }).then(({ data: res }) => { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = - "defaultPageSize" in this.tableConfig.column ? this.tableConfig.column.defaultPageSize : 20; + // this.page = 1; + // this.size = + // "defaultPageSize" in this.tableConfig.column ? this.tableConfig.column.defaultPageSize : 20; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1 + this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue b/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue index 0fe6cc7..7377264 100644 --- a/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue +++ b/src/views/modules/pms/blenderOrder/components/ListViewWithHead.vue @@ -85,7 +85,7 @@ export default { refreshLayoutKey: null, dialogBomCode: "", overlayVisible: false, - cachedSearchCondition: {} + cachedSearchCondition: {}, }; }, inject: ["urls"], @@ -175,6 +175,7 @@ export default { // payload: { type: string, data: string | number | object } switch (type) { case "delete": { + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除记录 "${data.name ?? data.id}" 吗?`, "提示", { confirmButtonText: "确认", @@ -191,8 +192,9 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/blenderOrder/config.js b/src/views/modules/pms/blenderOrder/config.js index dc0fc30..2e34d28 100644 --- a/src/views/modules/pms/blenderOrder/config.js +++ b/src/views/modules/pms/blenderOrder/config.js @@ -23,7 +23,7 @@ export default function () { { width: 120, prop: "comqty", label: "已完成量 [kg]" }, { width: 60, prop: "ai", label: "版本" }, { prop: "blenderCode", label: "混料机" }, - { width: 160, prop: "", label: "添加时间", filter: timeFilter }, + { width: 160, prop: "createTime", label: "添加时间", filter: timeFilter }, // { width: 120, prop: "badqty", label: "不合格数量" }, // { prop: "remark", label: "备注" }, // { prop: 'version', label: '配方号' }, diff --git a/src/views/modules/pms/blenderPress/components/ListViewWithHead.vue b/src/views/modules/pms/blenderPress/components/ListViewWithHead.vue index 2f484e0..27069d7 100644 --- a/src/views/modules/pms/blenderPress/components/ListViewWithHead.vue +++ b/src/views/modules/pms/blenderPress/components/ListViewWithHead.vue @@ -213,15 +213,11 @@ export default { switch (type) { case "detach": { // 下发订单 - this.$confirm( - `确定下发订单吗?`, - "提示", - { - confirmButtonText: "确认", - cancelButtonText: "我再想想", - type: "warning", - } - ).then(() => { + this.$confirm(`确定下发订单吗?`, "提示", { + confirmButtonText: "确认", + cancelButtonText: "我再想想", + type: "warning", + }).then(() => { this.overlayVisible = true; return this.$http .post(this.urls.pressDetach, data /* { id: data } */, { headers: { "Content-Type": "application/json" } }) @@ -232,7 +228,7 @@ export default { type: "success", duration: 1500, onClose: () => { - this.getList(this.cachedSearchCondition, 'press'); + this.getList(this.cachedSearchCondition, "press"); }, }); } else { @@ -256,6 +252,8 @@ export default { // payload: { type: string, data: string | number | object } switch (type) { case "delete": { + let currenPageListLength = this.dataList.length; + // 确认是否删除 return this.$confirm(`确定要删除记录 "${data.name ?? data.id}" 吗?`, "提示", { confirmButtonText: "确认", @@ -272,8 +270,9 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ @@ -390,7 +389,7 @@ export default { }); console.log("查询", this.cachedSearchCondition); this.getList(this.cachedSearchCondition); - this.getList(this.cachedSearchCondition, 'press'); + this.getList(this.cachedSearchCondition, "press"); break; } } diff --git a/src/views/modules/pms/carHistory/components/ListViewWithHead.vue b/src/views/modules/pms/carHistory/components/ListViewWithHead.vue index 30012f2..dcd673d 100644 --- a/src/views/modules/pms/carHistory/components/ListViewWithHead.vue +++ b/src/views/modules/pms/carHistory/components/ListViewWithHead.vue @@ -19,7 +19,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> @@ -242,6 +242,8 @@ export default { if (deleteConfig && "promptField" in deleteConfig) { promptName = data[deleteConfig.promptField]; } + + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除记录 "${promptName}" 吗?`, "提示", { confirmButtonText: "确认", @@ -262,8 +264,9 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 100; + // this.page = 1; + // this.size = 100; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/carHistory/components/temperatureDialog.vue b/src/views/modules/pms/carHistory/components/temperatureDialog.vue index 8030f57..ab9d96d 100644 --- a/src/views/modules/pms/carHistory/components/temperatureDialog.vue +++ b/src/views/modules/pms/carHistory/components/temperatureDialog.vue @@ -25,7 +25,7 @@ @size-change="handleSizeChange" @current-change="handlePageChange" :current-page.sync="page" - :page-sizes="[20, 50, 100]" + :page-sizes="[10, 20, 50, 100]" :page-size="size" :total="totalPage" layout="total, sizes, prev, pager, next, jumper"> @@ -93,11 +93,14 @@ export default { if (res.code === 0) { if ("list" in res.data) { this.dataList = res.data.list; + this.totalPage = res.data.total } else if (Array.isArray(res.data)) { this.dataList = res.data; + this.totalPage = res.data.length } // else ... } else { this.dataList.splice(0); + this.totalPage = 0 } // this.dataList = [ // { id: 1, code: 1, press1: 1, press2: 1, createTime: "2023-4-21 01:00:00", temp1: 1000 }, diff --git a/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue b/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue index aaecbca..e9a57d3 100644 --- a/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue +++ b/src/views/modules/pms/detectionPlatform/components/ListViewWithHead.vue @@ -12,8 +12,7 @@ @operate-event="handleOperate" :current-page="page" :current-size="size" - :refresh-layout-key="refreshLayoutKey" - /> + :refresh-layout-key="refreshLayoutKey" /> + layout="total, sizes, prev, pager, next, jumper"> + @refreshDataList="getList" /> + @refreshDataList="updateCarPayloadKey = Math.random()" /> + @add-record="openCarPayloadAddDialog($event)" /> @@ -146,7 +141,7 @@ export default { tableLoading: false, refreshLayoutKey: null, updateCarPayloadKey: 1, - cachedSearchCondition: {} + cachedSearchCondition: {}, }; }, inject: ["urls"], @@ -237,6 +232,8 @@ export default { if (deleteConfig && "promptField" in deleteConfig) { promptName = data[deleteConfig.promptField]; } + + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除记录 "${promptName}" 吗?`, "提示", { confirmButtonText: "确认", @@ -250,13 +247,14 @@ export default { method: "DELETE", data: data.id, headers: { - "Content-Type": "application/json" - } + "Content-Type": "application/json", + }, }).then(({ data: res }) => { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue b/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue index c974fe7..7236558 100644 --- a/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue +++ b/src/views/modules/pms/finishedOrder/components/ListViewWithHead.vue @@ -213,6 +213,7 @@ export default { if (deleteConfig && "promptField" in deleteConfig) { promptName = data[deleteConfig.promptField]; } + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除记录 "${promptName}" 吗?`, "提示", { confirmButtonText: "确认", @@ -227,8 +228,9 @@ export default { }).then(({ data: res }) => { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue b/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue index 50b3d08..4bd4097 100644 --- a/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue +++ b/src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue @@ -30,7 +30,6 @@ v-if="!!temperatureDialogVisible" :dialog-visible.sync="temperatureDialogVisible" @refreshDataList="getAList" /> - @@ -75,7 +74,7 @@ export default { width: 90, subcomponent: TableOperaionComponent, options: [ - { name: "temperature", label: "烧制温度", icon: "odometer", color: '#ff4d00' }, + { name: "temperature", label: "烧制温度", icon: "odometer", color: "#ff4d00" }, { name: "to-car-payload", label: "装载详情", icon: "shopping-cart-full" }, // or el-icon-box // { name: "delete", label: "删除", icon: "delete", emitFull: true, promptField: "code" }, ], @@ -143,6 +142,7 @@ export default { if (deleteConfig && "promptField" in deleteConfig) { promptName = data[deleteConfig.promptField]; } + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除记录 "${promptName}" 吗?`, "提示", { confirmButtonText: "确认", @@ -163,8 +163,9 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10;let currenPageListLength = this.dataList.length; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/finishedOrder/config.js b/src/views/modules/pms/finishedOrder/config.js index bb10882..3981db6 100644 --- a/src/views/modules/pms/finishedOrder/config.js +++ b/src/views/modules/pms/finishedOrder/config.js @@ -19,21 +19,21 @@ export default function () { { width: 100, prop: "shapeCode", label: "砖型" }, { width: 120, prop: "brand", label: "牌号" }, { width: 60, prop: "ai", label: "版本" }, - { width: 65, prop: "addon", label: "addon" }, + { width: 65, prop: "sapParam1", label: "addon" }, { width: 200, prop: "shortDesc", label: "物料号销售文本" }, { width: 100, prop: "bomCode", label: "配方编码" }, { width: 80, prop: "pressCode", label: "压机号" }, { width: 80, prop: "blenderCode", label: "混料机号" }, { width: 80, prop: "kilnCode", label: "隧道窑号" }, - { width: 120, prop: "ktmp", label: "烧成温度" }, - { width: 120, prop: "tt", label: "烧成时间" }, + { width: 120, prop: "sapParam6", label: "烧成温度" }, + { width: 120, prop: "sapParam7", label: "烧成时间(h)" }, { width: 120, prop: "yieldqty", label: "已生产数量" }, { width: 120, prop: "soqty", label: "销售订单数" }, { width: 200, prop: "saleNo", label: "销售订单号" }, { width: 200, prop: "saleOrderItem", label: "销售订单item号" }, { width: 200, prop: "packTechCode", label: "包装工艺代码" }, { width: 120, prop: "specifications", label: "生产订单类型" }, - { width: 120, prop: "deliveryTime", label: "销售时间" }, + { width: 120, prop: "deliveryTime", label: "销售时间", filter: timeFilter }, { width: 120, prop: "customerCode", label: "客户" }, { width: 120, prop: "pcsKilnCar", label: "托盘码放砖数" }, { width: 120, prop: "remark", label: "备注" }, diff --git a/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue b/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue index 5ae8bec..4b22b34 100644 --- a/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue +++ b/src/views/modules/pms/kilnWaitingRoom/components/ListViewWithHead.vue @@ -12,8 +12,7 @@ @operate-event="handleOperate" :current-page="page" :current-size="size" - :refresh-layout-key="refreshLayoutKey" - /> + :refresh-layout-key="refreshLayoutKey" /> + layout="total, sizes, prev, pager, next, jumper"> + @refreshDataList="getList" /> + @refreshDataList="getList" /> + @refreshDataList="getList" /> @@ -143,7 +138,7 @@ export default { dataList: [], tableLoading: false, refreshLayoutKey: null, - cachedSearchCondition: {} + cachedSearchCondition: {}, }; }, inject: ["urls"], @@ -234,6 +229,7 @@ export default { if (deleteConfig && "promptField" in deleteConfig) { promptName = data[deleteConfig.promptField]; } + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除记录 "${promptName}" 吗?`, "提示", { confirmButtonText: "确认", @@ -252,8 +248,9 @@ export default { }).then(({ data: res }) => { if (res.code === 0) { this.$message.success("删除成功!"); - this.page = 1; - this.size = 10; + // this.page = 1; + // this.size = 10;let currenPageListLength = this.dataList.length; + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(); } else { this.$message({ diff --git a/src/views/modules/pms/material/components/BaseListTable.vue b/src/views/modules/pms/material/components/BaseListTable.vue index 48cbb75..2a9b4c1 100644 --- a/src/views/modules/pms/material/components/BaseListTable.vue +++ b/src/views/modules/pms/material/components/BaseListTable.vue @@ -12,8 +12,7 @@ row-key="id" :lazy="true" :load="loadSubClassFn" - border - > + border> @@ -34,8 +33,7 @@ } : null " - v-bind="head.more" - > + v-bind="head.more"> + :show-overflow-tooltip="head.showOverflowTooltip || !(head.prop === 'operations')"> @@ -106,12 +105,18 @@ export default { type: Number, default: 0, }, + page: { + type: Number, + default: 1, + }, + size: { + type: Number, + default: 20, + }, }, inject: ["urls"], data() { return { - page: 1, - size: 20, // 默认20 dataList: [], }; }, diff --git a/src/views/modules/pms/material/components/ListViewWithHead.vue b/src/views/modules/pms/material/components/ListViewWithHead.vue index 22e0cfc..e44e036 100644 --- a/src/views/modules/pms/material/components/ListViewWithHead.vue +++ b/src/views/modules/pms/material/components/ListViewWithHead.vue @@ -16,6 +16,8 @@ :table-data="dataList" @operate-event="handleOperate" @load-sub="handleLoadSub" + :page="page" + :size="size" :refresh-layout-key="refreshLayoutKey" /> { if (res.code === 0) { this.$message.success("删除成功!"); - + if (currenPageListLength == 1) this.page = this.page > 1 ? this.page - 1 : 1; this.getList(this.cachedSearchCondition); } }); diff --git a/src/views/modules/pms/order/components/BaseListTable.vue b/src/views/modules/pms/order/components/BaseListTable.vue index 546329c..d55ff20 100644 --- a/src/views/modules/pms/order/components/BaseListTable.vue +++ b/src/views/modules/pms/order/components/BaseListTable.vue @@ -12,8 +12,7 @@ row-key="id" :lazy="true" :load="loadSubClassFn" - border - > + border> @@ -33,10 +32,9 @@ return val + 1 + (page - 1) * size; } : null - " + " :fixed="head.fixed || null" - v-bind="head.more" - > + v-bind="head.more"> + :show-overflow-tooltip="head.showOverflowTooltip || !(head.prop === 'operations')"> @@ -108,12 +107,18 @@ export default { type: Number, default: 0, }, + page: { + type: Number, + default: 1, + }, + size: { + type: Number, + default: 20, + }, }, inject: ["urls"], data() { return { - page: 1, - size: 20, // 默认20 dataList: [], }; }, @@ -143,7 +148,7 @@ export default { text-shadow: unset; } - .base-list-table >>> .no-padding-class:not(th) .cell { +.base-list-table >>> .no-padding-class:not(th) .cell { line-height: 1.75; padding: 0; } diff --git a/src/views/modules/pms/order/components/ListSectionWithHead.vue b/src/views/modules/pms/order/components/ListSectionWithHead.vue index 2ffa78c..275d84a 100644 --- a/src/views/modules/pms/order/components/ListSectionWithHead.vue +++ b/src/views/modules/pms/order/components/ListSectionWithHead.vue @@ -17,6 +17,8 @@ :table-config="tableConfig.table" :column-config="tableConfig.column" :table-data="dataList" + :page="listQuery.page" + :size="listQuery.limit" @operate-event="handleOperate" :refresh-layout-key="refreshLayoutKey" /> @@ -311,6 +313,7 @@ export default { }); } case "delete": { + let currenPageListLength = this.dataList.length; // 确认是否删除 return this.$confirm(`确定要删除 "${data.code ?? data.id}" 吗?`, "提示", { confirmButtonText: "确认", @@ -327,6 +330,7 @@ export default { if (res.code === 0) { this.$message.success("删除成功!"); // 获取数据 + if (currenPageListLength == 1) this.listQuery.page = this.listQuery.page > 1 ? this.listQuery.page - 1 : 1; this.getAList(Object.assign({}, this.listQuery, this.extraSearchConditions, this.params)); } }); diff --git a/src/views/modules/pms/order/components/ListViewWithHead.vue b/src/views/modules/pms/order/components/ListViewWithHead.vue index 12f37ad..201efd6 100644 --- a/src/views/modules/pms/order/components/ListViewWithHead.vue +++ b/src/views/modules/pms/order/components/ListViewWithHead.vue @@ -10,8 +10,7 @@ + @btn-click="handleBtnClick('ongoing', $event)" /> + :refresh-layout-key="refreshLayoutKey" /> + layout="total, sizes, prev, pager, next, jumper">
+ @btn-click="handleBtnClick('pending', $event)" /> + :refresh-layout-key="refreshLayoutKey" /> + layout="total, sizes, prev, pager, next, jumper">
+ @btn-click="handleBtnClick('finished', $event)" /> + :refresh-layout-key="refreshLayoutKey" /> + layout="total, sizes, prev, pager, next, jumper">