From 141eca89c7251e8368397914dab9cb38cc6044cc Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 3 Aug 2023 15:52:55 +0800
Subject: [PATCH] 1

---
 src/js/columns/constants/index.js             |  11 +-
 .../residentManagement/veteran/veteran.vue    | 594 +++++++++---------
 2 files changed, 314 insertions(+), 291 deletions(-)

diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js
index 3aa5b2bf0..320323e84 100644
--- a/src/js/columns/constants/index.js
+++ b/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,
+    },
   ];
   
\ No newline at end of file
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index 671abfa24..1818610d7 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -1,293 +1,296 @@
 <template>
   <div class="g-main">
     <div>
-      <div class="m-search" :class="
-					showSercahStatus
-						? 'm-form-box-height-auto'
-						: 'm-form-box-height'
-				">
-        <el-form
-          :inline="true"
-          :model="formData"
-          ref="ref_searchform"
-          :label-width="'100px'"
+      <div class="m-search">
+        <section
+          :class="
+            showSercahStatus ? 'm-form-box-height-auto' : 'm-form-box-height'
+          "
         >
-          <el-form-item label="姓名">
-            <el-input
-              v-model="formData.name"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="联系电话">
-            <el-input
-              v-model="formData.mobile"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="证件号">
-            <el-input
-              v-model="formData.idNum"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="居住地址">
-            <el-input
-              v-model="formData.currentResidence"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="出生日期">
-            <el-date-picker
-              v-model="formData.birthdayStartTime"
-              type="date"
-              size="small"
-              class="u-item-width-daterange"
-              value-format="yyyy-MM-dd"
-              placeholder="开始日期"
-              :picker-options="startPickerOptions"
-            >
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker
-              v-model="formData.birthdayEndTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-dd"
-              class="u-item-width-daterange u-data-tag"
-              placeholder="结束日期"
-              :picker-options="endPickerOptionsBirthday"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="性别">
-            <el-select
-              v-model="formData.gender"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            >
-              <el-option
-                v-for="item in genderList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+          <el-form
+            :inline="true"
+            :model="formData"
+            ref="ref_searchform"
+            :label-width="'100px'"
+          >
+            <el-form-item label="姓名">
+              <el-input
+                v-model="formData.name"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="联系电话">
+              <el-input
+                v-model="formData.mobile"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="证件号">
+              <el-input
+                v-model="formData.idNum"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="居住地址">
+              <el-input
+                v-model="formData.currentResidence"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="出生日期">
+              <el-date-picker
+                v-model="formData.birthdayStartTime"
+                type="date"
+                size="small"
+                class="u-item-width-daterange"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期"
+                :picker-options="startPickerOptions"
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="民族">
-            <el-select
-              v-model="formData.nation"
-              placeholder="请选择"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            >
-              <el-option
-                v-for="item in dicts.nationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              </el-date-picker>
+              <span class="u-data-tag">至</span>
+              <el-date-picker
+                v-model="formData.birthdayEndTime"
+                type="date"
+                size="small"
+                value-format="yyyy-MM-dd"
+                class="u-item-width-daterange u-data-tag"
+                placeholder="结束日期"
+                :picker-options="endPickerOptionsBirthday"
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="政治面貌">
-            <el-select
-              v-model="formData.politicsStatus"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            >
-              <el-option
-                v-for="item in politicsStatusList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="性别">
+              <el-select
+                v-model="formData.gender"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="文化程度">
-            <el-select
-              v-model="formData.education"
-              placeholder="请选择"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            >
-              <el-option
-                v-for="item in dicts.educationList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                <el-option
+                  v-for="item in genderList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="民族">
+              <el-select
+                v-model="formData.nation"
+                placeholder="请选择"
+                size="small"
+                class="u-item-width-normal"
+                clearable
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="服役单位">
-            <el-input
-              v-model="formData.serviceUnit"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="接收单位">
-            <el-input
-              v-model="formData.receiveUnit"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="入伍日期">
-            <el-date-picker
-              v-model="formData.joinArmyStartTime"
-              type="date"
-              size="small"
-              class="u-item-width-daterange"
-              value-format="yyyy-MM-dd"
-              placeholder="开始日期"
-              :picker-options="startPickerOptions"
-            >
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker
-              v-model="formData.joinArmyEndTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-dd"
-              class="u-item-width-daterange u-data-tag"
-              placeholder="结束日期"
-              :picker-options="endPickerOptionsJoinArmy"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="退伍日期">
-            <el-date-picker
-              v-model="formData.leaveArmyStartTime"
-              type="date"
-              size="small"
-              class="u-item-width-daterange"
-              value-format="yyyy-MM-dd"
-              placeholder="开始日期"
-              :picker-options="startPickerOptions"
-            >
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker
-              v-model="formData.leaveArmyEndTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-dd"
-              class="u-item-width-daterange u-data-tag"
-              placeholder="结束日期"
-              :picker-options="endPickerOptionsLeaveArmy"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="参战日期">
-            <el-date-picker
-              v-model="formData.joinWarStartTime"
-              type="date"
-              size="small"
-              class="u-item-width-daterange"
-              value-format="yyyy-MM-dd"
-              placeholder="开始日期"
-              :picker-options="startPickerOptions"
-            >
-            </el-date-picker>
-            <span class="u-data-tag">至</span>
-            <el-date-picker
-              v-model="formData.joinWarEndTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-dd"
-              class="u-item-width-daterange u-data-tag"
-              placeholder="结束日期"
-              :picker-options="endPickerOptionsJoinWar"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="是否办理公益岗">
-            <el-select
-              v-model="formData.pubWelfareJobFlag"
-              placeholder="请选择"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            >
-              <el-option
-                v-for="item in binaryOptionList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                <el-option
+                  v-for="item in dicts.nationList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="政治面貌">
+              <el-select
+                v-model="formData.politicsStatus"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="备注">
-            <el-input
-              v-model="formData.remark"
-              placeholder="请输入"
-              size="small"
-              class="u-item-width-normal"
-              clearable
-            ></el-input>
-          </el-form-item>
-          <el-row type="flex">
-            <el-col :span="24" align="right">
-              <el-button
-                style="margin-left: 30px"
+                <el-option
+                  v-for="item in politicsStatusList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="文化程度">
+              <el-select
+                v-model="formData.education"
+                placeholder="请选择"
                 size="small"
