From 0d5f2c20521598c01bc2a2d6376ab564b5effc2a Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期二, 10 十二月 2024 08:54:59 +0800 Subject: [PATCH] 修改bug --- src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue | 634 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 524 insertions(+), 110 deletions(-) diff --git a/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue b/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue index b889fed..87f3e95 100644 --- a/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue +++ b/src/views/safetyReview/expertManage/postEvaluation/components/evaluate.vue @@ -1,134 +1,548 @@ <template> - <div class="notice"> - <el-dialog - v-model="dialogVisible" - :title="title" - width="900px" - :before-close="handleClose" - > - <el-form :model="state.form" inline size="default" ref="busRef" :rules="state.formRules" label-width="140px" > - <el-form-item label="姓名:" prop="score"> - <el-input v-model.trim="state.form.score" readonly></el-input> - </el-form-item> - <el-form-item label="身份证号:" prop="content"> - <el-input v-model.trim="state.form.content" readonly></el-input> - </el-form-item> - <el-form-item label="项目名称:" prop="score"> - <el-input v-model.trim="state.form.score" readonly></el-input> - </el-form-item> - <el-form-item label="是否为专家组组长:" prop="content"> - <el-input v-model.trim="state.form.content" readonly></el-input> - </el-form-item> - <el-form-item label="考评记录时间:" prop="content"> - <el-input v-model.trim="state.form.content" readonly></el-input> - </el-form-item> - <el-form-item label="总计:" prop="content"> - <el-input v-model.trim="state.form.content" readonly></el-input> - </el-form-item> - </el-form> - <div> - 请对专家表现进行评分: - </div> - <div style="width: 100%;display: flex;align-items: center;justify-content: space-between"> - <el-button type="primary" size="default" v-preReClick>添加加分项</el-button> - <div> - 加分总计:52 分 - </div> - </div> - <el-table :data="tableData" border style="width: 100%"> - <el-table-column prop="name" label="加分项"/> - <el-table-column prop="score" label="分值" /> - </el-table> - <div style="width: 100%;display: flex;align-items: center;justify-content: space-between"> - <el-button type="primary" size="default" v-preReClick>添加扣分项</el-button> - <div> - 扣分总计:52 分 - </div> - </div> - <el-table :data="tableData" border style="width: 100%"> - <el-table-column prop="name" label="扣分项"/> - <el-table-column prop="score" label="分值" /> - </el-table> - <template #footer> - <span class="dialog-footer"> - <el-button type="primary" @click="handleClose" size="default" v-preReClick>确认</el-button> - </span> + <div class="notice"> + <el-dialog + v-model="dialogVisible" + :title="state.title" + width="50%" + :before-close="handleClose" + > + <el-form :model="state.info" size="default" ref="busRef" label-width="140px"> + <el-row> + <el-col :span="12"> + <el-form-item label="姓名"> + <el-input v-model.trim="state.info.name" readonly></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="身份证号"> + <el-input v-model.trim="state.info.idCard" readonly></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="项目名称"> + <el-input v-model.trim="state.info.projectName" readonly></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="是否为专家组组长"> + <el-input v-model.trim="state.info.teamLeader" readonly></el-input> + </el-form-item> + </el-col> + </el-row> +<!-- <el-form-item label="考评记录时间:">--> +<!-- <el-input v-model.trim="state.info.evaluateTime" readonly></el-input>--> +<!-- </el-form-item>--> +<!-- <el-form-item label="总计:">--> +<!-- <el-input v-model.trim="state.info.score" readonly></el-input>--> +<!-- </el-form-item>--> + </el-form> + <el-form :model="state.form" ref="evaluateRef" :rules="state.formRules" label-width="140px"> + <el-divider> + 专家工作表现 + </el-divider> + <el-form-item label="职业道德方面" prop="professionalEthics"> + <el-radio-group v-model="state.form.professionalEthics" style="width: 100%" :disabled="state.disable"> + <el-radio v-for="item in state.rateList" :label="item.value">{{ item.label }}</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="公正廉洁方面" prop="impartialHonest"> + <el-radio-group v-model="state.form.impartialHonest" style="width: 100%" :disabled="state.disable"> + <el-radio v-for="item in state.rateList" :label="item.value">{{ item.label }}</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="综合协调组织" prop="comprehensiveCoordination"> + <el-radio-group v-model="state.form.comprehensiveCoordination" style="width: 100%" :disabled="state.disable"> + <el-radio v-for="item in state.rateList" :label="item.value">{{ item.label }}</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="专业能力素养" prop="professionalAbility"> + <el-radio-group v-model="state.form.professionalAbility" style="width: 100%" :disabled="state.disable"> + <el-radio v-for="item in state.rateList" :label="item.value">{{ item.label }}</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="意见表达能力" prop="expressingOpinions"> + <el-radio-group v-model="state.form.expressingOpinions" style="width: 100%" :disabled="state.disable"> + <el-radio v-for="item in state.rateList" :label="item.value">{{ item.label }}</el-radio> + </el-radio-group> + </el-form-item> + <el-form-item label="其他意见建议"> + <el-input v-model="state.form.others" type="textarea" :autosize="{ minRows: 2}" :readonly="state.disable"></el-input> + </el-form-item> + <el-form-item label="使用单位综合评价情况" label-width="180px" prop="comprehensiveEvaluation"> + <el-radio-group v-model="state.form.comprehensiveEvaluation" style="width: 100%" :disabled="state.disable"> + <el-radio v-for="item in state.rateList" :label="item.value">{{ item.label }}</el-radio> + </el-radio-group> + </el-form-item> + + <el-divider> + 量化评分(非必填) + </el-divider> + <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin: 25px 0 15px"> + <div> + <el-button type="primary" size="default" @click="openSelectList('1')" v-preReClick :disabled="state.disable">添加加分项</el-button> + <el-button type="default" size="default" @click="addSelect('1')" v-preReClick :disabled="state.disable">自定义加分项</el-button> + </div> + <div style="font-size: 14px"> + 加分总计:<span style="font-weight: bolder;color: #10B981">{{addTotal}}</span> 分 + </div> + </div> + <el-table :data="state.addData" border style="width: 100%"> + <el-table-column prop="content" label="加分项"/> + <el-table-column prop="score" label="分值"> + <template #default="scope"> + <el-input v-model.trim="scope.row.score" type="number" :readonly="state.disable"></el-input> </template> - </el-dialog> - </div> + </el-table-column> + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" > + <template #default="scope"> + <!-- <el-button link type="primary" @click="openDialog('edit',scope.row)">编辑</el-button>--> + <el-button link type="danger" @click="deleteSelect(scope.row,scope.$index,1)" :disabled="state.disable">删除</el-button> + </template> + </el-table-column> + </el-table> + <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin: 25px 0 15px"> + <div> + <el-button type="primary" size="default" @click="openSelectList('2')" v-preReClick :disabled="state.disable">添加扣分项</el-button> + <el-button type="default" size="default" @click="addSelect('2')" v-preReClick :disabled="state.disable">自定义扣分项</el-button> + </div> + <div style="font-size: 14px"> + 扣分总计:<span style="font-weight: bolder;color: #EF4444">{{deductTotal}}</span> 分 + </div> + </div> + <el-table :data="state.deductData" border style="width: 100%"> + <el-table-column prop="content" label="扣分项"/> + <el-table-column prop="score" label="分值"> + <template #default="scope"> + <el-input v-model.trim="scope.row.score" type="number" :readonly="state.disable" placeholder="此处须填写负数"></el-input> + </template> + </el-table-column> + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" > + <template #default="scope"> + <el-button link type="danger" @click="deleteSelect(scope.row,scope.$index,2)" :disabled="state.disable">删除</el-button> + </template> + </el-table-column> + </el-table> + <div style="margin-top: 15px">提示:如果该专家在本项目无加分项,也无扣分项,可不填。</div> + + <div style="margin: 25px 0;font-size: 14px"> + <el-form-item label="本项目考评总计" prop="score"> + <el-input v-model.trim="totalScore" type="number" readonly=true><template #append>分</template></el-input> + </el-form-item> + </div> + <el-row> + <el-col :span="12"> + <el-form-item label="发现重大隐患" prop="majorDangers"> + <el-input v-model.trim="state.form.majorDangers" type="number" :readonly="state.disable" placeholder="请输入正整数,没有则填0"><template #append>条</template></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="一般隐患" prop="generalHazards"> + <el-input v-model.trim="state.form.generalHazards" type="number" :readonly="state.disable" placeholder="请输入正整数,没有则填0"><template #append>条</template></el-input> + </el-form-item> + </el-col> + </el-row> + <el-form-item label="内容描述"> + <el-input v-model="state.form.content" type="textarea" :autosize="{ minRows: 2}" :readonly="state.disable"></el-input> + </el-form-item> + <el-divider></el-divider> + <el-row> + <el-col :span="12"> + <el-form-item label="计费标准" prop="freightBasis"> + <el-input v-model.trim="state.form.freightBasis" :readonly="state.disable"><template #append>天/课时</template></el-input> +<!-- <el-select v-model="state.form.freightBasis" placeholder="计费标准" clearable>--> +<!-- <el-option :key="0" label="前三天600/天" :value="600"/>--> +<!-- <el-option :key="1" label="前三天800/天" :value="800"/>--> +<!-- <el-option :key="1" label="前三天1000/天" :value="1000"/>--> +<!-- <el-option :key="2" label="前三天1200/天" :value="1200"/>--> +<!-- <el-option :key="2" label="前三天1500/天" :value="1500"/>--> +<!-- </el-select>--> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="标准说明" prop="billingInstructions"> + <el-input v-model.trim="state.form.billingInstructions" type="textarea" :autosize="{ minRows: 2}" :readonly="state.disable" placeholder="如填写:第1-3天800元/天"></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="计费时长" prop="billingDuration"> + <el-input v-model.number.trim="state.form.billingDuration" type="number" :readonly="state.disable"><template #append>天/课时</template></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="税前金额(专家费)" prop="taxExpertFee"> + <el-input v-model="state.form.taxExpertFee" type="number" :readonly="state.disable"><template #append>元</template></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="8"> + <el-form-item label="应纳税所得额"> + <el-input v-model.trim="taxIncome" type="number" readonly><template #append>元</template></el-input> + </el-form-item> + </el-col> + <el-col :span="8"> + <el-form-item label="应缴个税"> + <el-input v-model.trim="taxPay" type="number" readonly><template #append>元</template></el-input> + </el-form-item> + </el-col> + <el-col :span="8"> + <el-form-item label="税后金额"> + <el-input v-model="afterTaxIncome" type="number" readonly><template #append>元</template></el-input> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="开户行" prop="openBank"> + <el-input v-model.trim="state.form.openBank" :readonly="state.disable"></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="银行卡号" prop="bankCard"> + <el-input v-model.trim="state.form.bankCard" :readonly="state.disable"></el-input> + </el-form-item> + </el-col> + </el-row> + </el-form> + <template #footer> + <span class="dialog-footer"> + <el-button type="primary" v-if="!state.disable" @click="confirmScore" size="default" v-preReClick>完成评分</el-button> + <el-button type="primary" v-if="state.disable" @click="handleClose" size="default" v-preReClick>确定</el-button> + </span> + </template> + <select-list ref="selectRef" @refreshSelected="getSelected"></select-list> + <el-dialog + v-model="state.addVisible" + :title="state.addTitle" + width="500px" + :before-close="closeAdd" + > + <el-form :model="state.addForm" size="default" ref="addRef" :rules="state.addFormRules" label-width="110px" > + <el-form-item label="内容:" prop="content"> + <el-input v-model.trim="state.addForm.content" type="textarea" :autosize="{minRows: 2}"></el-input> + </el-form-item> + <el-form-item label="分值:" prop="score"> + <el-input v-model.trim.number="state.addForm.score" type="number" placeholder="扣分请填写负数"></el-input> + </el-form-item> + </el-form> + <template #footer> + <span class="dialog-footer"> + <el-button @click="closeAdd" size="default">取 消</el-button> + <el-button type="primary" @click="submitAdd" size="default" v-preReClick>确认</el-button> + </span> + </template> + </el-dialog> + </el-dialog> + </div> </template> <script setup> -import {reactive, ref, toRefs} from 'vue' -import Editor from "@/components/Editor/index.vue"; +import {computed, defineAsyncComponent, reactive, ref, toRefs} from 'vue' import {ElMessage} from "element-plus"; -import {addNotice} from "@/api/backManage/notice"; -import {addDict, editDict, getDictDetail} from "@/api/backManage/evaluate"; +import SelectList from './selectList' +import {getExpertEvaDetail, projectExpertDetailSave} from '@/api/backManage/evaluate' -const dialogVisible = ref(false); -const title = ref(""); -const busRef = ref(); -const length = ref() +const dialogVisible = ref(false) +const evaluateRef = ref() +const busRef = ref() +const addRef = ref() +const selectRef = ref() const emit = defineEmits(["getList"]); const state = reactive({ - form: { - id: '', - label: '', - value: '', - dictType: "sys_assess_type", - }, - formRules:{ - label: [{ required: true, message: '请输入类型', trigger: 'blur' }], - }, - + title: '', + disable: false, + addData: [], + deductData: [], + info: { + name: '', + idCard: '', + projectName: '', + teamLeader: '' + }, + form: { + projectExpertId: null, + saveData: [], + delData: [], + score: 100, + professionalEthics: null, + impartialHonest: null, + comprehensiveCoordination: null, + professionalAbility: null, + expressingOpinions: null, + others: '', + comprehensiveEvaluation: null, + majorDangers: null, + generalHazards: null, + content: '', + freightBasis: '', + billingDuration: null, + taxExpertFee: null, + billingInstructions: '', + afterTaxAmount: null, + taxableIncome: null, + incomeTaxPayable: null, + openBank: '', + bankCard: '', + }, + formRules: { + score: [{required: true, message: '请输入总分', trigger: 'blur'}], + professionalEthics: [{required: true, message: '该选项不能为空', trigger: 'blur'}], + impartialHonest: [{required: true, message: '该选项不能为空', trigger: 'blur'}], + comprehensiveCoordination: [{required: true, message: '该选项不能为空', trigger: 'blur'}], + professionalAbility: [{required: true, message: '该选项不能为空', trigger: 'blur'}], + expressingOpinions: [{required: true, message: '该选项不能为空', trigger: 'blur'}], + comprehensiveEvaluation: [{required: true, message: '该选项不能为空', trigger: 'blur'}], + majorDangers: [{required: true, message: '请输入重大隐患数', trigger: 'blur'}], + generalHazards: [{required: true, message: '请输入一般隐患数', trigger: 'blur'}], + freightBasis: [{required: true, message: '请输入计费标准', trigger: 'blur'}], + billingDuration: [{required: true, message: '请输入计费时长', trigger: 'blur'}], + taxExpertFee: [{required: true, message: '请输入税前金额(专家费)', trigger: 'blur'}], + openBank: [{required: true, message: '请输入开户行', trigger: 'blur'}], + bankCard: [{required: true, message: '请输入卡号', trigger: 'blur'}] + }, + addVisible: false, + addTitle: '', + addForm: { + scoreType: '', + score: null, + content: '' + }, + addFormRules: { + content: [{required: true, message: '请输入内容', trigger: 'blur'}], + score: [{required: true, message: '请输入分值', trigger: 'blur'}], + }, + rateList: [ + {label: '优秀',value: 1}, + {label: '合格',value: 2}, + {label: '基本合格',value: 3}, + {label: '不合格',value: 4} + ] }) -const openDialog = async (type, value) => { - length.value = value.listLength - title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看' ; - if(type === 'edit') { - state.form = value; - const param = { - dictId: value.id - } - const res = await getDictDetail(param); - if(res.code === 200){ - state.form = res.data - }else{ - ElMessage.warning(res.message) - } +const addTotal = computed(()=>{ + return state.addData.map(i=>Number(i.score)).reduce((sum, num) => sum + num, 0) +}) + +const deductTotal = computed(()=>{ + return state.deductData.map(i=>Number(i.score)).reduce((sum, num) => sum + num, 0) +}) + +const totalScore = computed(()=>{ + return 100 + Number(addTotal.value) + Number(deductTotal.value) +}) + +const expertIncome = computed(()=>{ + if(state.form.freightBasis == null || state.form.billingDuration == null){ + return null + } + if(state.form.billingDuration <= 3){ + return (state.form.freightBasis * state.form.billingDuration) + }else{ + return (state.form.freightBasis * 3) + (state.form.freightBasis * 0.5 * (state.form.billingDuration - 3)) + } +}) + +const taxIncome = computed(()=>{ + const expertIncomeValue = state.form.taxExpertFee + if (expertIncomeValue == null || expertIncomeValue === 0 || expertIncomeValue <= 800) { + return 0 + } + if (expertIncomeValue > 800 && expertIncomeValue <= 4000) { + return expertIncomeValue - 800 + } else { + return expertIncomeValue * 0.8 + } +}) + +const taxPay = computed(()=>{ + const taxIncomeValue = taxIncome.value + if (taxIncomeValue == null || taxIncomeValue === 0) { + return 0 + } + if (taxIncomeValue <= 20000) { + return taxIncomeValue * 0.2; + } else if (taxIncomeValue <= 50000) { + return taxIncomeValue * 0.3 - 2000; + } else { + return taxIncomeValue * 0.4 - 7000; + } +}) + +const afterTaxIncome = computed(()=>{ + const expertIncomeValue = state.form.taxExpertFee + const taxPayValue = taxPay.value + if ((expertIncomeValue == null || expertIncomeValue == 0)|| (taxPayValue == null || taxPayValue == 0)) { + return 0 + } + return expertIncomeValue - taxPayValue; +}) + +const openDialog = async (type, value, projectName, projectCheckTime) => { + state.info = value + state.form.projectExpertId = value.id + state.info.projectName = projectName + state.info.teamLeader = state.info.teamLeader == 1 ? '是' : '否' + if (type === 'view') { + state.title = '查看' + state.disable = true + const res = await getExpertEvaDetail({projectExpertId: value.id}); + if(res.code == 200){ + state.form = res.data + state.addData = res.data.expertDetails?res.data.expertDetails.filter(i=>i.scoreType == '1'):[] + state.deductData = res.data.expertDetails?res.data.expertDetails.filter(i=>i.scoreType == '2'):[] + }else{ + ElMessage.warning(res.msg) } - dialogVisible.value = true; + }else{ + state.title = '评分' + state.disable = false + } + dialogVisible.value = true; +} + +const openSelectList = (type) => { + if(type == '1'){ + selectRef.value.openDialog(type, state.addData) + }else{ + selectRef.value.openDialog(type, state.deductData) + } +} + +const getSelected = (type)=>{ + if(type == '1'){ + state.addData = state.addData.concat(selectRef.value.data.selected.map(({ id, ...rest }) => rest)) + }else{ + state.deductData = state.deductData.concat(selectRef.value.data.selected.map(({ id, ...item }) => ({ + ...item, + score: item.score <0 ? item.score : -Math.abs(item.score) + }))) + } +} + +const deleteSelect=(row,index,type)=>{ + if(type == 1){ + state.addData.splice(index,1) + }else{ + state.deductData.splice(index,1) + } + if(row.id){ + state.form.delData.push(row.id) + } +} + +const addSelect = (type) =>{ + state.addVisible = true + if(type == '1'){ + state.addTitle = '自定义加分项' + state.addForm.scoreType = '1' + }else{ + state.addTitle = '自定义扣分项' + state.addForm.scoreType = '2' + } } const handleClose = () => { - busRef.value.clearValidate(); - reset(); - dialogVisible.value = false; + state.info = { + name: '', + idCard: '', + projectName: '', + teamLeader: '' + } + state.form = { + projectExpertId: null, + saveData: [], + delData: [], + score: 100, + professionalEthics: null, + impartialHonest: null, + comprehensiveCoordination: null, + professionalAbility: null, + expressingOpinions: null, + others: '', + comprehensiveEvaluation: null, + majorDangers: null, + generalHazards: null, + content: '', + freightBasis: '', + billingDuration: null, + taxExpertFee: null, + billingInstructions: '', + afterTaxAmount: null, + taxableIncome: null, + incomeTaxPayable: null, + openBank: '', + bankCard: '', + } + totalScore.value = null + taxIncome.value= null + taxPay.value= null + afterTaxIncome.value= null + busRef.value.clearValidate() + state.addData = [] + state.deductData = [] + dialogVisible.value = false; +} -} -const reset = () => { - state.form = { - id: '', - label: '', - value: '', - dictType: "sys_assess_type", +const submitAdd = async ()=>{ + const valid = await addRef.value.validate(); + if(valid){ + if(state.addTitle == '自定义加分项'){ + state.addData.push(state.addForm) + }else{ + state.deductData.push(state.addForm) } + await closeAdd() + } } + +const closeAdd = ()=>{ + state.addVisible = false + state.addForm = { + scoreType: '', + score: null, + content: '' + } +} + +const confirmScore = async ()=>{ + const valid = await evaluateRef.value.validate(); + if(valid){ + state.form.saveData = [...state.addData,...state.deductData] + state.form.delData = state.form.delData.filter((id) => !state.form.saveData.some((item) => item.id === id)) + state.form.score = totalScore.value || 0 + state.form.taxableIncome = taxIncome.value || 0 + state.form.incomeTaxPayable = taxPay.value || 0 + state.form.afterTaxAmount = afterTaxIncome.value || 0 + const res = await projectExpertDetailSave(state.form) + if(res.code == 200){ + ElMessage.success(res.msg) + await handleClose() + emit('getList') + }else{ + ElMessage.warning(res.msg) + } + } +} + defineExpose({ - openDialog -}); + openDialog +}) </script> <style scoped lang="scss"> -.notice{ - :deep(.el-form .el-form-item__label) { - font-size: 15px; - } - .file { - display: flex; - flex-direction: column; - align-items: flex-start; - } +.notice { + :deep(.el-form .el-form-item__label) { + font-size: 15px; + } + + .file { + display: flex; + flex-direction: column; + align-items: flex-start; + } } </style> -- Gitblit v1.9.2