| company/.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| company/.env.developmentCom | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| company/src/components/business/OperaWtbApplyShopWindow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| company/src/components/common/CommonHeader.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| company/src/components/enterprise/selectEmployees.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
company/.env.development
@@ -11,5 +11,5 @@ #VUE_APP_API = 'http://localhost:10030/' VUE_APP_API = 'http://192.168.0.143:10030/' #VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/' #VUE_APP_API = 'http://192.168.0.143:10030/' VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/' company/.env.developmentCom
@@ -9,4 +9,6 @@ # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/' #VUE_APP_API = 'http://localhost:10031/' VUE_APP_API = 'http://192.168.0.143:10031/' #VUE_APP_API = 'http://192.168.0.143:10031/' VUE_APP_API = 'https://www.yyb.red/yyb_web_api/' company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -12,8 +12,8 @@ <div class="desc_item_label_left"> <span>保险到期还有 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 天</span> <el-button type="primary" v-if="model.status === 27" @click="$refs.OperaInsuranceApplyAddWindow.open('续保', {id: dataId,type: 1 })">一键续保</el-button> <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: dataId })">加减保申请</el-button> <el-button type="primary" v-if="model.status === 27 && model.loseEfficacyDays" @click="$refs.factoryChange.open('更换派遣单位申请', { id: dataId })">更换派遣单位申请</el-button> <el-button type="primary" v-if="model.status === 27 && ( model.loseEfficacyDays ||!model.loseEfficacyDays)" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: dataId })">加减保申请</el-button> <el-button type="primary" v-if="model.status === 27 && ( model.loseEfficacyDays ||!model.loseEfficacyDays)" @click="$refs.factoryChange.open('更换派遣单位申请', { id: dataId })">更换派遣单位申请</el-button> </div> </div> <div class="desc_item_label"> @@ -26,7 +26,7 @@ <div class="desc_item_label_right"> <el-button type="primary" @click="$refs.InsuranceDetails.open('投保详情单',model,0)">导出详单</el-button> <template v-if="userInfo.type === 1"> <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApply.open('投保申请', {id: dataId})">再次投保</el-button> <el-button v-if="model.status == 24" type="primary" @click="$refs.OperaInsuranceApplyAddWindow.open('投保申请', {id: dataId})">再次投保</el-button> <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">查看确认书</el-button> <el-button v-if="[22,23,24,25,26,27].includes(model.status) && model.shenqingdanFile" type="primary" @click="viewShenqingdan">查看申请单</el-button> <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">查看投保单</el-button> company/src/components/common/CommonHeader.vue
@@ -101,14 +101,13 @@ if (userInfo == null) { return '' } if(userInfo.type === 1){ if (userInfo.company != null && userInfo.company.name.trim().length > 0) { if (userInfo.type === 1 && userInfo.company != null && userInfo.company.name.trim().length > 0) { if (userInfo.company.username === userInfo.username){ return userInfo.company.name } }else{ if (userInfo.realname != null && userInfo.realname.trim().length > 0) { return userInfo.realname } } if (userInfo.realname != null && userInfo.realname.trim().length > 0) { return userInfo.realname } return userInfo.username } company/src/components/enterprise/selectEmployees.vue
@@ -6,35 +6,39 @@ :confirm-working="isWorking" @confirm="confirm" > <div style="display: inline-block;padding: 20px 10px;color: red" class="el-upload__tip" > 操作提示： 请在下面搜索框内输入员工姓名或身份证号进行员工信息搜索，并选择员工进行操作 </div> <el-select v-model="memberIds" value-key="id" v-model="seleData" filterable multiple remote style="margin-bottom: 15px;width: 50%;margin-right: 10px" placeholder="请输入员工姓名或身份证号" style="margin-bottom: 15px;width: 100%;margin-right: 10px" placeholder="请输入员工姓名或身份证号进行选择" :remote-method="searchSelData" :loading="loading"> <el-option v-for="item in memberList" :key="item.id" :label="item.name+' ' +(item.idcardNo||'')" :value="item.id"> :value="item"> </el-option> </el-select> <!-- <el-input v-model="val" placeholder="请输入员工姓名后，点击搜索按钮或者按下enter键进行查询" @keypress.enter.native="getList" style="margin-bottom: 15px;width: 50%;margin-right: 10px"></el-input> --> <el-button type="primary" @click="getList" style="width: 100px;">搜索</el-button> <!-- <el-button type="primary" @click="getList" style="width: 100px;">搜索</el-button>--> <el-table :data="list" :data="seleData" border @selection-change="handleSelectionChange" selection-change1="handleSelectionChange" style="width: 100%"> <el-table-column <!-- <el-table-column type="selection" width="55"> </el-table-column> </el-table-column>--> <el-table-column label="序号" width="80px"> <template slot-scope="scope"> <span>{{scope.$index + 1}}</span> @@ -103,6 +107,11 @@ this.price = obj.price this.confirming=false this.oldList = obj.arr // this.seleData = obj.arr || [] this.memberIds=[] this.seleData=[] this.memberList=[] this.confirming=false if (obj.type) { this.type = obj.type } @@ -126,14 +135,16 @@ } this.confirming=true if (this.seleData.length === 0) { this.$message.warning('至少选择一项内容') this.$message.warning('至少搜索选择一位员工进行操作') this.confirming=false return } for (let i = 0; i < this.seleData.length; i++) { for (let a = 0; a < this.oldList.length; a++) { // this.seleData[i].name === this.oldList[a].memberName || if (this.seleData[i].idCard === this.oldList[a].idcardNo) { if (this.seleData[i].idcardNo === this.oldList[a].idCard) { this.$message.warning(`[${this.seleData[i].name}]员工重复`) this.confirming=false return } } @@ -142,6 +153,7 @@ item.idCard = item.idcardNo item.memberName = item.name item.memberId = item.id item.reducePrice = item.fee if (this.notInInsuranceApplyId || this.type == 1) { item.workTypeName = '' item.worktypeId = '' @@ -150,8 +162,12 @@ } item.fee = this.price }) this.$emit('result', this.seleData) console.log(this.oldList) console.log(this.seleData) this.confirming=false this.$emit('result', this.seleData) this.seleData=[] this.visible = false }, handleSelectionChange (e) { server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1183,7 +1183,6 @@ //如果已保全,可下载签约附件 String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode(); //直保 投保申请 String r = dealXBTBBiz(path,data,"直保-投保申请签署"); if(StringUtils.isNotBlank(r)){ return r; @@ -1259,7 +1258,6 @@ return null; } if( Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){ if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){ //完成签署已完成操作 String link = signService.linkFile(data.getApplyNo());
