From e6a531108c884133d02909341d4a841b3d548861 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 16 七月 2026 18:00:37 +0800
Subject: [PATCH] 银川 1.采购入库状态回写
---
src/views/erp/purchase/order/data.ts | 16 ++++++----------
src/views/erp/purchase/request/index.vue | 7 ++++---
src/views/erp/purchase/order/modules/item-form.vue | 7 +------
src/views/erp/purchase/request/data.ts | 24 +++++++++++++-----------
src/views/erp/purchase/request/modules/form.vue | 1 +
5 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/src/views/erp/purchase/order/data.ts b/src/views/erp/purchase/order/data.ts
index 98b77db..c97f2c2 100644
--- a/src/views/erp/purchase/order/data.ts
+++ b/src/views/erp/purchase/order/data.ts
@@ -181,16 +181,6 @@
slots: { default: 'productId' },
},
{
- field: 'stockCount',
- title: '搴撳瓨',
- minWidth: 80,
- },
- {
- field: 'productBarCode',
- title: '鏉＄爜',
- minWidth: 120,
- },
- {
field: 'productUnitName',
title: '鍗曚綅',
minWidth: 80,
@@ -447,6 +437,12 @@
},
},
{
+ field: 'inStatus',
+ title: '鍏ュ簱鐘舵��',
+ minWidth: 100,
+ slots: { default: 'inStatus' },
+ },
+ {
title: '鎿嶄綔',
width: 340,
fixed: 'right',
diff --git a/src/views/erp/purchase/order/modules/item-form.vue b/src/views/erp/purchase/order/modules/item-form.vue
index f4565b5..009246a 100644
--- a/src/views/erp/purchase/order/modules/item-form.vue
+++ b/src/views/erp/purchase/order/modules/item-form.vue
@@ -14,7 +14,6 @@
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { getItemPage } from '#/api/mdm/item';
-import { getStockCount } from '#/api/erp/stock/stock';
import { useFormItemColumns } from '../data';
@@ -124,10 +123,8 @@
const newRow = {
id: undefined,
productId: undefined,
- productUnitName: undefined, // 浜у搧鍗曚綅
- productBarCode: undefined, // 浜у搧鏉＄爜
+ productUnitName: undefined,
productPrice: undefined,
- stockCount: undefined,
count: 1,
totalProductPrice: undefined,
taxPercent: 0,
@@ -160,10 +157,8 @@
}
row.productId = productId;
row.productUnitId = product.unitMeasureId;
- row.productBarCode = product.barCode;
row.productUnitName = product.unitMeasureName;
row.productName = product.name;
- row.stockCount = (await getStockCount(productId)) || 0;
row.productPrice = product.purchasePrice || 0;
row.count = row.count || 1;
handleRowChange(row);
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index eeb1013..11c9837 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -148,11 +148,6 @@
slots: { default: 'productId' },
},
{
- field: 'productBarCode',
- title: '鏉＄爜',
- minWidth: 120,
- },
- {
field: 'productUnitName',
title: '鍗曚綅',
minWidth: 80,
@@ -163,6 +158,13 @@
minWidth: 120,
fixed: 'right',
slots: { default: 'count' },
+ },
+ {
+ field: 'inCount',
+ title: '鍏ュ簱鏁伴噺',
+ minWidth: 100,
+ fixed: 'right',
+ formatter: 'formatAmount6',
},
{
field: 'productPrice',
@@ -335,12 +337,6 @@
minWidth: 120,
},
{
- field: 'qcCheckFlag',
- title: '鏄惁璐ㄦ',
- minWidth: 80,
- slots: { default: 'qcCheckFlag' },
- },
- {
field: 'productNames',
title: '鐢宠浜у搧',
minWidth: 150,
@@ -358,6 +354,12 @@
slots: { default: 'status' },
},
{
+ field: 'inStatus',
+ title: '鍏ュ簱鐘舵��',
+ minWidth: 100,
+ slots: { default: 'inStatus' },
+ },
+ {
field: 'requestReason',
title: '鐢宠鐞嗙敱',
minWidth: 150,
diff --git a/src/views/erp/purchase/request/index.vue b/src/views/erp/purchase/request/index.vue
index f9d2d0e..fb964be 100644
--- a/src/views/erp/purchase/request/index.vue
+++ b/src/views/erp/purchase/request/index.vue
@@ -197,9 +197,10 @@
<Tag v-else-if="row.status === 30" color="error">瀹℃牳涓嶉�氳繃</Tag>
<Tag v-else-if="row.status === 40" color="warning">宸插彇娑�</Tag>
</template>
- <template #qcCheckFlag="{ row }">
- <Tag v-if="row.qcCheckFlag" color="success">鏄�</Tag>
- <Tag v-else color="default">鍚�</Tag>
+ <template #inStatus="{ row }">
+ <Tag v-if="row.inStatus === 0" color="default">鏈叆搴�</Tag>
+ <Tag v-else-if="row.inStatus === 1" color="warning">閮ㄥ垎鍏ュ簱</Tag>
+ <Tag v-else-if="row.inStatus === 2" color="success">鍏ㄩ儴鍏ュ簱</Tag>
</template>
<template #actions="{ row }">
<TableAction
diff --git a/src/views/erp/purchase/request/modules/form.vue b/src/views/erp/purchase/request/modules/form.vue
index f2a6ec2..05367e5 100644
--- a/src/views/erp/purchase/request/modules/form.vue
+++ b/src/views/erp/purchase/request/modules/form.vue
@@ -84,6 +84,7 @@
count: item.count,
taxPercent: item.taxPercent,
demandTime: item.demandTime,
+ qcCheckFlag: item.qcCheckFlag,
remark: item.remark,
}));
try {
--
Gitblit v1.9.3