nidapeng
2024-04-02 adb4be885811ee602073c2e723d9d09df0e5b4e6
提交一把
已修改12个文件
511 ■■■■■ 文件已修改
company/.env.developmentCom 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/api/business/insuranceApply.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/assets/style/style.scss 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OpearaUnionApply.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaUnionApplyCheckWindow.vue 324 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/OperaWtbApplyShopWindow.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/business/detailsEntrustedInsurance.vue 115 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/components/common/UploadFile.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/insuranceApplyShop.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/src/views/business/unionApply.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company/.env.developmentCom
@@ -15,4 +15,4 @@
# 平台端-萍姐
# VUE_APP_API = 'http://192.168.0.105:10023/'
VUE_APP_API = 'http://192.168.0.176:10031/'
VUE_APP_API = 'http://localhost:10031/'
company/src/api/business/insuranceApply.js
@@ -68,10 +68,16 @@
export function getSignLink (id) {
    return request.get(`business/insuranceApply/getSignLink/${id}`)
}
export function getSignWTBTBDLink (data) {
    return request.post(`business/insuranceApply/getSignWTBTBDLink`,data)
}
export function getSignTBQRSLink (data) {
    // return request.get('/business/insuranceApply/signTBQRSLink')
    return request.post('/business/insuranceApply/signTBQRSLink', data)
}
export function findListByDTO (data) {
    return request.post('/business/insuranceApply/findListByDTO', data)
}
export function getMemberListOnlineSignLink (data) {
    return request.post('/business/insuranceApply/getMemberListOnlineSignLink', data, {
        trim: true
company/src/assets/style/style.scss
@@ -91,7 +91,7 @@
.apply-status7, .apply-status8, .apply-status11,
.change-status3,.change-status4,.change-status5,.change-status8,
.settle-status1,
.tax-status2,union-apply-status4
.tax-status2,.union-apply-status4,
.du-status2 {
  color: #F95601 !important;
}
company/src/components/business/OpearaUnionApply.vue
@@ -13,9 +13,9 @@
                    <el-select v-model="form.baseSolutionId" @change="selectSolutions" placeholder="请选择">
                        <el-option
                            v-for="item in solutions"
                            :key="item.baseId"
                            :key="item.id"
                            :label="item.name"
                            :value="item.baseId">
                            :value="item.id">
                        </el-option>
                    </el-select>
                </el-form-item>
@@ -250,7 +250,7 @@
        capacity: 10,
        page: this.currentPage,
        model: {
          solutionBaseId: this.form.solutionsId,
          baseSolutionId: this.form.baseSolutionId,
          status: 23
        }
      }).then(res => {
company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -16,6 +16,11 @@
          <el-form-item label="上传投保单:" prop="toubaodanFile">
            <UploadFile @remove="dele2" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
          </el-form-item>
          <div v-for="(item,index) in this.model.applyList" :key="index">
            <el-form-item :label="(index+1)+'.被保险人('+item.companyName+'):'" prop="tbdMultifileList[index]">
              <UploadFile   :uploadData="{ folder: 'apply',fileType:'.pdf' }"  :fileIndex="index"  :showTips="showTips" :fileList="model.applyList[index].fileList" @uploadSuccess="toubaoFileUploaded2" />
            </el-form-item>
          </div>
        </el-form>
        <!--    上传保险单    -->
      <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
@@ -45,6 +50,11 @@
        <el-form-item label="上传保险单:" prop="baoxianFile">
          <UploadFile @remove="dele3" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
        </el-form-item>
        <div v-for="(item,index) in this.model.applyList" :key="index">
          <el-form-item :label="item.companyName" prop="bxdMultifileList[index]">
            <UploadFile   :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />
          </el-form-item>
        </div>
      </el-form>
      <template v-slot:footer>
        <el-button type="primary" @click="doSubmit">确 定</el-button>
@@ -59,19 +69,20 @@
import {
  cancel,
  uploadBXD,
  uploadToubaodan,
} from "@/api/business/unionApply";
import UploadFile from "@/components/common/UploadFile";
import {remark} from "@/api/business/settleClaims";
  uploadToubaodan
} from '@/api/business/unionApply'
import UploadFile from '@/components/common/UploadFile'
export default {
  name: 'OperaUnionApplyCheckWindow',
  extends: BaseOpera,
  components: {UploadFile, GlobalWindow },
  components: { UploadFile, GlobalWindow },
  data () {
    return {
      // 表单数据
      model: {},
      falg :0,
      falg: 0,
      showTips:false,
      rules1: {
        backCheckInfo: [
          { required: true, message: '请完善信息' }
@@ -91,21 +102,21 @@
        ],
        baoxianFile: [
          { required: true, message: '请完善信息' }
        ],
        ]
      },
      form: {
         id: null,
         backCheckInfo:'',
         editCheckInfo:'',
        startTime:null,
        code:null,
        toubaodanFile:null,
        baoxianFile:null,
        tbdMultifileList:[],
        bxdMultifileList:[],
        id: null,
        backCheckInfo: '',
        editCheckInfo: '',
        startTime: null,
        code: null,
        toubaodanFile: null,
        baoxianFile: null,
        tbdMultifileList: [],
        bxdMultifileList: [],
        fileList: [],
        fileList1: [],
        selectRadio:0
        selectRadio: 0
      },
      visible1: false,
      visible2: false,
@@ -113,55 +124,76 @@
    }
  },
  created () {
      this.config({
          api: '/business/insuranceApply',
          'field.id': 'id'
      })
    this.config({
      api: '/business/insuranceApply',
      'field.id': 'id'
    })
  },
  methods: {
    dele2() {
      this.form.toubaodanFile = ''
    dele2 () {
      this.form.toubaodanFile= null
    },
    dele3() {
      this.form.baoxianFile = ''
    deleIndex (flag,index) {
      if(flag == 0)
      this.form.tbdMultifileList[index].fileurl = null
      this.form.tbdMultifileList[index].name = null
    },
     open(title,target,flag){
       this.visible=true
       this.model={}
       this.form= {
         id: null,
         backCheckInfo:'',
         dealBackInfo:'',
         editCheckInfo:'',
         editDate: '',
         editCode: '',
         startTime:null,
         code:null,
         toubaodanFile:null,
         baoxianFile:null,
         editBaoxianFile:null,
         fileList: [],
         fileList1: [],
         selectRadio:0
       },
       this.model = target
       this.form.startTime = target.startTime
       this.title = title
       this.flag = flag
       this.visible1 = false
       this.visible2 = false
       this.visible3 = false
       if(flag == 1){
         this.visible1 = true
       }
       if(flag == 2){
         this.visible2 = true
       }
       if(flag == 3){
         this.visible3 = true
       }
     },
    doSubmit(){
    dele3 () {
      this.form.baoxianFile = null
    },
    open (title, target, flag) {
      this.visible = true
      this.model = {}
      this.form = {
        id: null,
        backCheckInfo: '',
        dealBackInfo: '',
        editCheckInfo: '',
        editDate: '',
        editCode: '',
        startTime: null,
        code: null,
        toubaodanFile: null,
        baoxianFile: null,
        editBaoxianFile: null,
        fileList: [],
        fileList1: [],
        selectRadio: 0
      }
      this.model = target
      this.form.startTime = target.startTime
      this.title = title
      this.flag = flag
      this.visible1 = false
      this.visible2 = false
      this.visible3 = false
      this.form.tbdMultifileList=[]
      this.form.bxdMultifileList=[]
      if (flag == 1) {
        this.visible1 = true
      }
      if (flag == 2) {
        this.visible2 = true
        if(this.model.applyList){
          this.model.applyList.forEach(item =>{
            item.fileList =[]
            this.form.tbdMultifileList.push({objId:item.id,fileurl:null,name:null})
          })
        }
      }
      console.log(this.model.applyList)
      if (flag == 3) {
        this.visible3 = true
        if(this.model.applyList){
          this.model.applyList.forEach(item =>{
            item.fileList1 =[]
            this.form.bxdMultifileList.push({objId:item.id,fileurl:null,name:null})
          })
        }
      }
    },
    doSubmit () {
      if (this.flag == 1) {
        this.$refs.form1.validate((valid) => {
          // debugger
@@ -188,87 +220,95 @@
        })
      }
    },
    selectChange(){
       if(this.form.selectRadio == 0){
         this.form.startTime = this.model.startTime
       }else{
         this.form.startTime = ''
       }
    },
    toubaoFileUploaded(data){
      this.form.toubaodanFile=data
    },
    baoxianFileUploaded(data){
      this.form.baoxianFile=data
    },
    backDo(){
      this.$dialog.messageConfirm('确认进行该操作吗?')
          .then(() => {
            this.isWorking = true
            cancel({id:this.model.id,reason:this.form.backCheckInfo})
                .then(response => {
                  this.visible = false
                  this.$emit('success')
                  }).catch(err => {
                this.$tip.apiFailed(err)
                 })
          })
    },
    uploadToubaodan(){
      this.$dialog.messageConfirm('确认进行该操作吗?')
          .then(() => {
            this.isWorking = true
            uploadToubaodan({businessId:this.model.id,fileurl:this.form.toubaodanFile.fileurl,name:this.form.toubaodanFile.name,multifileList:this.form.tbdMultifileList})
                .then(response => {
                  this.visible = false
                  this.$emit('success')
                }).catch(err => {
                  this.$tip.apiFailed(err)
                })
          })
    },
    uploadBaoxiandan(){
      this.$dialog.messageConfirm('确认进行该操作吗?')
          .then(() => {
            this.isWorking = true
            uploadBXD({id:this.model.id,startTime:this.form.startTime,code:this.form.code,baoxiandanFile:this.form.baoxianFile})
                .then(response => {
                  this.visible = false
                  this.$emit('success')
                }).catch(err => {
                  this.$tip.apiFailed(err)
                })
          })
    },
      handleRemove(file, fileList) {
          console.log(file, fileList);
      },
      handlePreview(file) {
          console.log(file);
      },
      handleExceed(files, fileList) {
          this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`);
      },
      beforeRemove(file, fileList) {
          return this.$confirm(`确定移除 ${ file.name }?`);
      },
      successEvent() {
      },
      handleSizeChange(val) {
          console.log(`每页 ${val} 条`);
      },
      handleCurrentChange(val) {
          console.log(`当前页: ${val}`);
      },
      handleClick(tab, event) {
          console.log(tab, event);
      },
      onSubmit() {
    selectChange () {
      if (this.form.selectRadio == 0) {
        this.form.startTime = this.model.startTime
      } else {
        this.form.startTime = ''
      }
    },
    toubaoFileUploaded (data) {
      this.form.toubaodanFile = data
    },
    toubaoFileUploaded2 (data) {
      this.form.tbdMultifileList[data.index].fileurl = data.fileurl
      this.form.tbdMultifileList[data.index].name = data.name
    },
    baoxianFileUploaded (data) {
      this.form.baoxianFile = data
    },
    baoxianFileUploaded2 (data) {
      this.form.bxdMultifileList[data.index].fileurl = data.fileurl
      this.form.bxdMultifileList[data.index].name = data.name
    },
    backDo () {
      this.$dialog.messageConfirm('确认进行该操作吗?')
        .then(() => {
          this.isWorking = true
          cancel({ id: this.model.id, reason: this.form.backCheckInfo })
            .then(response => {
              this.visible = false
              this.$emit('success')
            }).catch(err => {
              this.$tip.apiFailed(err)
            })
        })
    },
    uploadToubaodan () {
      this.$dialog.messageConfirm('确认进行该操作吗?')
        .then(() => {
          this.isWorking = true
          console.log(this.form.tbdMultifileList )
          uploadToubaodan({ businessId: this.model.id, fileurl: this.form.toubaodanFile.fileurl, name: this.form.toubaodanFile.name, multifileList: this.form.tbdMultifileList })
            .then(response => {
              this.visible = false
              this.$emit('success')
            }).catch(err => {
              this.$tip.apiFailed(err)
            })
        })
    },
    uploadBaoxiandan () {
      this.$dialog.messageConfirm('确认进行该操作吗?')
        .then(() => {
          this.isWorking = true
          uploadBXD({ id: this.model.id, startTime: this.form.startTime, code: this.form.code, baoxiandanFile: this.form.baoxianFile })
            .then(response => {
              this.visible = false
              this.$emit('success')
            }).catch(err => {
              this.$tip.apiFailed(err)
            })
        })
    },
    handleRemove (file, fileList) {
      console.log(file, fileList)
    },
    handlePreview (file) {
      console.log(file)
    },
    handleExceed (files, fileList) {
      this.$message.warning(`当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
    },
    beforeRemove (file, fileList) {
      return this.$confirm(`确定移除 ${file.name}?`)
    },
    successEvent () {
    },
    handleSizeChange (val) {
      console.log(`每页 ${val} 条`)
    },
    handleCurrentChange (val) {
      console.log(`当前页: ${val}`)
    },
    handleClick (tab, event) {
      console.log(tab, event)
    },
    onSubmit () {
    }
  }
}
</script>
company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -480,7 +480,7 @@
  exportExcel,
  applyChagneDetailExcel,
  applyOpt,
  getMemberListOnlineSignLink, getSignTBQRSLink
  getMemberListOnlineSignLink, getSignTBQRSLink, getSignWTBTBDLink
} from '@/api/business/insuranceApply'
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
@@ -629,7 +629,7 @@
            this.$tip.apiFailed(err)
          })
        } else if (this.form.type === 2) {
          getSignLink(this.dataId).then(res => {
          getSignWTBTBDLink(this.form).then(res => {
            setTimeout(() => {
              this.visiblePhone=false
              window.open(res)
company/src/components/business/detailsEntrustedInsurance.vue
@@ -21,7 +21,7 @@
              <el-button v-if="model.status == 1" type="primary" @click="getSignLink(0)">签署投保单</el-button>
              <el-button v-if="[2,3,4].includes(model.status)" type="primary" @click="viewToubaodan">查看投保单</el-button>
              <el-button v-if="[2].includes(model.status) " type="primary" @click="$refs.OperaUnionApplyCheckWindow.open('上传保险单',model,3)">上传保险单</el-button>
              <el-button v-if="model.status == 4" type="primary" @click="viewBaoxiandan">查看保险单</el-button>
              <el-button v-if="model.status == 3" type="primary" @click="viewBaoxiandan">查看保险单</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">
@@ -362,9 +362,10 @@
        :title="signTitle"
        :visible.sync="visiblePhone"
        width="500px"
        :modal="false"
        :show-close="false"
        :modal="true"
        :show-close="true"
        :close-on-click-modal="false"
        append-to-body
        center>
      <el-form :model="form" ref="form" :rules="rules">
        <el-form-item label="手机号" prop="phone">
@@ -383,6 +384,24 @@
                <el-button @click="visiblePhone=false">取 消</el-button>
            </span>
    </el-dialog>
    <el-dialog
        :title="fileTitle"
        :visible.sync="visibleFile"
        width="500px"
        :modal="true"
        :show-close="true"
        :close-on-click-modal="false"
        append-to-body
        center>
      <div class="desc_item_from" v-for="(item, index) in fileData" :key="index"  style="margin-bottom: 15px">
        <span v-if="index ==0">{{item.name}}:</span>
        <span v-if="index >0">被保险人({{item.name}}){{fileFlag=== 0?"投保单":"保险单"}}:</span>
        <a style="cursor: pointer;color: #2E68EC" v-if="item.file && item.file.fileurl" @click="openFile(item.file.fileurlFull)">在线预览</a><span v-if="!item.file || !item.file.fileurl">未上传</span>
      </div>
      <span slot="footer" class="dialog-footer">
                <el-button @click="visibleFile=false">关 闭</el-button>
            </span>
    </el-dialog>
  </GlobalWindow>
</template>
@@ -395,19 +414,20 @@
import OperaApplyChangeUnitDetailWindow from '@/components/business/OperaApplyChangeUnitDetailWindow'
import OperaUnionApplyCheckWindow from '@/components/business/OperaUnionApplyCheckWindow'
import { getById,getSignLink } from '@/api/business/unionApply'
import { getById, getSignLink } from '@/api/business/unionApply'
import {
  applyDetailPage,
  exportExcel,
  applyChagneDetailExcel,
  applyOpt,
  findListByDTO as applyList
} from '@/api/business/insuranceApply'
import { findListByDTO } from '@/api/business/dispatchUnit'
import { fetchList } from '@/api/business/applyChange'
import { findListByDTO as worktypeFindListByDTO } from '@/api/business/worktype'
import { mapState } from 'vuex'
import {sendSms} from "@/api/business/smsEmail";
import { sendSms } from '@/api/business/smsEmail'
export default {
  name: 'OperaWtbApplyShopWindow',
@@ -417,19 +437,23 @@
    OperaApplyChangeUnitDetailWindow,
    OperaApplyChangeDetailWindow,
    InsuranceDetailsWtb,
    OperaUnionApplyCheckWindow,
    OperaUnionApplyCheckWindow
  },
  data () {
    return {
      // 表单数据
      dataId: null,
      signTitle: '手机号验证',
      fileTitle: '查看投保单',
      fileFlag:0,
      visibleFile: false,
      fileData: [],
      model: {},
      form: {
        businessId: null,
        phone: this.$store.state.userInfo.company.phone,
        code: '',
        type:0
        type: 0
      },
      rules: {
        code: [
@@ -441,9 +465,9 @@
      formInline: {
        applyStatus: '',
        memberName: '',
        end:[],
        startTimeS:null,
        startTimeE:null,
        end: [],
        startTimeS: null,
        startTimeE: null,
        applyCompanyName: ''
      },
      visiblePhone: false,
@@ -475,6 +499,9 @@
      this.visible = true
      this.title = title
      this.model = {}
      this.fileData = []
      this.taobaodanFileData = []
      this.baoxiandanFileData = []
      this.dataId = null
      this.dataId = target.id
      this.form.businessId = target.id
@@ -503,18 +530,18 @@
      this.visiblePhone = true
      this.$nextTick(() => {
        this.$refs.form.resetFields()
      });
      })
    },
    goSignDo(){
    goSignDo () {
      this.$refs.form.validate((valid) => {
        if (!valid) {
          return
        }
        this.isWorking = true
        if(this.form.type===0){
        if (this.form.type === 0) {
          getSignLink(this.form).then(res => {
            setTimeout(() => {
              this.visiblePhone=false
              this.visiblePhone = false
              window.open(res)
            }, 500)
          }).catch(err => {
@@ -561,9 +588,9 @@
    // 派遣单位
    getDW () {
      findListByDTO({ applyId: this.dataId })
          .then(res => {
            this.dwList = res
          })
        .then(res => {
          this.dwList = res
        })
    },
    // 工种
    getGZ () {
@@ -581,6 +608,7 @@
        this.formInline.applyStatus = ''
      }
      this.formInline.start = ''
      this.fileData = []
      this.formInline.startTimeE = ''
      this.formInline.endTimeE = ''
      this.list = []
@@ -733,8 +761,16 @@
        this.$tip.apiFailed(err)
      })
    },
    openFile (url) {
      setTimeout(() => {
        window.open(url)
      }, 500)
    },
    viewToubaodan () {
      if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
      this.fileData = this.taobaodanFileData;
      this.visibleFile=true
      this.fileFlag = 0
     /* if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
        setTimeout(() => {
          window.open(this.model.toubaodanSignedFile.fileurlFull)
        }, 500)
@@ -742,12 +778,15 @@
        setTimeout(() => {
          window.open(this.model.toubaodanFile.fileurlFull)
        }, 500)
      }
      }*/
    },
    viewBaoxiandan () {
      if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
      this.fileFlag = 1
      this.fileData = this.baoxiandanFileData;
      this.visibleFile=true
     /* if (this.model.baoxiandanFile && this.model.baoxiandanFile.fileurlFull) {
        window.open(this.model.baoxiandanFile.fileurlFull)
      }
      }*/
    },
    viewFanganshu () {
      if (this.model.fanganFile && this.model.fanganFile.fileurlFull) {
@@ -777,10 +816,44 @@
        this.tableData.push(res)
        console.log(this.tableData)
        this.activities = res.applyLogList
        if (this.model.toubaodanSignedFile && this.model.toubaodanSignedFile.fileurlFull) {
          this.taobaodanFileData.push({ name: '商户投保单', file: this.model.toubaodanSignedFile })
        } else if (this.model.toubaodanFile && this.model.toubaodanFile.fileurlFull) {
          this.taobaodanFileData.push({ name: '商户投保单', file: this.model.toubaodanFile })
        }
        this.baoxiandanFileData.push({ name: '商户保险单', file: this.model.baoxiandanFile })
        // if (this.model.status !== 0 && this.model.status !== 4) {
          this.getApplyList()
        // }
      }).catch(err => {
      })
    },
    getApplyList () {
      applyList({ unionApplyId: this.dataId, getFiles: 1 }).then(res => {
        this.model.applyList = res
        if (res && res.length > 0) {
          res.forEach(item => {
            if (item.toubaodanSignedFile) {
              this.taobaodanFileData.push({ name: item.companyName, file: item.toubaodanSignedFile })
            } else if (item.toubaodanFile) {
              this.taobaodanFileData.push({ name: item.companyName, file: item.toubaodanFile })
            } else {
              this.taobaodanFileData.push({ name: item.companyName, file: null })
            }
            if (item.baoxiandanFile) {
              this.baoxiandanFileData.push({ name: item.companyName, file: item.baoxiandanFile })
            } else {
              this.baoxiandanFileData.push({ name: item.companyName, file: null })
            }
          })
        }
      }).catch(err => {
      })
    },
    successEvent () {
      this.fileData=[]
      this.taobaodanFileData=[]
      this.baoxiandanFileData=[]
      // this.visible=false
      this.getDetail()
      this.$emit('success')
company/src/components/common/UploadFile.vue
@@ -3,7 +3,7 @@
    <el-upload
      ref="uploadFileBtn"
      class="upload-demo"
      :accept="uploadData.fileTyp"
      :accept="uploadData.fileType"
      :action="uploadImgUrl"
      :limit="1"
      :before-remove="removes"
@@ -13,7 +13,7 @@
      :before-upload="beforeFileUpload"
      :file-list="fileList">
    <el-button size="small" type="primary"  >点击上传</el-button>
    <div style="display: inline-block"  slot="tip" class="el-upload__tip">(只能上传{{ uploadData.fileType }}文件,且不超过5mb)</div>
    <div style="display: inline-block;position: absolute"  slot="tip" class="el-upload__tip" v-if="showTips">{{'(只能上传'+uploadData.fileType +'文件,且不超过5mb)'}}</div>
  </el-upload>
  </div>
@@ -30,7 +30,14 @@
      type: Object,
      default: () => {}
    },
    tipsLabel: '',
    fileIndex: {
      type: Number,
      default: () =>0
    },
    showTips: {
      type: Boolean,
    default: () => true
    },
    customStyle: {
      type: String,
      default: 'width: 190px; height: 190px;'
@@ -49,6 +56,11 @@
        this.fileList = new Array();
      }
     // alert(this.fileList)
    },
    tipsLabel (nv,ov) {
      if(this.tipsLabel ==null){
        this.tipsLabel = ''
      }
    }
  },
  methods: {
@@ -64,7 +76,7 @@
        let { data } = res
        // this.fileList = [{name: data.originname, url: data.url }]
        this.$message.success('上传成功')
        this.$emit('uploadSuccess', { fileurl: data.imgaddr,  fileurlFull: data.url, name: data.originname })
        this.$emit('uploadSuccess', { fileurl: data.imgaddr,  fileurlFull: data.url, name: data.originname ,index:this.fileIndex})
      } else {
        this.$message.apiFailed('上传失败')
      }
@@ -91,7 +103,7 @@
  height: $image-width;
}
::v-deep .el-upload {
  border: 1px dashed #d9d9d9;
  //border: 1px dashed #d9d9d9;
  border-radius: 6px;
  cursor: pointer;
  position: relative;
@@ -114,7 +126,7 @@
  width: $image-width;
  height: $image-width;
  display: block;
}
}#67C23A
.tips-style {
  height: 13px;
  font-size: 13px;
@@ -128,6 +140,9 @@
  width: 90px !important;
  height: 90px !important;
}
::v-deep .el-upload-list__item-name{
  color: #67C23A;
}
::v-deep .el-upload-list__item {
  width: 80% !important;
  height: 50px !important;
company/src/views/business/insuranceApplyShop.vue
@@ -4,24 +4,13 @@
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="保单状态" prop="statusCollect">
                <el-select v-model="searchForm.statusCollect" placeholder="请选择" @keypress.enter.native="search">
<<<<<<< HEAD
                    <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="28"></el-option>
                    <el-option label="待审核" value="22"></el-option>
                  <el-option label="待签署" value="28"></el-option>
                  <el-option label="待审核" value="22"></el-option>
                  <el-option label="待出单" value="23"></el-option>
                  <el-option label="已退回" value="24"></el-option>
                  <el-option label="已关闭" value="25"></el-option>
                  <el-option label="投保中" value="26"></el-option>
                  <el-option label="保障中" value="27"></el-option>
>>>>>>> 2ce7d1d9934f97604ff00b1789dd3628d814dd60
                </el-select>
            </el-form-item>
            <el-form-item label="投保企业" prop="companyId">
company/src/views/business/unionApply.vue
@@ -67,8 +67,8 @@
                    min-width="120"
                    fixed="right"
                >
                    <template slot-scope="{row}">
                        <el-button type="text" icon="el-icon-edit" @click="$refs.detailsEntrustedInsurance.open('委托投保详情', row)" v-permissions="['business:insuranceapply:update']">查看详情</el-button>
                    <template slot-scope="{row}" >
                        <el-button type="text"  icon="el-icon-edit" @click="$refs.detailsEntrustedInsurance.open('委托投保详情', row)" v-permissions="['business:insuranceapply:update']">查看详情</el-button>
                    </template>
                </el-table-column>
            </el-table>
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -2066,7 +2066,7 @@
        List<Integer> objList =  new ArrayList<>();
        if(list!=null && list.size()>0){
            for(InsuranceApply param : list){
                objList.get(param.getId());
                objList.add(param.getId());
            }
        }else{
            return;
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -389,7 +389,7 @@
                eq(Solutions::getType,Constants.ONE)
                .eq(Solutions::getIsdeleted,Constants.ZERO)
                .eq(Solutions::getDataType,Constants.ZERO)
                .eq(Solutions::getBaseId,saveUnionApplyDTO.getBaseSolutionId()));
                .eq(Solutions::getId,saveUnionApplyDTO.getBaseSolutionId()));
        //查询方案数据
        if(solutions == null){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起,方案信息有误,请刷新页面重试");
@@ -650,7 +650,7 @@
        }
        Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
                .eq(Multifile::getObjId,unionApply.getId())
                .eq(Multifile::getObjType,Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey())
                .eq(Multifile::getObjType,Constants.MultiFile.HBD_BD_APPLY_PDF.getKey())
                .eq(Multifile::getIsdeleted,Constants.ZERO)
                .last("limit 1"));
        if(f == null || StringUtils.isBlank(f.getFileurl())){