From 3639cc3129fe3433f110a18d53b1cae2c4f4ff8e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 10 三月 2026 17:37:24 +0800
Subject: [PATCH] fix: 入库流程优化
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 4 +-
src/api/inventoryManagement/stockInRecord.js | 52 +++++++++++++-------------
src/views/inventoryManagement/receiptManagement/Record.vue | 25 +++++++-----
3 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/src/api/inventoryManagement/stockInRecord.js b/src/api/inventoryManagement/stockInRecord.js
index 7a438b6..118be18 100644
--- a/src/api/inventoryManagement/stockInRecord.js
+++ b/src/api/inventoryManagement/stockInRecord.js
@@ -2,43 +2,43 @@
// 鏌ヨ鍏ュ簱淇℃伅鍒楄〃
export const getStockInRecordListPage = (params) => {
- return request({
- url: "/stockInRecord/listPage",
- method: "get",
- params,
- });
+ return request({
+ url: "/stockInRecord/listPage",
+ method: "get",
+ params,
+ });
};
// 鏍规嵁 ID 鏌ヨ鍗曟潯鍏ュ簱璁板綍璇︽儏
export const getStockInRecordById = (id) => {
- return request({
- url: "/stockInRecord/getById",
- method: "get",
- params: { id },
- });
+ return request({
+ url: "/stockInRecord/getById",
+ method: "get",
+ params: { id },
+ });
};
export const updateStockInRecord = (id, data) => {
- return request({
- url: "/stockInRecord/" + id,
- method: "put",
- data: data,
- });
+ return request({
+ url: "/stockInRecord/" + id,
+ method: "put",
+ data: data,
+ });
};
// 閲嶆柊鎻愯捣瀹℃壒锛堟洿鏂板叆搴撹褰曪級
export const updateStockInRecordForReApprove = (data) => {
- return request({
- url: "/stocklnRecord/updateStocklnRecord",
- method: "post",
- data,
- });
+ return request({
+ url: "/stockInRecord/updateStockInRecord",
+ method: "post",
+ data,
+ });
};
export const batchDeleteStockInRecords = (ids) => {
- return request({
- url: "/stockInRecord",
- method: "delete",
- data: ids,
- });
-};
\ No newline at end of file
+ return request({
+ url: "/stockInRecord",
+ method: "delete",
+ data: ids,
+ });
+};
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index c38d349..323953c 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -60,7 +60,7 @@
<el-col :span="12">
<el-form-item label="鍏ュ簱鏁伴噺锛�">
<el-tag type="warning">
- {{ form.stockInNum ?? '-' }}
+ {{ currentStockIn.stockInNum ?? '-' }}
</el-tag>
</el-form-item>
</el-col>
@@ -87,7 +87,7 @@
<el-col :span="24">
<el-form-item label="鐢熶骇璁㈠崟鍙凤細">
<el-tag type="info">
- {{ currentStockIn.productionOrderNo || '-' }}
+ {{ currentStockIn.npsNo || '-' }}
</el-tag>
</el-form-item>
</el-col>
diff --git a/src/views/inventoryManagement/receiptManagement/Record.vue b/src/views/inventoryManagement/receiptManagement/Record.vue
index 11ee21d..ab60046 100644
--- a/src/views/inventoryManagement/receiptManagement/Record.vue
+++ b/src/views/inventoryManagement/receiptManagement/Record.vue
@@ -76,20 +76,11 @@
<el-table-column label="瀹℃壒鐘舵��"
prop="approveStatus"
align="center"
- width="180">
+ width="120">
<template #default="scope">
<el-tag :type="getApproveStatusType(scope.row.approveStatus)">
{{ getApproveStatusText(scope.row.approveStatus) }}
</el-tag>
- <el-button
- v-if="scope.row.approveStatus === 3"
- type="primary"
- link
- style="margin-left: 8px"
- @click="handleReApprove(scope.row)"
- >
- 閲嶆柊鎻愯捣瀹℃壒
- </el-button>
</template>
</el-table-column>
<el-table-column label="鍏ュ簱浜�"
@@ -102,6 +93,20 @@
{{ getRecordType(scope.row.recordType) }}
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔"
+ align="center"
+ width="200">
+ <template #default="scope">
+ <el-button
+ v-if="scope.row.approveStatus === 3"
+ type="primary"
+ link
+ @click="handleReApprove(scope.row)"
+ >
+ 閲嶆柊鎻愯捣瀹℃壒
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination v-show="total > 0"
:total="total"
--
Gitblit v1.9.3