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

jiangping

2024-11-01 4d685f52c0ab2ebd4614ce4c2639e31b9eb68bf5

 company/src/views/business/solutions.vue

@@ -5,18 +5,6 @@
            <el-form-item label="保险方案" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="启用状态" prop="status" v-if="userInfo.type !== 1">
                <el-select v-model="searchForm.status" placeholder="请选择" @keypress.enter.native="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="type" >
                <el-select v-model="searchForm.type" placeholder="请选择" @keypress.enter.native="search">
                    <el-option label="直保" value="0"></el-option>
                    <el-option label="委托投保" value="1"></el-option>
                </el-select>
            </el-form-item>
            <section>
                <el-button type="primary" @click="search">搜索</el-button>
                <el-button @click="reset">重置</el-button>
@@ -39,22 +27,15 @@
                        <span>{{scope.$index + 1}}</span>
                    </template>
                </el-table-column>
                <el-table-column prop="name" label="保险方案" min-width="150px"></el-table-column>
                <el-table-column prop="insuranceName" label="保险公司" min-width="100px"></el-table-column>
                <el-table-column label="投保年龄" min-width="100px">
                <el-table-column prop="name" label="子方案名称" min-width="150px"></el-table-column>
                <el-table-column prop="insuranceName" label="主方案" min-width="100px"></el-table-column>
                <el-table-column label="投保类型" min-width="120px" align="center">
                    <template slot-scope="{row}">
                        <span>{{row.minAge}}至{{row.maxAge}}岁</span>
                        <span v-if="row.type === 0">直保</span>
                        <span v-if="row.type === 1">委托<div style="color: blue;display:  block" >{{row.shopName||'-'}}</div></span>
                    </template>
                </el-table-column>
                <el-table-column label="投保生效日期" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.validType === 0">{{row.validTypeNum}}日后生效</span>
                        <span v-if="row.validType === 1">次月生效</span>
                    </template>
                </el-table-column>
<!--                <el-table-column prop="addValidDays"  label="批增生效时间" min-width="100px">   </el-table-column>
                <el-table-column prop="delValidDays"  label="批减生效时间" min-width="100px">   </el-table-column>-->
                <el-table-column label="方案费用" min-width="100px">
                <el-table-column label="投保价格" min-width="100px">
                    <template slot-scope="{row}">
                        <span>{{row.price}}元/人/</span>
                        <span v-if="row.timeUnit === 0">天</span>
@@ -65,12 +46,8 @@
                        <span v-if="row.timeUnit === 5">年</span>
                    </template>
                </el-table-column>
                <el-table-column label="投保类型" min-width="120px" align="center">
                    <template slot-scope="{row}">
                        <span v-if="row.type === 0">直保</span>
                        <span v-if="row.type === 1">委托<div style="color: blue;display:  block" >{{row.shopName||'-'}}</div></span>
                    </template>
                </el-table-column>
                <el-table-column prop="name" label="需要复审"></el-table-column>
                <el-table-column prop="createDate" label="方案创建日期" min-width="100px"></el-table-column>
                <el-table-column prop="status" label="启用状态" min-width="100px" v-if="userInfo.type !== 1">
                    <template slot-scope="{row}">
                        <el-switch
@@ -83,7 +60,6 @@
                        </el-switch>
                    </template>
                </el-table-column>
                <el-table-column prop="createDate" label="方案日期" min-width="100px"></el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:solutions:update', 'business:solutions:delete'])"
                    label="操作"