✨ ERP：增加 ERP 销售出库的编辑界面

YunaiV · YunaiV · commit 00a386dd7c2a · 2024-02-11T16:12:12.000+08:00
diff --git a/src/api/erp/sale/order/index.ts b/src/api/erp/sale/order/index.ts
@@ -10,7 +10,7 @@ export interface SaleOrderVO {
   totalPrice: number // 合计金额，单位：元
   status: number // 状态
   remark: string // 备注
-  inCount: number // 销售入库数量
+  outCount: number // 销售出库数量
   returnCount: number // 销售退货数量
 }
 
diff --git a/src/views/erp/sale/order/SaleOrderForm.vue b/src/views/erp/sale/order/SaleOrderForm.vue
@@ -43,6 +43,24 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="销售人员" prop="saleUserId">
+            <el-select
+              v-model="formData.saleUserId"
+              clearable
+              filterable
+              placeholder="请选择销售人员"
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
@@ -140,6 +158,7 @@ import SaleOrderItemForm from './components/SaleOrderItemForm.vue'
 import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
 import { AccountApi, AccountVO } from '@/api/erp/finance/account'
 import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils'
+import * as UserApi from '@/api/system/user'
 
 /** ERP 销售订单表单 */
 defineOptions({ name: 'SaleOrderForm' })
@@ -155,6 +174,7 @@ const formData = ref({
   id: undefined,
   customerId: undefined,
   accountId: undefined,
+  saleUserId: undefined,
   orderTime: undefined,
   remark: undefined,
   fileUrl: '',
@@ -173,6 +193,7 @@ const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
 const customerList = ref<CustomerVO[]>([]) // 客户列表
 const accountList = ref<AccountVO[]>([]) // 账户列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 子表的表单 */
 const subTabsName = ref('item')
@@ -211,6 +232,8 @@ const open = async (type: string, id?: number) => {
   }
   // 加载客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
+  // 加载用户列表
+  userList.value = await UserApi.getSimpleUserList()
   // 加载账户列表
   accountList.value = await AccountApi.getAccountSimpleList()
   const defaultAccount = accountList.value.find((item) => item.defaultStatus)
@@ -251,6 +274,7 @@ const resetForm = () => {
     id: undefined,
     customerId: undefined,
     accountId: undefined,
+    saleUserId: 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
@@ -153,7 +153,6 @@ const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
   inId: [{ required: true, message: '出库编号不能为空', trigger: 'blur' }],
-  warehouseId: [{ required: true, message: '仓库不能为空', trigger: 'blur' }],
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
   count: [{ required: true, message: '产品数量不能为空', trigger: 'blur' }]
 })
diff --git a/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue b/src/views/erp/sale/order/components/SaleOrderOutEnableList.vue
@@ -92,7 +92,7 @@
         <el-table-column
           label="出库数量"
           align="center"
-          prop="inCount"
+          prop="outCount"
           :formatter="erpCountTableColumnFormatter"
         />
         <el-table-column
diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
@@ -182,7 +182,7 @@
       <el-table-column
         label="出库数量"
         align="center"
-        prop="inCount"
+        prop="outCount"
         :formatter="erpCountTableColumnFormatter"
       />
       <el-table-column
diff --git a/src/views/erp/sale/out/SaleOutForm.vue b/src/views/erp/sale/out/SaleOutForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1440">
     <el-form
       ref="formRef"
       :model="formData"
@@ -25,6 +25,17 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="关联订单" prop="orderNo">
+            <el-input v-model="formData.orderNo" readonly>
+              <template #append>
+                <el-button @click="openSaleOrderOutEnableList">
+                  <Icon icon="ep:search" /> 选择
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="customerId">
             <el-select
@@ -44,17 +55,24 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="关联订单" prop="orderNo">
-            <el-input v-model="formData.orderNo" readonly>
-              <template #append>
-                <el-button @click="openSaleOrderOutEnableList">
-                  <Icon icon="ep:search" /> 选择
-                </el-button>
-              </template>
-            </el-input>
+          <el-form-item label="销售人员" prop="saleUserId">
+            <el-select
+              v-model="formData.saleUserId"
+              clearable
+              filterable
+              placeholder="请选择销售人员"
+              class="!w-1/1"
+            >
+              <el-option
+                v-for="item in userList"
+                :key="item.id"
+                :label="item.nickname"
+                :value="item.id"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input
               type="textarea"
@@ -105,6 +123,18 @@
             <el-input disabled v-model="formData.totalPrice" :formatter="erpPriceInputFormatter" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="其它费用" prop="otherPrice">
+            <el-input-number
+              v-model="formData.otherPrice"
+              controls-position="right"
+              :min="0"
+              :precision="2"
+              placeholder="请输入其它费用"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="结算账户" prop="accountId">
             <el-select
@@ -124,13 +154,13 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="收取订金" prop="depositPrice">
+          <el-form-item label="本次收款" prop="payPrice">
             <el-input-number
-              v-model="formData.depositPrice"
+              v-model="formData.payPrice"
               controls-position="right"
               :min="0"
               :precision="2"
-              placeholder="请输入收取订金"
+              placeholder="请输入本次收款"
               class="!w-1/1"
             />
           </el-form-item>
@@ -156,6 +186,7 @@ import { AccountApi, AccountVO } from '@/api/erp/finance/account'
 import { erpPriceInputFormatter, erpPriceMultiply } from '@/utils'
 import SaleOrderOutEnableList from '@/views/erp/sale/order/components/SaleOrderOutEnableList.vue'
 import { SaleOrderVO } from '@/api/erp/sale/order'
+import * as UserApi from '@/api/system/user'
 
 /** ERP 销售出库表单 */
 defineOptions({ name: 'SaleOutForm' })
@@ -171,25 +202,29 @@ const formData = ref({
   id: undefined,
   customerId: undefined,
   accountId: undefined,
+  saleUserId: undefined,
   outTime: undefined,
   remark: undefined,
   fileUrl: '',
   discountPercent: 0,
   discountPrice: 0,
   totalPrice: 0,
-  depositPrice: 0,
+  otherPrice: 0,
+  payPrice: 0,
   orderNo: undefined,
   items: [],
   no: undefined // 出库单号，后端返回
 })
 const formRules = reactive({
   customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }],
-  outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }]
+  outTime: [{ required: true, message: '出库时间不能为空', trigger: 'blur' }],
+  payPrice: [{ required: true, message: '本次收款不能为空', trigger: 'blur' }]
 })
 const disabled = computed(() => formType.value === 'detail')
 const formRef = ref() // 表单 Ref
 const customerList = ref<CustomerVO[]>([]) // 客户列表
 const accountList = ref<AccountVO[]>([]) // 账户列表
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 子表的表单 */
 const subTabsName = ref('item')
