Merge remote-tracking branch 'origin/master'

k94314517

2024-02-23 3c456949b70671cc2ad95ad5395dfaceda519f17

 company/src/components/business/OperaSolutionsWindow.vue

@@ -50,7 +50,7 @@
                    <span style="margin: 0 30px;">元/人</span>
                    <el-select v-model="form.timeUnit" style="flex: 1;" placeholder="请选择">
                        <el-option label="天" :value="0"></el-option>
                        <el-option label="半月" :value="1"></el-option>
<!--                        <el-option label="半月" :value="1"></el-option>-->
                        <el-option label="月" :value="2"></el-option>
                        <el-option label="年" :value="3"></el-option>
                    </el-select>
@@ -62,17 +62,22 @@
                    <span style="margin: 0 30px;"></span>
                    <el-select v-model="form.insureCycleUnit" style="flex: 1;" placeholder="请选择">
                        <el-option label="天" :value="0"></el-option>
                        <el-option label="半月" :value="1"></el-option>
<!--                        <el-option label="半月" :value="1"></el-option>-->
                        <el-option label="月" :value="2"></el-option>
                        <el-option label="年" :value="3"></el-option>
                    </el-select>
                </div>
            </el-form-item>
            <el-form-item label="生效时间" prop="validType">
                <el-radio-group v-model="form.validType">
                    <el-radio :label="0">日后生效</el-radio>
                    <el-radio :label="1">次月生效</el-radio>
                </el-radio-group>
            <el-form-item label="生效时间" prop="validTypeNum">
                <div style="width: 100%; display: flex; align-items: center;">
                    <div style="flex-shrink: 0;">
                        <el-radio-group v-model="form.validType" @change="form.validTypeNum = ''">
                            <el-radio :label="0">日后生效</el-radio>
                            <el-radio :label="1">次月生效</el-radio>
                        </el-radio-group>
                    </div>
                    <el-input style="margin-left: 20px;" type="number" v-model="form.validTypeNum" placeholder="请输入延迟天数" v-if="form.validType === 0"></el-input>
                </div>
            </el-form-item>
            <el-form-item label="投保类型" prop="type">
                <el-radio-group v-model="form.type">
@@ -146,6 +151,14 @@
        extends: BaseOpera,
        components: { GlobalWindow },
        data () {
            var validType = (rule, value, callback) => {
                if (this.form.validType === 0 && !value) {
                    return callback(new Error('延迟天数不能为空'));
                } else if (!/^[0-9]*[1-9][0-9]*$/.test(value)) {
                    return callback(new Error('延迟天数只能为正整数'));
                }
                callback();
            }
            return {
                // 表单数据
                form: {
@@ -166,6 +179,7 @@
                    specialInfo: '',
                    ortherInfo: '',
                    signKeyword: '',
                    validTypeNum: '',
                    worktypeIdList: [{ worktypeId: '' }]
                },
                // 验证规则
@@ -188,8 +202,8 @@
                    insureCycle: [
                        { required: true, message: '请输入投保周期' }
                    ],
                    validType: [
                        { required: true, message: '请选择生效时间' }
                    validTypeNum: [
                        { required: true, validator: validType }
                    ],
                    type: [
                        { required: true, message: '请选择投保类型' }
@@ -255,6 +269,10 @@
            },
            open (title, target) {
                this.title = title
                this.form.maxAge = ''
                this.form.timeUnit = ''
                this.form.insureCycleUnit = ''
                this.form.validTypeNum = ''
                this.visible = true
                this.form.worktypeIdList = [{ worktypeId: '' }]
                this.allCompany()
@@ -292,7 +310,7 @@
            },
            // 查询全部保险公司
            allCompany() {
                all({ dataType: 2 })
                all({ dataType: 2, status: 0 })
                    .then(res => {
                        console.log(res)
                        this.company = res