company/src/components/base/BaseOpera.vue
@@ -83,7 +83,23 @@ getChangApplyTimeTitle (changeType, model) { if (changeType === 2) { return model.status === 2 ? '批单生效期' : '期望批单生效期' }else if (changeType === 1) { } else if (changeType === 1) { return model.status === 2 ? '批增生效起期' : '期望批增生效起期' } else { return model.status === 2 ? '批减生效起期' : '期望批减生效起期' } }, getUnionApplyTimeTitle (type, model) { if (type === 1) { return model.status === 3 ? '保险生效起期' : '期望生效起期' } else { return model.status === 3 ? '保险生效止期' : '期望生效止期' } }, getUnionChangTimeTitle (changeType, model) { if (changeType === 2) { return model.status === 2 ? '批单生效期' : '期望批单生效期' } else if (changeType === 1) { return model.status === 2 ? '批增生效起期' : '期望批增生效起期' } else { return model.status === 2 ? '批减生效起期' : '期望批减生效起期' company/src/components/business/ApplyChangeDetails1.vue
@@ -27,8 +27,8 @@ <div class="box_table_content_item box_table_content_header">{{form.code}}</div> <div class="box_table_content_item box_table_content_header">{{form.startTime}}</div> <div class="box_table_content_item box_table_content_header">{{form.endTime}}</div> <div class="box_table_content_item box_table_content_header">{{arr1.length}}人</div> <div class="box_table_content_item box_table_content_header">{{arr2.length}}人</div> <div class="box_table_content_item box_table_content_header">{{arr1.length}} 人</div> <div class="box_table_content_item box_table_content_header">{{arr2.length}} 人</div> <!-- <div class="box_table_content_item box_table_content_header">{{form.applyStartTime}}</div>--> </div> </div> company/src/components/business/InsuranceDetailsWtb.vue
@@ -15,8 +15,8 @@ <div class="box_table_head_item">投保人</div> <div class="box_table_head_item">被保险人</div> <div class="box_table_head_item">保险方案</div> <div class="box_table_head_item">保险生效起期</div> <div class="box_table_head_item">保险生效止期</div> <div class="box_table_head_item">{{ getUnionApplyTimeTitle(1,model)}}</div> <div class="box_table_head_item">{{ getUnionApplyTimeTitle(0,model)}}</div> <div class="box_table_head_item">在保/投保人数</div> <div class="box_table_head_item">总费用(元)</div> </div> company/src/components/business/OpearaUnionApply.vue
@@ -37,7 +37,7 @@ </div> </el-form-item> <el-form-item label="费用" v-if="item"> <span>{{item.price}}元</span> <span>{{item.price}} 元</span> <span v-if="item.timeUnit === 0">/天</span> <span v-if="item.timeUnit === 1">/半月</span> <span v-if="item.timeUnit === 2">/月</span> company/src/components/business/OpearaUnionChange.vue
@@ -28,7 +28,7 @@ </div> </el-form-item>--> <el-form-item label="费用" v-if="model"> <span>{{model.price}}元</span> <span>{{model.price}} 元</span> <span v-if="model.timeUnit === 0">/天</span> <span v-if="model.timeUnit === 1">/半月</span> <span v-if="model.timeUnit === 2">/月</span> company/src/components/business/OpearaUnionChangeUnit.vue
@@ -29,7 +29,7 @@ </div> </el-form-item> <el-form-item label="费用" v-if="model"> <span>{{model.price}}元</span> <span>{{model.price}} 元</span> <span v-if="model.timeUnit === 0">/天</span> <span v-if="model.timeUnit === 1">/半月</span> <span v-if="model.timeUnit === 2">/月</span> company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -195,6 +195,8 @@ <el-button type="primary" style="width: 80px;" @click="search">查询</el-button> <el-button @click="resetting" style="width: 80px;">重置</el-button> <el-button type="primary" style="width: 80px;" @click="exportExcel" v-if="activeName === '0'">导出名单</el-button> <el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('加减保费用月度统计',model)" v-if="activeName === '1'">费用统计查询</el-button> </el-form-item> </el-form> </div> @@ -308,13 +310,19 @@ :key="Math.random()" prop="addNum" align="center" label="增加人数（人）"> label="增加人数"> <template scope="{row}"> {{row.addNum||0}} 人 </template> </el-table-column> <el-table-column :key="Math.random()" prop="delNum" align="center" label="减少人数（人）"> label="减少人数 "> <template scope="{row}"> {{row.delNum||0}} 人 </template> </el-table-column> <el-table-column :key="Math.random()" @@ -338,7 +346,10 @@ :key="Math.random()" prop="fee" align="center" label="费用变更(元)"> label="费用变更"> <template scope="{row}"> {{row.fee||0}}元 </template> </el-table-column> <el-table-column :key="Math.random()" @@ -391,6 +402,9 @@ prop="changeNum" align="center" label="更换派遣单位人数"> <template scope="{row}"> {{row.changeNum||0}} 人 </template> </el-table-column> <el-table-column :key="Math.random()" @@ -468,6 +482,7 @@ <!-- 验证手机号 --> <operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" /> <OperaPdfViewerWindow ref="OperaPdfViewerWindow" /> <OperaApplyChangeMonthWindow ref="OperaApplyChangeMonthWindow" /> <template v-slot:footer> <el-button @click="visible=false">返回</el-button> </template> @@ -483,6 +498,7 @@ import factoryChange from '@/components/enterprise/factoryChange' import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew' import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow' import OperaApplyChangeMonthWindow from '@/components/business/OperaApplyChangeMonthWindow' import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow' import applyReturn from '@/components/enterprise/applyReturn' @@ -504,6 +520,7 @@ applyReturn, additionSubtractionApplication, factoryChange, OperaApplyChangeMonthWindow, OperaApplyChangeDetailWindow, OperaApplyChangeUnitDetailWindow, OperaInsuranceApplyAddWindow, company/src/components/business/OperaSolutionsDescWindow.vue
@@ -73,11 +73,11 @@ </div> <div class="info_list_item"> <div class="info_list_item_label">批增生效：</div> <div class="info_list_item_val">{{form.addValidDays||0}}天</div> <div class="info_list_item_val">{{form.addValidDays||0}} 天</div> </div> <div class="info_list_item"> <div class="info_list_item_label">批减生效：</div> <div class="info_list_item_val">{{form.delValidDays||0}}天</div> <div class="info_list_item_val">{{form.delValidDays||0}} 天</div> </div> <div class="info_list_item"> <div class="info_list_item_label">批改支持：</div> company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -76,12 +76,12 @@ <el-table-column prop="applyStartTime" align="center" label="批增生效日期"> :label="getUnionChangTimeTitle(1,model)"> </el-table-column> <el-table-column prop="delValidTime" align="center" label="批减生效日期"> :label="getUnionChangTimeTitle(0,model)"> </el-table-column> <el-table-column prop="addNum" company/src/components/business/OperaUnionChangeUnitDetailWindow.vue
@@ -79,7 +79,7 @@ <el-table-column prop="applyStartTime" align="center" label="批单生效起期"> :label="getUnionChangTimeTitle(2,model)"> </el-table-column> </el-table> </div> company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -84,24 +84,37 @@ prop="insureNum" align="center" label="投保人数"> <template scope="{row}"> <span>{{row.insureNum||0}} 人</span> </template> </el-table-column> <el-table-column prop="guaranteeNum" align="center" label="在保人数" ></el-table-column> <el-table-column prop="guaranteeNum" align="center" label="在保人数" > <template scope="{row}"> <span>{{row.guaranteeNum||0}} 人</span> </template> </el-table-column> <el-table-column prop="serviceDays" align="center" label="保单时长（天）"> label="保单时长"> <template scope="{row}"> <span>{{row.serviceDays||0}} 天</span> </template> </el-table-column> <el-table-column prop="currentFee" align="center" label="已产生费用(元)"> label="已产生费用"> <template scope="{row}"> <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="fee" align="center" label="总费用(元)"> label="总费用"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee: '-'}}</span> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> </el-table> @@ -202,6 +215,7 @@ <el-button type="primary" style="width: 80px;" @click="search">查询</el-button> <el-button @click="resetting" style="width: 80px;">重置</el-button> <el-button type="primary" style="width: 80px;" @click="exportExcel" v-if="activeName === '0'">导出名单</el-button> <el-button type="primary" style="width: 100px;" @click="$refs.OperaApplyChangeMonthWindow.open('加减保费用月度统计',model)" v-if="activeName === '1'">费用统计查询</el-button> </el-form-item> </el-form> </div> @@ -269,7 +283,7 @@ prop="fee" label="产生费用"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee: '-'}}</span> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column @@ -472,6 +486,7 @@ <OperaApplyChangeUnitDetailWindow ref="OperaApplyChangeUnitDetailWindow" @success="successEvent"/> <!-- 验证手机号 --> <OperaPdfViewerWindow ref="OperaPdfViewerWindow" /> <OperaApplyChangeMonthWindow ref="OperaApplyChangeMonthWindow" /> <operaverifyPhoneNumberWindew ref="operaverifyPhoneNumberWindew" @success="goSign" /> <template v-slot:footer> <el-button @click="visible=false">返回</el-button> @@ -517,6 +532,7 @@ import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew' import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow' import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow' import OperaApplyChangeMonthWindow from '@/components/business/OperaApplyChangeMonthWindow' import applyReturn from '@/components/enterprise/applyReturn' import { getDetail, @@ -542,6 +558,7 @@ OperaPdfViewerWindow, OperaWtbApplyCheckWindow, applyReturn, OperaApplyChangeMonthWindow, OperaInsuranceApplyAddWindowNew, additionSubtractionApplication, factoryChange, company/src/components/business/UnionChangeDetails.vue
@@ -12,32 +12,32 @@ </div> <div class="box_table"> <div class="box_table_head"> <div class="box_table_head_item" style="flex: 1.5">投保人</div> <div class="box_table_head_item" style="flex: 1.5">保险方案</div> <div class="box_table_head_item">保险生效起期</div> <div class="box_table_head_item">保险生效止期</div> <div class="box_table_head_item" style="flex: 2">投保人</div> <div class="box_table_head_item" style="flex: 2">保险方案</div> <div class="box_table_head_item" style="flex: 2">保险生效起期</div> <div class="box_table_head_item" style="flex: 2">保险生效止期</div> <div class="box_table_head_item">保单号</div> <div class="box_table_head_item" style="flex: 0.5">加保人数</div> <div class="box_table_head_item" style="flex: 0.5">减保人数</div> <div class="box_table_head_item">批增生效日期</div> <div class="box_table_head_item">批减生效日期</div> <div class="box_table_head_item" >加保人数</div> <div class="box_table_head_item" >减保人数</div> <div class="box_table_head_item" style="flex: 2">{{ getUnionChangTimeTitle(1,model) }}</div> <div class="box_table_head_item" style="flex: 2">{{ getUnionChangTimeTitle(0,model) }}</div> </div> <div class="box_table_content " > <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ model.shopName }}</div> <div class="box_table_content_item box_table_content_header" style="flex: 1.5">{{ model.solutionsName }}</div> <div class="box_table_content_item box_table_content_header">{{ model.startTime }}</div> <div class="box_table_content_item box_table_content_header">{{ model.endTime }}</div> <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.shopName }}</div> <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.solutionsName }}</div> <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.startTime }}</div> <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.endTime }}</div> <div class="box_table_content_item box_table_content_header">{{ model.applyCode }}</div> <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ model.addNum}}</div> <div class="box_table_content_item box_table_content_header" style="flex: 0.5">{{ model.delNum}}</div> <div class="box_table_content_item box_table_content_header">{{ model.applyStartTime}}</div> <div class="box_table_content_item box_table_content_header">{{ model.delValidTime}}</div> <div class="box_table_content_item box_table_content_header" >{{ model.addNum}}</div> <div class="box_table_content_item box_table_content_header" >{{ model.delNum}}</div> <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.applyStartTime}}</div> <div class="box_table_content_item box_table_content_header" style="flex: 2">{{ model.delValidTime}}</div> </div> </div> <div class="box_table"> <div class="box_table_head box_table_content"> <div class="box_table_head_item" style=" flex: 1.5;border-bottom: 0px">被保险人</div> <div class="box_table_content_item box_table_content_header" style=" flex: 7.5;"> <div class="box_table_head_item" style=" flex: 2; border-bottom: 0px">被保险人</div> <div class="box_table_content_item box_table_content_header" style=" flex: 14.7;"> <p v-for="(item, index) in companyList" :key="index" > {{index>0?'，':''}} {{ item[1]}} </p> @@ -66,7 +66,7 @@ <div class="box_table_content_item">{{ item.companyName }}</div> <div class="box_table_content_item">{{ item.duName }}</div> <div class="box_table_content_item">{{item.workTypeName}}</div> <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark"{{item.remark}}</div> <div class="box_table_content_item" style="align-items: baseline;cursor: pointer; " :title="item.remark">{{item.remark}}</div> </div> </div> <div class="box_table" v-if="delList && delList.length>0"> @@ -301,6 +301,7 @@ height: 50px; background: #f2f2f2; display: flex; padding: 10px; align-items: center; justify-content: center; font-size: 14px; @@ -314,6 +315,7 @@ height: 50px; background: #f2f2f2; display: flex; padding: 10px; align-items: center; justify-content: center; font-size: 14px; company/src/components/business/UnionChangeUnitDetails.vue
@@ -18,7 +18,7 @@ <div class="box_table_head_item">保险生效止期</div> <div class="box_table_head_item">保单号</div> <div class="box_table_head_item">换厂</div> <div class="box_table_head_item">批单生效期</div> <div class="box_table_head_item">{{ getUnionChangTimeTitle(2,model) }}</div> </div> <div class="box_table_content " > <div class="box_table_content_item box_table_content_header">{{ model.shopName }}</div> company/src/components/business/add_subtract_entrust.vue
@@ -24,7 +24,7 @@ </div> </el-form-item> <el-form-item label="费用" v-if="item && item.solutionType==0"> <span>{{item.price}}元</span> <span>{{item.price}} 元</span> <span v-if="item.timeUnit === 0">/天</span> <span v-if="item.timeUnit === 1">/半月</span> <span v-if="item.timeUnit === 2">/月</span> company/src/components/business/detailsEntrustedInsurance.vue
@@ -50,33 +50,49 @@ <el-table-column prop="startTime" align="center" label="保险生效起期"> :label="getUnionApplyTimeTitle(1,model)"> </el-table-column> <el-table-column prop="endTime" align="center" label="保险生效止期"> :label="getUnionApplyTimeTitle(0,model)"> </el-table-column> <el-table-column prop="insureNum" align="center" label="投保人数"> <template slot-scope="{row}"> <span>{{row.insureNum||0}} 人</span> </template> </el-table-column> <el-table-column prop="guaranteeNum" align="center" label="在保人数" ></el-table-column> <el-table-column prop="guaranteeNum" align="center" label="在保人数" > <template slot-scope="{row}"> <span>{{row.guaranteeNum||0}} 人</span> </template> </el-table-column> <el-table-column prop="serviceDays" align="center" label="保单时长（天）"> label="保单时长"> <template slot-scope="{row}"> <span>{{row.serviceDays||0}} 天</span> </template> </el-table-column> <el-table-column prop="currentFee" align="center" label="已产生费用(元)"> label="已产生费用"> <template slot-scope="{row}"> <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="fee" align="center" label="总费用(元)"> label="总费用"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> </el-table> </div> @@ -189,13 +205,13 @@ :key="Math.random()" prop="startTime" align="center" label="保险生效起期"> :label="getUnionApplyTimeTitle(1,model)"> </el-table-column> <el-table-column :key="Math.random()" prop="endTime" align="center" label="保险生效止期"> :label="getUnionApplyTimeTitle(0,model)"> </el-table-column> <el-table-column :key="Math.random()" company/src/views/business/applyChangeShop.vue
@@ -80,12 +80,12 @@ <el-table-column prop="solutionsName" label="保险方案" min-width="150px" align="center"></el-table-column> <el-table-column prop="addNum" label="加保人数" min-width="80px" align="center"> <template slot-scope="{row}"> {{row.addNum||0}}人 {{row.addNum||0}} 人 </template> </el-table-column> <el-table-column prop="delNum" label="减保人数" min-width="80px" align="center"> <template slot-scope="{row}"> {{row.delNum||0}}人 {{row.delNum||0}} 人 </template> </el-table-column> <el-table-column prop="fee" label="费用变更" min-width="80px" align="center"> company/src/views/business/insuranceApply.vue
@@ -96,12 +96,12 @@ </el-table-column> <el-table-column prop="currentFee" label="已产生费用" align="center"> <template slot-scope="{row}"> <span>{{row.currentFee!=null?row.currentFee+'元': '-'}}</span> <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="fee" label="总费用" align="center"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee+'元': '-'}}</span> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="createDate" label="提交日期" align="center" min-width="150"></el-table-column> company/src/views/business/insuranceApplyShop.vue
@@ -112,12 +112,12 @@ </el-table-column> <el-table-column prop="currentFee" label="已产生费用" align="center"> <template slot-scope="{row}"> <span>{{row.currentFee!=null?row.currentFee+'元': '-'}}</span> <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="fee" label="总费用" align="center"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee+'元': '-'}}</span> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="createDate" label="提交日期" align="center" min-width="150"></el-table-column> company/src/views/business/member.vue
@@ -62,37 +62,37 @@ :data="tableData.list" stripe > <el-table-column label="序号" width="80px"> <el-table-column align="center" label="序号" width="50px" fixed> <template slot-scope="scope"> <span>{{scope.$index + 1}}</span> </template> </el-table-column> <el-table-column label="保险状态" min-width="100px"> <el-table-column align="center" label="保险状态" min-width="80px" fixed> <template slot-scope="{row}"> <span style="color: green;" v-if="row.solutionsStatus === 1">保障中</span> <span v-else-if="row.solutionsStatus === 2">不在保</span> </template> </el-table-column> <el-table-column prop="companyName" label="所属企业" min-width="100px" v-if="userInfo.type === 0"></el-table-column> <el-table-column prop="name" label="员工姓名" min-width="100px"></el-table-column> <el-table-column label="性别" min-width="100px"> <template slot-scope="{row}"> <span v-if="row.sex === 0">男</span> <el-table-column align="center" prop="companyName" fixed label="所属企业" min-width="150px" v-if="userInfo.type === 0"></el-table-column> <el-table-column align="center" prop="name" label="员工姓名" fixed min-width="100px"></el-table-column> <el-table-column align="center" prop="solutionName" label="保险方案" fixed min-width="150px"></el-table-column> <el-table-column align="center" prop="idcardNo" label="身份证号码" fixed min-width="150px"></el-table-column> <el-table-column align="center" label="性别" min-width="50px" fixed> <template slot-scope="{row}"> <span v-if="row.sex === 0">男</span> <span v-if="row.sex === 1">女</span> </template> </el-table-column> <el-table-column prop="idcardNo" label="身份证号码" min-width="100px"></el-table-column> <el-table-column label="年龄" min-width="100px"> </el-table-column> <el-table-column align="center" label="年龄" min-width="50px" fixed> <template slot-scope="{row}"> {{ calculateAge(row.idcardNo) }} </template> </el-table-column> <el-table-column prop="solutionName" label="保险方案" min-width="100px"></el-table-column> <el-table-column prop="duName" label="派遣单位" min-width="100px"></el-table-column> <el-table-column prop="workTypeName" label="所属工种" min-width="100px"></el-table-column> <el-table-column prop="startTime" label="实际保险生效起期" min-width="100px"></el-table-column> <el-table-column prop="endTime" label="实际保险生效止期" min-width="100px"></el-table-column> <el-table-column label="操作" <el-table-column align="center" prop="duName" label="派遣单位" min-width="150px"></el-table-column> <el-table-column align="center" prop="workTypeName" label="所属工种" min-width="150px"></el-table-column> <el-table-column align="center" prop="startTime" label="实际保险生效起期" min-width="150px"></el-table-column> <el-table-column align="center" prop="endTime" label="实际保险生效止期" min-width="150px"></el-table-column> <el-table-column align="center" label="操作" fixed="right" min-width="120px"> <template slot-scope="{row}"> company/src/views/business/switchCourt.vue
@@ -77,7 +77,7 @@ <el-table-column prop="solutionsName" label="保险方案" min-width="150px" align="center"></el-table-column> <el-table-column prop="changeNum" label="更换派遣单位人数" min-width="150px" align="center"> <template slot-scope="{row}"> {{row.changeNum||0}}人 {{row.changeNum||0}} 人 </template> </el-table-column> <el-table-column prop="createDate" label="提交时间" min-width="150px" align="center"></el-table-column> company/src/views/business/unionChange.vue
@@ -56,12 +56,12 @@ <el-table-column align="center" prop="solutionsName" label="保险方案" min-width="150px"></el-table-column> <el-table-column align="center" prop="addNum" label="加保人数" min-width="100px"> <template slot-scope="{row}"> {{row.addNum||0}}人 {{row.addNum||0}} 人 </template> </el-table-column> <el-table-column align="center" prop="delNum" label="减保人数" min-width="100px"> <template slot-scope="{row}"> {{row.delNum||0}}人 {{row.delNum||0}} 人 </template> </el-table-column> <el-table-column align="center" prop="createDate" label="提交时间" min-width="150px"></el-table-column> company/src/views/business/unionChangeUnit.vue
@@ -56,7 +56,7 @@ <el-table-column align="center" prop="solutionsName" label="保险方案" min-width="150px"></el-table-column> <el-table-column align="center" prop="changeNum" label="更换派遣单位人数" min-width="150px"> <template slot-scope="{row}"> {{row.changeNum||0}}人 {{row.changeNum||0}} 人 </template> </el-table-column> <el-table-column align="center" prop="createDate" label="提交时间" min-width="150px"></el-table-column> company/src/views/enterprise/add_subtract.vue
@@ -76,17 +76,17 @@ </el-table-column> <el-table-column align="center" prop="addNum" label="加保人数" min-width="100px"> <template slot-scope="{row}"> {{row.addNum||0}}人 {{row.addNum||0}} 人 </template> </el-table-column> <el-table-column align="center" prop="delNum" label="减保人数" min-width="100px"> <template slot-scope="{row}"> {{row.delNum||0}}人 {{row.delNum||0}} 人 </template> </el-table-column> <el-table-column align="center" prop="fee" label="费用变更" min-width="100px"> <template slot-scope="{row}"> {{row.fee||0}}元 <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column align="center" prop="validTime" label="申请日期" min-width="150px"></el-table-column> company/src/views/enterprise/insuranceApply.vue
@@ -90,12 +90,12 @@ </el-table-column> <el-table-column prop="currentFee" label="已产生费用" align="center"> <template slot-scope="{row}"> <span>{{row.currentFee!=null?row.currentFee+'元': '-'}}</span> <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="fee" label="总费用" align="center"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee+'元': '-'}}</span> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="createDate" label="提交日期" align="center" min-width="150"></el-table-column> company/src/views/enterprise/myPolicy.vue
@@ -116,17 +116,17 @@ </el-table-column> <el-table-column prop="currentFee" label="已产生费用" align="center"> <template slot-scope="{row}"> <span>{{row.currentFee!=null?row.currentFee+'元': '-'}}</span> <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="fee" label="总费用" align="center"> <template slot-scope="{row}"> <span>{{row.fee!=null?row.fee+'元': '-'}}</span> <span>{{row.fee!=null?row.fee+' 元': '-'}}</span> </template> </el-table-column> <el-table-column prop="createDate" label="提交日期" align="center"min-width="150"></el-table-column> <el-table-column prop="startTime" label="投保生效日期" align="center"min-width="150"></el-table-column> <el-table-column prop="endTime" label="投保失效日期" align="center"min-width="150"></el-table-column> <el-table-column prop="createDate" label="提交日期" align="center" min-width="150"></el-table-column> <el-table-column prop="startTime" label="投保生效日期" align="center" min-width="150"></el-table-column> <el-table-column prop="endTime" label="投保失效日期" align="center" min-width="150"></el-table-column> <el-table-column v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])" label="操作" company/src/views/enterprise/switchCourt.vue
@@ -71,7 +71,7 @@ <el-table-column align="center" prop="solutionsName" label="保险方案" min-width="150px"></el-table-column> <el-table-column align="center" prop="changeNum" label="更换派遣单位人数 " min-width="150px"> <template slot-scope="{row}"> {{row.changeNum||0}}人 {{row.changeNum||0}} 人 </template> </el-table-column> <el-table-column align="center" prop="createDate" label="提交时间" min-width="150px"></el-table-column> server/service/src/main/java/com/doumee/core/annotation/excel/ExcelExporter.java
@@ -1844,8 +1844,8 @@ header1.createCell(4).setCellValue("保险生效止期"); header1.createCell(5).setCellValue("加保人数"); header1.createCell(6).setCellValue("减保人数"); header1.createCell(7).setCellValue("批增生效日期"); header1.createCell(8).setCellValue("批减生效日期"); header1.createCell(7).setCellValue(Constants.getChangeApplyTimeTitle(1,data)); header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(0,data)); for (int i = 0; i < 9; i++) { configFirstCell(sxssfWorkbook,header1.getCell(i)); } @@ -2014,7 +2014,7 @@ header1.createCell(5).setCellValue("保险生效起期"); header1.createCell(6).setCellValue("保险生效止期"); header1.createCell(7).setCellValue("换厂人数"); header1.createCell(8).setCellValue("期望批单生效期"); header1.createCell(8).setCellValue(Constants.getChangeApplyTimeTitle(2,data)); sheet.addMergedRegion(new CellRangeAddress(1 ,1,0,1)); sheet.addMergedRegion(new CellRangeAddress(1 ,1,2,3)); server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -4,10 +4,7 @@ import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.dao.business.dto.CountCyclePriceDTO; import com.doumee.dao.business.model.ApplyChange; import com.doumee.dao.business.model.ApplyDetail; import com.doumee.dao.business.model.InsuranceApply; import com.doumee.dao.business.model.Solutions; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.ChangeDealTypeVO; import com.doumee.dao.business.vo.CountCyclePriceVO; import io.swagger.models.auth.In; @@ -139,6 +136,32 @@ return Constants.equalsInteger(model.getStatus(), ApplyChangeStatus.APPROVE.getKey())?"批减生效起期":"期望批减生效起期"; } } public static String getApplyTimeTitle(int type, UnionApply model){ if(type ==1){ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"保险生效起期":"期望保险生效起期"; }else{ return Constants.equalsInteger(model.getStatus(), UnionApplyStatus.FINISH.getKey())?"保险生效止期":"预计生效止期"; } } /** * 获取批改单时间标题列 * @param type 0更换派遣单位 1加保 0减保 * @param model * @return */ public static String getChangeApplyTimeTitle(int type, UnionChange model){ if(type ==2){ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"批单生效期":"期望批单生效期"; }else if(type ==1){ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"批增生效起期":"期望批增生效起期"; }else{ return Constants.equalsInteger(model.getStatus(), UnionChangeStatus.FINISH.getKey())?"批减生效起期":"期望批减生效起期"; } } /** * 企业数据来源 0平台注册 1后台导入 */
