MrShi
2024-02-26 90e8215dddc36944c2300a47e8f106791214fe7b
mrshi
已修改17个文件
203 ■■■■■ 文件已修改
company/.env 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env.production 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaApplyChangeDetailWindow.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaInsuranceApplyCheckWindow.vue 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaInsuranceApplyWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/OperaInsuranceApplyWindow.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/commissionDetails.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/importEmployees.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/onlineReporting.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/renewalInsurance.vue 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/selectEmployees.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/enterprise/selectSolutions.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/member.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/settleClaims.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/enterprise/insuranceApply.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/enterprise/myPolicy.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env
@@ -4,7 +4,7 @@
VUE_APP_ROUTER_MODE = 'hash'
# 项目上下文路径
VUE_APP_CONTEXT_PATH = '/yyb_web'
VUE_APP_CONTEXT_PATH = '/yyb_admin'
# 接口前缀
VUE_APP_API_PREFIX = '/api'
company/.env.production
@@ -1,10 +1,10 @@
# 生产环境配置
NODE_ENV = 'production'
VUE_APP_API_PREFIX = '/yyb_web_api'
VUE_APP_API_PREFIX = '/yyb_admin_api'
# 平台端
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_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/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -11,8 +11,8 @@
                <div class="desc_item_label">
                    <div class="desc_item_label_left">
                        <span>投保企业:{{ apply.companyName }}</span>
                        <span v-if="model.status === 1">保单状态:<span  :class="'change-status'+model.status" >待签署</span></span>
                        <span v-if="model.status === 0">保单状态:<span  :class="'change-status'+model.status" >待审核</span></span>
                        <span v-if="model.status === 0">保单状态:<span  :class="'change-status'+model.status" >待签署</span></span>
                        <span v-if="model.status === 1">保单状态:<span  :class="'change-status'+model.status" >待审核</span></span>
                        <span v-if="model.status === 2">保单状态:<span  :class="'change-status'+model.status" >已生效</span></span>
                        <span v-if="model.status === 3 || model.status === 4">保单状态:<span  :class="'change-status'+model.status" >退回申请</span></span>
                        <span v-if="model.status === 5 || model.status === 8">保单状态:<span  :class="'change-status'+model.status" >已退回</span></span>
company/src/components/business/OperaInsuranceApplyCheckWindow.vue
@@ -18,34 +18,34 @@
          </el-form-item>
        </el-form>
        <!--    上传保险单    -->
              <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
                <el-form-item label="客户期望保险生效起期:">
                  {{ model.applyStartTime }}
                </el-form-item>
                <el-form-item label="" >
                  <el-radio-group v-model="form.selectRadio" @change="selectChange">
                    <el-radio :label="0" >与保单一致</el-radio>
                    <el-radio :label="1" >与保单不一致</el-radio>
                  </el-radio-group>
                </el-form-item>
                <el-form-item label="保险生效起期:" prop="startTime" >
                  <el-date-picker
                      v-model="form.startTime"
                      type="date"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      placeholder="选择日期">
                  </el-date-picker>
                </el-form-item>
                <el-form-item label="保险生效起期:">
                  {{ form.startTime }}
                </el-form-item>
                <el-form-item label="保单号:" prop="code">
                  <el-input v-model="form.code" placeholder="请输入" v-trim/>
                </el-form-item>
                <el-form-item label="上传保险单:" prop="baoxianFile">
                  <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
                </el-form-item>
              </el-form>
      <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
        <el-form-item label="客户期望保险生效起期:">
          {{ model.applyStartTime }}
        </el-form-item>
        <el-form-item label="" >
          <el-radio-group v-model="form.selectRadio" @change="selectChange">
            <el-radio :label="0" >与保单一致</el-radio>
            <el-radio :label="1" >与保单不一致</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="保险生效起期:" prop="startTime" v-if="form.selectRadio === 1">
          <el-date-picker
              v-model="form.startTime"
              type="date"
              value-format="yyyy-MM-dd HH:mm:ss"
              placeholder="选择日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="保险生效起期:">
          {{ form.startTime }}
        </el-form-item>
        <el-form-item label="保单号:" prop="code">
          <el-input v-model="form.code" placeholder="请输入" v-trim/>
        </el-form-item>
        <el-form-item label="上传保险单:" prop="baoxianFile">
          <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
        </el-form-item>
      </el-form>
        <!--    修改保险单    -->
      <el-form v-if="visible4==true" :model="form" ref="form4" :rules="rules4" style="width: 100%;">
        <el-form-item label="保险生效起期:">
