Merge branch 'wyz' into 'test'

入账检核--修改入账状态发布测试 See merge request !126

Merge branch 'wyz' into 'test'
入账检核--修改入账状态发布测试 See merge request !126
0b469171 · yuzhenWang · 7e34eea4 · 0b2828d7 · 0b469171 · 0b469171
Commit 0b469171 authored May 08, 2026 by yuzhenWang
Hide whitespace changes
Inline Side-by-side

Showing with 99 additions and 9 deletions

src/api/financial/commission.js
+4 -4

src/views/financialCenter/financialIncome.vue
+95 -5

No files found.
--- a/src/api/financial/commission.js
+++ b/src/api/financial/commission.js
@@ -539,11 +539,11 @@ export function actualPayoutDateApi(data) {
    data: data
  })
 }
-//出账检核--修改结算汇率
+//入账检核--修改入账状态
-export function editExchangeRateApi(data) {
+export function editStatusApi(data) {
  return request({
-    url: 'csf/api/fortune/edit/exchange_rate',
+    url: 'csf/api/commission/edit/status',
-    method: 'post',
+    method: 'put',
    data: data
  })
 }
--- a/src/views/financialCenter/financialIncome.vue
+++ b/src/views/financialCenter/financialIncome.vue
@@ -411,7 +411,7 @@
      @close="viewRecordDialogFlag = false"
    >
    </CommonDialog>
-    <!-- 更新数据 -->
+    <!-- 修改检核 -->
    <CommonDialog
      dialogTitle="修改检核"
@@ -428,6 +428,23 @@
        v-model="updateDataFormModel"
      />
    </CommonDialog>
+    <!-- 修改入账状态 -->
+    <CommonDialog
+      dialogTitle="修改入账状态"
+      dialogWidth="80%"
+      :openDialog="accountedStatusFlag"
+      :showAction="true"
+      :showClose="true"
+      @close="accountedStatusFlag = false"
+      @confirm="confirmAccountedStatus"
+    >
+      <SearchForm
+        ref="accountedStatusFormRef"
+        :config="accountedStatusConfig"
+        v-model="accountedStatusFormModel"
+      />
+    </CommonDialog>
  </div>
 </template>
@@ -436,7 +453,7 @@ import { ref, reactive, onMounted } from 'vue'
 import CommonPage from '@/components/commonPage'
 import CommonDialog from '@/components/commonDialog'
 import SearchForm from '@/components/SearchForm/SearchForm.vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { formatCurrency } from '@/utils/number'
 // 接口
 import {
@@ -448,19 +465,41 @@ import {
  updateCommissionRecord,
  deletePolicyCommission,
  syncExpectedCommission,
-  compareCommissionEntry
+  compareCommissionEntry,
+  editStatusApi
 } from '@/api/financial/commission'
 import { InfoFilled, Select, Upload, Plus } from '@element-plus/icons-vue'
 import FileUpload from '@/components/FileUpload/index.vue'
 import { loadDicts, getDictLabel } from '@/utils/useDict'
+const accountedStatusFormModel = ref({})
+const accountedStatusFlag = ref(false)
+const accountedStatusFormRef = ref(null)
 const { proxy } = getCurrentInstance()
 const { csf_expected_commission_status } = proxy.useDict('csf_expected_commission_status')
 const { csf_commission_status } = proxy.useDict('csf_commission_status')
 const downloadTemplateUrl =
  'https://yd-ali-oss.oss-cn-shanghai-finance-1-pub.aliyuncs.com/xlsx/2026/01/26/33f0637762144d58a256f5d8d3c2d2b6.xlsx'
 const recordCheckDialogFlag = ref(false)
+const accountedStatusConfig = ref([
+  {
+    type: 'select',
+    prop: 'status',
+    label: '入账状态',
+    dictType: 'csf_expected_commission_status',
+    rules: [{ required: true, message: '请选择入账状态', trigger: 'blur' }]
+    // defaultValue: selectedRow.value.status || ''
+  },
+  {
+    type: 'textarea',
+    prop: 'statusDesc',
+    label: '修改理由',
+    rules: [{ required: true, message: '请填写修改理由', trigger: 'blur' }]
+    // defaultValue: selectedRow.value.statusDesc || ''
+  }
+])
 const downloadTemplate = () => {
  const link = document.createElement('a')
  link.href = downloadTemplateUrl // 注意：以 / 开头，指向 public 下的文件
@@ -804,6 +843,11 @@ const addCheckRecordConfig = ref([
      { required: true, message: '请输入金额', trigger: 'blur' },
      { pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
    ]
+  },
+  {
+    type: 'input',
+    prop: 'remark',
+    label: '备注'
  }
 ])
 const addCheckRecordDialogFlag = ref(false)
@@ -870,8 +914,8 @@ const generateCommissionRecordapi = async () => {
 const dropdownItems = [
  { label: '设置比对状态', value: 'setStatus', confirm: '' },
  { label: '同步到应收款管理', value: 'syncToReceivable', confirm: '确认要同步到应收款管理吗？' },
-  { label: '修改检核记录', value: 'editCheckRecord' }
+  { label: '修改检核记录', value: 'editCheckRecord' },
-  // { label: '查看记录', value: 'viewRecord' }
+  { label: '修改入账状态', value: 'setAccountedStatus' }
 ]
 const handleMenuConfirm = async (action, row) => {
  console.log('点击了操作菜单', action, row)
@@ -1031,6 +1075,13 @@ const handleSelect = (e, row) => {
    updateDataFormModel.value = { ...selectedRow.value }
    recordCheckDialogFlag.value = true
    return
+  } else if (e === 'setAccountedStatus') {
+    accountedStatusFormModel.value = {
+      statusDesc: selectedRow.value.statusDesc,
+      status: selectedRow.value.commissionExpectedStatus
+    }
+    accountedStatusFlag.value = true
+    return
  }
 }
 const handleAddCheckList = () => {
@@ -1122,6 +1173,45 @@ const compareCommissionEntryapi = async row => {
    ElMessage.error('重新比对失败')
  }
 }
+const confirmAccountedStatus = () => {
+  const formData = accountedStatusFormRef.value.getFormData()
+  console.log('====================================')
+  console.log('formData', formData)
+  console.log('====================================')
+  if (!formData.status) {
+    return ElMessage.warning('请选择入账状态')
+  }
+  if (!formData.statusDesc) {
+    return ElMessage.warning('请输入修改理由')
+  }
+  ElMessageBox.confirm('确定要修改入账状态吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      try {
+        const res = await editStatusApi({
+          commissionExpectedBizId: selectedRow.value.commissionExpectedBizId,
+          statusDesc: formData.statusDesc,
+          status: formData.status
+        })
+        if (res.code === 200) {
+          ElMessage.success('状态修改成功')
+          accountedStatusFlag.value = false
+          loadTableData() // 重新加载表格
+        } else {
+          ElMessage.error(res.msg || '状态修改失败')
+        }
+      } catch (error) {
+        console.error('修改状态失败:', error)
+        ElMessage.error('修改状态失败')
+      }
+    })
+    .catch(() => {
+      ElMessage.info('已取消修改')
+    })
+}
 </script>
 <style scoped>