commit

src/main/resources/views/platform/sickHelp/import/excel.html

@@ -239,8 +239,8 @@ layout("/layouts/platform.html"){
             async doImport() {
                 const hasErrorData = this.tableData.some(v => !v.valid)
                 if (hasErrorData) {
-                    this.notifyWarning('数据校验不合格，无法导入')
-                    return
+                    // this.notifyWarning('数据校验不合格，无法导入')
+                    // return
                 }
                 const resp = await $.post('/platform/sickHelp/import/doImport', {sickHelps: JSON.stringify(this.tableData)})
                 if (resp.code === 0) {

src/main/resources/views/platform/sickHelp/medicalIns/index.html

@@ -235,8 +235,8 @@ layout("/layouts/platform.html"){
                     {prop: 'zhzf', label: '账户自付'},
                     {prop: 'xjzl', label: '现金自理'},
                     {prop: 'xjzf', label: '现金自付'},
-                    {prop: 'sxzf', label: '四项之和'},
-                    {prop: 'lxzf', label: '两项之和'},
+                    {prop: 'sxzf', label: '个人自付、个人自理'},
+                    {prop: 'lxzf', label: '个人自付'},
                     {prop: 'ecbx', label: '学校二次报销金额'},
                     {prop: 'calc', label: '补助计算金额'},
                 ],

src/main/resources/views/platform/sickHelp/member/execlImport.html

@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
     <guava ref="guava">
         <el-card shadow="never">
             <template #header>
-                <h3 style="color: rgb(24, 103, 176);">大病医疗互助会员数据导入</h3>
+                <h3 style="color: rgb(24, 103, 176);">重大疾病医疗互助会员数据导入</h3>
             </template>
             <el-row justify="center" style="position: relative" type="flex">
                 <div class="downLoadTemplate">

src/main/resources/views/platform/sickHelp/member/list.html

@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
         </el-card>
 
         <el-card class="mt10" shadow="never">
-            <table-tool :app="this" label="大病医疗互助会员">
+            <table-tool :app="this" label="重大疾病医疗互助会员台账">
                 <template #func>
                     <el-radio-group v-model="pageForm.checkMode" size="small" @change="doSearch" class="mr10">
                         <el-radio-button label="">全部</el-radio-button>
@@ -113,6 +113,11 @@ layout("/layouts/platform.html"){
                         <span v-if="row.isMember==false">否</span>
                         <span v-if="row.isMember==null"></span>
                     </template>
+                    <template scope="{row}" v-else-if="column.prop==='mutualGoldStartTime'">
+                        <span v-if="row.mutualGoldStartTime">
+                              {{moment(row.mutualGoldStartTime).format('YYYY-MM')}}
+                        </span>
+                    </template>
                 </el-table-column>
                 <el-table-column label="操作" width="200">
                     <template scope="{row}">
@@ -167,7 +172,7 @@ layout("/layouts/platform.html"){
                         :picker-options="pickerOptions"
                         placeholder="入会时间"
                         style="width: 100%"
-                        type="date"
+                        type="month"
                         v-model="formData.mutualGoldStartTime"
                         value-format="yyyy-MM-dd">
                 </el-date-picker>
@@ -206,7 +211,7 @@ layout("/layouts/platform.html"){
                 rules: {
                     loginName: [{required: true, message: '请输入工号', trigger: ['change', 'blur']}],
                     userName: [{required: true, message: '请输入姓名', trigger: ['change', 'blur']}],
-                    sex: [{required: true, message: '请选择性别', trigger: ['change', 'blur']}],
+                    // sex: [{required: true, message: '请选择性别', trigger: ['change', 'blur']}],
                     unitName: [{required: false, message: '请输入单位', trigger: ['change', 'blur']}],
                     unitId: [{required: true, message: '请选择单位', trigger: ['change', 'blur']}],
                     isMember: [{required: true, message: '请选择是否会员', trigger: ['change', 'blur']}],