From af5847927931d3f491d7be5e0178cff3c37ac6f9 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 06 十一月 2025 17:20:44 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue"
index dae42ce..0d35945 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue"
@@ -62,7 +62,7 @@
</div>
<div class="box-table" style="margin-top: 1%">
<el-table ref="singleTable" :data="tableData" style="width: 100%; height: 630px" highlight-current-row
- @current-change="handleCurrentChange" height="500px" @row-click="handleRowClick"
+ height="500px" @row-click="handleRowClick"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column label="搴忓彿" type="index" fixed="left" width="55" align="center"></el-table-column>
@@ -75,6 +75,11 @@
:class="item.icon" style="font-size: 22px"></i></el-link></el-tooltip>
</div>
+ <div v-else-if="item.type == 'tags'">
+ <el-tag size="small" :type="scoped.row.remark === '鏈夊簱瀛�' ? 'primary' : 'error'">
+ {{ getDictionary(scoped.row, item) }}
+ </el-tag>
+ </div>
<div v-else-if="item.type == 'tag'">
<el-tag size="small">
{{ getDictionary(scoped.row, item) }}
@@ -83,6 +88,12 @@
</template>
</el-table-column>
</el-table>
+ </div>
+ <div style="margin-top: 20px; text-align: right;">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="paginations.page" :page-sizes="paginations.sizes" :page-size="paginations.size"
+ layout="total, sizes, prev, pager, next, jumper" :total="paginations.total"> <!-- 鍏抽敭锛氱粦瀹歵otal灞炴�� -->
+ </el-pagination>
</div>
</vol-box>
<stock-select ref="child" @parentCall="parentCall"></stock-select>
@@ -137,6 +148,12 @@
title: "闇�姹傚垎绫�",
type: "string",
width: 150,
+ },
+ {
+ prop: "remark",
+ title: "鏄惁鏈夊簱瀛�",
+ type: "tags",
+ width:120,
},
{
prop: "orderQuantity",
@@ -259,7 +276,6 @@
},
getData() {
var wheres = [{ name: "orderId", value: this.row.id }, { name: "materielCode", value: this.MaterialCode, DisplayType: "text" }];
- console.log(JSON.stringify(wheres));
var param = {
page: this.paginations.page,
rows: this.paginations.rows,
@@ -267,9 +283,13 @@
order: this.paginations.order,
wheres: JSON.stringify(wheres), // 鏌ヨ鏉′欢锛屾牸寮忎负[{ name: "瀛楁", value: "xx" }]
};
+ console.log(param);
this.http
.post("api/AllocateOutboundOrderDetail/GetPageData", param, "鏌ヨ涓�")
.then((x) => {
+ this.tableData = x.rows;
+ this.MaterialCode = "";
+ this.paginations.total = x.total;
this.tableData = x.rows;
});
},
@@ -279,6 +299,7 @@
this.$message.error("璇ュ崟鎹凡娌℃湁鏁伴噺鍙嚭搴�");
return;
}
+ console.log(row);
this.$refs.child.open(row);
}
},
@@ -306,8 +327,21 @@
setCurrent(row) {
this.$refs.singleTable.setCurrentRow(row);
},
- handleCurrentChange(val) {
- this.currentRow = val;
+ // handleCurrentChange(val) {
+ // this.currentRow = val;
+ // },
+ handleSizeChange(size) {
+ console.log(size);
+ this.paginations.size = size;
+ this.paginations.rows = size;
+ this.paginations.page = 1; // 閲嶇疆椤电爜
+ this.getData();
+ },
+
+ handleCurrentChange(page) {
+ console.log(page)
+ this.paginations.page = page;
+ this.getData();
},
getButtonEnable(propName, row) {
if (propName == "assignStock") {
@@ -365,7 +399,7 @@
}
}
},
- },
+ }
};
</script>
<style scoped>
--
Gitblit v1.9.3