-                type="primary "
-                @click="handleSearch"
-                >查询</el-button
+                class="u-item-width-normal"
+                clearable
               >
-              <el-button
-                style="margin-left: 10px"
-                is-plain
-                class="diy-button--white el-button--default"
+                <el-option
+                  v-for="item in dicts.educationList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="服役单位">
+              <el-input
+                v-model="formData.serviceUnit"
+                placeholder="请输入"
                 size="small"
-                @click="resetSearch"
-                >重置</el-button
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="接收单位">
+              <el-input
+                v-model="formData.receiveUnit"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="入伍日期">
+              <el-date-picker
+                v-model="formData.joinArmyStartTime"
+                type="date"
+                size="small"
+                class="u-item-width-daterange"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期"
+                :picker-options="startPickerOptions"
               >
-              <el-button
-						type="text"
-						size="small"
-						style="margin-left: 10px"
-						class="f-right5"
-						@click="showSercahStatus = !showSercahStatus"
-					>
-						<i
-							:class="
-								showSercahStatus
-									? 'el-icon-arrow-up'
-									: 'el-icon-arrow-down'
-							"
-						></i>
-						{{ showSercahStatus ? "收起" : "展开" }}
-					</el-button>
-            </el-col>
-          </el-row>
-        </el-form>
+              </el-date-picker>
+              <span class="u-data-tag">至</span>
+              <el-date-picker
+                v-model="formData.joinArmyEndTime"
+                type="date"
+                size="small"
+                value-format="yyyy-MM-dd"
+                class="u-item-width-daterange u-data-tag"
+                placeholder="结束日期"
+                :picker-options="endPickerOptionsJoinArmy"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="退伍日期">
+              <el-date-picker
+                v-model="formData.leaveArmyStartTime"
+                type="date"
+                size="small"
+                class="u-item-width-daterange"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期"
+                :picker-options="startPickerOptions"
+              >
+              </el-date-picker>
+              <span class="u-data-tag">至</span>
+              <el-date-picker
+                v-model="formData.leaveArmyEndTime"
+                type="date"
+                size="small"
+                value-format="yyyy-MM-dd"
+                class="u-item-width-daterange u-data-tag"
+                placeholder="结束日期"
+                :picker-options="endPickerOptionsLeaveArmy"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="参战日期">
+              <el-date-picker
+                v-model="formData.joinWarStartTime"
+                type="date"
+                size="small"
+                class="u-item-width-daterange"
+                value-format="yyyy-MM-dd"
+                placeholder="开始日期"
+                :picker-options="startPickerOptions"
+              >
+              </el-date-picker>
+              <span class="u-data-tag">至</span>
+              <el-date-picker
+                v-model="formData.joinWarEndTime"
+                type="date"
+                size="small"
+                value-format="yyyy-MM-dd"
+                class="u-item-width-daterange u-data-tag"
+                placeholder="结束日期"
+                :picker-options="endPickerOptionsJoinWar"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="是否办理公益岗">
+              <el-select
+                v-model="formData.pubWelfareJobFlag"
+                placeholder="请选择"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              >
+                <el-option
+                  v-for="item in binaryOptionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="备注">
+              <el-input
+                v-model="formData.remark"
+                placeholder="请输入"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+              ></el-input>
+            </el-form-item>
+           
+          </el-form>
+        </section>
+        <el-row type="flex">
+              <el-col :span="24" align="right">
+                <el-button
+                  style="margin-left: 30px"
+                  size="small"
+                  type="primary "
+                  @click="handleSearch"
+                  >查询</el-button
+                >
+                <el-button
+                  style="margin-left: 10px"
+                  is-plain
+                  class="diy-button--white el-button--default"
+                  size="small"
+                  @click="resetSearch"
+                  >重置</el-button
+                >
+                <el-button
+                  type="text"
+                  size="small"
+                  style="margin-left: 10px"
+                  class="f-right5"
+                  @click="showSercahStatus = !showSercahStatus"
+                >
+                  <i
+                    :class="
+                      showSercahStatus
+                        ? 'el-icon-arrow-up'
+                        : 'el-icon-arrow-down'
+                    "
+                  ></i>
+                  {{ showSercahStatus ? "收起" : "展开" }}
+                </el-button>
+              </el-col>
+            </el-row>
       </div>
 
       <div class="m-table">
@@ -412,9 +415,17 @@
             label="性别"
             :show-overflow-tooltip="true"
           >
-          <template slot-scope="scope">
-            <span>{{scope.row.gender!=null?scope.row.gender==1?'男':scope.row.gender==2?'女':'--':'--'}}</span>
-          </template>
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.gender != null
+                  ? scope.row.gender == 1
+                    ? "男"
+                    : scope.row.gender == 2
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="nationName"
@@ -565,18 +576,22 @@
     
       <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";
 import addForm from "./addForm";
 // import detailForm from "./detailForm";
 //   import editForm from "./editForm";
-// 
+//
 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,24 +638,23 @@ export default {
         joinWarEndTime: "",
         pubWelfareJobFlag: 16,
         remark: null,
-       
       },
-      showSercahStatus:false,
+      showSercahStatus: false,
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       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,