From 9d80b9fc7147a16483775925e27d778554010395 Mon Sep 17 00:00:00 2001
From: nehc <934298133@qq.com>
Date: Fri, 1 Aug 2025 18:22:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(@vben/web-antd):=20erp-stock-in=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=8D=95=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/views/erp/stock/in/index.vue |  8 ++---
 .../erp/stock/in/modules/StockInItemForm.vue  | 26 ++++----------
 .../src/views/erp/stock/in/modules/form.vue   | 34 -------------------
 3 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/apps/web-antd/src/views/erp/stock/in/index.vue b/apps/web-antd/src/views/erp/stock/in/index.vue
index 8bb4c15d8..55891fa95 100644
--- a/apps/web-antd/src/views/erp/stock/in/index.vue
+++ b/apps/web-antd/src/views/erp/stock/in/index.vue
@@ -169,19 +169,19 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               label: '详情',
+              icon: ACTION_ICON.VIEW,
               auth: ['erp:stock-in:query'],
               onClick: () => openForm('detail', row.id),
             },
             {
               label: '编辑',
-              type: 'primary',
               auth: ['erp:stock-in:update'],
-              ifShow: row.status === 10,
+              icon: ACTION_ICON.EDIT,
+              disabled: row.status !== 10,
               onClick: () => openForm('update', row.id),
             },
             {
               label: '审核',
-              type: 'primary',
               auth: ['erp:stock-in:update'],
               ifShow: row.status === 10,
               popConfirm: {
@@ -203,7 +203,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '删除',
               danger: true,
               auth: ['erp:stock-in:delete'],
-              ifShow: row.status === 10,
+              disabled: row.status !== 10,
               popConfirm: {
                 title: '确认要删除该入库单吗？',
                 confirm: () => handleDelete([row.id]),
diff --git a/apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue b/apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue
index fd5f10a44..b35ff3146 100644
--- a/apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue
+++ b/apps/web-antd/src/views/erp/stock/in/modules/StockInItemForm.vue
@@ -246,41 +246,27 @@ defineExpose({
       <template #warehouseId="{ row }">
         <Select
           v-model:value="row.warehouseId"
+          :options="warehouseOptions"
+          :field-names="{ label: 'name', value: 'id' }"
           placeholder="请选择仓库"
           :disabled="disabled"
           show-search
-          :filter-option="false"
           @change="(value) => handleWarehouseChange(value, row)"
           class="w-full"
-        >
-          <Select.Option
-            v-for="warehouse in warehouseOptions"
-            :key="warehouse.id"
-            :value="warehouse.id"
-          >
-            {{ warehouse.name }}
-          </Select.Option>
-        </Select>
+        />
       </template>
 
       <template #productId="{ row }">
         <Select
           v-model:value="row.productId"
+          :options="productOptions"
+          :field-names="{ label: 'name', value: 'id' }"
           placeholder="请选择产品"
           :disabled="disabled"
           show-search
-          :filter-option="false"
           @change="(value) => handleProductChange(value, row)"
           class="w-full"
-        >
-          <Select.Option
-            v-for="product in productOptions"
-            :key="product.id"
-            :value="product.id"
-          >
-            {{ product.name }}
-          </Select.Option>
-        </Select>
+        />
       </template>
 
       <template #count="{ row }">
diff --git a/apps/web-antd/src/views/erp/stock/in/modules/form.vue b/apps/web-antd/src/views/erp/stock/in/modules/form.vue
index 2f09d5215..fffca0978 100644
--- a/apps/web-antd/src/views/erp/stock/in/modules/form.vue
+++ b/apps/web-antd/src/views/erp/stock/in/modules/form.vue
@@ -198,39 +198,5 @@ defineExpose({ modalApi, handleUpdateStatus });
         />
       </template>
     </Form>
-
-    <!-- 审核操作按钮 -->
-    <template #footer>
-      <div class="flex w-full justify-between">
-        <div>
-          <template v-if="formType === 'detail' && formData">
-            <a-button
-              v-if="formData.status === 10"
-              type="primary"
-              @click="handleUpdateStatus(formData.id!, 20)"
-            >
-              审核
-            </a-button>
-            <a-button
-              v-if="formData.status === 20"
-              danger
-              @click="handleUpdateStatus(formData.id!, 10)"
-            >
-              反审核
-            </a-button>
-          </template>
-        </div>
-        <div>
-          <a-button
-            v-if="formType !== 'detail'"
-            type="primary"
-            @click="modalApi.confirm()"
-          >
-            确定
-          </a-button>
-          <a-button @click="modalApi.close()">取消</a-button>
-        </div>
-      </div>
-    </template>
   </Modal>
 </template>