@@ -184,9 +184,9 @@
         fileList2: [],
         selectRadio:0
       },
       this.model=target
       this.form.startTime=this.model.startTime
       this.title=title
       this.model = target
       this.form.startTime = target.startTime
       this.title = title
       this.flag = flag
       this.visible1 = false
       this.visible2 = false
@@ -271,7 +271,7 @@
       if(this.form.selectRadio == 0){
         this.form.startTime = this.model.startTime
       }else{
         this.form.startTime = ''
       }
    },
    toubaoFileUploaded(data){
company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -11,7 +11,7 @@
                <div class="desc_item_label" v-if="userInfo.type === 1 &&(model.statusCollect === 2 || model.statusCollect === 3)">
                    <div class="desc_item_label_left">
                        <span>保险到期还有 <b style="color: #F95601;">{{model.loseEfficacyDays ? model.loseEfficacyDays : '-'}}</b> 天</span>
                        <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('续保', { id: dataId })">一键续保</el-button>
                        <el-button type="primary" v-if="model.statusCollect === 2 || model.statusCollect === 3" @click="$refs.OperaInsuranceApply.open('续保', { id: dataId, type: 1 })">一键续保</el-button>
                        <el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.additionSubtractionApplication.open('加减保申请', { id: dataId })">加减保申请</el-button>
                        <el-button type="primary" v-if="model.statusCollect === 2" @click="$refs.factoryChange.open('换厂申请', { id: dataId })">换厂申请</el-button>
                    </div>
company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -163,6 +163,7 @@
          applyStartTime: '',
          applyEndTime: ''
      },
      type: '',
      pickerOptions: {}, // 存放picker options的变量
      price: '',
      company: [],
@@ -192,6 +193,9 @@
          this.tableData = []
          this.form.id = null
          this.item = null
          if (target.type) {
              this.type = target.type
          }
          this.form.solutionId = ''
          this.form.applyStartTime = ''
          this.form.applyEndTime = ''
@@ -216,8 +220,15 @@
            findList({ applyId: this.form.id })
                .then(res => {
                    res.forEach(item => {
                        console.log(item)
                        item.idCard = item.idcardNo
                        item.fee = ''
                        if (this.type === 1) {
                            item.duName = ''
                            item.duId = ''
                            item.worktypeId = ''
                            item.workTypeName = ''
                        }
                    })
                    this.tableData = res
                })
