From d80dbcd093573d191053b8c3034acfc47e040ebd Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 20 五月 2025 14:16:44 +0800
Subject: [PATCH] 修改
---
src/views/safetyReview/projectManage/components/chooseExpert.vue | 51 +++++++++++++++----------
src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue | 20 ++++++++++
src/views/safetyReview/projectManage/index.vue | 16 ++++---
3 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue b/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue
index 699c934..0ab1e04 100644
--- a/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue
+++ b/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue
@@ -224,6 +224,22 @@
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="交通费" prop="travelExpenses">
+ <el-input v-model="state.form.travelExpenses" type="travelExpenses" :readonly="state.disable" @input="state.form.travelExpenses= state.form.travelExpenses.replace(/[^0-9.\/\-]/g,'')">
+ <template #append>元</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="住宿费" prop="accommodationFee">
+ <el-input v-model="state.form.accommodationFee" type="accommodationFee" :readonly="state.disable" @input="state.form.accommodationFee= state.form.accommodationFee.replace(/[^0-9.\/\-]/g,'')">
+ <template #append>元</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="12">
@@ -316,6 +332,8 @@
afterTaxAmount: null,
taxableIncome: null,
incomeTaxPayable: null,
+ travelExpenses: '',
+ accommodationFee: '',
openBank: '',
bankCard: '',
},
@@ -332,6 +350,8 @@
freightBasis: [{required: true, message: '请输入计费标准', trigger: 'blur'}],
billingDuration: [{required: true, message: '请输入计费时长', trigger: 'blur'}],
taxExpertFee: [{required: true, message: '请输入税前金额（专家费）', trigger: 'blur'}],
+ travelExpenses: [{required: true, message: '请输入交通费', trigger: 'blur'}],
+ accommodationFee: [{required: true, message: '请输入住宿费', trigger: 'blur'}],
openBank: [{required: true, message: '请输入开户行', trigger: 'blur'}],
bankCard: [{required: true, message: '请输入卡号', trigger: 'blur'}]
},
diff --git a/src/views/safetyReview/projectManage/components/chooseExpert.vue b/src/views/safetyReview/projectManage/components/chooseExpert.vue
index 6620012..2b8af6e 100644
--- a/src/views/safetyReview/projectManage/components/chooseExpert.vue
+++ b/src/views/safetyReview/projectManage/components/chooseExpert.vue
@@ -8,7 +8,7 @@
v-model.trim="queryParams.num"
placeholder="请输入专家总人数"
style="width: 150px;"
- @input="queryParams.num = queryParams.num.replace(/[^1-9]/g,'')"
+ @input="queryParams.num = queryParams.num.replace(/[^0-9]/g,'')"
:disabled="!state.isAble || state.newProgress >=3 "
>
@@ -47,7 +47,7 @@
<div style="display: flex;align-items: center">
<span style="font-weight: 600">随机选用部分</span>
<el-icon style="margin-left: 10px;margin-right: 4px;margin-top: 2px;color: #FE8E8A"><InfoFilled /></el-icon>
- <span style="font-size: 14px;color: #FE8E8A">随机人数为 {{queryParams.num-1}} 的5倍，可根据实际情况删除至 {{queryParams.num-1}} 人</span>
+ <span style="font-size: 14px;color: #FE8E8A">随机人数为 {{queryParams.num-1}} 的5倍，可根据实际情况选取{{queryParams.num-1}} 人</span>
</div>
<el-form :model="queryParams" ref="queryForm" :inline="true" style="margin-top: 10px" label-width="90px">
<el-row :gutter="24">
@@ -99,7 +99,8 @@
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
- <el-table v-loading="rLoading" :data="randomDataList" :border="true" ref="rTableRef" style="width: 100%;">
+ <el-table v-loading="rLoading" :data="randomDataList" :border="true" ref="rTableRef" style="width: 100%;" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" />
<el-table-column label="姓名" prop="name" align="center" />
<el-table-column label="性别" prop="sex" align="center" >
<template #default="scope">
@@ -113,11 +114,11 @@
</template>
</el-table-column>
<el-table-column label="专业领域" prop="domain" align="center" />
- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
- <template #default="scope">
- <el-button link type="primary" @click="delR(scope.row)" :disabled="state.info.step == 4 || state.isAdmin">删除</el-button>
- </template>
- </el-table-column>
+<!-- <el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">-->
+<!-- <template #default="scope">-->
+<!-- <el-button link type="primary" @click="delR(scope.row)" :disabled="state.info.step == 4 || state.isAdmin">删除</el-button>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
</el-table>
</div>
<experts-list ref="expertsListRef" @getName="getSelected"></experts-list>
@@ -178,7 +179,7 @@
randomNum:0,
isAble: true
})
-
+const choosedRandomList = ref([])
const userInfo = ref()
onMounted(async () =>{
// localStorage.removeItem('numData')
@@ -341,14 +342,16 @@
})
}
-
-
- if(randomDataList.value && randomDataList.value.length > Number(queryParams.num) - 1){
- ElMessage.warning(`仅可保留${Number(queryParams.num) - 1}名随机专家`);
+ if(choosedRandomList.value && choosedRandomList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可选取${Number(queryParams.num) - 1}名随机专家`);
return
}
- if(randomDataList.value && randomDataList.value.length > 0){
- rData = randomDataList.value.map(item => {
+ if(choosedRandomList.value.length < Number(queryParams.num) - 1){
+ ElMessage.warning(`随机专家数不能低于${Number(queryParams.num) - 1}人`)
+ return
+ }
+ if(choosedRandomList.value && choosedRandomList.value.length > 0){
+ rData = choosedRandomList.value.map(item => {
return {
expertId: item.id,
expertName:item.name,
@@ -384,15 +387,18 @@
}
})
}
- if(randomDataList.value && randomDataList.value.length > Number(queryParams.num) - 1){
- ElMessage.warning(`仅可保留${Number(queryParams.num) - 1}名随机专家`);
+ if(choosedRandomList.value && choosedRandomList.value.length > Number(queryParams.num) - 1){
+ ElMessage.warning(`仅可选取${Number(queryParams.num) - 1}名随机专家`);
return
}
- if(randomDataList.value && randomDataList.value.length > 0){
- rData = randomDataList.value.map(item => {
+ if(choosedRandomList.value.length < Number(queryParams.num) - 1){
+ ElMessage.warning(`随机专家数不能低于${Number(queryParams.num) - 1}人`)
+ return
+ }
+ if(choosedRandomList.value && choosedRandomList.value.length > 0){
+ rData = choosedRandomList.value.map(item => {
return {
- id: item.expertId ? item.id : '',
- expertId: item.expertId ? item.expertId : item.id,
+ expertId: item.id,
expertName:item.name,
selectionMode: 2,
teamLeader: 0
@@ -494,6 +500,9 @@
// }
// localStorage.setItem('randomNum', JSON.stringify(rnDataArray));
}
+const handleSelectionChange = (val) => {
+ choosedRandomList.value = val
+}
const getSelected = (type,data)=>{
const selectData = JSON.parse(JSON.stringify(data))
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 4e08d65..a0e6af0 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -206,6 +206,8 @@
'姓名':'expertName',
'处室':'deptName',
'专家费': 'expertFee',
+ '交通费': 'travelExpenses',
+ '住宿费':'accommodationFee',
'申请时间': 'createTime',
'事由': 'projectName',
'发现重大隐患':'majorDangers',
@@ -367,17 +369,17 @@
const title = [[`自治区应急管理厅外聘专家劳务费发放表（项目编码${row.projectCode}）`]]
// 固定一行：填报处室和单位
const fixedHeader = [
- ["填报处室：" + row.deptName, "", "", "", "", "单位：元", "", "", "", "",""]
+ ["填报处室：" + row.deptName, "", "", "", "", "单位：元", "", "", "", "","", "",""]
]
if(res.data && res.data[0] && Array.isArray(res.data[0].projectExpertExportResps) && res.data[0].projectExpertExportResps.length>0){
let mainData = res.data[0].projectExpertExportResps
const data = mainData.map((item,index)=>{
- return [index+1,item.name,item.companyName,item.title,item.idCard,item.freightBasis,item.billingDuration,item.taxExpertFee,item.incomeTaxPayable,item.openBank,item.bankCard]
+ return [index+1,item.name,item.companyName,item.title,item.idCard,item.freightBasis,item.billingDuration,item.taxExpertFee,item.incomeTaxPayable,item.travelExpenses,item.accommodationFee,item.openBank,item.bankCard]
})
console.log(data,'data')
// 定义表头
const headers = [
- ["序号", "姓名", "工作单位", "职称", "身份证号", "计费标准", "计费时长", "专家费", "应缴税费", "开户银行", "卡号"]
+ ["序号", "姓名", "工作单位", "职称", "身份证号", "计费标准", "计费时长", "专家费", "应缴税费", "交通费", "住宿费","开户银行", "卡号"]
]
// 固定一行：经办人和负责人
const footer = [
@@ -399,9 +401,9 @@
const dataRowCount = data.length;
// 合并单元格的范围
ws['!merges'] = [
- { s: { r: 0, c: 0 }, e: { r: 0, c: 10 } }, // 合并标题：第1行 0列到12列
+ { s: { r: 0, c: 0 }, e: { r: 0, c: 12 } }, // 合并标题：第1行 0列到12列
{ s: { r: 1, c: 0 }, e: { r: 1, c: 4 } }, // 合并填报处室：第2行 第0列到4列
- { s: { r: 1, c: 5 }, e: { r: 1, c: 10 } }, // 合并单位：第2行 第5列到12列
+ { s: { r: 1, c: 5 }, e: { r: 1, c: 12 } }, // 合并单位：第2行 第5列到12列
{ s: { r: 3 + dataRowCount, c: 0 }, e: { r: 3 + dataRowCount, c: 4 } }, // 合并经办人：最后一行的第0列到4列
{ s: { r: 3 + dataRowCount, c: 5 }, e: { r: 3 + dataRowCount, c: 6} }, // 合并负责人：最后一行的第5列到+6列
]
@@ -420,7 +422,7 @@
// 设置数据区（包括填报处室、单位、数据行和最后一行）为左对齐
const totalRows = 3 + dataRowCount + 1; // 标题、固定行和数据行的总数
for (let r = 3; r <= totalRows; r++) { // 遍历每一行
- for (let c = 0; c < 11; c++) { // 遍历每一列
+ for (let c = 0; c < 13; c++) { // 遍历每一列
const cellRef = `${String.fromCharCode(65 + c)}${r}`;
if (!ws[cellRef]) ws[cellRef] = {}; // 确保单元格存在
ws[cellRef].s = {
@@ -440,7 +442,7 @@
}
// 设置最后一行（经办人、负责人）左对齐
const lastRowStart = 3 + dataRowCount;
- for (let c = 0; c < 11; c++) {
+ for (let c = 0; c < 13; c++) {
const cellRef = `${String.fromCharCode(65 + c)}${lastRowStart + 1}`;
console.log(cellRef,'ref')
if (!ws[cellRef]) ws[cellRef] = {}; // 确保单元格存在
--
Gitblit v1.9.2