From f8b686fbc4853de13313b4b4eafd96c46e38d223 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 10 Feb 2024 21:48:15 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20ERP=EF=BC=9A=E5=A2=9E=E5=8A=A0=20ER?=
 =?UTF-8?q?P=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=2090%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f7c526601557a1e19a9f4109628518426f7d0176)
---
 src/api/erp/finance/account/index.ts          |  5 +++
 src/views/erp/sale/order/SaleOrderForm.vue    | 31 ++++++++++++++++++-
 .../order/components/SaleOrderItemForm.vue    |  1 +
 src/views/erp/sale/order/index.vue            |  2 ++
 .../check/components/StockCheckItemForm.vue   |  2 ++
 src/views/erp/stock/check/index.vue           |  2 ++
 src/views/erp/stock/in/StockInForm.vue        |  1 +
 .../stock/in/components/StockInItemForm.vue   |  2 ++
 src/views/erp/stock/in/index.vue              |  3 ++
 .../move/components/StockMoveItemForm.vue     |  9 +++++-
 src/views/erp/stock/move/index.vue            |  4 ++-
 src/views/erp/stock/out/StockOutForm.vue      |  1 +
 .../stock/out/components/StockOutItemForm.vue |  2 ++
 src/views/erp/stock/out/index.vue             |  3 ++
 src/views/erp/stock/record/index.vue          |  1 +
 src/views/erp/stock/stock/index.vue           |  1 +
 16 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/src/api/erp/finance/account/index.ts b/src/api/erp/finance/account/index.ts
index 85b90080..a62b1807 100644
--- a/src/api/erp/finance/account/index.ts
+++ b/src/api/erp/finance/account/index.ts
@@ -18,6 +18,11 @@ export const AccountApi = {
     return await request.get({ url: `/erp/account/page`, params })
   },
 