@@ -252,7 +263,7 @@
            }
            this.seleData.forEach(item => {
                this.tableData.forEach((row, index) => {
                    if (item === row.name) {
                    if (item === row.idCard) {
                        this.tableData.splice(index, 1)
                    }
                })
@@ -427,7 +438,7 @@
      getUser(obj) {
          this.seleData.forEach(id => {
              this.tableData.forEach(row => {
                   if (id === row.id) {
                   if (id === row.idCard) {
                       row.workTypeName = obj.workTypeName
                       row.worktypeId = obj.worktypeId
                       row.duName = obj.duName
@@ -482,7 +493,7 @@
          return sexAndAge.age
      },
      handleSelectionChange (e) {
          this.seleData = e.map(item => item.id)
          this.seleData = e.map(item => item.idCard)
      },
      getValue(list) {
          this.tableData.push(...list)
company/src/components/enterprise/commissionDetails.vue
@@ -172,7 +172,7 @@
                        data.forEach(item => {
                            price += item.totalFee
                        })
                        sums[index] = price
                        sums[index] = price.toFixed(2)
                    }
                })
                return sums;
company/src/components/enterprise/importEmployees.vue
@@ -46,7 +46,7 @@
            },
            // 导出模板
            exportTemplate () {
                window.open(process.env.VUE_APP_USERTEMPLATE_URL)
                window.open(process.env.VUE_APP_MEMBER_URL)
            },
            clickRef () {
                this.$refs.fileExcel.click()
@@ -74,7 +74,7 @@
            confirm () {
                for (let i = 0; i < this.addList.length; i++) {
                    for (let a = 0; a < this.list.length; a++) {
                        if (this.addList[i].name === this.list[a].memberName || this.addList[i].idCard === this.list[a].idcardNo) {
                        if (this.addList[i].idCard === this.list[a].idcardNo) {
                            this.$message.warning(`[${this.addList[i].name}]员工重复`)
                            return
                        }
company/src/components/enterprise/onlineReporting.vue
@@ -290,7 +290,9 @@
                    // 调用新建接口
                    this.isWorking = true
                    let obj = JSON.parse(JSON.stringify(this.form))
                    obj.areaId = obj.areaId.join(',')
                    if (obj.areaId) {
                        obj.areaId = obj.areaId.join(',')
                    }
                    create(obj)
                        .then(() => {
                            this.visible = false
@@ -313,6 +315,7 @@
                    })
            },
            getVal(e) {
                console.log(e)
                this.form.insuranceApplyId = e.applyId
                this.form.solutionId = e.solutionId
                this.form.solutionName = e.solutionName
company/src/components/enterprise/renewalInsurance.vue
@@ -34,26 +34,43 @@
            <el-table-column prop="startTime" label="投保生效日期"></el-table-column>
            <el-table-column prop="endTime" label="投保失效日期"></el-table-column>
            <el-table-column
                prop="address"
                min-width="150"
                label="操作">
                <template slot-scope="{row}">
                    <el-button type="text" @click="$refs.OperaInsuranceApply.open('续保', { id: row.id, type: 1 })">一件续保</el-button>
                    <el-button type="text" @click="dele(row)">删除提醒</el-button>
                </template>
            </el-table-column>
        </el-table>
        <div style="width: 100%; height: 10px;"></div>
        <el-pagination
            @current-change="handleCurrentChange"
            :current-page="currentPage"
            layout="total, prev, pager, next, jumper"
            :total="total">
        </el-pagination>
        <!--    续保    -->
        <OperaInsuranceApply ref="OperaInsuranceApply" @success="successEvent" />
    </GlobalWindow>
</template>
<script>
    import BaseOpera from '@/components/base/BaseOpera'
    import GlobalWindow from '@/components/common/GlobalWindow'
    import OperaInsuranceApply from '@/components/enterprise/OperaInsuranceApplyWindow'
    import { fetchList } from '@/api/business/insuranceApply'
    export default {
        name: 'renewalInsurance',
        extends: BaseOpera,
        components: { GlobalWindow },
        components: { GlobalWindow, OperaInsuranceApply },
        data () {
            return {
                form: {
                    id: null
                },
                tableData: []
                tableData: [],
                total: 0,
                currentPage: 1
            }
        },
        created () {
@@ -63,7 +80,42 @@
            })
        },
        methods: {
            open (title, target) {
                this.title = title
                this.visible = true
                this.getList()
            },
            handleCurrentChange(page) {
                this.currentPage = page
                this.getList()
            },
            getList() {
                fetchList({
                    capacity: 10,
                    page: this.currentPage,
                    model: {
                        loseEfficacy: 1
                    }
                }).then(res => {
                    this.tableData = res.records
                    this.total = res.total
                })
            },
            dele(row) {
                this.$confirm('确定关闭此提示吗?', '提示', {
                    confirmButtonText: '确定',
                    cancelButtonText: '取消',
                    type: 'warning'
                }).then(() => {
                }).catch(() => {
                });
                console.log(row)
            },
            successEvent(){
                this.$emit('success')
            }
        }
    }
</script>
company/src/components/enterprise/selectEmployees.vue
@@ -99,7 +99,8 @@
                }
                for (let i = 0; i < this.seleData.length; i++) {
                    for (let a = 0; a < this.oldList.length; a++) {
                        if (this.seleData[i].name === this.oldList[a].memberName || this.seleData[i].idCard === this.oldList[a].idcardNo) {
                        // this.seleData[i].name === this.oldList[a].memberName ||
                        if (this.seleData[i].idCard === this.oldList[a].idcardNo) {
                            this.$message.warning(`[${this.seleData[i].name}]员工重复`)
                            return
                        }
company/src/components/enterprise/selectSolutions.vue
@@ -30,7 +30,7 @@
                label="保单号">
            </el-table-column>
            <el-table-column
                prop="applyChangeId"
                prop="pdCode"
                label="批单号">
            </el-table-column>
            <el-table-column
company/src/views/business/member.vue
@@ -8,13 +8,13 @@
            <el-form-item label="身份证号" prop="idcardNo">
                <el-input v-model="searchForm.idcardNo" placeholder="请输入" maxlength="18" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="保险方案" prop="solutionId">
                <el-select v-model="searchForm.solutionId" placeholder="请选择" @change="search">
            <el-form-item label="保险方案" prop="solutionsId">
                <el-select v-model="searchForm.solutionsId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutions"
                        :key="item.id"
                        :key="item.baseId"
                        :label="item.name"
                        :value="item.id">
                        :value="item.baseId">
                    </el-option>
                </el-select>
            </el-form-item>
@@ -137,7 +137,7 @@
                    name: '',
                    idcardNo: '',
                    solutionsStatus: '',
                    solutionId: ''
                    solutionsId: ''
                },
                options: [],
                solutions: [],
company/src/views/business/settleClaims.vue
@@ -22,9 +22,9 @@
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.id"
                        :key="item.baseId"
                        :label="item.name"
                        :value="item.id">
                        :value="item.baseId">
                    </el-option>
                </el-select>
            </el-form-item>
company/src/views/enterprise/insuranceApply.vue
@@ -43,7 +43,7 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('投保申请')">投保申请</el-button></li>
                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('投保申请', {type: ''})">投保申请</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"
company/src/views/enterprise/myPolicy.vue
@@ -9,9 +9,9 @@
                <el-select v-model="searchForm.baseSolutionId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="item in solutionList"
                        :key="item.id"
                        :key="item.baseId"
                        :label="item.name"
                        :value="item.id">
                        :value="item.baseId">
                    </el-option>
                </el-select>
            </el-form-item>
@@ -19,7 +19,7 @@
                <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="7"></el-option>
                    <el-option label="保障中" value="2"></el-option>
                    <el-option label="已过期" value="3"></el-option>
                    <el-option label="已退回" value="4"></el-option>
@@ -56,20 +56,20 @@
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <div style="margin-bottom: 30px;" v-if="obj.waitSignNum > 0 && obj.renewalNum > 0">
                <el-alert type="warning" show-icon :closable="false" style="margin-bottom: 15px;" v-if="obj.renewalNum > 0">
            <div style="margin-bottom: 15px;" v-if="obj.waitSignNum > 0 || obj.renewalNum > 0">
                <el-alert type="warning" show-icon :closable="false" :style="obj.waitSignNum > 0 ? 'margin-bottom: 15px;' : ''" v-if="obj.renewalNum > 0">
                    <span style="margin-right: 15px;">续保提醒: 您有即将到期保险</span>
                    <el-button type="text" @click="$refs.renewalInsurance.open('续保提醒')">查看详情</el-button>
                    <el-button type="text" @click="closeRemind(1)">关闭提醒</el-button>
                    <el-button type="text" @click="closeRemind(6)">关闭提醒</el-button>
                </el-alert>
                <el-alert type="warning" :closable="false" show-icon v-if="obj.waitSignNum > 0">
                    <span style="margin-right: 15px;">投保提醒: 您有投保申请待签署</span>
                    <el-button type="text" @click="see">查看详情</el-button>
                    <el-button type="text" @click="closeRemind(2)">关闭提醒</el-button>
                    <el-button type="text" @click="closeRemind(1)">关闭提醒</el-button>
                </el-alert>
            </div>
            <ul class="toolbar" v-permissions="['business:dispatchunit:create']">
                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('投保申请')">投保申请</el-button></li>
                <li><el-button type="primary" @click="$refs.OperaInsuranceApplyWindow.open('投保申请', { type: '' })">投保申请</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"
company/vue.config.js
@@ -3,7 +3,7 @@
// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length)
module.exports = {
  publicPath: './',
  outputDir: 'yyb_web',
  outputDir: 'yyb_admin',
  assetsDir: 'static',
  lintOnSave: false,
  devServer: {