金币产品与软件产品不能互切

4 weeks ago · 7194ddd3df
2 changed files with 143 additions and 113 deletions
--- a/src/components/MoneyManage/ProductSelect.vue
+++ b/src/components/MoneyManage/ProductSelect.vue
@ -12,7 +12,7 @@
    </div>

    <div class="menu" v-show="isOpen">
-      <div class="coinselect" @click="coinhandelMenu" :class="{ 'active': coinisOpen }">
+      <div class="coinselect" @click="coinhandelMenu" :class="{ 'active': coinisOpen, 'disabled-menu': restrictType === 'software' }">
        <div class="cointxt">
          {{ t('cash.goldProduct') }}
        </div>
@ -26,7 +26,7 @@
        <el-radio v-model="selectedValue" :label="t('cash.coinRecharge')" size="large" />
      </div>
      <div class="product">
-        <div class="coinselect" @click="producthandelMenu" :class="{ 'active': productisOpen }">
+        <div class="coinselect" @click="producthandelMenu" :class="{ 'active': productisOpen, 'disabled-menu': restrictType === 'gold' }">
          <div class="cointxt">
            {{ t('cash.softwareProduct') }}
          </div>
@ -154,9 +154,11 @@ const handelMenu = () => {
  ifselectAndOpen()
 }
 const coinhandelMenu = () => {
+  if (props.restrictType === 'software') return;
  coinisOpen.value = !coinisOpen.value
 }
 const producthandelMenu = () => {
+  if (props.restrictType === 'gold') return;
  productisOpen.value = !productisOpen.value
 }

@ -165,6 +167,10 @@ const props = defineProps({
  modelValue: {
    type: String,
    default: ''
+  },
+  restrictType: {
+    type: String,
+    default: 'all' // 'all', 'gold', 'software'
  }
 })

@ -513,6 +519,12 @@ defineExpose({ resetSelect });
    display: flex;
    border-radius: 5px;

+    &.disabled-menu {
+      cursor: not-allowed;
+      opacity: 0.5;
+      background-color: #f5f7fa;
+    }
+
    .cointxt {
      width: 100px;
      height: 100%;
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@ -80,9 +80,9 @@
                </div>

                <div class="table">
-                    <el-table ref="tableRef" :data="tableData" style="width: 80vw;height:64vh;" @sort-change="handleSortChange"
-                        :row-style="{ height: '60px' }" :header-cell-style="{ textAlign: 'center' }"
-                        :cell-style="{ textAlign: 'center' }">
+                    <el-table ref="tableRef" :data="tableData" style="width: 80vw;height:64vh;"
+                        @sort-change="handleSortChange" :row-style="{ height: '60px' }"
+                        :header-cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }">
                        <el-table-column type="index" :label="t('common_list.id')" width="100px" fixed="left">
                            <template #default="scope">
                                <span>{{ scope.$index + 1 + (pageInfo.pageNum - 1) * pageInfo.pageSize }}</span>
@ -218,8 +218,9 @@
                            :value="item.id" />
                    </el-select>
                </el-form-item>
-                <el-form-item :label="t('common_add.productName')" required prop="goodsName" >
-                    <ProductSelect ref="productSelectRef" v-model="addFormData.goodsName" @change="handleProductChange(addFormData.goodsName)"></ProductSelect>
+                <el-form-item :label="t('common_add.productName')" required prop="goodsName">
+                    <ProductSelect ref="productSelectRef" v-model="addFormData.goodsName" :restrictType="productRestrictType"
+                        @change="handleProductChange(addFormData.goodsName)"></ProductSelect>
                </el-form-item>
                <el-form-item v-show="!isGold" :label="t('common_add.productNum')" required>
                    <div style="display: flex;">
@ -259,15 +260,13 @@
                </el-form-item>
                <el-form-item :label="t('common_add.receiveArea')" prop="receivedMarket">
                    <CurrencySelect v-model="addFormData.receivedMarket" :items="MoneyAddressOptions"