+  // 查询结算账户精简列表
+  getAccountSimpleList: async () => {
+    return await request.get({ url: `/erp/account/simple-list` })
+  },
+
   // 查询结算账户详情
   getAccount: async (id: number) => {
     return await request.get({ url: `/erp/account/get?id=` + id })
diff --git a/src/views/erp/sale/order/SaleOrderForm.vue b/src/views/erp/sale/order/SaleOrderForm.vue
index 16e7ffbd..fab99f59 100644
--- a/src/views/erp/sale/order/SaleOrderForm.vue
+++ b/src/views/erp/sale/order/SaleOrderForm.vue
@@ -29,6 +29,7 @@
           <el-form-item label="客户" prop="customerId">
             <el-select
               v-model="formData.customerId"
+              clearable
               filterable
               placeholder="请选择客户"
               class="!w-1/1"
@@ -93,6 +94,24 @@
             <el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="结算账户" prop="accountId">
+            <el-select
+              v-model="formData.accountId"
+              clearable
+              filterable
+              placeholder="请选择结算账户"
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="item in accountList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="收取订金" prop="depositPrice">
             <el-input-number
@@ -119,7 +138,8 @@
 import { SaleOrderApi, SaleOrderVO } from '@/api/erp/sale/order'
 import SaleOrderItemForm from './components/SaleOrderItemForm.vue'
 import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
-import { erpPriceInputFormatter, erpPriceMultiply, getSumValue } from '@/utils'
+import { AccountApi, AccountVO } from '@/api/erp/finance/account'
+import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils'
 
 /** ERP 销售订单表单 */
 defineOptions({ name: 'SaleOrderForm' })
@@ -134,6 +154,7 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   customerId: undefined,
+  accountId: undefined,
   orderTime: undefined,
   remark: undefined,
   fileUrl: '',
@@ -151,6 +172,7 @@ const formRules = reactive({
 const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
 const customerList = ref<CustomerVO[]>([]) // 客户列表
+const accountList = ref<AccountVO[]>([]) // 账户列表
 
 /** 子表的表单 */
 const subTabsName = ref('item')
@@ -189,6 +211,12 @@ const open = async (type: string, id?: number) => {
   }
   // 加载客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
+  // 加载账户列表
+  accountList.value = await AccountApi.getAccountSimpleList()
+  const defaultAccount = accountList.value.find((item) => item.defaultStatus)
+  if (defaultAccount) {
+    formData.value.accountId = defaultAccount.id
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -222,6 +250,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     customerId: undefined,
+    accountId: undefined,
     orderTime: undefined,
     remark: undefined,
     fileUrl: undefined,
diff --git a/src/views/erp/sale/order/components/SaleOrderItemForm.vue b/src/views/erp/sale/order/components/SaleOrderItemForm.vue
index 4b034ac6..0422dc75 100644
--- a/src/views/erp/sale/order/components/SaleOrderItemForm.vue
+++ b/src/views/erp/sale/order/components/SaleOrderItemForm.vue
@@ -15,6 +15,7 @@
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
               v-model="row.productId"
+              clearable
               filterable
               @change="onChangeProduct($event, row)"
               placeholder="请选择产品"
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index 90cdabd7..22cc61ba 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -47,6 +47,7 @@
       <el-form-item label="客户" prop="customerId">
         <el-select
           v-model="queryParams.customerId"
+          clearable
           filterable
           placeholder="请选择供客户"
           class="!w-240px"
@@ -62,6 +63,7 @@
       <el-form-item label="创建人" prop="creator">
         <el-select
           v-model="queryParams.creator"
+          clearable
           filterable
           placeholder="请选择创建人"
           class="!w-240px"
diff --git a/src/views/erp/stock/check/components/StockCheckItemForm.vue b/src/views/erp/stock/check/components/StockCheckItemForm.vue
index 21b79d0a..60363114 100644
--- a/src/views/erp/stock/check/components/StockCheckItemForm.vue
+++ b/src/views/erp/stock/check/components/StockCheckItemForm.vue
@@ -19,6 +19,7 @@
           >
             <el-select
               v-model="row.warehouseId"
+              clearable
               filterable
               placeholder="请选择仓库名字"
               @change="onChangeWarehouse($event, row)"
@@ -38,6 +39,7 @@
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
               v-model="row.productId"
+              clearable
               filterable
               @change="onChangeProduct($event, row)"
               placeholder="请选择产品"
diff --git a/src/views/erp/stock/check/index.vue b/src/views/erp/stock/check/index.vue
index 483f839b..a9f08819 100644
--- a/src/views/erp/stock/check/index.vue
+++ b/src/views/erp/stock/check/index.vue
@@ -47,6 +47,7 @@
       <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
+          clearable
           filterable
           placeholder="请选择仓库"
           class="!w-240px"
@@ -62,6 +63,7 @@
       <el-form-item label="创建人" prop="creator">
         <el-select
           v-model="queryParams.creator"
+          clearable
           filterable
           placeholder="请选择创建人"
           class="!w-240px"
diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue
index 3522ec2d..f36bbb60 100644
--- a/src/views/erp/stock/in/StockInForm.vue
+++ b/src/views/erp/stock/in/StockInForm.vue
@@ -29,6 +29,7 @@
           <el-form-item label="供应商" prop="supplierId">
             <el-select
               v-model="formData.supplierId"
+              clearable
               filterable
               placeholder="请选择供应商"
               class="!w-1/1"
diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index b7ee2e5c..53a2fd2d 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -19,6 +19,7 @@
           >
             <el-select
               v-model="row.warehouseId"
+              clearable
               filterable
               placeholder="请选择仓库"
               @change="onChangeWarehouse($event, row)"
@@ -38,6 +39,7 @@
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
               v-model="row.productId"
+              clearable
               filterable
               @change="onChangeProduct($event, row)"
               placeholder="请选择产品"
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index efa5fb56..6da0e803 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -47,6 +47,7 @@
       <el-form-item label="供应商" prop="supplierId">
         <el-select
           v-model="queryParams.supplierId"
+          clearable
           filterable
           placeholder="请选择供应商"
           class="!w-240px"
@@ -62,6 +63,7 @@
       <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
+          clearable
           filterable
           placeholder="请选择仓库"
           class="!w-240px"
@@ -77,6 +79,7 @@
       <el-form-item label="创建人" prop="creator">
         <el-select
           v-model="queryParams.creator"
+          clearable
           filterable
           placeholder="请选择创建人"
           class="!w-240px"
diff --git a/src/views/erp/stock/move/components/StockMoveItemForm.vue b/src/views/erp/stock/move/components/StockMoveItemForm.vue
index ff85ee80..8971956f 100644
--- a/src/views/erp/stock/move/components/StockMoveItemForm.vue
+++ b/src/views/erp/stock/move/components/StockMoveItemForm.vue
@@ -19,6 +19,7 @@
           >
             <el-select
               v-model="row.fromWarehouseId"
+              clearable
               filterable
               placeholder="请选择调出仓库"
               @change="onChangeWarehouse($event, row)"
@@ -40,7 +41,12 @@
             :rules="formRules.toWarehouseId"
             class="mb-0px!"
           >
-            <el-select v-model="row.toWarehouseId" filterable placeholder="请选择调入仓库">
+            <el-select
+              v-model="row.toWarehouseId"
+              clearable
+              filterable
+              placeholder="请选择调入仓库"
+            >
               <el-option
                 v-for="item in warehouseList"
                 :key="item.id"
@@ -56,6 +62,7 @@
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
               v-model="row.productId"
+              clearable
               filterable
               @change="onChangeProduct($event, row)"
               placeholder="请选择产品"
diff --git a/src/views/erp/stock/move/index.vue b/src/views/erp/stock/move/index.vue
index 75e5a85c..f9f0f5b1 100644
--- a/src/views/erp/stock/move/index.vue
+++ b/src/views/erp/stock/move/index.vue
@@ -20,7 +20,7 @@
       <el-form-item label="产品" prop="productId">
         <el-select
           v-model="queryParams.productId"
-          productId
+          clearable
           filterable
           placeholder="请选择产品"
           class="!w-240px"
@@ -47,6 +47,7 @@
       <el-form-item label="仓库" prop="fromWarehouseId">
         <el-select
           v-model="queryParams.fromWarehouseId"
+          clearable
           filterable
           placeholder="请选择仓库"
           class="!w-240px"
@@ -62,6 +63,7 @@
       <el-form-item label="创建人" prop="creator">
         <el-select
           v-model="queryParams.creator"
+          clearable
           filterable
           placeholder="请选择创建人"
           class="!w-240px"
diff --git a/src/views/erp/stock/out/StockOutForm.vue b/src/views/erp/stock/out/StockOutForm.vue
index 22e18be3..8ae8d633 100644
--- a/src/views/erp/stock/out/StockOutForm.vue
+++ b/src/views/erp/stock/out/StockOutForm.vue
@@ -29,6 +29,7 @@
           <el-form-item label="客户" prop="customerId">
             <el-select
               v-model="formData.customerId"
+              clearable
               filterable
               placeholder="请选择客户"
               class="!w-1/1"
diff --git a/src/views/erp/stock/out/components/StockOutItemForm.vue b/src/views/erp/stock/out/components/StockOutItemForm.vue
index 7d0c7f4a..b09a5695 100644
--- a/src/views/erp/stock/out/components/StockOutItemForm.vue
+++ b/src/views/erp/stock/out/components/StockOutItemForm.vue
@@ -19,6 +19,7 @@
           >
             <el-select
               v-model="row.warehouseId"
+              clearable
               filterable
               placeholder="请选择仓库"
               @change="onChangeWarehouse($event, row)"
@@ -38,6 +39,7 @@
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
             <el-select
               v-model="row.productId"
+              clearable
               filterable
               @change="onChangeProduct($event, row)"
               placeholder="请选择产品"
diff --git a/src/views/erp/stock/out/index.vue b/src/views/erp/stock/out/index.vue
index 5e841ad5..403432aa 100644
--- a/src/views/erp/stock/out/index.vue
+++ b/src/views/erp/stock/out/index.vue
@@ -47,6 +47,7 @@
       <el-form-item label="客户" prop="customerId">
         <el-select
           v-model="queryParams.customerId"
+          clearable
           filterable
           placeholder="请选择供客户"
           class="!w-240px"
@@ -62,6 +63,7 @@
       <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
+          clearable
           filterable
           placeholder="请选择仓库"
           class="!w-240px"
@@ -77,6 +79,7 @@
       <el-form-item label="创建人" prop="creator">
         <el-select
           v-model="queryParams.creator"
+          clearable
           filterable
           placeholder="请选择创建人"
           class="!w-240px"
diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue
index ec05005b..c2ceaeda 100644
--- a/src/views/erp/stock/record/index.vue
+++ b/src/views/erp/stock/record/index.vue
@@ -28,6 +28,7 @@
       <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
+          clearable
           filterable
           placeholder="请选择仓库"
           class="!w-240px"
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index 89f74d4c..04f7da2a 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -28,6 +28,7 @@
       <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
+          clearable
           filterable
           placeholder="请选择仓库"
           class="!w-240px"