Skip to content

Y
yd-csf-front
Commit 64281c76 by yuzhenWang
Options

Merge branch 'feature-20260407wyz-增加拆分出帐' into 'test' 

Feature 20260407wyz 增加拆分出帐

See merge request !104
parents 74677502 43a80971
Showing with 179 additions and 68 deletions
Dockerfile
...@@ -45,7 +45,7 @@ RUN ls -la node_modules/esbuild/bin && \ ...@@ -45,7 +45,7 @@ RUN ls -la node_modules/esbuild/bin && \
# 复制源码并构建 # 复制源码并构建
COPY . . COPY . .
RUN npm run build:dev RUN npm run build:prod
# 生产阶段 # 生产阶段
FROM docker.m.daocloud.io/library/nginx:alpine FROM docker.m.daocloud.io/library/nginx:alpine
...@@ -60,5 +60,5 @@ RUN echo "https://mirrors.aliyun.com/alpine/v3.22/main/" > /etc/apk/repositories ...@@ -60,5 +60,5 @@ RUN echo "https://mirrors.aliyun.com/alpine/v3.22/main/" > /etc/apk/repositories
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \ cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone echo "Asia/Shanghai" > /etc/timezone
EXPOSE 6688 EXPOSE 2669
CMD ["nginx", "-g", "daemon off;"] CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
nginx.conf
# 定义网关服务的负载均衡组
upstream gateway_load_balance {
server 139.224.150.79:9010; # 管理节点服务器上的网关实例
server 139.224.149.150:9011; # 工作节点服务器上的网关实例
}
server { server {
listen 6688; listen 2669;
server_name 139.224.145.34; server_name _;
# 处理前端静态资源（Vue应用） root /usr/share/nginx/html;
location / { index index.html;
root /usr/share/nginx/html;
index index.html; # 静态资源处理 - 必须放在最前面
try_files $uri $uri/ /index.html; # 处理Vue路由history模式 location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|map)$ {
if ($request_method = OPTIONS) { # ✅ 关键：添加 try_files 指令
try_files $uri =404;
# 确保静态资源有正确的过期时间和缓存头
expires 1y;
add_header Cache-Control "public, immutable";
# 为静态资源添加CORS头
add_header 'Access-Control-Allow-Origin' '*' always;
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization' always;
# 处理OPTIONS请求（CORS预检）
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization';
add_header 'Access-Control-Max-Age' 1728000; add_header 'Access-Control-Max-Age' 1728000;
add_header 'Content-Type' 'text/plain charset=UTF-8';
add_header 'Content-Length' 0; add_header 'Content-Length' 0;
add_header 'Content-Type' 'text/plain; charset=UTF-8';
return 204; return 204;
} }
limit_except GET POST PUT DELETE OPTIONS {
deny all;
}
} }
# 代理后端API请求 - 使用更具体的路径 # 健康检查接口
location /api/ { location /health {
proxy_buffer_size 1024k; #设置代理服务器（nginx）保存用户头信息的缓冲区大小 access_log off;
proxy_buffers 16 1024k; #proxy_buffers缓冲区，网页平均在32k以下的设置 return 200 "healthy\n";
proxy_busy_buffers_size 2048k; #高负荷下缓冲大小（proxy_buffers*2） add_header Content-Type text/plain;
proxy_temp_file_write_size 2048k; #设定缓存文件夹大小，大于这个值，将从upstream服务器传
proxy_pass http://139.224.145.34:9002/;
} }
# 可能需要代理其他后端服务 # 前端路由处理 - 放在最后，作为兜底规则
# location /other-service/ { location / {
# proxy_pass http://other-service:port/; try_files $uri $uri/ /index.html; # 处理Vue路由history模式
# }
} # 为页面添加CORS头
add_header 'Access-Control-Allow-Origin' '*' always;
add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Authorization' always;
}
}
\ No newline at end of file
src/api/financial/commission.js
...@@ -9,7 +9,6 @@ export function getPolicyCommissionList(data) { ...@@ -9,7 +9,6 @@ export function getPolicyCommissionList(data) {
}) })
} }
// 生成可出账记录 // 生成可出账记录
export function generateCommissionRecord(data) { export function generateCommissionRecord(data) {
return request({ return request({
...@@ -55,7 +54,7 @@ export function downloadPolicyFortuneAccount(data) { ...@@ -55,7 +54,7 @@ export function downloadPolicyFortuneAccount(data) {
return request({ return request({
url: '/csf/api/fortune/download/account', url: '/csf/api/fortune/download/account',
method: 'post', method: 'post',
data: data, data: data
}) })
} }
...@@ -257,7 +256,6 @@ export function commissionEntryEditRecords(data) { ...@@ -257,7 +256,6 @@ export function commissionEntryEditRecords(data) {
}) })
} }
// 获取保单发佣列表 // 获取保单发佣列表
export function policyNoCommissionPayRecord(data) { export function policyNoCommissionPayRecord(data) {
return request({ return request({
...@@ -303,8 +301,8 @@ export function updateCommissionExpected(data) { ...@@ -303,8 +301,8 @@ export function updateCommissionExpected(data) {
} }
// 修改出账状态 // 修改出账状态
export function updataPayrollStatus(data){ export function updataPayrollStatus(data) {
return request({ return request({
url: '/csf/api/fortune/update/status', url: '/csf/api/fortune/update/status',
method: 'post', method: 'post',
data: data data: data
...@@ -312,8 +310,8 @@ export function updataPayrollStatus(data){ ...@@ -312,8 +310,8 @@ export function updataPayrollStatus(data){
} }
// 批量新增检核记录 // 批量新增检核记录
export function addPayrollCheckRecord(data){ export function addPayrollCheckRecord(data) {
return request({ return request({
url: '/csf/api/commission/addBatch', url: '/csf/api/commission/addBatch',
method: 'post', method: 'post',
data: data data: data
...@@ -321,8 +319,8 @@ export function addPayrollCheckRecord(data){ ...@@ -321,8 +319,8 @@ export function addPayrollCheckRecord(data){
} }
// 新增应收款 // 新增应收款
export function addReceivedFortune(data){ export function addReceivedFortune(data) {
return request({ return request({
url: '/csf/api/CommissionExpected/add', url: '/csf/api/CommissionExpected/add',
method: 'post', method: 'post',
data: data data: data
...@@ -330,23 +328,23 @@ export function addReceivedFortune(data){ ...@@ -330,23 +328,23 @@ export function addReceivedFortune(data){
} }
// 新增出账记录 // 新增出账记录
export function addPayRecord(data){ export function addPayRecord(data) {
return request({ return request({
url: '/csf/api/expectedFortune/add', url: '/csf/api/expectedFortune/add',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 获取销售员详情 // 获取销售员详情
export function userSaleExpandDetail(data){ export function userSaleExpandDetail(data) {
return request({ return request({
url: '/insurance/base/api/userSaleExpand/detail?userSaleBizId=' + data, url: '/insurance/base/api/userSaleExpand/detail?userSaleBizId=' + data,
method: 'get', method: 'get'
}) })
} }
// 更新比对状态 // 更新比对状态
export function updateCompareStatus(data){ export function updateCompareStatus(data) {
return request({ return request({
url: '/csf/api/commission/updateCompareStatus', url: '/csf/api/commission/updateCompareStatus',
method: 'post', method: 'post',
data: data data: data
...@@ -354,8 +352,8 @@ export function updateCompareStatus(data){ ...@@ -354,8 +352,8 @@ export function updateCompareStatus(data){
} }
// 更新数据 // 更新数据
export function updateCommissionRecord(data){ export function updateCommissionRecord(data) {
return request({ return request({
url: '/csf/api/commission/update', url: '/csf/api/commission/update',
method: 'post', method: 'post',
data: data data: data
...@@ -363,8 +361,8 @@ export function updateCommissionRecord(data){ ...@@ -363,8 +361,8 @@ export function updateCommissionRecord(data){
} }
// 新增出账检核记录 // 新增出账检核记录
export function addCheckRecordaddBatch(data){ export function addCheckRecordaddBatch(data) {
return request({ return request({
url: '/csf/api/fortune/addBatch', url: '/csf/api/fortune/addBatch',
method: 'post', method: 'post',
data: data data: data
...@@ -372,8 +370,8 @@ export function addCheckRecordaddBatch(data){ ...@@ -372,8 +370,8 @@ export function addCheckRecordaddBatch(data){
} }
// 设置本期出账金额 // 设置本期出账金额
export function updatePayoutAmount(data){ export function updatePayoutAmount(data) {
return request({ return request({
url: '/csf/api/fortune/update', url: '/csf/api/fortune/update',
method: 'post', method: 'post',
data: data data: data
...@@ -381,16 +379,16 @@ export function updatePayoutAmount(data){ ...@@ -381,16 +379,16 @@ export function updatePayoutAmount(data){
} }
// 同步预计来佣 // 同步预计来佣
export function syncExpectedCommission(data){ export function syncExpectedCommission(data) {
return request({ return request({
url: '/csf/api/commission/addToExpected', url: '/csf/api/commission/addToExpected',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 更新出账记录 // 更新出账记录
export function updatePayRecord(data){ export function updatePayRecord(data) {
return request({ return request({
url: '/csf/api/expectedFortune/update', url: '/csf/api/expectedFortune/update',
method: 'post', method: 'post',
data: data data: data
...@@ -406,10 +404,10 @@ export function exportPayRecord(data) { ...@@ -406,10 +404,10 @@ export function exportPayRecord(data) {
}) })
} }
// 入账检核重新比对 // 入账检核重新比对
export function compareCommissionEntry(data){ export function compareCommissionEntry(data) {
return request({ return request({
url: '/csf/api/commission/compare?commissionBizId=' + data, url: '/csf/api/commission/compare?commissionBizId=' + data,
method: 'get', method: 'get'
}) })
} }
...@@ -418,7 +416,7 @@ export function payableReport(data) { ...@@ -418,7 +416,7 @@ export function payableReport(data) {
return request({ return request({
url: '/csf/api/expectedFortune/payable_report', url: '/csf/api/expectedFortune/payable_report',
method: 'post', method: 'post',
data: data, data: data
}) })
} }
...@@ -434,8 +432,8 @@ export function receivableReport(data) { ...@@ -434,8 +432,8 @@ export function receivableReport(data) {
// 薪资拆分应发信息汇总列表 // 薪资拆分应发信息汇总列表
export function salarySummary(data) { export function salarySummary(data) {
return request({ return request({
url:'csf/api/salarySplit/summary/page', url: 'csf/api/salarySplit/summary/page',
method: 'post', method: 'post',
data: data data: data
}) })
} }
...@@ -443,8 +441,61 @@ export function salarySummary(data) { ...@@ -443,8 +441,61 @@ export function salarySummary(data) {
// 薪资拆分应发信息汇总列表下载---待提供 // 薪资拆分应发信息汇总列表下载---待提供
export function exportPayRoll(data) { export function exportPayRoll(data) {
return request({ return request({
url:'csf/api/salarySplit/export/summary/list', url: 'csf/api/salarySplit/export/summary/list',
method: 'post', method: 'post',
data: data, data: data
}) })
} }
\ No newline at end of file
// 拆分出账列表
export function salarySplitList(data) {
return request({
url: 'csf/api/salarySplit/page',
method: 'post',
data: data
})
}
// 拆分出账查询-原币种剩余总金额和原币种
export function billSplitRemaining(data) {
return request({
url: 'csf/api/salarySplit/query/remaining',
method: 'post',
data: data
})
}
// 获取转介人详情
export function borkerDetail(data) {
return request({
url: '/insurance/base/api/userSaleExpand/detail?clientUserBizId=' + data,
method: 'get'
})
}
// 拆分出账查询-原币种和原币种金额——>目标币种即时汇率和目标币种金额
export function billSplitRate(data) {
return request({
url: 'csf/api/salarySplit/query/rate',
method: 'post',
data: data
})
}
// 拆分出账查询-批量保存-薪资拆分应发信息列表
export function billBatchSave(data) {
return request({
url: 'csf/api/salarySplit/batch/save',
method: 'post',
data: data
})
}
// 拆分出账查询-计算目标金额
export function billCalculateToAmount(data) {
return request({
url: 'csf/api/salarySplit/calculate/toAmount',
method: 'post',
data: data
})
}
src/utils/common.js
...@@ -75,3 +75,7 @@ export function processUserName(users) { ...@@ -75,3 +75,7 @@ export function processUserName(users) {
} }
}) })
} }
export function generateId() {
return `${Date.now()}_${Math.random().toString(36).substr(2, 8)}`
}
src/utils/usePositiveDecimal.js 0 → 100644
import { ref } from 'vue'
export function usePositiveDecimal(defaultPlaces = 2) {
// 实时过滤（返回过滤后的字符串）
const filterInput = (value, decimalPlaces = defaultPlaces) => {
if (value === undefined || value === null) return ''
let str = String(value)
// 1. 只保留数字和小数点
str = str.replace(/[^\d.]/g, '')
// 2. 限制只有一个小数点
const parts = str.split('.')
if (parts.length > 2) {
str = parts[0] + '.' + parts.slice(1).join('')
}
// 3. 限制小数位数
if (parts.length === 2 && parts[1].length > decimalPlaces) {
str = parts[0] + '.' + parts[1].slice(0, decimalPlaces)
}
return str
}
// 失焦时格式化（补零 / 截断）
const formatBlur = (value, decimalPlaces = defaultPlaces) => {
if (value === '' || value === null || value === undefined) {
return ''
}
let num = parseFloat(value)
if (isNaN(num) || num < 0) {
return ''
}
return num.toFixed(decimalPlaces)
}
return { filterInput, formatBlur }
}
src/views/sign/policyReceipts/premiumRecon.vue
...@@ -582,9 +582,11 @@ const confirmAffirm = async () => { ...@@ -582,9 +582,11 @@ const confirmAffirm = async () => {
currentRow.value = {} currentRow.value = {}
} }
} catch (error) { } catch (error) {
console.log('error', error)
settingAffirmLoading.value = false settingAffirmLoading.value = false
console.error('加载数据失败:', error) if (error.message && error.message.includes('Validation')) {
ElMessage.error('必填项不能为空' || '认定失败') ElMessage.error('必填项不能为空')
}
} }
} }
// ==============设置认定结果结束============ // ==============设置认定结果结束============
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment