Skip to content

B
bims
Commit 92525925 authored by 朱彩云's avatar 朱彩云
Browse files
Options

Merge branch 'ECCS-1509' into 'master' 

商报调整内容完成上线

See merge request !7
parents cce1778a e2dc83e4
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 59 deletions
src/main.js
View file @ 92525925
......@@ -3,7 +3,7 @@ import App from "./App.vue";
import router from "./router";
import store from "./store";
import globalComponents from "./components";
import utils from "./utils";
import * as utils from "./utils";
import globalMixin from "./mixins";
import apis from "./api/funcs_modules";
import directives from "./directives";
......
src/settings.js
View file @ 92525925
module.exports = {
title: "商保管理系统",
title: "商保智能系统",
}
src/views/charge-query/lpjManage.vue
View file @ 92525925
......@@ -72,7 +72,7 @@
{{ text==1?'已寄送':'未寄送' }}
</template>
<template slot="operation" slot-scope="text, record, index">
<a-button type="link" @click.stop="editEvt(record)">编辑</a-button>
<a-button type="link" @click.stop="editEvt(record, true)">编辑</a-button>
<a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
<a-button type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
</template>
......@@ -175,12 +175,12 @@ export default {
}
},
//编辑
editEvt(record) {
editEvt(record, isEdit) {
const { sendBatchNo } = record;
localStorage.setItem('jisongDataDetail', JSON.stringify(record));
this.$router.push({
path: "/charge-query/lpjManageDetail",
query: { sendBatchNo },
query: { sendBatchNo, isEdit },
});
},
handlerSearch() {
......
src/views/charge-query/lpjManageDetail.vue
View file @ 92525925
......@@ -7,7 +7,7 @@
<a-row :gutter="30">
<a-col :lg="8" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allowClear>
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit">
<a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
......@@ -16,7 +16,7 @@
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="寄送状态">
<a-select v-model="form.sendSts" placeholder="请选择寄送状态" allowClear>
<a-select v-model="form.sendSts" placeholder="请选择寄送状态" allow-clear :disabled="!isEdit">
<a-select-option value="1">已寄送</a-select-option>
<a-select-option value="2">未寄送</a-select-option>
</a-select>
......@@ -24,19 +24,19 @@
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="快递公司">
<a-select v-model="form.sendCompany" placeholder="请选择快递公司" showSearch allowClear>
<a-select v-model="form.sendCompany" placeholder="请选择快递公司" showSearch allow-clear :disabled="!isEdit">
<a-select-option v-for="(item) in expressList" :key="item.id" :value="item.descCh">{{item.descCh}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="快递单号">
<a-input v-model="form.trackingNo" placeholder="请输入快递单号" allow-clear />
<a-input v-model="form.trackingNo" placeholder="请输入快递单号" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="寄送方式">
<a-select v-model="form.sendMode" placeholder="请选择寄送方式" allowClear>
<a-select v-model="form.sendMode" placeholder="请选择寄送方式" allow-clear :disabled="!isEdit">
<a-select-option value="快递">快递</a-select-option>
<a-select-option value="邮件">邮件</a-select-option>
</a-select>
......@@ -49,20 +49,20 @@
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="寄送地址">
<a-input v-model="form.sendAddress" placeholder="请输入寄送地址" allow-clear />
<a-input v-model="form.sendAddress" placeholder="请输入寄送地址" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="寄送邮箱">
<a-input v-model="form.sendEmail" placeholder="请输入寄送邮箱" allow-clear />
<a-input v-model="form.sendEmail" placeholder="请输入寄送邮箱" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="寄送备注">
<a-textarea v-model="form.sendRemark" placeholder="请输入寄送备注" :auto-size="{ minRows: 2, maxRows: 5 }" />
<a-textarea v-model="form.sendRemark" placeholder="请输入寄送备注" :auto-size="{ minRows: 2, maxRows: 5 }" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :sm="24" class="none-label">
<a-col :sm="24" class="none-label" v-if="isEdit">
<div class="btn-div flex">
<span></span>
<a-form-model-item label="button">
......@@ -83,7 +83,7 @@
<a-button type="primary" @click="exportEvt">
<Icon name="ssidaochu" :size="14" />导出
</a-button>
<a-button class="mar-left10" type="primary" @click="addNewBill">
<a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
<Icon :name="isEditNewBill?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewBill? '保存账单': '添加账单'}}</a-button>
</a-form-model-item>
</div>
......@@ -175,6 +175,7 @@ export default {
return {
loading: false,
dialogShow: false,
isEdit: false,
columns,
sendBatchNo: '', //寄送批号
form: {
......@@ -216,7 +217,9 @@ export default {
BurtPagination,
},
created() {
this.sendBatchNo = this.$route.query.sendBatchNo;
const { sendBatchNo, isEdit } = this.$route.query;
this.sendBatchNo = !!sendBatchNo;
this.isEdit = isEdit;
this._getCompanyOptions();
this.getRefcdByRefgrp();
if(this.sendBatchNo){
......
src/views/customer/edit/index.vue
View file @ 92525925
......@@ -112,7 +112,6 @@
<div class="picture">
<a-upload
action=""
accept="image/*"
list-type="picture-card"
:file-list="medCardCopeFiles"
:beforeUpload="uploadMedImg"
......@@ -404,8 +403,16 @@ export default {
}
},
handlePreview(file) {
this.previewImage = file.url;
this.previewVisible = true;
if (!file || !file.url) {
return false
}
var regex=/^.*(jpeg|JPEG|GIF|gif|bmp|BMP|jpg|JPG|PNG|png){1}$/g;
if (regex.test(file.url)) {
this.previewImage = file.url;
this.previewVisible = true;
return true
}
window.open(file.url)
},
handleClose() {
this.previewVisible = false;
......
src/views/verification/collection.vue
View file @ 92525925
......@@ -38,7 +38,7 @@
{{text==1?'待回款':'已回款'}}
</template>
<template slot="operation" slot-scope="text, record, index">
<a-button type="link" @click.stop="editEvt(record)">修改</a-button>
<a-button type="link" @click.stop="editEvt(record, true)">修改</a-button>
<a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
<a-button v-if="record.backMoneyNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
</template>
......@@ -129,13 +129,14 @@ export default {
})
},
//编辑回款
editEvt(record){
editEvt(record, isEdit){
const { backMoneyNo } = record;
localStorage.setItem('backMoneyDataDetail', JSON.stringify(record));
this.$router.push({
path: '/verification/collectionDetail',
query: {
backMoneyNo
backMoneyNo,
isEdit
}
})
},
......
src/views/verification/collectionDetail.vue
View file @ 92525925
......@@ -6,7 +6,7 @@
<a-row :gutter="30">
<a-col :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allowClear>
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit">
<a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
......@@ -15,34 +15,32 @@
</a-col>
<a-col :lg="5" :sm="12">
<a-form-model-item label="回款日期">
<a-date-picker format="YYYY年MM月DD日" v-model="form.backDate" placeholder="选择日期" />
<a-date-picker format="YYYY年MM月DD日" v-model="form.backDate" placeholder="选择日期" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="5" :sm="12">
<a-form-model-item label="回款金额(人民币)">
<a-input type="number" v-model="form.backAmountCny" placeholder="请输入金额"/>
<a-input type="number" v-model="form.backAmountCny" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="5" :sm="12">
<a-form-model-item label="回款金额(美元)">
<a-input type="number" v-model="form.backAmountUsd" placeholder="请输入金额"/>
<a-input type="number" v-model="form.backAmountUsd" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="汇率差">
<a-input v-model="form.backExchangeRate" placeholder="请输入金额" />
<a-input v-model="form.backExchangeRate" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :md="24" :lg="18" class="none-label">
<a-col :md="24" :lg="18" class="none-label" v-if="isEdit">
<a-form-model-item label="button">
<a-button class="mar-left10" type="primary" @click="addNewEvt">
<Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />{{backMoneyNo?'保存回款':'新建回款'}}
</a-button>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="30">
<a-col :md="24" class="none-label">
<a-col :md="24" class="none-label" v-if="isEdit">
<a-form-model-item label="button">
<!-- <a-button class="mar-left10" type="primary" @click="handlerSearch">
<Icon name="ssisearch_active" :size="14" />查询
......@@ -77,7 +75,7 @@
<a-row :gutter="30">
<a-col :lg="12" :sm="24">
<a-form-model-item label="EOB状态" prop="eobSts">
<a-select v-model="editFormObj.eobSts" placeholder="请选择状态" allowClear>
<a-select v-model="editFormObj.eobSts" placeholder="请选择状态" allow-clear>
<a-select-option v-for="(item,i) in EOBStatusOptions" :key="i" :value="item.value">{{item.name}}</a-select-option>
</a-select>
</a-form-model-item>
......@@ -120,11 +118,11 @@ const columns = [
{ title: "EOB回款金额(人民币)", dataIndex: "eobBackMoneyCny", ellipsis: true, width: 190,},
{ title: "EOB回款金额(美元)", dataIndex: "eobBackMoneyUsd", ellipsis: true, width: 190,},
{ title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px", align: "center"},
];
export default {
data() {
return {
isEdit: false,
columns,
EOBStatusOptions,
dialogShow: false,
......@@ -165,13 +163,20 @@ export default {
BurtPagination,
},
created(){
this.backMoneyNo = this.$route.query.backMoneyNo;
const { backMoneyNo, isEdit } = this.$route.query
this.backMoneyNo = backMoneyNo;
this.isEdit = isEdit;
this._getCompanyOptions();
if(this.backMoneyNo){
if(backMoneyNo){
let backMoneyDataDetail = localStorage.getItem('backMoneyDataDetail');
this.form = backMoneyDataDetail? JSON.parse(backMoneyDataDetail): {};
this.getData();
}
if(isEdit) {
this.columns.push(
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px", align: "center"},
)
}
},
methods: {
moment,
......
src/views/verification/index.vue
View file @ 92525925
......@@ -51,7 +51,7 @@
<span>{{text | formatEOBStatus}}</span>
</template>
<template slot="operation" slot-scope="text, record, index">
<a-button type="link" @click.stop="editEvt(record)">修改</a-button>
<a-button type="link" @click.stop="editEvt(record, true)">修改</a-button>
<a-button type="link" class="success" @click.stop="editEvt(record)">查看</a-button>
<a-button v-if="record.eobNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
</template>
......@@ -169,13 +169,14 @@ export default {
})
},
//修改
editEvt(record){
editEvt(record, isEdit){
const { eobNo } = record;
localStorage.setItem('EobDataDetail', JSON.stringify(record));
this.$router.push({
path: '/verification/detail',
query: {
eobNo
eobNo,
isEdit
}
})
}
......
src/views/verification/indexDetail.vue
View file @ 92525925
......@@ -6,7 +6,7 @@
<a-row :gutter="30">
<a-col :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allowClear>
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit">
<a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
......@@ -15,37 +15,37 @@
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB日期">
<a-date-picker format="YYYY年MM月DD日" v-model="form.eobDate" placeholder="选择日期" />
<a-date-picker format="YYYY年MM月DD日" v-model="form.eobDate" placeholder="选择日期" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB名称">
<a-input v-model="form.eobName" placeholder="请输入EOB名称" />
<a-input v-model="form.eobName" placeholder="请输入EOB名称" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB金额(人民币)">
<a-input type="number" v-model="form.eobAmountCny" placeholder="请输入金额"/>
<a-input type="number" v-model="form.eobAmountCny" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB金额(美元)">
<a-input type="number" v-model="form.eobAmountUsd" placeholder="请输入金额"/>
<a-input type="number" v-model="form.eobAmountUsd" placeholder="请输入金额" allow-clear :disabled="!isEdit"/>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB状态">
<a-select v-model="form.eobSts" placeholder="请选择">
<a-select v-model="form.eobSts" placeholder="请选择" allow-clear :disabled="!isEdit">
<a-select-option v-for="(item,i) in EOBStatusOptions" :key="i" :value="item.value">{{item.name}}</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="备注">
<a-input v-model="form.eobRemark" placeholder="请输入备注"/>
<a-input v-model="form.eobRemark" placeholder="请输入备注" allow-clear :disabled="!isEdit"/>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-col :lg="6" :sm="12" v-if="isEdit">
<a-form-model-item label="EOB文件">
<a-upload name="file" :multiple="false" :showUploadList="true"
:fileList="form.eobFile"
......@@ -55,7 +55,7 @@
</a-upload>
</a-form-model-item>
</a-col>
<a-col :lg="24" :sm="24" class="none-label">
<a-col :lg="24" :sm="24" class="none-label" v-if="isEdit">
<a-form-model-item label="button">
<a-button class="mar-left10" type="primary" @click="addNewEvt">
<Icon :name="eobNo?'ssibaocun':'ssiadd'" :size="14" />{{eobNo?'保存EOB':'新建EOB'}}
......@@ -72,7 +72,7 @@
<a-button type="primary" @click="exportEvt">
<Icon name="ssidaochu" :size="14" />导出
</a-button>
<a-button class="mar-left10" type="primary" @click="addNewBill">
<a-button class="mar-left10" type="primary" @click="addNewBill" v-if="isEdit">
<Icon :name="isEditNewEob?'ssibaocun':'ssiadd'" :size="14" />{{isEditNewEob? '保存账单': '添加账单'}}</a-button>
</a-form-model-item>
</a-col>
......@@ -102,7 +102,7 @@
<a-row :gutter="30">
<a-col :lg="12" :sm="24">
<a-form-model-item label="理赔状态" prop="claimsStatus">
<a-select v-model="editFormObj.claimsStatus" placeholder="请选择理赔状态" allowClear>
<a-select v-model="editFormObj.claimsStatus" placeholder="请选择理赔状态" allow-clear>
<a-select-option v-for="(item,i) in ClaimsStatusOptions" :key="i" :value="item.value">{{item.name}}</a-select-option>
</a-select>
</a-form-model-item>
......@@ -148,12 +148,12 @@ const columns = [
{ title: "保险公司欠费", dataIndex: "payorNoPaidAmount", ellipsis: true, width: 110, },
{ title: "个人欠费", dataIndex: "perNoPaidAmount", ellipsis: true, width: 85 },
{ title: "备注", dataIndex: "sendRemark", ellipsis: true, width: 120 },
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "170px", align: "center"},
];
export default {
data() {
return {
dialogShow: false,
isEdit: false,
columns,
ClaimsStatusOptions,
EOBStatusOptions,
......@@ -194,7 +194,9 @@ export default {
BurtPagination,
},
created(){
this.eobNo = this.$route.query.eobNo;
const { eobNo, isEdit } = this.$route.query
this.eobNo = eobNo;
this.isEdit = !!isEdit;
this._getCompanyOptions();
if(this.eobNo){
let EobDataDetail = localStorage.getItem('EobDataDetail');
......@@ -214,6 +216,11 @@ export default {
this.form = dataDetail;
this.getData();
}
if(isEdit) {
this.columns.push(
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" }, fixed: "right", width: "170px", align: "center"},
)
}
},
methods: {
moment,
......
src/views/welfare/info/components/benefits/index.vue
View file @ 92525925
......@@ -39,7 +39,7 @@
</a-collapse-panel>
</a-collapse> -->
<a-row v-for="(item, index) in benefitData" :key="item.benefitCode" class="policy_line" :gutter="10">
<a-col :span="12">{{item.benefitCode + ' ' +item.benefitDesc}}</a-col>
<a-col :span="12">{{item.benefitDesc}}</a-col>
<a-col :span="12" class="border-r">
<a-row :gutter="10">
<a-col :span="12">{{item.benefitConditionDesc}}</a-col>
......
src/views/welfare/info/components/condition/index.vue
View file @ 92525925
......@@ -24,12 +24,12 @@ export default {
{ title: "条件类型", dataIndex: "frequencyDesc" },
{ title: "条件内容", dataIndex: "limitDesc" },
// { title: "最小值", dataIndex: "minValue" },
// { title: "福利限制", dataIndex: "maxValue", customRender: (val, row) => {
// if (row.limitCode.indexOf('07') === 0) {
// return val + '%'
// }
// return val
// }},
{ title: "福利限制", dataIndex: "maxValue", customRender: (val, row) => {
if (row.limitCode.indexOf('07') === 0) {
return val + '%'
}
return val
}},
{ title: "剩余金额", dataIndex: "leftValue" },
{ title: "备注", dataIndex: "remark" }
];
......
src/views/welfare/info/index.vue
View file @ 92525925
......@@ -27,7 +27,7 @@
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="保险卡号" prop="idNo">
<a-form-model-item label="保险卡号" prop="cardNo">
<a-input v-model="form.cardNo" allow-clear placeholder="请输入保险卡号"></a-input>
</a-form-model-item>
</a-col>
......
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