Skip to content

B
bims
Commit 80ebe0f7 authored by 吴婷慧's avatar 吴婷慧
Browse files
Options

Merge branch 'update-0218' into test

parents 2bb2d139 6ddc49ac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 181 additions and 159 deletions
src/views/author/forget.vue
View file @ 80ebe0f7
......@@ -32,7 +32,7 @@
</a-form-model-item>
<a-form-model-item prop="verificationCode">
<a-input v-model="form.verificationCode" placeholder="请输入验证码">
<a-button type="primary" slot="addonAfter" @click="getVerifyCode"
<a-button type="primary" slot="addonAfter" size="small" @click="getVerifyCode"
>发送验证码至邮箱</a-button
>
</a-input>
......@@ -76,7 +76,7 @@ export default {
activeStep: "1",
form: {},
formRules: {
userName: [{ required: true, message: "请输入邮箱" }],
userName: [{ required: true, message: "请输入用户名" }],
passWord: [{ required: true, message: "请输入密码" }],
newPwd: [
{ required: true, message: "请再次输入新密码" },
......@@ -184,7 +184,7 @@ export default {
}
}
.steps {
.pa(18, 37, 32, 37);
.pa(0, 32, 32, 32);
display: flex;
.step-item {
.fs(12);
......@@ -229,7 +229,7 @@ export default {
.module-title {
.fs(14);
.lh(20);
.mg-b(32);
.mg-b(30);
a {
color: #373842;
opacity: 0.4;
......
src/views/author/index.vue
View file @ 80ebe0f7
......@@ -23,7 +23,7 @@ export default {
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
min-height: 100vh;
background: url("../../assets/image/login_bg.png") center center no-repeat;
background-size: 100% 100%;
.title {
......@@ -32,12 +32,15 @@ export default {
.pb(90);
color: #fff;
letter-spacing: 3px;
text-align: center;
}
.login,
.forget {
.w(394);
width: 394px;
max-width: 90%;
// .w(394);
.bd-rd(27);
.pa(50, 63, 10, 63);
.pa(50, 47, 18, 47);
margin: 0 auto;
position: relative;
background-color: #fff;
......
src/views/customer/edit/index.vue
View file @ 80ebe0f7
This diff is collapsed.
src/views/customer/info/index.vue
View file @ 80ebe0f7
......@@ -81,7 +81,7 @@ export default {
{ title: "性别", dataIndex: "sex", width: 80 },
{ title: "保险公司", dataIndex: "payorName", width: 180 },
{ title: "保单号码", dataIndex: "policyNo", width: 190 },
{ title: "保险有效日期", dataIndex: "startDate", width: 170, customRender: dateFormat },
{ title: "保险生效日期", dataIndex: "startDate", width: 170, customRender: dateFormat },
{ title: "保险终止日期", dataIndex: "endDate", width: 170, customRender: dateFormat },
{ title: "操作", key: "operation", width: "260px", fixed: "right", scopedSlots: { customRender: "operation" }},
];
......
src/views/welfare/edit/components/benefits/index.vue
View file @ 80ebe0f7
......@@ -32,7 +32,7 @@
v-model="isBenefitEditShow"
:footer="null"
width="50%"
@cancel="isBenefitEditShow = false"
@cancel="cancel"
>
<a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
<a-row :gutter="20">
......@@ -54,7 +54,7 @@
<a-col :md="12">
<a-form-model-item label="福利项目" prop="benefitCode">
<a-select v-model="editForm.benefitCode" show-search allow-clear @filterOption="filterCode">
<a-select-option v-for="item in benefitCode" :key="item.benefitCode" :vlaue="item.benefitCode">
<a-select-option v-for="item in benefitCode" :key="item.benefitCode + item.description" :vlaue="item.benefitCode">
{{ item.description }}
</a-select-option>
</a-select>
......@@ -71,14 +71,18 @@
</a-form-model-item>
</a-col>
<a-col :md="12">
<a-form-model-item label="等待期">
<a-input-number v-model="editForm.waitingPeriod">
</a-input-number>
<a-form-model-item label="是否等待期">
<a-radio-group v-model="editForm.isdays" :default-value="editForm.isdays" button-style="solid"
>
<a-radio-button value="Y"> 是 </a-radio-button>
<a-radio-button class="mar-left10" value="N"> 否 </a-radio-button>
</a-radio-group>
</a-form-model-item>
</a-col>
<a-col :md="12">
<a-form-model-item label="是否天数">
<a-input-number v-model="editForm.isdays"></a-input-number>
<a-form-model-item label="等待期天数" prop="waitingPeriod" :rules="[{required: editForm.isdays === 'Y', message: '请输入等待期天数'}]">
<a-input-number v-model="editForm.waitingPeriod">
</a-input-number>
</a-form-model-item>
</a-col>
<a-col :md="12">
......@@ -118,7 +122,7 @@
<a-button type="primary" @click="saveBenefitData">
<Icon name="ssiadd" :size="14" />保存
</a-button>
<a-button class="mar-left10" @click="isBenefitEditShow = false">取消</a-button>
<a-button class="mar-left10" @click="cancel">取消</a-button>
</a-form-model-item>
</a-form-model>
</a-modal>
......@@ -146,10 +150,10 @@ export default {
const columns = [
{ title: "责任项目明细", dataIndex: "benefitDesc" },
// { title: "预授权申请", dataIndex: "index" },
{ title: "更新日期", dataIndex: "modifierDate", width: 180 },
{ title: "开始日期", dataIndex: "startDate", customRender: dateFormat },
{ title: "结束日期", dataIndex: "endDate", customRender: dateFormat },
{ title: "备注", dataIndex: "remark", width: 180 },
{ title: "更新日期", dataIndex: "modifierDate", width: 180 },
{ title: "备注", dataIndex: "remarks", width: 180 },
{
title: "操作",
key: "operation",
......@@ -168,6 +172,7 @@ export default {
benefitCode: [{ required: true, message: "请选择福利项" }],
startDate: [{ required: true, message: "请选择开始时间" }],
endDate: [{ required: true, message: "请选择结束时间" }],
waitingPeriod: [{ required: true, message: "请输入等待期天数" }]
},
};
},
......@@ -177,6 +182,7 @@ export default {
methods: {
// 选择框筛选
filterCode(input, option) {
console.log(option.componentOptions)
return (
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
);
......@@ -195,6 +201,10 @@ export default {
this.editForm = this.$lodash.cloneDeep(data);
this.isBenefitEditShow = true;
},
cancel() {
this.$refs.editForm.resetFields();
this.isBenefitEditShow = false;
},
deleteData(record) {
const data = this.$lodash.cloneDeep(record);
data.status = "2"; // 置为无效状态即删除
......@@ -202,11 +212,12 @@ export default {
},
saveBenefitData() {
this.$refs.editForm.validate((valid) => {
console.log(valid)
if (!valid) {
return false;
}
});
this._editBenefitData(this.editForm);
});
},
_editBenefitData(data) {
const fn = data.id || data.id === 0 ? this.$apis.EDITBENEFITLIST : this.$apis.ADDBENEFITLIST;
......
src/views/welfare/edit/components/condition/index.vue
View file @ 80ebe0f7
......@@ -28,42 +28,42 @@
title="条件管理"
v-model="isConditionEditShow"
:footer="null"
@cancel="isConditionEditShow = false"
@cancel="cancel"
>
<a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
<a-form-model-item label="频率" prop="frequencyCode">
<a-form-model-item label="限额" prop="frequencyCode">
<a-select v-model="editForm.frequencyCode" show-search allow-clear @filterOption="filterCode">
<a-select-option v-for="item in frequencyCode" :key="item.frequencyCode" :vlaue="item.frequencyCode">
<a-select-option v-for="item in frequencyCode" :key="item.frequencyCode + item.frequencyDesc" :vlaue="item.frequencyCode">
{{ item.frequencyDesc }}
</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="条件" prop="limitCode">
<a-form-model-item label="保障福利" prop="limitCode">
<a-select v-model="editForm.limitCode" show-search allow-clear @filterOption="limitCode">
<a-select-option v-for="item in limitCode" :key="item.limitCode" :vlaue="item.limitCode">
<a-select-option v-for="item in limitCode" :key="item.limitCode + item.limitDesc" :vlaue="item.limitCode">
{{ item.limitDesc }}
</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="开始时间" prop="startDate">
<!-- <a-form-model-item label="开始时间" prop="startDate">
<a-date-picker v-model="editForm.startDate" placeholder="请选择开始时间" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
</a-form-model-item>
<a-form-model-item label="结束时间" prop="endDate">
<a-date-picker v-model="editForm.endDate" placeholder="请选择结束时间" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
</a-form-model-item>
</a-form-model-item> -->
<a-row :gutter="10">
<a-col :span="8">
<a-form-model-item label="最小值">
<a-form-model-item label="年限额">
<a-input-number v-model="editForm.minValue"> </a-input-number>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item label="最大值">
<a-form-model-item label="次限额">
<a-input-number v-model="editForm.maxValue"> </a-input-number>
</a-form-model-item>
</a-col>
<a-col :span="8">
<a-form-model-item label="家庭最大值">
<a-form-model-item label="赔付比率">
<a-input-number v-model="editForm.familyMaxValue">
</a-input-number>
</a-form-model-item>
......@@ -71,7 +71,7 @@
</a-row>
<a-form-model-item label="币种">
<a-select v-model="editForm.currency" show-search allow-clear @filterOption="filterCode">
<a-select-option v-for="item in currencyCode" :key="item.code" :vlaue="item.code">
<a-select-option v-for="item in currencyCode" :key="item.code + item.name" :vlaue="item.code">
{{ item.name }}
</a-select-option>
</a-select>
......@@ -92,14 +92,14 @@
</a-select-option>
</a-select>
</a-form-model-item> -->
<a-form-model-item label="备注" prop="remarks">
<a-textarea v-model="editForm.remarks" :autoSize="{ minRows: 2, maxRows: 5 }"></a-textarea>
<a-form-model-item label="备注" prop="remark">
<a-textarea v-model="editForm.remark" :autoSize="{ minRows: 2, maxRows: 5 }"></a-textarea>
</a-form-model-item>
<a-form-model-item class="text-r">
<a-button type="primary" @click="saveConditionData">
<Icon name="ssiadd" :size="14" />保存
</a-button>
<a-button class="mar-left10" @click="isConditionEditShow = false">取消</a-button>
<a-button class="mar-left10" @click="cancel">取消</a-button>
</a-form-model-item>
</a-form-model>
</a-modal>
......@@ -107,7 +107,6 @@
</template>
<script>
import moment from 'moment'
export default {
props: {
......@@ -117,14 +116,9 @@ export default {
},
},
data() {
const dateFormat = (val) => {
return val && moment(val).format('YYYY-MM-DD')
}
const columns = [
{ title: "条件类型", dataIndex: "frequencyDesc" },
{ title: "条件内容", dataIndex: "limitDesc" },
{ title: "开始时间", dataIndex: "startDate", customRender: dateFormat },
{ title: "结束时间", dataIndex: "endDate", customRender: dateFormat },
{ title: "状态", dataIndex: "status", customRender: (val) => {
for(let i = 0; i < this.statusCode.length; i ++) {
if (val === this.statusCode[i].code) {
......@@ -135,6 +129,7 @@ export default {
} },
// { title: "限额或限次", dataIndex: "index" },
{ title: "最大值", dataIndex: "maxValue" },
{ title: "备注", dataIndex: "remark" },
{
title: "操作",
key: "operation",
......@@ -159,10 +154,8 @@ export default {
{ code: "2", name: "无效" },
],
editRule: {
frequencyCode: [{ required: true, message: "请选择频率" }],
limitCode: [{ required: true, message: "请选择条件" }],
startDate: [{ required: true, message: "请选择开始时间" }],
endDate: [{ required: true, message: "请选择结束时间" }],
frequencyCode: [{ required: true, message: "请选择限额" }],
limitCode: [{ required: true, message: "请选择保障福利" }],
},
};
},
......@@ -207,6 +200,10 @@ export default {
}
});
},
cancel() {
this.$refs.editForm.resetFields();
this.isConditionEditShow = false;
},
deleteData(record) {
const data = this.$lodash.cloneDeep(record);
data.status = "2"; // 置为无效状态即删除
......
src/views/welfare/edit/components/coverages/index.vue
View file @ 80ebe0f7
......@@ -33,7 +33,7 @@
v-model="isCoverageEditShow"
:footer="null"
width="50%"
@cancel="isCoverageEditShow = false"
@cancel="cancel"
>
<a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
<a-row :gutter="20">
......@@ -87,7 +87,7 @@
<a-button type="primary" @click="saveCoverageData">
<Icon name="ssiadd" :size="14" />保存
</a-button>
<a-button class="mar-left10" @click="isCoverageEditShow = false">取消</a-button>
<a-button class="mar-left10" @click="cancel">取消</a-button>
</a-form-model-item>
</a-form-model>
</a-modal>
......@@ -182,6 +182,10 @@ export default {
this._editCoverageData(this.editForm);
});
},
cancel() {
this.$refs.editForm.resetFields();
this.isCoverageEditShow = false;
},
deleteData(record) {
const data = this.$lodash.cloneDeep(record);
data.status = "2"; // 置为无效状态即删除
......
src/views/welfare/edit/index.vue
View file @ 80ebe0f7
......@@ -53,7 +53,7 @@
:pagination="false"
>
<template slot="operation" slot-scope="record">
<a-button type="link" @click.stop="editPlanData(null)">新增</a-button>
<a-button type="link" @click.stop="editPlanData(record, true)">新增</a-button>
<a-button type="link" @click.stop="editPlanData(record)">修改</a-button>
<!-- <a-popconfirm
title="你确定要删除吗？"
......@@ -76,7 +76,7 @@
v-model="isPlanEditShow"
:footer="null"
width="50%"
@cancel="isPlanEditShow = false"
@cancel="cancel"
>
<a-form-model ref="editForm" layout="vertical" :model="editForm" :rules="editRule">
<!-- <a-form-model-item label="保险公司" prop="payorCode">
......@@ -88,27 +88,35 @@
</a-form-model-item> -->
<a-row :gutter="20">
<a-col :md="12">
<a-form-model-item label="保险计划" prop="planCode">
<a-input v-model="editForm.planCode"></a-input>
<a-form-model-item label="计划编号" prop="planCode">
<a-input v-model="editForm.planCode" disabled></a-input>
</a-form-model-item>
<a-form-model-item label="计划全称" prop="longName">
<a-input v-model="editForm.longName"></a-input>
</a-form-model-item>
<a-form-model-item label="公司名称" prop="corpName">
<a-input v-model="editForm.corpName"></a-input>
<a-form-model-item label="英文名称" prop="englishName">
<a-input v-model="editForm.englishName"></a-input>
</a-form-model-item>
<a-form-model-item label="生效日期" prop="effectiveDate">
<!-- <a-form-model-item label="生效日期" prop="effectiveDate">
<a-date-picker v-model="editForm.effectiveDate" placeholder="请选择生效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
</a-form-model-item>
</a-form-model-item> -->
<a-form-model-item label="地区限制" prop="regionalRestrictions">
<a-select v-model="editForm.regionalRestrictions" placeholder="请选择地区限制" show-search allow-clear @filterOption="filterCode">
<a-select-option v-for="item in areaCode" :key="item.refcd" :value="item.refcd" :label="item.descCh">{{ item.descCh }}</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="备注" prop="remarks">
<a-textarea v-model="editForm.remarks" :autoSize="{ minRows: 2, maxRows: 5 }"></a-textarea>
</a-form-model-item>
</a-col>
<a-col :md="12">
<a-form-model-item label="英文名称" prop="englishName">
<a-input v-model="editForm.englishName"></a-input>
<a-form-model-item label="公司名称" prop="corpCode">
<a-select v-model="editForm.corpCode" disabled>
<a-select-option v-for="item in corpCode" :key="item.corpCode" :value="item.corpCode">
{{ item.longName }}
</a-select-option>
</a-select>
<!-- <a-input v-model="editForm.corpCode" disabled></a-input> -->
</a-form-model-item>
<a-form-model-item label="计划简称" prop="shortName">
<a-input v-model="editForm.shortName"></a-input>
......@@ -116,24 +124,21 @@
<a-form-model-item label="等待期(天)" prop="waitingPeriod">
<a-input-number v-model="editForm.waitingPeriod"></a-input-number>
</a-form-model-item>
<a-form-model-item label="失效日期" prop="terminationDate">
<!-- <a-form-model-item label="失效日期" prop="terminationDate">
<a-date-picker v-model="editForm.terminationDate" placeholder="请选择失效日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
</a-form-model-item>
</a-form-model-item> -->
<a-form-model-item label="医院限制" prop="hospitalRestrictions">
<a-select v-model="editForm.hospitalRestrictions" placeholder="请选择医院限制" show-search allow-clear @filterOption="filterCode">
<a-select-option v-for="item in hosCode" :key="item.refcd" :value="item.refcd" :label="item.descCh">{{ item.descCh }}</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="备注" prop="remarks">
<a-textarea v-model="editForm.remarks" :autoSize="{ minRows: 2, maxRows: 5 }"></a-textarea>
</a-form-model-item>
</a-col>
</a-row>
<a-form-model-item class="text-r">
<a-button type="primary" @click="savePlanData">
<Icon name="ssiadd" :size="14" />保存
</a-button>
<a-button class="mar-left10" @click="isPlanEditShow = false">取消</a-button>
<a-button class="mar-left10" @click="cancel">取消</a-button>
</a-form-model-item>
</a-form-model>
</a-modal>
......@@ -144,7 +149,7 @@
import BurtPagination from "@/components/CUSTOMER/pagation";
import condition from "./components/condition";
import coverages from "./components/coverages";
import moment from 'moment'
// import moment from 'moment'
export default {
beforeRouteUpdate(to, from, next) {
this.$refs.form.resetFields();
......@@ -157,15 +162,15 @@ export default {
coverages,
},
data() {
const dateFormat = (val) => {
return val && moment(val).format('YYYY-MM-DD')
}
// const dateFormat = (val) => {
// return val && moment(val).format('YYYY-MM-DD')
// }
const columns = [
// { title: "计划责任", dataIndex: "planCode", width: 180 },
{ title: "计划全称", dataIndex: "longName", width: 180},
{ title: "简称", dataIndex: "shortName", width: 130, ellipsis: true },
{ title: "起始日期", dataIndex: "effectiveDate", width: 130, customRender: dateFormat },
{ title: "终止日期", dataIndex: "terminationDate", width: 130, customRender: dateFormat },
// { title: "起始日期", dataIndex: "effectiveDate", width: 130, customRender: dateFormat },
// { title: "终止日期", dataIndex: "terminationDate", width: 130, customRender: dateFormat },
{ title: "医院限制", dataIndex: "hospitalRestrictions", width: 130, customRender: (val) => {
for(let i = 0; i < this.hosCode.length; i ++) {
if (val === this.hosCode[i].refcd) {
......@@ -234,6 +239,8 @@ export default {
mounted() {
if (this.$route.query && this.$route.query.planCode) {
this.form = this.$route.query;
this._getCorporateCode(this.$route.query.payorCode);
this._getPlanCode(this.$route.query.corpCode);
this.$nextTick(this.handlerSearch)
}
this._getPayorCode();
......@@ -278,28 +285,36 @@ export default {
.indexOf(input.toLowerCase()) >= 0
);
},
cancel() {
this.$refs.editForm.resetFields();
this.isPlanEditShow = false;
},
deleteData(record) {
const data = this.$lodash.cloneDeep(record);
data.status = "2"; // 置为无效状态即删除
this._editPlanData(data);
},
editPlanData(data) {
if (data) {
editPlanData(data, isNew) {
if (!isNew) {
this.editForm = this.$lodash.cloneDeep(data);
this.isPlanEditShow = true;
} else {
this.$refs.form.validateField(["payorCode", "corpCode"], (error) => {
if (error) {
return false;
const { planCode, longName, englishName, corpCode, shortName } = data;
this.editForm = { planCode, longName, englishName, corpCode, shortName }
}
data = {
payorCode: this.form.payorCode,
corpCode: this.form.corpCode,
};
this.editForm = this.$lodash.cloneDeep(data);
this.isPlanEditShow = true;
});
}
// else {
// this.$refs.form.validateField(["payorCode", "corpCode"], (error) => {
// if (error) {
// return false;
// }
// data = {
// payorCode: this.form.payorCode,
// corpCode: this.form.corpCode,
// };
// this.editForm = this.$lodash.cloneDeep(data);
// this.isPlanEditShow = true;
// });
// }
// data = data || {};
},
savePlanData() {
......
src/views/welfare/info/components/PolicyInfo.vue
View file @ 80ebe0f7
......@@ -13,7 +13,7 @@
<a-col :span="6">是否承担既往症：{{policyData.isUndertakeAnamnesis}}</a-col>
<a-col :span="6">保单直付区域：{{policyData.policyDircetArea}}</a-col>
<a-col :span="6" v-if="policyData.waitingPeriod === 'Y'">剩余等待期天数{{policyData.waitingPeriodTime}}</a-col>
<a-col :span="6">其他备注{{policyData.remark}}</a-col>
<a-col :span="6">其他备注：{{policyData.remark}}</a-col>
</a-row>
</a-collapse-panel>
</a-collapse>
......
src/views/welfare/info/index.vue
View file @ 80ebe0f7
......@@ -15,7 +15,7 @@
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="出生日期" prop="birthday">
<a-date-picker v-model="form.birthday" placeholder="请选择出生日期" value-format="YYYY-MM-DD"></a-date-picker>
<a-date-picker v-model="form.birthday" placeholder="请选择出生日期" value-format="YYYY-MM-DD 00:00:00"></a-date-picker>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
......@@ -40,13 +40,6 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="是否直付" prop="idType">
<a-select v-model="form.idType" placeholder="请选择保单直付区域" show-search allow-clear @filterOption="filterCode">
<a-select-option v-for="item in companyCode" :key="item.id" :value="item.id" :label="item.longName">{{ item.longName }}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="14" :lg="12" :sm="24" class="none-label">
<a-form-model-item label="button">
<a-button type="primary" class="text-r" @click="handlerReset">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment