From 75acf1b5e508ae8349c64818f3ab1c188a76cc8e Mon Sep 17 00:00:00 2001
From: “zengxiangping” <318732054@qq.com>
Date: Wed, 29 Nov 2023 14:41:20 +0800
Subject: [PATCH] 批量取消组盘bug修复，入库单页面刷新问题
---
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue | 2 +-
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue | 22 +++++++++++-----------
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index e474183..6c480ef 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -420,7 +420,7 @@ export default {
}
var ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
- if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+ if (this.selectedRowKeys[a] != null && typeof this.selectedRowKeys[a] == "number") {
ids += this.selectedRowKeys[a] + ",";
}
}
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
index df843d1..7db8bd7 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
@@ -67,7 +67,7 @@
</a-select>
</a-form-item>
</a-col>
- <template v-if="toggleSearchStatus">
+ <template v-show="toggleSearchStatus">
<a-col :xl="12" :lg="14" :md="16" :sm="24">
<a-form-item label="创建日期">
<j-date :show-date="true" date-format="YYYY-MM-DD" placeholder="请选择开始时间"
@@ -175,29 +175,29 @@
</template>
<span slot="action" slot-scope="text, record">
- <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
+ <a-popconfirm v-has="'receiptHeader:back'" v-show="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
<a><a-button type="default">回传</a-button></a>
</a-popconfirm>
- <a-popconfirm v-has="'receiptHeader:crossDocking'" v-if="record.lastStatus == 0" title="确定越库吗?" @confirm="() => hanleCross(record)">
+ <a-popconfirm v-has="'receiptHeader:crossDocking'" v-show="record.lastStatus == 0" title="确定越库吗?" @confirm="() => hanleCross(record)">
<a><a-button type="primary">越库</a-button></a>
<a-divider type="vertical"/>
</a-popconfirm>
- <a v-if="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'">
+ <a v-show="(record.lastStatus < 800 && record.firstStatus >= 15 && record.firstStatus != '20') || (flowOff == '0' && record.lastStatus < 800) " @click="receive(record)" v-has="'receiptHeader:receive'">
<a-button type="primary">组盘</a-button>
</a>
- <a v-if="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
- <a v-if="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
- <a v-if="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a>
- <a-dropdown v-if="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1') || (record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null)">
+ <a v-show="record.firstStatus == '0' && flowOff == '1'" @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
+ <a v-show="record.nextAuditor == username && flowOff == '1'" @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
+ <a v-show="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a>
+ <a-dropdown v-show="(record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1') || (record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null)">
<a class="ant-dropdown-link"><a-divider type="vertical"/>更多 <a-icon type="down"/></a>
<a-menu slot="overlay">
- <a-menu-item v-if="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
+ <a-menu-item v-show="record.firstStatus > 0 && record.firstStatus <= 20 && flowOff=='1'">
<a @click="openProcess(record)" type="primary">审核进度</a>
</a-menu-item>
- <a-menu-item v-has="'receiptHeader:edit'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
+ <a-menu-item v-has="'receiptHeader:edit'" v-show="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
<a @click="handleEdit(record)">编辑</a>
</a-menu-item>
- <a-menu-item v-has="'receiptHeader:delete'" v-if="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
+ <a-menu-item v-has="'receiptHeader:delete'" v-show="record.firstStatus == 0 && record.lastStatus == 0 && record.referCode == null">
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
index f1d598b..94fad6e 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
@@ -423,7 +423,7 @@ export default {
}
var ids = ''
for (var a = 0; a < this.selectedRowKeys.length; a++) {
- if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
+ if (this.selectedRowKeys[a] != null && typeof this.selectedRowKeys[a] == "number") {
ids += this.selectedRowKeys[a] + ','
}
}
--
libgit2 0.22.2