company/.env.development
@@ -7,6 +7,6 @@ # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/' VUE_APP_API = 'http://192.168.0.190:10030/' # VUE_APP_API = 'http://192.168.0.190:10030/' #VUE_APP_API = 'http://localhost:10030/' VUE_APP_API = 'http://localhost:10030/' company/.env.developmentCom
@@ -7,6 +7,6 @@ # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/' VUE_APP_API = 'http://192.168.0.190:10031/' #VUE_APP_API = 'http://192.168.0.190:10031/' #VUE_APP_API = 'http://localhost:10030/' VUE_APP_API = 'http://localhost:10031/' company/.env.developmentShop
@@ -7,6 +7,6 @@ # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/' VUE_APP_API = 'http://192.168.0.190:10032/' #VUE_APP_API = 'http://192.168.0.190:10032/' #VUE_APP_API = 'http://localhost:10030/' VUE_APP_API = 'http://localhost:10032/' company/.env.productionCom
@@ -1,10 +1,10 @@ # 生产环境配置 NODE_ENV = 'production' VUE_APP_API_PREFIX = '/yyb_admin_api' VUE_APP_API_PREFIX = '/yyb_web_api' # 平台端 VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/' VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/' # 企业端 # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/' company/.env.productionShop
@@ -1,10 +1,10 @@ # 生产环境配置 NODE_ENV = 'production' VUE_APP_API_PREFIX = '/yyb_admin_api' VUE_APP_API_PREFIX = '/yyb_shop_api' # 平台端 VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/' VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/' # 企业端 # VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/' company/src/components/business/OpearaUnionApply.vue
@@ -213,8 +213,8 @@ }, changeTime (e) { if (e.length > 0) { this.form.startDate = e[0] this.form.endDate = e[1] this.form.startDate = e[0]+ ' 00:00:00' this.form.endDate = e[1] + ' 23:59:59' } else { this.form.startDate = '' this.form.endDate = '' company/src/components/business/OpearaUnionChange.vue
@@ -21,6 +21,7 @@ v-model="form.applyDate" type="date" format="yyyy 年 MM 月 dd 日" placeholder="前选择日期" value-format="yyyy-MM-dd" /> <span style="color: #F95601; font-size: 14px;">（2. 次日生效投保请于17:30前提交，超时提交以保险单为准）</span> </div> company/src/components/business/OpearaUnionChangeUnit.vue
@@ -19,6 +19,7 @@ <div style="display: flex; flex-direction: column;"> <el-date-picker v-model="form.applyDate" placeholder="前选择日期" type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" /> company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -44,6 +44,7 @@ <el-form-item label="保险生效止期：" prop="endTime" v-if="form.selectRadio === 1"> <el-date-picker v-model="form.endTime" @change="changEndTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"> @@ -161,6 +162,9 @@ }) }, methods: { changEndTime(){ this.form.endTime=this.form.endTime.replace(" 00:00:00"," 23:59:59") }, dele2 () { this.form.toubaodanFile= null }, company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -117,6 +117,9 @@ <el-table-column prop="fee" label="费用"> <template slot-scope="{row}"> {{item.type==1?'-':row.fee}} </template> </el-table-column> <el-table-column label="操作"> @@ -299,7 +302,7 @@ this.tableData.forEach(item => { total += item.fee }) sums[index] = total sums[index] = total.toFixed(2) } }) return sums company/src/components/enterprise/additionSubtractionApplication.vue
@@ -328,12 +328,12 @@ this.form.addDetailList.forEach(item => { total += item.fee }) sums[index] = total sums[index] = total.toFixed(2) } else { this.form.delDetailList.forEach(item => { total += item.fee }) sums[index] = '-' + total sums[index] = '-' + total.toFixed(2) } } }) company/src/components/enterprise/confirmJobType.vue
@@ -60,6 +60,7 @@ this.form.solutionId = arr.solutionId this.data = arr.seleData this.visible = true this.options=[] this.getFindListByDTO() }, getFindListByDTO () { @@ -84,6 +85,10 @@ }) }, confirm() { if(!this.dw || !this.gz){ this.$message.error("请先选择派遣单位和工种！") return; } let obj = { workTypeName: '', worktypeId: '', company/src/components/enterprise/reinsurance.vue
@@ -415,14 +415,14 @@ this.form.addDetailList.forEach(item => { total += item.fee }) sums[index] = total sums[index] = total.toFixed(2) return } else { this.form.delDetailList.forEach(item => { total += item.fee }) // if (total < 0) { sums[index] = total sums[index] = total.toFixed(2) // } else { // sums[index] = '-' + total // } company/src/views/enterprise/entrustedInvoicing.vue
@@ -77,7 +77,7 @@ return { searchForm: { type: 1, status: '5,7' status: '5,27' } } }, @@ -96,12 +96,12 @@ this.$message.warning('至少选择一项内容') return } for (let i = 0; i < this.tableData.selectedRows.length; i++) { /*for (let i = 0; i < this.tableData.selectedRows.length; i++) { if (this.tableData.selectedRows[i].currentFee - this.tableData.selectedRows[i].taxesMoney === 0) { this.$message.warning(`第${i + 1}项可开票金额为0，不能进行开票！`) return } } }*/ let obj = {} obj.list = JSON.parse(JSON.stringify(this.tableData.selectedRows)) obj.list.forEach(item => { company/src/views/indexShop.vue
@@ -92,7 +92,6 @@ <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handleCurrentChange0()"/> <OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/> <OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handleCurrentChange0()"/> <OperaTaxesWindow ref="OperaTaxesWindow" @success="handleCurrentChange1()"/> </div> </template>
@@ -783,23 +783,26 @@ company.setIsdeleted(Constants.ZERO); LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(Constants.equalsInteger(company.getType(),Constants.ONE)){ }else { //如果查询企业数据 if(company.getQueryFlag() == 0){ //只能看权限范围内 if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){ wrapper.lambda().eq(Company::getId,-1);//设置无效访问 }else { wrapper.lambda().in(Company::getId, user.getCompanyIdList()); return new ArrayList<>(); }else { if(Constants.equalsInteger(user.getType(),Constants.TWO)){ //如果是商户 wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//设置无效访问 }else{ //如果查询企业数据 if(company.getQueryFlag() == 0){ //只能看权限范围内 if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){ wrapper.lambda().eq(Company::getId,-1);//设置无效访问 }else { wrapper.lambda().in(Company::getId, user.getCompanyIdList()); } } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) { //查詢是否有查看權限 wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission"); } } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) { //查詢是否有查看權限 wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission"); } } return companyMapper.selectList(wrapper); } @@ -813,20 +816,27 @@ if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) { }else{ //如果查询企业数据，只能看权限范围内 if(pageWrap.getModel().getQueryFlag() == 0){ //只能看权限范围内 if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){ queryWrapper.lambda().eq(Company::getId,-1);//设置无效访问 }else { queryWrapper.lambda().in(Company::getId, user.getCompanyIdList()); } if(Constants.equalsInteger(user.getType(),Constants.TWO)){ //如果是商户 queryWrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//设置无效访问 }else{ //如果查询企业数据，只能看权限范围内 if(pageWrap.getModel().getQueryFlag() == 0){ //只能看权限范围内 if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){ queryWrapper.lambda().eq(Company::getId,-1);//设置无效访问 }else { queryWrapper.lambda().in(Company::getId, user.getCompanyIdList()); } // queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id"); } else if (pageWrap.getModel().getQueryFlag() == 1) { //查詢是否有查看權限 queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission"); } else if (pageWrap.getModel().getQueryFlag() == 1) { //查詢是否有查看權限 queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission"); } } } if (pageWrap.getModel().getId() != null) { queryWrapper.lambda().eq(Company::getId, pageWrap.getModel().getId()); } server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -370,12 +370,12 @@ if(solutions.getDataType() == null){ solutions.setDataType(Constants.TWO); } QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions); if(Constants.equalsObject(user.getType(),Constants.TWO)){ //如果是删除 solutions.setShopId(user.getCompanyId()); } QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions); wrapper.lambda().exists("select c.id from company_solution c left join solutions d on c.solution_id=d.id where c.isdeleted=0 and d.base_id=solutions.base_id and c.shop_id="+user.getCompanyId());//设置无效访问 } return solutionsMapper.selectList(wrapper); }