-                            :placeholder="t('common_add.receiveAreaPlaceholder')"
-                            :disabled="isGroup"
+                        :placeholder="t('common_add.receiveAreaPlaceholder')" :disabled="isGroup"
                        @change="showWallet(addFormData.receivedMarket)">
                    </CurrencySelect>
                </el-form-item>
                <el-form-item :label="t('common_add.receiveWallet')" required prop="receivedWallet" v-show="isGold">
                    <CurrencySelect v-model="addFormData.receivedWallet" :items="MoneyWalletOptions"
-                        :placeholder="t('common_add.receiveWalletPlaceholder')"
-                        :disabled=" !selectWallet || isGroup "
+                        :placeholder="t('common_add.receiveWalletPlaceholder')" :disabled="!selectWallet || isGroup"
                        </CurrencySelect>
                </el-form-item>

@ -426,8 +425,8 @@
        </el-dialog>

        <!-- 查看驳回理由 -->
-        <el-dialog class="reject-dialog" :title="t('common_add.rejectReason')" v-model="rejectReasonVisible" width="50%" top="30vh"
-            style="min-width: 200px; max-width: 500px;" :before-close="closeRejectForm">
+        <el-dialog class="reject-dialog" :title="t('common_add.rejectReason')" v-model="rejectReasonVisible" width="50%"
+            top="30vh" style="min-width: 200px; max-width: 500px;" :before-close="closeRejectForm">
            <div class="reject-reason-box">
                {{ rejectReason }}
            </div>
@ -454,7 +453,7 @@ import _ from 'lodash'
 import { isNumber } from 'lodash'
 // 导入客服相关规则和静态数据
 import { addFormRule as getAddFormRule } from './utils/recriveFormRules.js'
-import { productList, MarketNameForId, CurrencyForId, marketList,statusList, normalizeSubmitterMarket, normalizeGoodsName, normalizePayType ,WalletForId } from './utils/staticData.js'
+import { productList, MarketNameForId, CurrencyForId, marketList, statusList, normalizeSubmitterMarket, normalizeGoodsName, normalizePayType, WalletForId } from './utils/staticData.js'
 import { selectAllWallets } from '@/api/common/common.js'
 // 国际化
 import { useI18n } from 'vue-i18n'
