From a0a35be4065d75b80ba4a9a51da7031e03166766 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 21 一月 2026 17:47:45 +0800
Subject: [PATCH] 湟水峡 1.成品入库添加编辑功能
---
src/views/inventoryManagement/receiptManagement/index.vue | 11 ++++-------
src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue | 42 +++++++++++-------------------------------
src/views/collaborativeApproval/vehicleManagement/index.vue | 6 ++----
3 files changed, 17 insertions(+), 42 deletions(-)
diff --git a/src/views/collaborativeApproval/vehicleManagement/index.vue b/src/views/collaborativeApproval/vehicleManagement/index.vue
index acbf408..85245bc 100644
--- a/src/views/collaborativeApproval/vehicleManagement/index.vue
+++ b/src/views/collaborativeApproval/vehicleManagement/index.vue
@@ -82,10 +82,8 @@
</template>
<template #operation="{ row }">
<el-button link type="primary" size="small" @click="openForm('edit', row)">缂栬緫</el-button>
- <el-button link type="primary" size="small" v-if="row.usageStatus === '绌洪棽'"
- @click="openUseForm(row)">鐢ㄨ溅</el-button>
- <el-button link type="primary" size="small" v-if="row.usageStatus === '浣跨敤涓�'"
- @click="openReturnForm(row)">杩樿溅</el-button>
+ <el-button link type="primary" size="small" v-if="row.usageStatus === '绌洪棽'" @click="openUseForm(row)">鐢ㄨ溅</el-button>
+ <el-button link type="primary" size="small" v-if="row.usageStatus === '浣跨敤涓�'" @click="openReturnForm(row)">杩樿溅</el-button>
<el-button link type="primary" size="small" @click="openUsageRecordsDialog(row)">浣跨敤璁板綍</el-button>
</template>
</PIMTable>
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
index 6048e18..72006a2 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鑷畾涔夊叆搴�' : '缂栬緫鑷畾涔夊叆搴�'" width="70%"
+ <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鎴愬搧鍏ュ簱' : '缂栬緫鎴愬搧鍏ュ簱'" width="70%"
@close="closeDia">
<el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
<div style="margin-bottom: 10px;" v-if="operationType === 'add'">
@@ -17,38 +17,16 @@
width="60"
/>
<el-table-column label="浜у搧澶х被" prop="productCategory" width="200">
- <template #default="scope">
- <el-input v-model="scope.row.productCategory" placeholder="璇疯緭鍏ヤ骇鍝佸ぇ绫�" />
- </template>
</el-table-column>
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200">
- <template #default="scope">
- <el-input v-model="scope.row.specificationModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
- </template>
</el-table-column>
<el-table-column label="鍗曚綅" prop="unit" width="100">
- <template #default="scope">
- <el-input v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�" />
- </template>
</el-table-column>
<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="150">
- <template #default="scope">
- <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.inboundNum" @change="() => calculateTotalPrice(scope.row)" />
- </template>
</el-table-column>
<el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundDate" width="180">
- <template #default="scope">
- <el-date-picker
- v-model="scope.row.inboundDate"
- type="date"
- placeholder="璇烽�夋嫨鍏ュ簱鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- style="width: 100%"
- />
- </template>
</el-table-column>
- <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150">
+ <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="210">
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.unitPrice" @change="() => calculateTotalPrice(scope.row)" />
</template>
@@ -58,11 +36,6 @@
prop="totalPrice"
width="150"
>
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="80" v-if="operationType === 'add'">
- <template #default="scope">
- <el-button type="danger" size="small" @click="removeProductRow(scope.$index)">鍒犻櫎</el-button>
- </template>
</el-table-column>
</el-table>
</el-form>
@@ -91,6 +64,7 @@
const productList = ref([]);// 浜у搧鍒楄〃鏁版嵁
const loadingProducts = ref(false);// 浜у搧鍔犺浇鐘舵��
const loading = ref(false);
+const currentTabType = ref('');// 褰撳墠鏍囩椤电被鍨� ('production' for 鎴愬搧鍏ュ簱, etc.)
function formatDateTime(date = new Date(), includeTime = true) {
const d = new Date(date);
@@ -225,7 +199,12 @@
loading.value = true
if (operationType.value === 'edit') {
const editPayload = payloadList[0]
- await updateProduct(editPayload)
+ // 濡傛灉鏄垚鍝佸叆搴撶紪杈戯紝娣诲姞type: 3鍙傛暟
+ if (currentTabType.value === 'production') {
+ await updateProduct({...editPayload, type: 3})
+ } else {
+ await updateProduct(editPayload)
+ }
} else {
await addStockInCustom(payloadList)
}
@@ -251,8 +230,9 @@
emit('close')
}
-const openDialog = async (type, row) => {
+const openDialog = async (type, row, tabType) => {
operationType.value = type
+ currentTabType.value = tabType || '' // 瀛樺偍鏍囩椤电被鍨�
dialogFormVisible.value = true
if (type === 'add') {
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 3258d76..a4050eb 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -53,10 +53,7 @@
<el-table-column label="鍏ュ簱鏃堕棿"
prop="createTime"
show-overflow-tooltip/>
- <el-table-column label="閿�鍞悎鍚屽彿"
- prop="salesContractNo"
- width="180"
- show-overflow-tooltip/>
+
<el-table-column label="浜у搧澶х被"
prop="productCategory"
show-overflow-tooltip/>
@@ -77,7 +74,7 @@
<el-table-column label="鎬讳环(鍏�)"
prop="totalPrice"
width="150"></el-table-column>
- <!-- <el-table-column fixed="right"
+ <el-table-column fixed="right"
label="鎿嶄綔"
min-width="60"
align="center">
@@ -87,7 +84,7 @@
size="small"
@click="openForm('edit', scope.row, 'production');">缂栬緫</el-button>
</template>
- </el-table-column> -->
+ </el-table-column>
</el-table>
<pagination v-show="total > 0"
:total="total"
@@ -361,7 +358,7 @@
const currentTab = tabType || activeTab.value;
await nextTick(() => {
if (currentTab === "production") {
- formDiaProduct.value?.openDialog(type, row);
+ formDiaProduct.value?.openDialog(type, row, currentTab);
} else {
formDia.value?.openDialog(type, row);
}
--
Gitblit v1.9.3