Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

k94314517

2024-11-29 d1c205d29b5eacf1de22a7af29329ca370d1c2d3

Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

 company/.env.development

@@ -9,7 +9,7 @@
VUE_APP_COOKIE_NAME='dmplat-auth-token'

# 测试服
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'

# 任康
# VUE_APP_API = 'http://192.168.0.147:10030/'
VUE_APP_API = 'http://192.168.0.162:10030/'

 company/.env.developmentCom

@@ -7,8 +7,8 @@
VUE_APP_CONTEXT_PATH = '/yyb_web'
VUE_APP_COOKIE_NAME='doumee-auth-token'

VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'

# VUE_APP_API = 'http://192.168.0.147:10031/'
VUE_APP_API = 'http://192.168.0.162:10031/'

# VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'

 company/.env.developmentShop

@@ -8,7 +8,7 @@
VUE_APP_CONTEXT_PATH = '/yyb_shop'
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'

# VUE_APP_API = 'http://192.168.0.147:10032/'
# VUE_APP_API = 'http://192.168.0.162:10032/'

#VUE_APP_API = 'http://localhost:10032/'


 company/.env.productionShop

@@ -6,9 +6,9 @@
VUE_APP_COOKIE_NAME='dmshop-auth-token'
VUE_APP_CONTEXT_PATH = '/yyb_shop'
# 平台端
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'

VUE_APP_SYSTEM_TITLE = '云易保客户服务系统-商户端'

# 企业端
VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
# VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'

 company/src/components/business/OperaApplyChangeCheckWindow.vue

