Merge branch 'zhangyong/milestone-20250913-现金管理二期' into milestone-20251104-现金二期

src/components/MoneyManage/ProductSelect.vue

@@ -135,8 +135,8 @@ watch(selectedValue, (newVal) => {
 });
 
 
-const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机活跃度']
-const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘']
+const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机活跃度','AI机构探测神器']
+const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘','超级机构探测神器']
 const InfoFee = ['静态信息费', '博股会员']
 const menuData = [
   {

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -162,8 +162,8 @@
                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
                         <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
                             show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'" width="150px"
-                            show-overflow-tooltip>
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                            width="150px" show-overflow-tooltip>
                             <template #default="scope">
                                 <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
                                 <span style="color: rgb(127,204,133);" v-else>正常</span>
@@ -543,12 +543,12 @@
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.permanentGold" dsabled />
+                                v-model="refundFormData.partRefundGold" dsabled />
                         </div>
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.freeGold"  />
+                                v-model="refundFormData.partRefundFree" />
                         </div>
                     </div>
                     <div class="add-item">
@@ -650,16 +650,8 @@ const openRefundDialog = () => {
 const closeRefundForm = () => {
     refundDialog.value = false
     refundFormData.value = {}
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 
-const refundCoinData = ref({
-    permanentGold: 0,
-    freeGold: 0
-})
 const isRefundGold = ref(false)
 const ifRefundGold = () => {
     if (refundFormData.value.goodsName === '金币充值') {
@@ -763,10 +755,6 @@ const getlist = async () => {
 const resetRefund = () => {
     refundFormData.value.refundModel = ''
     refundFormData.value.refundReason = ''
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 //提交退款
 const submitRefund = async () => {
@@ -781,24 +769,27 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
-        if(refundFormData.value.refundReason){
-            
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
         }
         const result = await request({
             url: '/Money/addOnline',
             data: {
-                jwcode: refundFormData.value.jwcode, // 精网号（必填）
-                name: refundFormData.value.name,  // 姓名（必填）
-                market: refundFormData.value.marketName,  // 所属地区（必填）
-                submitterMarket:adminData.value.markets,
+                jwcode: refundFormData.value.jwcode,
+                name: refundFormData.value.name,
+                market: refundFormData.value.marketName,
                 submitterId: adminData.value.id,
-                remark: refundFormData.value.remark,  // 备注信息（可选）
-                refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
-                refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）
-                id: refundFormData.value.id,                      //订单id
+                submitterMarket: adminData.value.markets,
+                remark: refundFormData.value.remark,
+                refundReason: refundFormData.value.refundReason,
+                refundModel: refundFormData.value.refundModel,
+                id: refundFormData.value.id,
                 orderCode: refundFormData.value.orderCode,
-                permanentGold: (refundCoinData.value.permanentGold) * 100 || 0,
-                freeGold: (refundCoinData.value.freeGold) * 100 || 0
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0,
+                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
             }
         })
         if (result.code == 200) {
@@ -1102,9 +1093,9 @@ onMounted(async () => {
     await getlist();
 
     // 菜单权限校验（确保地区财务权限）
-    if (!hasMenuPermission(menuTree.value, 78)) {
+    if (!hasMenuPermission(menuTree.value, 67)) {
         ElMessageBox.alert(
-            '您暂无地区财务操作权限，请联系管理员',
+            '您暂无该页面操作权限，请联系管理员',
             '权限提示',
             { type: 'error' }
         ).then(() => {

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -162,8 +162,8 @@
                             v-if="activeTab == 'pass' || activeTab == 'done'" width="180px" />
                         <el-table-column prop="remark" label="备注" v-if="activeTab != 'reject'" width="150px"
                             show-overflow-tooltip></el-table-column>
-                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'" width="150px"
-                            show-overflow-tooltip>
+                        <el-table-column prop="status" fixed="right" label="订单状态" v-if="activeTab == 'done'"
+                            width="150px" show-overflow-tooltip>
                             <template #default="scope">
                                 <span style="color: rgb(242, 84, 83);" v-if="scope.row.status == 6">退款</span>
                                 <span style="color: rgb(127,204,133);" v-else>正常</span>
@@ -543,12 +543,12 @@
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.permanentGold" dsabled />
+                                v-model="refundFormData.partRefundGold" dsabled />
                         </div>
                         <div style=" display: flex; align-items: center;justify-content: center; ">
                             <span style="color: #999999;  white-space: nowrap;">免费金币：</span>
                             <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
-                                v-model="refundCoinData.freeGold"  />
+                                v-model="refundFormData.partRefundFree" />
                         </div>
                     </div>
                     <div class="add-item">
@@ -650,16 +650,8 @@ const openRefundDialog = () => {
 const closeRefundForm = () => {
     refundDialog.value = false
     refundFormData.value = {}
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 
-const refundCoinData = ref({
-    permanentGold: 0,
-    freeGold: 0
-})
 const isRefundGold = ref(false)
 const ifRefundGold = () => {
     if (refundFormData.value.goodsName === '金币充值') {
@@ -763,10 +755,6 @@ const getlist = async () => {
 const resetRefund = () => {
     refundFormData.value.refundModel = ''
     refundFormData.value.refundReason = ''
-    refundCoinData.value = {
-        permanentGold: 0,
-        freeGold: 0
-    }
 }
 //提交退款
 const submitRefund = async () => {
@@ -781,35 +769,27 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
+        }
         const result = await request({
             url: '/Money/addOnline',
             data: {
-                jwcode: refundFormData.value.jwcode, // 精网号（必填）
-                name: refundFormData.value.name,  // 姓名（必填）
-                market: refundFormData.value.marketName,  // 所属地区（必填）
-                activity: refundFormData.value.activity, // 活动名称（可选）
-                bankCode: refundFormData.value.bankCode,  // 银行流水订单号（必填）
-                goodsName: refundFormData.value.goodsName, // 商品名称（必填）
-                goodNum: refundFormData.value.goodNum,  // 商品数量（必填，默认0）
-                paymentCurrency: refundFormData.value.paymentCurrency,  // 付款币种（必填）
-                paymentAmount: (refundFormData.value.paymentAmount) * 100,  // 付款金额（必填）
-                receivedCurrency: refundFormData.value.receivedCurrency,  // 到账币种（必填）
-                receivedAmount: (refundFormData.value.receivedAmount) * 100,  // 到账金额（必填）
-                handlingCharge: (refundFormData.value.handlingCharge) * 100,  // 手续费（可选）
-                receivedMarket: refundFormData.value.receivedMarket, // 到账地区（可选）
-                payType: refundFormData.value.payType,  // 支付方式（必填）
-                payTime: refundFormData.value.payTime,  // 付款时间，格式：yyyy-MM-dd HH:mm:ss（可选）
-                receivedTime: refundFormData.value.receivedTime,  // 到账时间，格式：yyyy-MM-dd HH:mm:ss（可选）
-                areaServise: adminData.value.adminName,  // 提交人（可选）
+                jwcode: refundFormData.value.jwcode,
+                name: refundFormData.value.name,
+                market: refundFormData.value.marketName,
                 submitterId: adminData.value.id,
-                voucher: refundFormData.value.voucher,  // 转账凭证URL（可选）
-                remark: refundFormData.value.remark,  // 备注信息（可选）
-                refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
-                refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）
-                id: refundFormData.value.id,                      //订单id
+                submitterMarket: adminData.value.markets,
+                remark: refundFormData.value.remark,
+                refundReason: refundFormData.value.refundReason,
+                refundModel: refundFormData.value.refundModel,
+                id: refundFormData.value.id,
                 orderCode: refundFormData.value.orderCode,
-                permanentGold: (refundCoinData.value.permanentGold) * 100 || 0,
-                freeGold: (refundCoinData.value.freeGold) * 100 || 0
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0,
+                partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
+                partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
             }
         })
         if (result.code == 200) {
@@ -1113,9 +1093,9 @@ onMounted(async () => {
     await getlist();
 
     // 菜单权限校验（确保地区财务权限）
-    if (!hasMenuPermission(menuTree.value, 78)) {
+    if (!hasMenuPermission(menuTree.value, 79)) {
         ElMessageBox.alert(
-            '您暂无地区财务操作权限，请联系管理员',
+            '您暂无该页面操作权限，请联系管理员',
             '权限提示',
             { type: 'error' }
         ).then(() => {

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -139,9 +139,9 @@
                 </div>
 
                 <div class="pagination">
-                    <el-pagination background  :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                        layout="total, sizes, prev, pager, next, jumper" :total="total"
-                        @size-change="handlePagination('size', $event)"
+                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
+                        :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                        :total="total" @size-change="handlePagination('size', $event)"
                         @current-change="handlePagination('page', $event)"></el-pagination>
                 </div>
             </el-card>
@@ -302,8 +302,8 @@
                         <el-text style="width:4vw;">产品数量</el-text>
                         <el-input style="padding-right: 10px; width:6.5vw;" v-model="refundFormData.goodNum"
                             placeholder="请输入产品数量" disabled />
-                        <CurrencySelect disabled v-model="refundFormData.numUnit" :items="numUnitList" style="width: 3.5vw;"
-                            placeholder="单位" @change="handleCurrencyChange" />
+                        <CurrencySelect disabled v-model="refundFormData.numUnit" :items="numUnitList"
+                            style="width: 3.5vw;" placeholder="单位" @change="handleCurrencyChange" />
                     </div>
                     <div v-show="isRefundGold" style="margin-bottom: 15px; ">
                         <div style=" display: flex; ">
@@ -364,11 +364,13 @@
                             <el-radio value="1">部分退款</el-radio>
                         </el-radio-group>
                     </div>
-                    <div class="add-item" v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
+                    <div class="add-item"
+                        v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
                         <el-text style="width:4vw;">永久金币</el-text>
                         <el-input v-model="refundFormData.partRefundGold" style="width:5vw;" />&nbsp;&nbsp;个
                     </div>
-                    <div class="add-item" v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
+                    <div class="add-item"
+                        v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
                         <el-text style="width:4vw;">免费金币</el-text>
                         <el-input v-model="refundFormData.partRefundFree" style="width:5vw;" />&nbsp;&nbsp;个
                     </div>
@@ -819,6 +821,10 @@ const closeRefundForm = () => {
 // 提交退款
 const submitRefund = async () => {
     try {
+        if (refundFormData.value.refundModel == 0) {
+            refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
+            refundFormData.value.partRefundFree = refundFormData.value.freeGold
+        }
         const result = await request({
             url: '/Money/add',
             data: {