@@ -202,11 +237,17 @@ watch(
     if (!val) {
       return
     }
+    // 计算
     const totalPrice = val.items.reduce((prev, curr) => prev + curr.totalPrice, 0)
     const discountPrice =
       val.discountPercent != null ? erpPriceMultiply(totalPrice, val.discountPercent / 100.0) : 0
+    // debugger
+    // TODO 芋艿：这里有问题
+    const payPrice = totalPrice - discountPrice + val.otherPrice
+    // 赋值
     formData.value.discountPrice = discountPrice
     formData.value.totalPrice = totalPrice - discountPrice
+    formData.value.payPrice = payPrice
   },
   { deep: true }
 )
@@ -228,15 +269,14 @@ const open = async (type: string, id?: number) => {
   }
   // 加载客户列表
   customerList.value = await CustomerApi.getCustomerSimpleList()
+  // 加载用户列表
+  userList.value = await UserApi.getSimpleUserList()
   // 加载账户列表
   accountList.value = await AccountApi.getAccountSimpleList()
   const defaultAccount = accountList.value.find((item) => item.defaultStatus)
   if (defaultAccount) {
     formData.value.accountId = defaultAccount.id
   }
-
-  // TODO 芋艿：单独搞
-  // saleOrderOutEnableListRef.value.open()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -247,18 +287,17 @@ const openSaleOrderOutEnableList = () => {
 }
 
 const handleSaleOrderChange = (order: SaleOrderVO) => {
-  debugger
+  // 将订单设置到出库单
+  formData.value.orderId = order.id
   formData.value.orderNo = order.no
-  // formData.value.customerId = order.customerId
-  // formData.value.accountId = order.accountId
-  // formData.value.items = order.items.map((item) => {
-  //   return {
-  //     productId: item.productId,
-  //     count: item.count,
-  //     productPrice: item.productPrice,
-  //     taxPercent: item.taxPercent
-  //   }
-  // })
+  formData.value.customerId = order.customerId
+  formData.value.accountId = order.accountId
+  formData.value.saleUserId = order.saleUserId
+  formData.value.discountPercent = order.discountPercent
+  formData.value.remark = order.remark
+  formData.value.fileUrl = order.fileUrl
+  // 将订单项设置到出库单项
+  formData.value.items = order.items.filter((item) => item.count > item.outCount)
 }
 
 /** 提交表单 */
@@ -292,13 +331,15 @@ const resetForm = () => {
     id: undefined,
     customerId: undefined,
     accountId: undefined,
+    saleUserId: undefined,
     outTime: undefined,
     remark: undefined,
     fileUrl: undefined,
     discountPercent: 0,
     discountPrice: 0,
     totalPrice: 0,
-    depositPrice: 0,
+    otherPrice: 0,
+    payPrice: 0,
     items: []
   }
   formRef.value?.resetFields()
diff --git a/src/views/erp/sale/out/components/SaleOutItemForm.vue b/src/views/erp/sale/out/components/SaleOutItemForm.vue

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export interface SaleOrderVO {`
`10`	`10`	`totalPrice: number // 合计金额，单位：元`
`11`	`11`	`status: number // 状态`
`12`	`12`	`remark: string // 备注`
`13`		`- inCount: number // 销售入库数量`
	`13`	`+ outCount: number // 销售出库数量`
`14`	`14`	`returnCount: number // 销售退货数量`
`15`	`15`	`}`
`16`	`16`