@@ -381,7 +381,7 @@
      this.$dialog.messageConfirm('确认进行该操作吗？')
        .then(() => {
          this.isWorking = true
          editChangePidan({ id: this.model.id, checkInfo: this.form.editCheckInfo, validCode: this.form.editValidCode, pidanFile: this.form.editPidanFile })
          editChangePidan({ id: this.model.id, checkInfo: this.form.editCheckInfo, validCode: this.form.editValidCode, pidanFileList: this.form.editPidanFile })
            .then(response => {
              this.visible = false
              this.$emit('success')

 company/src/components/business/OperaApplyChangeUnitCheckWindow.vue

@@ -73,7 +73,7 @@
                <div class="form_item">
                    <div class="form_item_label"><span>*</span>上传批单：</div>
                    <div class="form_item_val">
                      <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
                      <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :limit="99" @remove="removeEditPiDan" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
                    </div>
                </div>
                <div class="form_item">
@@ -136,7 +136,7 @@
          applyStartTime:null,
         validCode:null,
          pidanFile:[],
         editPidanFile:null,
         editPidanFile:[],
          fileList1: [],
          fileList2: [],
          selectRadio:0
@@ -167,7 +167,7 @@
         applyStartTime:null,
         validCode:null,
         pidanFile:[],
         editPidanFile:null,
         editPidanFile:[],
         fileList1: [],
         fileList2: [],
         selectRadio:0
@@ -229,8 +229,15 @@
          })
      },
    editBaoxianFileUploaded(data){
      this.form.editPidanFile=data
      this.form.editPidanFile.push(data)
    },
      removeEditPiDan(imgaddr) {
          this.form.editPidanFile.forEach((item, index) => {
              if (imgaddr === item.imgaddr) {
                  this.form.editPidanFile.splice(index, 1)
              }
          })
      },
    backDo(){
      this.$dialog.messageConfirm('确认进行该操作吗？')
          .then(() => {
@@ -261,7 +268,7 @@
      this.$dialog.messageConfirm('确认进行该操作吗？')
          .then(() => {
            this.isWorking = true
            uploadChangePidan({id:this.model.id,applyStartTime:this.form.applyStartTime, validCode:this.form.validCode,pidanFile:this.form.pidanFile})
            uploadChangePidan({id:this.model.id,applyStartTime:this.form.applyStartTime, validCode:this.form.validCode,pidanFileList:this.form.pidanFile})
                .then(response => {
                  this.visible = false
                  this.$emit('success')
@@ -275,7 +282,7 @@
      this.$dialog.messageConfirm('确认进行该操作吗？')
          .then(() => {
            this.isWorking = true
            editChangePidan({id:this.model.id, checkInfo:this.form.editCheckInfo,validCode:this.form.editValidCode,pidanFile:this.form.editPidanFile})
            editChangePidan({id:this.model.id, checkInfo:this.form.editCheckInfo,validCode:this.form.editValidCode,pidanFileList:this.form.editPidanFile})
                .then(response => {
                  this.visible = false
                  this.$emit('success')

 company/src/components/business/OperaUnionChangeDetailWindow.vue

@@ -28,7 +28,8 @@
                            <el-button v-if="[0].includes(model.status)" type="primary" :disabled="loading" :loading="loading" @click="getSignLink(0)">签署申请单</el-button>
                            <el-button v-if="[2].includes(model.status)" type="primary" @click="viewPidan">查看批单</el-button>
                            <el-button v-if=" [1].includes(model.status) && userInfo.type === 0" type="primary" @click="$refs.OperaUnionChangeCheckWindow.open('上传批单',model,3)">上传批单</el-button>
                            <el-button  v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaUnionChangeCheckWindow.open('退回申请',model,1)">退回申请</el-button>

                            <el-button  v-if="[0,1].includes(model.status)" type="danger" @click="$refs.OperaUnionChangeCheckWindow.open('关闭申请',model,1)">关闭申请</el-button>
                        </template>
                        <template  v-if="0">
                          <template  v-if="0">

 company/src/components/business/detailsEntrustedInsurance.vue

@@ -33,7 +33,7 @@
              <el-button v-if="[0,1,2,5].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('退回申请',model,1)">退回申请</el-button>
              <el-button v-if="[5].includes(model.status)" type="primary" @click="fusheng">投保复审</el-button>

              <el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('退回申请',model,1)">退回申请</el-button>
<!--              <el-button v-if="[0,1,2].includes(model.status) " type="danger" @click="$refs.OperaUnionApplyCheckWindow.open('退回申请',model,1)">退回申请</el-button>-->
            </template>
            <template v-if="userInfo.type ===0">
              <el-button v-if="[2,3,4,1,5].includes(model.status) && (model.toubaodanFile || model.toubaodanSignedFile)" type="primary" @click="viewToubaodan">{{model.signType === 1 ? '查看申请单' : '查看投保单'}}</el-button>

 company/src/components/enterprise/additionSubtractionApplication.vue

@@ -454,7 +454,8 @@
        this.visible = false
        this.$tip.apiSuccess('操作成功')
        // this.$refs.OperaApplyChangeDetailWindow.open('加减保详情', { applyId: this.form.id, id: res })
        this.$emit('success', { applyId: this.form.id, id: res })
        //   { applyId: this.form.id, id: res }
        this.$emit('success')
      }).catch(e => {
        this.$tip.apiFailed(e)
      }).finally(() => {
@@ -607,7 +608,6 @@
      }
    },
    getUser (obj) {
      console.log(this.seleData)
      this.seleData.forEach(item => {
        if (this.activeName === '0') {
          this.form.addDetailList.forEach(row => {

 company/src/components/enterprise/reinsurance.vue

@@ -102,7 +102,9 @@
                <el-button type="danger" @click="deleItem">删除</el-button>
            </div>
            <div class="btns_item" v-if="activeName !== '1'">
                <el-button type="primary" @click="sele">选取派遣单位</el-button>
<!--                <el-button type="primary" @click="sele">选取派遣单位</el-button>-->
                <el-button type="primary" @click="sele(1)" v-if="item && item.hasDispatchUnit !== 1">选取派遣单位</el-button>
                <el-button type="primary" @click="sele(2)" v-if="item && item.hasDispatchUnit === 1">选取工种</el-button>
            </div>
        </div>
        <el-table
@@ -144,6 +146,7 @@
                </template>
            </el-table-column>
            <el-table-column
                v-if="item && item.hasDispatchUnit !== 1"
                :key="Math.random()"
                prop="duName"
                label="派遣单位">
@@ -205,14 +208,15 @@
                </template>
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    prop="duName"
                    label="派遣单位">
                v-if="item && item.hasDispatchUnit !== 1"
                :key="Math.random()"
                prop="duName"
                label="派遣单位">
            </el-table-column>
            <el-table-column
                    :key="Math.random()"
                    prop="workTypeName"
                    label="所属工种">
                :key="Math.random()"
                prop="workTypeName"
                label="所属工种">
            </el-table-column>
            <el-table-column
                :key="Math.random()"
@@ -346,7 +350,7 @@
        types: [0]
      }).then(res => {
        res.forEach(item => {
          item.fee = ''
          item.fee = item.fee
          item.idCard = item.memberIdcardNo
          item.workTypeName = ''
          item.worktypeId = ''
@@ -409,7 +413,7 @@
      columns.forEach((column, index) => {
        if (index === 0) {
          sums[index] = '总价'
        } else if (index === 7) {
        } else if (this.item && this.item.hasDispatchUnit === 1 && index === 6) {
          let total = 0
          if (this.activeName === '0') {
            this.form.addDetailList.forEach(item => {
@@ -421,14 +425,26 @@
            this.form.delDetailList.forEach(item => {
              total += item.fee
            })
            // if (total < 0) {
            sums[index] = (total||0).toFixed(2)
            // } else {
            //     sums[index] = '-' + total
            // }
            return
          }
          sums[index] = ''
        } else if (this.item && this.item.hasDispatchUnit === 0 && index === 7) {
            let total = 0
            if (this.activeName === '0') {
                this.form.addDetailList.forEach(item => {
                    total += item.fee
                })
                sums[index] = total.toFixed(2)
                return
            } else {
                this.form.delDetailList.forEach(item => {
                    total += item.fee
                })
                sums[index] = (total||0).toFixed(2)
                return
            }
            sums[index] = ''
        }
      })
      return sums
@@ -441,7 +457,7 @@
      if (this.activeName === '0') {
        this.seleData.forEach(item => {
          this.form.addDetailList.forEach((row, index) => {
            if (item === row.name) {
            if (item === row.idCard) {
              this.form.addDetailList.splice(index, 1)
            }
          })
@@ -449,7 +465,7 @@
      } else {
        this.seleData.forEach(item => {
          this.form.delDetailList.forEach((row, index) => {
            if (item === row.name) {
            if (item === row.idCard) {
              this.form.delDetailList.splice(index, 1)
            }
          })
@@ -522,9 +538,9 @@
        return
      }
      if (this.activeName === '0') {
        this.$refs.addEmployee.open('添加加保员工', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
        this.$refs.addEmployee.open('添加加保员工', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
      } else {
        this.$refs.addEmployee.open('添加减保员工', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
        this.$refs.addEmployee.open('添加减保员工', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice, companyId: this.item.hasDispatchUnit === 1 ? '1' : '' })
      }
    },
    uploadUser () {
@@ -533,9 +549,9 @@
        return
      }
      if (this.activeName === '0') {
        this.$refs.importEmployees.open('加保员工名单', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
        this.$refs.importEmployees.open('加保员工名单', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId, hasDispatchUnit: this.item.hasDispatchUnit })
      } else {
        this.$refs.importEmployees.open('减保员工名单', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
        this.$refs.importEmployees.open('减保员工名单', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id, hasDispatchUnit: this.item.hasDispatchUnit })
      }
    },
    // 切换方案
@@ -560,7 +576,7 @@
      this.seleData.forEach(item => {
        if (this.activeName === '0') {
          this.form.addDetailList.forEach(row => {
            if (item === row.name) {
            if (item === row.idCard) {
              row.workTypeName = obj.workTypeName
              row.worktypeId = obj.worktypeId
              row.duName = obj.duName
@@ -569,7 +585,7 @@
          })
        } else {
          this.form.delDetailList.forEach(row => {
            if (item === row.name) {
            if (item === row.idCard) {
              row.workTypeName = obj.workTypeName
              row.worktypeId = obj.worktypeId
              row.duName = obj.duName
@@ -582,7 +598,7 @@
      this.$refs.multipleTable.clearSelection()
    },
    // 选择员工
    sele () {
    sele (type) {
      if (!this.form.solutionId) {
        this.$message.warning('请选择保险方案')
        return
@@ -591,7 +607,7 @@
        this.$message.warning('请选择员工')
        return
      }
      this.$refs.confirmJobType.open('确认工种', { solutionId: this.newVersionSolutionId })
      this.$refs.confirmJobType.open('确认工种', { solutionId: this.newVersionSolutionId, type })
    },
    // 查询全部方案
    getCompany () {
@@ -626,7 +642,7 @@
      return sexAndAge.age
    },
    handleSelectionChange (e) {
      this.seleData = e.map(item => item.name)
      this.seleData = e.map(item => item.memberIdcardNo)
    },
    getValue (list) {
      console.log(list)

 company/src/views/business/companyUserApply.vue

@@ -35,9 +35,9 @@
                <el-table-column prop="createDate" label="申请时间"></el-table-column>
                <el-table-column label="申请状态">
                    <template slot-scope="{row}">
                        <span v-if="row.status === 0">待审核</span>
                        <span v-if="row.status === 1">审核通过</span>
                        <span v-if="row.status === 2">审核不通过</span>
                        <span style="color: #216EEE;" v-if="row.status === 0">待审核</span>
                        <span style="color: #00BA92;" v-if="row.status === 1">审核通过</span>
                        <span style="color: red;" v-if="row.status === 2">审核不通过</span>
                    </template>
                </el-table-column>
                <el-table-column
@@ -48,7 +48,7 @@
                    <template slot-scope="{row}">
                        <el-button type="text" @click="$refs.operaCompanyUserApplyDescWindow.open('申请记录详情', row.id)" icon="el-icon-view">查看</el-button>
                        <el-button type="text" v-if="userInfo.type === 0 && row.status === 0" @click="$refs.operaCompanyUserApplyCarefulWindow.open('集团申请记录审核', row.id)">审核</el-button>
                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1" v-permissions="['business:companyuserapply:delete']">删除</el-button>
                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-if="userInfo.type === 1 && row.status === 0" v-permissions="['business:companyuserapply:delete']">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>

 company/src/views/business/member.vue

@@ -172,16 +172,11 @@
                    .then(res => {
                        this.solutions = res
                    })
             /* if(this.userInfo.type ==1){
                findListByDTO({ dataType: 2 })
                    .then(res => {
                      this.options = res
                if (this.userInfo.type === 0) {
                    companyAll({}).then(res => {
                        this.companyList = res
                    })
              }*/

              companyAll({}).then(res => {
                this.companyList = res
              })
                }
            },
            calculateAge(idNumber) {
                if (!idNumber) return

 company/src/views/enterprise/myPolicy.vue

@@ -97,7 +97,9 @@
                </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 style="color:#f95601;" v-if="row.status === 5 && row.statusInfo === '待生效'">{{row.statusInfo}}</span>
                    <span style="color:#999;" v-else-if="row.status === 5 && row.statusInfo === '已过期'">{{row.statusInfo}}</span>
                    <span :class="'apply-status'+row.status" v-else>{{row.statusInfo}}</span>
                  </template>
                </el-table-column>
                <el-table-column prop="solutionsName" align="center" fixed label="保险方案" min-width="150"></el-table-column>
@@ -216,7 +218,7 @@
        startTimeE: '',
        startTimeS: '',
        baseSolutionId: '',
        status: '5',
        status: '5,27',
        solutionType: '',
        timeOut: ''
      },

 company/src/views/index.vue

@@ -115,7 +115,7 @@
          </div>
          <div class="home_content_right_page">
            <el-pagination
                @current-change="handleCurrentChange2"
                @current-change="handleCurrentChange6"
                :current-page="page2"
                :page-size="5"
                layout="total, prev, pager, next, jumper"
@@ -129,7 +129,7 @@
            <div class="list_item" v-for="(item, index) in tableData6" :key="index">
              <div class="list_item_left">
                <span>{{item.title}}（{{ item.typeDetail }}）</span>
                <span>{{item.info}}（{{item.content}}）</span>
                <span>{{item.content}}</span>
              </div>
              <div class="list_item_center">
                <span>{{item.companyName}}</span>
@@ -160,7 +160,7 @@
            <div class="list_item" v-for="(item, index) in tableData7" :key="index">
              <div class="list_item_left">
                <span>{{item.title}}（{{ item.typeDetail }}）</span>
                <span>{{item.info}}（{{item.content}}）</span>
                <span>{{item.content}}</span>
              </div>
              <div class="list_item_center">
                <span>{{item.companyName}}</span>
@@ -178,7 +178,7 @@
          </div>
          <div class="home_content_right_page">
            <el-pagination
              @current-change="handleCurrentChange2"
              @current-change="handleCurrentChange7"
              :current-page="page7"
              :page-size="5"
              layout="total, prev, pager, next, jumper"
@@ -209,11 +209,11 @@
          </div>
          <div class="home_content_right_page">
            <el-pagination
              @current-change="handleCurrentChange2"
              :current-page="page7"
              @current-change="handleCurrentChange8"
              :current-page="page8"
              :page-size="5"
              layout="total, prev, pager, next, jumper"
              :total="totalPage7">
              :total="totalPage8">
            </el-pagination>
          </div>
        </div>

 company/src/views/indexShop.vue

@@ -92,7 +92,7 @@
            <div class="list_item"  v-for="(item, index) in tableData6" :key="index">
              <div class="list_item_left">
                <span>{{item.title}}（{{ item.typeDetail }}）</span>
                <span>{{item.info}}（{{item.content}}）</span>
                <span>{{item.content}}</span>
              </div>
              <div class="list_item_center">
                <span>{{item.companyName}}</span>