jiangping
2024-10-30 f3d34173074df5589fd577d03e272948853ebfb3
Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
已修改9个文件
155 ■■■■ 文件已修改
company/.env 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env.developmentCom 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env.productionCom 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/api/business/insuranceApply.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/OperaDispatchUnitWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/additionSubtractionApplication.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/enterprise/insuranceApply.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/enterprise/myPolicy.vue 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/index.vue 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env
@@ -4,8 +4,8 @@
VUE_APP_ROUTER_MODE = 'hash'
# 项目上下文路径
VUE_APP_CONTEXT_PATH = '/yyb_admin'
# VUE_APP_CONTEXT_PATH = '/yyb_web'
# VUE_APP_CONTEXT_PATH = '/yyb_admin'
VUE_APP_CONTEXT_PATH = '/yyb_web'
# VUE_APP_CONTEXT_PATH = '/yyb_shop'
# 接口前缀
company/.env.developmentCom
@@ -6,9 +6,9 @@
VUE_APP_SYSTEM_TITLE = '云易保客户服务系统-企业端'
VUE_APP_COOKIE_NAME='doumee-auth-token'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
#VUE_APP_API = 'http://localhost:10031/'
#VUE_APP_API = 'http://192.168.0.135:10031/'
#VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
VUE_APP_API = 'http://192.168.0.138:10031/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
company/.env.productionCom
@@ -3,7 +3,7 @@
VUE_APP_API_PREFIX = '/yyb_web_api'
VUE_APP_CONTEXT_PATH = '/company'
#VUE_APP_CONTEXT_PATH = '/company'
VUE_APP_CONTEXT_NAME = 'company'
@@ -11,8 +11,8 @@
VUE_APP_SYSTEM_TITLE = '云易保客户服务系统-企业端'
# 平台端
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 企业端
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 企业端
VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
company/src/api/business/insuranceApply.js
@@ -181,3 +181,7 @@
        download: true
    })
}
// 查询保单是否可进行加减保
export function getApplyPower (data) {
    return request.post('/business/insuranceApply/getApplyPower', data)
}
company/src/components/enterprise/OperaDispatchUnitWindow.vue
@@ -23,7 +23,7 @@
                <div class="list_item_input">
                    <div class="list_item_input_label"><span>*</span>保险方案</div>
                    <div class="list_item_input_val">
                        <el-select v-model="item.solutionId" @change="changeTypeWork($event, index)" placeholder="请选择">
                        <el-select v-model="item.solutionId" filterable @change="changeTypeWork($event, index)" placeholder="请选择">
                            <el-option
                                v-for="item in insuranceScheme"
                                :key="item.id"
company/src/components/enterprise/additionSubtractionApplication.vue
@@ -204,7 +204,7 @@
import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
// import OperaApplyChangeDetailWindow from '@/components/business/OperaApplyChangeDetailWindow'
import { all } from '@/api/business/solutions'
import { getDetail } from '@/api/business/insuranceApply'
import { getDetail, getApplyPower } from '@/api/business/insuranceApply'
import { create, getChangeCountCyclePriceVO } from '@/api/business/applyChange'
import { getDate, compareDates, getTomorrow } from '@/utils/util'
import { mapState } from 'vuex'
@@ -231,6 +231,8 @@
        addDetailList: [],
        delDetailList: []
      },
      addTrue: '',
      delTrue: '',
      tempMemberIndex: -1,
      activeName: '0',
      pickerOptions: {},
