From a296223898d61a9838bbd35ed75c87575e308a36 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 07 十一月 2025 17:19:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/Order/Allocate/AllocateoutOrderDetail.vue | 94 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 18 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 8861a7b..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"
@@ -23,21 +23,46 @@
</div>
<div style="margin-top:10px;width:400px">
<el-form ref="form" :model="form" label-width="90px">
- <el-form-item label="鍑哄簱鍖哄煙" prop="areaId">
+ <!-- <el-form-item label="鍑哄簱鍖哄煙" prop="areaId">
<el-select v-model="areaId" placeholder="璇烽�夋嫨鍑哄簱鍖哄煙">
<el-option label="涓�妤糀GV鍑哄簱缂撳瓨鍖�" value="2" />
<el-option label="涓�妤糀GV绔嬪簱缂撳瓨鍖�" value="3" />
<el-option label="涓�妤糀GV鍏ュ簱缂撳瓨鍖�" value="4" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="璋冩嫧鍑哄簱" prop="Warehouse">
- <el-input style="width: 310px" v-model="Warehouse" placeholder="璇疯緭鍏ヨ皟鎷ㄤ粨搴�"></el-input>
+ <!-- <el-input style="width: 310px" v-model="Warehouse" placeholder="璇疯緭鍏ヨ皟鎷ㄤ粨搴�"></el-input> -->
+ <el-select v-model="Warehouse" placeholder="璇烽�夋嫨璋冩嫧浠撳簱">
+ <el-option label="灏忎欢鎴愬搧浠�" value="102" />
+ <el-option label="缁勪欢浠�" value="103" />
+ <el-option label="椤圭洰鎴愬搧浠�" value="104" />
+ <el-option label="涓嶈壇鍝佷粨" value="105" />
+ <el-option label="闆舵垚鏈粨" value="106" />
+ <el-option label="杞﹂棿鍦ㄥ埗浠�" value="199" />
+ <el-option label="鏅鸿兘绔嬪簱" value="107" />
+ <el-option label="鐢垫皵瑁呴厤浠撳簱" value="108" />
+ <el-option label="鏈哄姞浠�" value="109" />
+ <el-option label="鍘熸潗鏂欎粨" value="201" />
+ <el-option label="鍖栧伐浠�" value="110" />
+ <el-option label="澶栧崗渚涘簲鍟嗕粨" value="111" />
+ <el-option label="杈呭姪鏂欎粨" value="202" />
+ <el-option label="閰嶄欢浠�" value="203" />
+ <el-option label="鐢靛櫒浠�" value="204" />
+ <el-option label="WMS鍑哄簱缂撳瓨鍖�" value="205" />
+ <el-option label="鎴愬搧浠�" value="206" />
+ <el-option label="寰呭鐞嗕粨" value="211" />
+ <el-option label="宸ュ簾浠�" value="212" />
+ <el-option label="澶栧崗寰呭彂浠�" value="221" />
+ <el-option label="渚涘簲鍟嗘垚鍝佷粨" value="222" />
+ <el-option label="宸ョ▼閫�鏂欎粨" value="231" />
+ <el-option label="鏆傛椂浠�" value="232" />
+ </el-select>
</el-form-item>
</el-form>
</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>
@@ -50,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) }}
@@ -58,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>
@@ -73,10 +109,10 @@
return {
row: null,
areaId: "2",
- Warehouse:"",
+ Warehouse: "",
showDetialBox: false,
flag: false,
- MaterialCode:"",
+ MaterialCode: "",
currentRow: null,
selection: [],
tableData: [],
@@ -114,17 +150,22 @@
width: 150,
},
{
+ prop: "remark",
+ title: "鏄惁鏈夊簱瀛�",
+ type: "tags",
+ width:120,
+ },
+ {
prop: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "string",
width: 90,
},
{
- prop: "lockQuantity",
- title: "閿佸畾鏁伴噺",
+ prop: "notOutQuantity",
+ title: "鏈嚭搴撴暟閲�",
type: "int",
- width: 90,
- hidden: true,
+ width: 100,
},
{
prop: "overOutQuantity",
@@ -234,8 +275,7 @@
this.getData();
},
getData() {
- var wheres = [{ name: "orderId", value: this.row.id},{name: "materielCode",value:this.MaterialCode,DisplayType:"text"}];
- console.log(JSON.stringify(wheres));
+ var wheres = [{ name: "orderId", value: this.row.id }, { name: "materielCode", value: this.MaterialCode, DisplayType: "text" }];
var param = {
page: this.paginations.page,
rows: this.paginations.rows,
@@ -243,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;
});
},
@@ -255,6 +299,7 @@
this.$message.error("璇ュ崟鎹凡娌℃湁鏁伴噺鍙嚭搴�");
return;
}
+ console.log(row);
this.$refs.child.open(row);
}
},
@@ -264,9 +309,9 @@
}
var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
var param = {
- "orderIds":keys,
+ "orderIds": keys,
"AreaId": this.areaId,
- "Warehouse":this.Warehouse,
+ "Warehouse": this.Warehouse,
}
this.http
.post("api/AllocateOutboundOrder/GenerateAllocateOutboundTask", param, "鏁版嵁澶勭悊涓�")
@@ -282,12 +327,25 @@
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") {
- if (row.orderDetailStatus !== 0 &&row.orderDetailStatus !== 60 &&row.orderDetailStatus !== 70
+ if (row.orderDetailStatus !== 0 && row.orderDetailStatus !== 60 && row.orderDetailStatus !== 70
) {
return true;
} else {
@@ -341,7 +399,7 @@
}
}
},
- },
+ }
};
</script>
<style scoped>
--
Gitblit v1.9.3