From f7f5d63b359aab0283e1a6926cf14803bd3e40e8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 15:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_HXSJ' into dev_HXSJ
---
src/views/inventoryManagement/receiptManagement/index.vue | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index fb4aa46..d93f2ae 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -76,6 +76,14 @@
prop="inboundNum"
width="90"
show-overflow-tooltip />
+ <el-table-column label="缂鸿揣鏁伴噺"
+ prop="outStockQuantity"
+ width="100"
+ show-overflow-tooltip />
+ <el-table-column label="缂鸿揣鎯呭喌"
+ prop="shortageDescription"
+ width="150"
+ show-overflow-tooltip />
<el-table-column label="鍚◣鍗曚环"
prop="taxInclusiveUnitPrice"
width="100"
@@ -177,6 +185,25 @@
:min="0"
style="width: 100%"
v-model="scope.row.quantityStock" />
+ </template>
+ </el-table-column>
+ <el-table-column label="缂鸿揣鏁伴噺"
+ prop="outStockQuantity"
+ width="150">
+ <template #default="scope">
+ <el-input-number :step="0.01"
+ :min="0"
+ style="width: 100%"
+ v-model="scope.row.outStockQuantity" />
+ </template>
+ </el-table-column>
+ <el-table-column label="缂鸿揣鎯呭喌"
+ prop="shortageDescription"
+ width="150">
+ <template #default="scope">
+ <el-input v-model="scope.row.shortageDescription"
+ placeholder="璇疯緭鍏ョ己璐ф儏鍐�"
+ clearable />
</template>
</el-table-column>
<el-table-column label="绋庣巼(%)"
@@ -486,6 +513,8 @@
const stockInData = {
id: selectedRows.value[0].recordId,
quantityStock: Number(selectedRows.value[0].quantityStock), // 浣跨敤鏂版牸寮忓寲鍑芥暟
+ outStockQuantity: selectedRows.value[0].outStockQuantity,
+ shortageDescription: selectedRows.value[0].shortageDescription,
};
await updateStockIn(stockInData);
proxy.$modal.msgSuccess("淇敼鍏ュ簱鎴愬姛");
@@ -531,6 +560,8 @@
// id: product.salesLedgerProductId,
inboundQuantity: Number(product.quantityStock),
productModelId: product.productModelId,
+ outStockQuantity: product.outStockQuantity,
+ shortageDescription: product.shortageDescription,
})),
};
// 璋冪敤API
--
Gitblit v1.9.3