Merge remote-tracking branch 'origin/master'

jiangping

2024-02-02 f8b1073fbb28d37e08016eed32c682f8c5eae391

 company/src/views/business/member.vue

@@ -24,7 +24,20 @@
                    <el-option label="不在保" value="2"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="派遣单位" prop="duId">
            <el-form-item  v-if="userInfo.type === 0" label="所属企业" prop="companyId">
                <el-select v-model="searchForm.companyId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="(item, index) in companyList"
                        :key="index"
                        :label="item.name"
                        :value="item.id">
                    </el-option>
                </el-select>
            </el-form-item>
          <el-form-item label="派遣单位" prop="duName">
            <el-input v-model="searchForm.duName" placeholder="请输入" maxlength="18" @keypress.enter.native="search"></el-input>
          </el-form-item>
<!--            <el-form-item label="派遣单位" prop="duId">
                <el-select v-model="searchForm.duId" placeholder="请选择" @change="search">
                    <el-option
                        v-for="(item, index) in options"
@@ -33,7 +46,7 @@
                        :value="item.id">
                    </el-option>
                </el-select>
            </el-form-item>
            </el-form-item>-->
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
@@ -111,6 +124,7 @@
    import { findListByDTO } from '@/api/business/dispatchUnit'
    import { memberExportExcel } from '@/api/business/member'
    import { mapState } from 'vuex'
    import {pageAll as companyAll} from "@/api/business/company";
    export default {
        name: 'Member',
        extends: BaseTable,
@@ -126,7 +140,8 @@
                    solutionId: ''
                },
                options: [],
                solutions: []
                solutions: [],
                companyList: []
            }
        },
        computed: {
@@ -153,14 +168,20 @@
                })
            },
            getSolutions() {
                all()
                all({})
                    .then(res => {
                        this.solutions = res
                    })
             /* if(this.userInfo.type ==1){
                findListByDTO({ dataType: 2 })
                    .then(res => {
                        this.options = res
                    })
              }*/

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