@ -616,7 +615,7 @@ const handlePagination = (type, val) => {

 // ===================== 客服新增/编辑收款弹窗 =====================
 const addFormisible = ref(false) // 弹窗显隐
-const addFormData = ref({ name: '', market: '', goodsName: '' , receivedWallet:'' }) // 表单数据
+const addFormData = ref({ name: '', market: '', goodsName: '', receivedWallet: '' }) // 表单数据
 const addFormRef = ref(null) // 表单引用
 const addOrEdit = ref(0) // 1=新增，2=编辑
 const isGold = ref(false) // 是否为金币充值产品
@ -630,7 +629,7 @@ const ifGold = () => {
        addFormData.value.goodNum = 0
    } else {
        isGold.value = false
-        console.log('12312312',addFormData.value.goodsName);
+        console.log('12312312', addFormData.value.goodsName);
        numUnitList.value = [t('cash.unit'), t('cash.year'), t('cash.month')]
        const selectItems = ref([
            t('cash.aiService.aiTracking'),
@ -686,68 +685,68 @@ watch(() => addFormData.value.goodsName, () => {

 // 支付方式变更：判断是否为默认归属平台
 const isGroup = ref(false)
-const selectWallet=ref(false)
+const selectWallet = ref(false)
 const ifGroup = () => {
-    addFormData.value.receivedMarket=''
-    addFormData.value.receivedWallet=''
+    addFormData.value.receivedMarket = ''
+    addFormData.value.receivedWallet = ''
    if (addFormData.value.payType === t('cash.payMethods.stripe') || addFormData.value.payType === t('cash.payMethods.paymentAsia')) {
        isGroup.value = true
        addFormData.value.receivedMarket = t('cash.markets.HongKong')
-        addFormData.value.receivedWallet=t('cash.wallet.HongKongWallet')
+        addFormData.value.receivedWallet = t('cash.wallet.HongKongWallet')
    } else if (addFormData.value.payType === t('cash.payMethods.ipay88')) {
        isGroup.value = true
        addFormData.value.receivedMarket = t('cash.markets.Malaysia')
-        addFormData.value.receivedWallet=t('cash.wallet.MalaysiaWallet')
+        addFormData.value.receivedWallet = t('cash.wallet.MalaysiaWallet')
    } else if (addFormData.value.payType === t('cash.payMethods.transfer')) {
        isGroup.value = true
        addFormData.value.receivedMarket = t('cash.markets.Canada')
-        addFormData.value.receivedWallet=t('cash.wallet.CanadaWallet')
+        addFormData.value.receivedWallet = t('cash.wallet.CanadaWallet')
    } else if (addFormData.value.payType === t('cash.payMethods.grabpay') || addFormData.value.payType === t('cash.payMethods.nets') || addFormData.value.payType === t('cash.payMethods.paypal')) {
        isGroup.value = true
        addFormData.value.receivedMarket = t('cash.markets.Singapore')
-        addFormData.value.receivedWallet=t('cash.wallet.SingaporeCMWallet')
-    }else if (addFormData.value.payType === t('cash.payMethods.paysolution')) {
+        addFormData.value.receivedWallet = t('cash.wallet.SingaporeCMWallet')
+    } else if (addFormData.value.payType === t('cash.payMethods.paysolution')) {
        isGroup.value = true
        addFormData.value.receivedMarket = t('cash.markets.Thailand')
-        addFormData.value.receivedWallet=t('cash.wallet.ThailandHAWallet')
+        addFormData.value.receivedWallet = t('cash.wallet.ThailandHAWallet')
    } else if (addFormData.value.payType === t('cash.payMethods.stripe2')) {
        isGroup.value = true
        addFormData.value.receivedMarket = t('cash.markets.Singapore')
-        addFormData.value.receivedWallet=t('cash.wallet.SingaporeHCWallet')
+        addFormData.value.receivedWallet = t('cash.wallet.SingaporeHCWallet')
    } else {
        isGroup.value = false
        selectWallet.value = true
    }
 }
 //选择地区之后  钱包下拉框显示对应地区的钱包
-const MoneyWalletOptions=ref([])
-const showWallet =(receivedMarket)=>{
+const MoneyWalletOptions = ref([])
+const showWallet = (receivedMarket) => {
    console.log('selectedMarket', receivedMarket);
-    MoneyWalletOptions.value=[]
-    addFormData.value.receivedWallet=''
-    if(receivedMarket===t('cash.markets.HongKong')){
-        selectWallet.value=false
-        addFormData.value.receivedWallet=t('cash.wallet.HongKongWallet')
-    }else if(receivedMarket===t('cash.markets.Malaysia')){
-        selectWallet.value=false
-        addFormData.value.receivedWallet=t('cash.wallet.MalaysiaWallet')
-    }else if(receivedMarket===t('cash.markets.Singapore')){
-        selectWallet.value=true
+    MoneyWalletOptions.value = []
+    addFormData.value.receivedWallet = ''
+    if (receivedMarket === t('cash.markets.HongKong')) {
+        selectWallet.value = false
+        addFormData.value.receivedWallet = t('cash.wallet.HongKongWallet')
+    } else if (receivedMarket === t('cash.markets.Malaysia')) {
+        selectWallet.value = false
+        addFormData.value.receivedWallet = t('cash.wallet.MalaysiaWallet')
+    } else if (receivedMarket === t('cash.markets.Singapore')) {
+        selectWallet.value = true
        MoneyWalletOptions.value.push(t('cash.wallet.SingaporeCMWallet'))
        MoneyWalletOptions.value.push(t('cash.wallet.SingaporeHCWallet'))
-    }else if(receivedMarket===t('cash.markets.Thailand')){
-        selectWallet.value=true
+    } else if (receivedMarket === t('cash.markets.Thailand')) {
+        selectWallet.value = true
        MoneyWalletOptions.value.push(t('cash.wallet.ThailandHSWallet'))
        MoneyWalletOptions.value.push(t('cash.wallet.ThailandHAWallet'))
-    }else if(receivedMarket===t('cash.markets.VietnamHCM')){
-        selectWallet.value=false
-        addFormData.value.receivedWallet=t('cash.wallet.VietnamHCMWallet')
-    }else if(receivedMarket===t('cash.markets.Canada')  ){
-        selectWallet.value=false
-        addFormData.value.receivedWallet=t('cash.wallet.CanadaWallet')
-    }else if(receivedMarket===t('cash.markets.Beijing')){
-        selectWallet.value=false
-        addFormData.value.receivedWallet=t('cash.wallet.BeijingWallet')
+    } else if (receivedMarket === t('cash.markets.VietnamHCM')) {
+        selectWallet.value = false
+        addFormData.value.receivedWallet = t('cash.wallet.VietnamHCMWallet')
+    } else if (receivedMarket === t('cash.markets.Canada')) {
+        selectWallet.value = false
+        addFormData.value.receivedWallet = t('cash.wallet.CanadaWallet')
+    } else if (receivedMarket === t('cash.markets.Beijing')) {
+        selectWallet.value = false
+        addFormData.value.receivedWallet = t('cash.wallet.BeijingWallet')
    }
 }

@ -810,6 +809,7 @@ const jwcodeSeachMarket = async () => {
    }
 }

+const LastGoodsName = ref('')
 // 打开新增/编辑弹窗
 const openAddForm = (row) => {
    productSelectRef.value?.resetSelect();
@ -820,6 +820,9 @@ const openAddForm = (row) => {
            ...row,
            receivedWallet: walletList.value.find(item => item.id == row.walletId)?.walletName || ''
        }
+        if (row?.goodsName) {
+            LastGoodsName.value = row?.goodsName
+        }
        console.log('这是编辑数据：', addFormData.value);
        showWallet(addFormData.value.receivedMarket)
        jwcodeSeachMarket()
@ -886,7 +889,7 @@ const handleAddForm = async () => {
            }
        }

-        if ( !isGold.value && addFormData.value.numUnit == '') {
+        if (!isGold.value && addFormData.value.numUnit == '') {
            ElMessage.error(t('elmessage.checkNumUnit'));
            return;
        }
@ -920,8 +923,8 @@ const handleAddForm = async () => {
                receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
                paymentAmount: (addFormData.value.paymentAmount) * 100,
                submitterMarket: normalizeSubmitterMarket(adminData.value.markets),
-                ...(isGold. value ? { 
-                walletId:WalletForId(addFormData.value.receivedWallet)
+                ...(isGold.value ? {
+                    walletId: WalletForId(addFormData.value.receivedWallet)
                } : {})
            }
        })
@ -929,7 +932,7 @@ const handleAddForm = async () => {
            ElMessage.success(t('elmessage.addSuccess'))
            getlist()
            closeAddForm()
-        }else if(result.code == 0){
+        } else if (result.code == 0) {
            ElMessage.error(result.msg);
            return;
        }
@ -991,14 +994,14 @@ const handleEditForm = async () => {
                paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
                receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
                paymentAmount: (addFormData.value.paymentAmount) * 100,
-                walletId:WalletForId(addFormData.value.receivedWallet)
+                walletId: WalletForId(addFormData.value.receivedWallet)
            }
        })
        if (result.code == 200) {
            ElMessage.success(t('elmessage.editSuccess'))
            getlist()
            closeAddForm()
-        }else if(result.code == 0){
+        } else if (result.code == 0) {
            ElMessage.error(result.msg);
            return;
        }
@ -1052,7 +1055,20 @@ const handleCurrencyChange = (option) => {
 };

 // 产品名称改变时触发
+const productRestrictType = computed(() => {
+    if (addOrEdit.value == 2) {
+        if (LastGoodsName.value == t('cash.coinRecharge')) {
+            return 'gold'
+        } else if (LastGoodsName.value) {
+            return 'software'
+        }
+    }
+    return 'all'
+})
+
 const handleProductChange = (productName) => {
+    console.log('LastGoodsName:', LastGoodsName.value);
+    LastGoodsName.value = productName
    console.log('选中的产品名称:', productName);
    if (productName && productName == t('cash.coinRecharge')) {
        showWallet(addFormData.value.receivedMarket)
@ -1593,6 +1609,7 @@ onMounted(async () => {

    :deep(.refundDialog) {
        background: #F3FAFE !important;
+
        .left {
            width: 50%;
            height: 70vh;
@ -1655,6 +1672,7 @@ onMounted(async () => {
 :deep(.reject-dialog) {
    background-color: #F3FAFE !important;
 }
+
 .reject-reason-box {
    width: 80%;
    padding: 20px;