From a17be0b4b85f3f0116802234045b377e881097ff Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 6 Nov 2025 11:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E6=96=B0=E5=A2=9E=E5=B8=A6?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MoneyManage/CurrencySelect.vue      | 53 +++++++++++-----------
 .../moneyManage/receiveDetail/receiveService.vue   | 34 ++++++++------
 .../receiveDetail/utils/recriveFormRules.js        | 10 +---
 .../moneyManage/receiveDetail/utils/staticData.js  |  4 +-
 4 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/src/components/MoneyManage/CurrencySelect.vue b/src/components/MoneyManage/CurrencySelect.vue
index f0a01ba..0f4281f 100644
--- a/src/components/MoneyManage/CurrencySelect.vue
+++ b/src/components/MoneyManage/CurrencySelect.vue
@@ -124,7 +124,7 @@ watch(() => props.modelValue, (newVal) => {
 // 下拉容器
 .dropdown {
   position: relative;
-  width: 268px;
+  width: 100%;
   font-family: 'Arial', sans-serif;
 }
 
@@ -154,30 +154,32 @@ watch(() => props.modelValue, (newVal) => {
     width: 100%;
     height: 100%;
     position: sticky;
-  }
 
-  // 搜索输入框
-  .search-input {
-    width: 100%;
-    height: 90%;
-    /* 左侧留出图标空间 */
-    box-sizing: border-box;
-    border: none;
-    border-radius: 6px;
-    padding-left: 11px;
-    outline: none;
-    font-size: 14px;
-    transition: border-color 0.3s ease;
-
-    &::placeholder {
-      color: #999999;
-      opacity: 1;
-      font-style: normal;
-      font-weight: 350;
-      line-height: 22px;
+    // 搜索输入框
+    .search-input {
+      width: 100%;
+      height: 90%;
+      /* 左侧留出图标空间 */
+      box-sizing: border-box;
+      border: none;
+      border-radius: 6px;
+      padding-left: 11px;
+      outline: none;
+      font-size: 14px;
+      transition: border-color 0.3s ease;
+
+      &::placeholder {
+        color: #999999;
+        opacity: 1;
+        font-style: normal;
+        font-weight: 350;
+        line-height: 22px;
+      }
     }
-
   }
+   .arrow {
+      color: #9ca3af;
+    }
 
   .clear-icon {
     position: absolute;
@@ -211,9 +213,6 @@ watch(() => props.modelValue, (newVal) => {
       display: none;
     }
 
-    .arrow {
-      color: #9ca3af;
-    }
 
     &:hover {
       border-color: #d1d5db;
@@ -250,7 +249,7 @@ watch(() => props.modelValue, (newVal) => {
   position: absolute;
   top: 100%; // 紧贴触发器下方
   left: 0;
-  width: 100%;
+  width: 120%;
   border: 1px solid #678BFF;
   min-height: 50px;
   max-height: 300px;
@@ -313,7 +312,7 @@ watch(() => props.modelValue, (newVal) => {
   border: none;
   border-radius: 10px;
   background-color: #fff;
-  box-shadow:0 0 0 1px rgba(200, 200, 200, 0.3) ;
+  box-shadow: 0 0 0 1px rgba(200, 200, 200, 0.3);
   font-size: 12px;
   font-style: normal;
   font-weight: 700;
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index c71cf4d..3e26dd0 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -189,11 +189,11 @@
                 <el-form-item label="客户姓名" required prop="name">
                     <el-input disabled v-model="addFormData.name" placeholder="请输入客户姓名" />
                 </el-form-item>
-                <el-form-item label="所属地区" required prop="market">
+                <el-form-item label="所属地区"  prop="market">
                     <el-input disabled v-model="addFormData.marketName" placeholder="请输入所属地区" />
                 </el-form-item>
                 <el-form-item label="活动名称" required prop="activity">
-                    <el-select v-model="addFormData.activity" placeholder="请选择活动方式"  clearable>
+                    <el-select v-model="addFormData.activity" placeholder="请选择活动方式" clearable>
                         <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
                             :value="item.id" />
                     </el-select>
@@ -202,9 +202,11 @@
                     <ProductSelect ref="productSelectRef" v-model="addFormData.goodsName"></ProductSelect>
                 </el-form-item>
                 <el-form-item v-show="!isGold" label="产品数量" required prop="goodNum">
-                    <div style="padding-right: 50px; display: flex;">
-                        <el-input style="padding-right: 10px;" v-model="addFormData.goodNum" placeholder="请输入产品数量" />
-                        <span style="color: #999999;">{{ productUnit }}</span>
+                    <div style="display: flex;">
+                        <el-input style="padding-right: 30px; flex: 3;" v-model="addFormData.goodNum"
+                            placeholder="请输入产品数量" />
+                        <CurrencySelect v-model="addFormData.numUnit" :items="numUnitList" style="flex: 1.5;"
+                            placeholder="单位" @change="handleCurrencyChange" />
                     </div>
                 </el-form-item>
                 <div v-show="isGold" style="margin-bottom: 15px;  display: flex;">
@@ -233,7 +235,7 @@
                         @change="ifGroup">
                     </CurrencySelect>
                 </el-form-item>
-                <el-form-item label="到账地区" required prop="receivedMarket">
+                <el-form-item label="到账地区" prop="receivedMarket">
                     <CurrencySelect v-model="addFormData.receivedMarket" :items="MoneyAddressOptions"
                         :disabled="isGroup" placeholder="请选择到账地区">
                     </CurrencySelect>
@@ -242,7 +244,7 @@
                     <el-date-picker type="datetime" placement="right" v-model="addFormData.payTime"
                         placeholder="请选择付款时间" />
                 </el-form-item>
-                <el-form-item label="转账凭证" required prop="voucher">
+                <el-form-item label="转账凭证"  prop="voucher">
                     <div class="pic">
                         <el-upload ref="uploadRef" class="uploader" :show-file-list="false" list-type="picture-card"
                             :auto-upload="false" :before-upload="beforeUpload" :on-error="handelImgErr"
@@ -255,7 +257,7 @@
                         </el-upload>
                     </div>
                 </el-form-item>
-                <el-form-item label="备注" required prop="remark">
+                <el-form-item label="备注"  prop="remark">
                     <el-input v-model="addFormData.remark" type="textarea" :rows="4" placeholder="请输入备注" maxlength="100"
                         show-word-limit />
                 </el-form-item>
@@ -392,7 +394,7 @@ import { hasMenuPermission } from '@/utils/menuTreePermission.js'
 import _ from 'lodash'
 // 导入客服相关规则和静态数据
 import { addFormRule } from './utils/recriveFormRules.js'
-import { productList, MarketNameForId, CurrencyForId, marketList, statusList } from './utils/staticData.js'
+import { productList, MarketNameForId, CurrencyForId, marketList, statusList, numUnitList } from './utils/staticData.js'
 
 // ===================== 基础状态管理（仅保留客服相关） =====================
 const adminStore = useAdminStore();
@@ -504,7 +506,6 @@ const addFormData = ref({ name: '', market: '', permanentGold: 0, freeGold: 0, g
 const addFormRef = ref(null) // 表单引用
 const addOrEdit = ref(0) // 1=新增，2=编辑
 const isGold = ref(false) // 是否为金币充值产品
-const productUnit = ref('个') // 产品单位
 const productSelectRef = ref(null) // 产品选择器引用
 const uploadRef = ref(null) // 上传组件引用
 
@@ -515,9 +516,14 @@ const ifGold = () => {
         addFormData.value.goodNum = 0
     } else {
         isGold.value = false
-        // 特殊产品单位为“年”
-        const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", "静态信息费", "博股会员"]
-        productUnit.value = selectItems.includes(addFormData.value.goodsName) ? '年' : '个'
+        const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", 'HC信息费']
+        if (selectItems.includes(addFormData.value.goodsName)) {
+            addFormData.value.numUnit = ''
+        } else if (addFormData.value.goodsName == '静态信息费') {
+            addFormData.value.numUnit = '年'
+        }else{
+            addFormData.value.numUnit = '个'
+        }
     }
 }
 
@@ -740,8 +746,6 @@ const ifRefundGold = () => {
         refundFormData.value.goodNum = 0
     } else {
         isRefundGold.value = false
-        const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", "静态信息费", "博股会员"]
-        productUnit.value = selectItems.includes(refundFormData.value.goodsName) ? '年' : '个'
     }
 }
 
diff --git a/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js b/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js
index 12589fc..7f1bb2d 100644
--- a/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js
+++ b/src/views/moneyManage/receiveDetail/utils/recriveFormRules.js
@@ -9,7 +9,7 @@ export const addFormRule = {
         { required: true, message: '请输入客户姓名', trigger: 'blur' }
     ],
     // 所属地区：必填
-    marketName: [
+    market: [
         { required: true, message: '请选择所属地区', trigger: 'blur' }
     ],
     // 活动名称：必填 + 长度小于30
@@ -80,14 +80,6 @@ export const addFormRule = {
     // 付款时间：必填
     payTime: [
         { required: true, message: '请选择付款时间', trigger: 'change' }
-    ],
-    // 转账凭证：必填
-    voucher: [
-        { required: true, message: '请上传转账凭证', trigger: 'change' }
-    ],
-    // 备注：必填
-    remark: [
-        { required: true, message: '请输入备注', trigger: 'blur' }
     ]
 };
 
diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js
index 12acd6a..35dce6c 100644
--- a/src/views/moneyManage/receiveDetail/utils/staticData.js
+++ b/src/views/moneyManage/receiveDetail/utils/staticData.js
@@ -256,4 +256,6 @@ export const statusList = [
     name: '已驳回',
     value: 2
   },
-]
\ No newline at end of file
+]
+
+export const numUnitList = ['个', '年', '月']
\ No newline at end of file