mk 2 years ago
parent
commit
141eca89c7
  1. 11
      src/js/columns/constants/index.js
  2. 42
      src/views/modules/base/residentManagement/veteran/veteran.vue

11
src/js/columns/constants/index.js

@ -28,6 +28,15 @@ export const genderList = [
label: "否",
value: 0,
},
// 更多的数组项...
];
export const politicsStatusList = [
{
label: "中国共产党党员",
value: 1,
},
{
label: "群众",
value: 0,
},
];

42
src/views/modules/base/residentManagement/veteran/veteran.vue

@ -1,11 +1,12 @@
<template>
<div class="g-main">
<div>
<div class="m-search" :class="
showSercahStatus
? 'm-form-box-height-auto'
: 'm-form-box-height'
">
<div class="m-search">
<section
:class="
showSercahStatus ? 'm-form-box-height-auto' : 'm-form-box-height'
"
>
<el-form
:inline="true"
:model="formData"
@ -252,6 +253,9 @@
clearable
></el-input>
</el-form-item>
</el-form>
</section>
<el-row type="flex">
<el-col :span="24" align="right">
<el-button
@ -287,7 +291,6 @@
</el-button>
</el-col>
</el-row>
</el-form>
</div>
<div class="m-table">
@ -413,7 +416,15 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{scope.row.gender!=null?scope.row.gender==1?'男':scope.row.gender==2?'女':'--':'--'}}</span>
<span>{{
scope.row.gender != null
? scope.row.gender == 1
? "男"
: scope.row.gender == 2
? "女"
: "--"
: "--"
}}</span>
</template>
</el-table-column>
<el-table-column
@ -565,7 +576,11 @@
<script>
import { requestPost } from "@/js/dai/request";
import { genderList, binaryOptionList,politicsStatusList } from "@/js/columns/constants";
import {
genderList,
binaryOptionList,
politicsStatusList,
} from "@/js/columns/constants";
import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex";
import axios from "axios";
@ -576,7 +591,7 @@ import addForm from "./addForm";
export default {
components: { addForm },
data() {
let self = this
let self = this;
function endDisabledDate(time, key) {
let nowData = Date.now();
let startTime = self.formData[key];
@ -623,7 +638,6 @@ export default {
joinWarEndTime: "",
pubWelfareJobFlag: 16,
remark: null,
},
showSercahStatus: false,
pageNo: 1,
@ -631,16 +645,16 @@ export default {
total: 1,
endPickerOptionsBirthday: {
disabledDate: (time) => endDisabledDate(time, 'birthdayStartTime'),
disabledDate: (time) => endDisabledDate(time, "birthdayStartTime"),
},
endPickerOptionsJoinArmy: {
disabledDate: (time) => endDisabledDate(time, 'joinArmyStartTime'),
disabledDate: (time) => endDisabledDate(time, "joinArmyStartTime"),
},
endPickerOptionsLeaveArmy: {
disabledDate: (time) => endDisabledDate(time, 'leaveArmyStartTime'),
disabledDate: (time) => endDisabledDate(time, "leaveArmyStartTime"),
},
endPickerOptionsJoinWar: {
disabledDate: (time) => endDisabledDate(time, 'joinWarStartTime'),
disabledDate: (time) => endDisabledDate(time, "joinWarStartTime"),
},
startPickerOptions: {
disabledDate: startDisabledDate,

Loading…
Cancel
Save