@@ -278,6 +280,7 @@
          this.form.id = target.id
          this.getDetails()
          this.changeApplyStartTime(null)
          this.getApplyPowerData()
        })
      } else {
        this.$nextTick(() => {
@@ -288,6 +291,14 @@
      this.getCompany()
      this.visible = true
      // this.updatePickerOptions()
    },
    // 获取是否能加减保
    getApplyPowerData() {
      getApplyPower({ applyId: this.form.id })
        .then(res => {
          this.addTrue = res.addTrue
          this.delTrue = res.delTrue
        })
    },
    changeApplyStartTime (e) {
      getChangeCountCyclePriceVO({
@@ -375,6 +386,11 @@
      return sums
    },
    deleItem () {
      if (this.activeName === '0') {
        if (this.addTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      } else {
        if (this.delTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      }
      if (this.seleData.length === 0) {
        this.$message.warning('至少选择一项内容')
        return
@@ -427,6 +443,7 @@
      })
    },
    confirm () {
      if (this.addTrue !== 0 && this.delTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      this.$refs.form.validate((valid) => {
        if (valid) {
          // if (this.form.addDetailList.length === 0) {
@@ -487,6 +504,11 @@
      })
    },
    seleUser () {
      if (this.activeName === '0') {
        if (this.addTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      } else {
        if (this.delTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      }
      if (!this.form.solutionId) {
        this.$message.warning('请先选择保险方案')
        return
@@ -502,6 +524,11 @@
      }
    },
    addUser () {
      if (this.activeName === '0') {
        if (this.addTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      } else {
        if (this.delTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      }
      if (!this.form.solutionId) {
        this.$message.warning('请先选择保险方案')
        return
@@ -513,6 +540,11 @@
      }
    },
    uploadUser () {
      if (this.activeName === '0') {
        if (this.addTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      } else {
        if (this.delTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      }
      if (!this.form.solutionId) {
        this.$message.warning('请先选择保险方案')
        return
@@ -572,6 +604,11 @@
    },
    // 选择员工
    sele () {
      if (this.activeName === '0') {
        if (this.addTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      } else {
        if (this.delTrue !== 0) return this.$message.warning('当前保单暂不支持操作')
      }
      if (!this.form.solutionId) {
        this.$message.warning('请选择保险方案')
        return
company/src/views/enterprise/insuranceApply.vue
@@ -16,7 +16,7 @@
                </el-select>
            </el-form-item>
            <el-form-item label="保险方案" prop="baseSolutionId">
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.baseSolutionId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.baseId"
company/src/views/enterprise/myPolicy.vue
@@ -6,7 +6,7 @@
                <el-input v-model="searchForm.code" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="保险方案" prop="baseSolutionId">
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                <el-select v-model="searchForm.baseSolutionId" filterable placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.baseId"
@@ -15,19 +15,32 @@
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="状态" prop="statusCollect">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @change="search">
                    <el-option label="待审核" value="0"></el-option>
                    <el-option label="待出单" value="1"></el-option>
                    <el-option label="待签署" value="7"></el-option>
                    <el-option label="保障中" value="2"></el-option>
                    <el-option label="已过期" value="3"></el-option>
                    <el-option label="已退回" value="4"></el-option>
                    <el-option label="退回申请中" value="5"></el-option>
                    <el-option label="已关闭" value="6"></el-option>
                    <el-option label="投保中" value="26"></el-option>
            <el-form-item label="投保类型" prop="solutionType">
                <el-select v-model="searchForm.solutionType" placeholder="请选择" @change="search">
                    <el-option label="直接投保" value="0"></el-option>
                    <el-option label="委托投保" value="1"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="状态" prop="timeOut">
                <el-select v-model="searchForm.timeOut" placeholder="请选择" @change="search">
                    <el-option label="未开始" value="0"></el-option>
                    <el-option label="保障中" value="1"></el-option>
                    <el-option label="已过期" value="2"></el-option>
                </el-select>
            </el-form-item>
<!--            <el-form-item label="状态" prop="statusCollect">-->
<!--                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @change="search">-->
<!--                    <el-option label="待审核" value="0"></el-option>-->
<!--                    <el-option label="待出单" value="1"></el-option>-->
<!--                    <el-option label="待签署" value="7"></el-option>-->
<!--                    <el-option label="保障中" value="2"></el-option>-->
<!--                    <el-option label="已过期" value="3"></el-option>-->
<!--                    <el-option label="已退回" value="4"></el-option>-->
<!--                    <el-option label="退回申请中" value="5"></el-option>-->
<!--                    <el-option label="已关闭" value="6"></el-option>-->
<!--                    <el-option label="投保中" value="26"></el-option>-->
<!--                </el-select>-->
<!--            </el-form-item>-->
            <el-form-item label="保险生效起期" prop="time1">
                <el-date-picker
                    v-model="time1"
@@ -84,7 +97,7 @@
                </el-table-column>
                <el-table-column prop="statusInfo" align="center" fixed label="状态">
                  <template slot-scope="{row}">
                    <span :class="'apply-status'+row.status" >{{row.statusInfo}}</span>
                    <span :class="'apply-status'+row.status">{{row.statusInfo}}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="solutionsName" align="center" fixed label="保险方案" min-width="150"></el-table-column>
@@ -99,12 +112,12 @@
                        <span>{{row.code ? row.code : '-'}}</span>
                    </template>
                </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 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="当前在保人数" width="120">
                  <template slot-scope="{row}">
                    <span>{{(row.guaranteeNum||0)}} 人</span>
                  </template>
@@ -114,11 +127,16 @@
                        <span>{{(row.serviceDays - row.loseEfficacyDays) < 0 ? `-` : (row.serviceDays - row.loseEfficacyDays+'天')}}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="currentFee" label="已产生费用"  align="center">
<!--                <el-table-column prop="currentFee" label="已产生费用"  align="center">-->
<!--                    <template slot-scope="{row}">-->
<!--                      <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span>-->
<!--                    </template>-->
<!--                  </el-table-column>-->
                <el-table-column prop="fee" label="批改费用合计"  align="center" width="120">
                    <template slot-scope="{row}">
                      <span>{{row.currentFee!=null?row.currentFee+' 元': '-'}}</span>
                        <span>{{row.changeMoney+' 元'}}</span>
                    </template>
                  </el-table-column>
                </el-table-column>
                <el-table-column prop="fee" label="总费用"  align="center">
                  <template slot-scope="{row}">
                    <span>{{row.fee!=null?row.fee+' 元': '-'}}</span>
@@ -138,7 +156,7 @@
                        <el-button type="text" @click="godetail(row)" v-permissions="['business:insuranceapply:update']">查看详情</el-button>
                      <!--                        <el-button type="text" @click="$refs.OperaApplyChangeMonthWindow.open('加减保月度费用统计',row)" v-permissions="['business:applychange:query']">加减保费用</el-button>
                                          <template v-if="row.statusCollect === 2">-->
<!--                            <el-button type="text" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: row.id })">加减保申请</el-button>-->
                        <el-button type="text" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: row.id })">加减保申请</el-button>
<!--                        </template>-->
                    </template>
                </el-table-column>
@@ -198,7 +216,9 @@
        startTimeE: '',
        startTimeS: '',
        baseSolutionId: '',
        statusCollect: '2'
        status: '5',
        solutionType: '',
        timeOut: ''
      },
      obj: {
        renewalNum: 0,
company/src/views/index.vue
@@ -341,6 +341,11 @@
        this.tabs.push({ name: '2', label: '理赔提醒' })
        // this.handleCurrentChange2(0);
      }
      //新增分类
      if (pemissons.includes('business:notice:settle')) {
        this.tabs.push({ name: '3', label: '合同签署提醒' })
        // this.handleCurrentChange2(0);
      }
      /* if (pemissons.includes('business:notice:insurance')) {
        this.getNoticeList(0, this.page0)
      }
@@ -544,22 +549,25 @@
  }
  .home_content {
    width: 100%;
    height: calc(100% - 170px);
    /*height: calc(100% - 170px);*/
    margin-top: 10px;
    display: flex;
    align-items: center;
    justify-content: space-between;
    /*align-items: center;*/
    /*justify-content: space-between;*/
    .home_content_left {
      width: 350px;
      height: 100%;
      /*height: 100%;*/
      height: auto;
      flex-shrink: 0;
      display: flex;
      flex-direction: column;
      justify-content: space-between;
      .home_content_left_item {
        width: 100%;
        height: 32%;
        /*height: 32%;*/
        height: 200px;
        background: #ffffff;
        margin-bottom: 10px;
      }
    }
    .home_content_right {
@@ -584,6 +592,7 @@
          box-sizing: border-box;
          width: 100%;
          display: flex;
          align-items: center;
          justify-content: space-between;
          border: 1px solid #ececec;
          margin-bottom: 15px;
@@ -619,6 +628,7 @@
            }
          }
          .list_item_right {
            flex-shrink: 0;
            height: 100%;
            display: flex;
            align-items: center;