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

.env.development

@@ -11,7 +11,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 # zhangyong
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 本地
-# VITE_API_BASE='http://localhost:8081/'
+VITE_API_BASE='http://localhost:8081/'
 # sunjiabei
 # VITE_API_BASE='http://192.168.1.70:8081/'
 

src/views/moneyManage/receiveDetail/receiveDetail.vue

@@ -218,7 +218,7 @@
                                 <span v-else-if="kefu && scope.row.status == 5" style="color: #2741DE;"
                                     @click="openAddForm(scope.row)">编辑</span>
                                 <span v-else-if="kefu && scope.row.status == 0" style="color: #FA5A1E;"
-                                    @click="openConfirm('recall')">撤回</span>
+                                    @click="openConfirm('recall',scope.row)">撤回</span>
                                 <span v-else-if="kefu && scope.row.status == 2" style="color: #FA5A1E;"
                                     @click="openRejectReason(scope.row.rejectReason)">查看驳回理由</span>
                                 <span v-else-if="activeTab == 'wait' && !kefu" style="color: #2741DE;"
@@ -250,7 +250,7 @@
                 <button @click="closeRecall" class="Btn">取消</button>
             </div>
             <div class="confirm">
-                <button @click="" class="Btn">确定</button>
+                <button @click="handleRecall" class="Btn">确定</button>
             </div>
         </div>
         <!-- 退款确认 -->
@@ -452,11 +452,12 @@
                                 clearable></el-select>
                         </el-form-item>
                         <el-form-item label="付款币种">
-                            <CurrencySelect :disabled="!isOnline" v-model="editFormData.paymentCurrency" :items="customOptions"
-                                placeholder="请选择付款币种"/>
+                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                                :items="customOptions" placeholder="请选择付款币种" />
                         </el-form-item>
                         <el-form-item label="付款金额">
-                            <el-input :disabled="!isOnline" v-model="editFormData.paymentAmount" placeholder="请输入付款金额" />
+                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
+                                placeholder="请输入付款金额" />
                         </el-form-item>
                         <el-form-item label="支付方式">
                             <el-select disabled="true" v-model="editFormData.payType" placeholder="请选择支付方式"
@@ -842,10 +843,10 @@ const handleAddForm = async () => {
                 submitterId: adminData.value.id,
                 permanentGold: (addFormData.value.permanentGold || 0) * 100,
                 freeGold: (addFormData.value.freeGold || 0) * 100,
-                goodNum: paymentAmount || 0,
+                goodNum: addFormData.value.goodNum || 0,
                 paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '',
                 receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '',
-                paymentAmount:(addFormData.value.freeGold)*100
+                paymentAmount: (addFormData.value.paymentAmount) * 100
             }
         })
         if (result.code == 200) {
@@ -1012,6 +1013,7 @@ const submitRefund = async () => {
 const textContent = ref('')
 const recallDialog = ref(false)
 const refundConfirmDialog = ref(false)
+const RecallNum = ref('')
 const openConfirm = (val, row) => {
     console.log('打开弹窗', val, row);
     if (val == 'refund') {
@@ -1022,11 +1024,31 @@ const openConfirm = (val, row) => {
     if (val == 'recall') {
         textContent.value = '将要撤回该信息!'
         recallDialog.value = true
+        RecallNum.value = row.orderCode
     }
 }
 const closeRecall = () => {
     recallDialog.value = false
     textContent.value = ''
+    RecallNum.value = ''
+}
+const handleRecall = async() => {
+    try {
+        const result = await request({
+            url: '/cashCollection/cancel',
+            data: {
+                orderCode: RecallNum.value,
+            }
+        })
+        if (result.code == 200) {
+            ElMessage.success('撤回成功')
+            getlist()
+            closeRecall()
+        }
+        console.log('返回参数：', result);
+    } catch (error) {
+        console.log(error);
+    }
 }
 const closeConfirmRefund = () => {
     refundConfirmDialog.value = false