diff --git a/src/views/modules/base/residentManagement/veteran/addForm.vue b/src/views/modules/base/residentManagement/veteran/addForm.vue
index 0bf1ffd4d..53547bc69 100644
--- a/src/views/modules/base/residentManagement/veteran/addForm.vue
+++ b/src/views/modules/base/residentManagement/veteran/addForm.vue
@@ -83,7 +83,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-
+<!--  -->
         <el-row>
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
@@ -94,6 +94,7 @@
               <el-date-picker
                 v-model="formData.birthday"
                 type="date"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="选择日期"
                 style="width: 202px"
                 clearable
@@ -132,11 +133,15 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">民族: </span>
-              <span>{{ formData.nationName || "--" }}</span>
+              <span>{{ nationName(formData.nation) }}</span>
             </div>
             <el-form-item label-width="100px" label="民族" class="wd-wr" v-else>
               <template>
-                <el-select v-model="formData.nation" placeholder="请选择" clearable>
+                <el-select
+                  v-model="formData.nation"
+                  placeholder="请选择"
+                  clearable
+                >
                   <el-option
                     v-for="item in dicts.nationList"
                     :label="item.label"
@@ -151,7 +156,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">政治面貌: </span>
-              <span>{{ formData.politicsStatusName || "--" }}</span>
+              <span>{{ formData.politicsStatus!=null?formData.politicsStatus==1?'中国共产党党员':formData.politicsStatus==0?'群众':'--':'--'}}</span>
             </div>
             <el-form-item
               label-width="100px"
@@ -182,7 +187,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">文化程度: </span>
-              <span>{{ formData.cultureLevelName || "--" }}</span>
+              <span>{{ cultureLevelName(formData.cultureLevel) }}</span>
             </div>
             <el-form-item
               label-width="100px"
@@ -191,7 +196,11 @@
               v-else
             >
               <template>
-                <el-select v-model="formData.cultureLevel" placeholder="请选择" clearable>
+                <el-select
+                  v-model="formData.cultureLevel"
+                  placeholder="请选择"
+                  clearable
+                >
                   <el-option
                     v-for="item in dicts.educationList"
                     :label="item.label"
@@ -206,7 +215,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">婚姻状况: </span>
-              <span>{{ formData.marriageName || "--" }}</span>
+              <span>{{ marriageName(formData.marriage) }}</span>
             </div>
             <el-form-item
               label-width="100px"
@@ -215,7 +224,11 @@
               v-else
             >
               <template>
-                <el-select v-model="formData.marriage" placeholder="请选择" clearable>
+                <el-select
+                  v-model="formData.marriage"
+                  placeholder="请选择"
+                  clearable
+                >
                   <el-option
                     v-for="item in dicts.marriageList"
                     :label="item.label"
@@ -312,6 +325,7 @@
               <el-date-picker
                 v-model="formData.joinArmyTime"
                 type="date"
+                       value-format="yyyy-MM-dd"
                 placeholder="选择日期"
                 style="width: 202px"
                 clearable
@@ -328,6 +342,7 @@
               <el-date-picker
                 v-model="formData.leaveArmyTime"
                 type="date"
+                       value-format="yyyy-MM-dd"
                 placeholder="选择日期"
                 style="width: 202px"
                 clearable
@@ -569,31 +584,31 @@ export default {
       btnDisable: false,
 
       formData: {
-        name: "张三",
-        mobile: "176777777777",
-        idType: "1",
-        idNum: "370215151515154551",
-        birthday: "2021-04-06",
-        gender: -2827257,
-        nation: "0",
-        politicsStatus: -54855012,
-        cultureLevel: "0",
-        marriage: "0",
-        localResidenceFlag: 0,
-        placeOfDomicile: "十大国际广场",
-        currentResidence: "李沧区",
-        joinArmyTime: "2021-05-07",
-        leaveArmyTime: "2021-05-05",
-        serviceUnit: "火箭军",
-        receiveUnit: "测测",
-        joinWarStartTime: "2021-05-07",
-        joinWarEndTime: "2021-05-07",
-        employmentSituation: "失业",
-        settlementAmount: 0,
-        trainDesc: "汽车维修",
-        pubWelfareJobFlag: 73704271,
-        workUnit: "时代国际广场",
-        remark: "备注",
+        name: "",
+        mobile: "",
+        idType: "",
+        idNum: "",
+        birthday: "",
+        gender: null,
+        nation: "",
+        politicsStatus: null,
+        cultureLevel: "",
+        marriage: "",
+        localResidenceFlag: null,
+        placeOfDomicile: "",
+        currentResidence: "",
+        joinArmyTime: "",
+        leaveArmyTime: "",
+        serviceUnit: "",
+        receiveUnit: "",
+        joinWarStartTime: "",
+        joinWarEndTime: "",
+        employmentSituation: "",
+        settlementAmount: null,
+        trainDesc: "",
+        pubWelfareJobFlag: null,
+        workUnit: "",
+        remark: "",
       },
       endPickerOptionsJoinWar: {
         disabledDate: (time) => endDisabledDate(time, "joinWarStartTime"),
@@ -618,6 +633,7 @@ export default {
         nationList: [],
         educationList: [],
         marriageList: [],
+        idCard_type:[]
       }, //字典对象
     };
   },
@@ -637,39 +653,34 @@ export default {
     async initForm(type, row) {
       this.formType = type;
       this.scopeId = row.categorizedResiId;
-      await this.getDetail();
+      await this.getDetail(this.scopeId );
     },
-    binaryText(value) {
-      let text = "";
-      text = this.binaryOptionList.filter((item) => item.value == value)[0]
-        .label;
-      return text || "--";
+    nationName(val){
+      let filtered = this.dicts.nationList.filter(item=>item.value == val);
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : '--';
+    },
+
+    cultureLevelName(val){
+      let filtered = this.dicts.educationList.filter(item=>item.value == val);
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : '--';
+    },
+    marriageName(val){
+      let filtered = this.dicts.marriageList.filter(item=>item.value == val);
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : '--';
+    },
+    binaryText(val) {
+      let filtered = this.binaryOptionList.filter(item=>item.value == val);
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : '--';
     },
     async getDetail(categorizedResiId) {
-      const url = `/governance/commonDemand/detail/${categorizedResiId}`;
+      const url = `/actual/base/resiCategorized/veteran/detail/${categorizedResiId}`;
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
-        console.log(data);
-        //   let obj = {
-        //     name: "测试",
-        //     mobile: "17555555555",
-        //     idType: "1",
-        //     idNum: "370254111111111111",
-        //     gender: "1",
-        //     localResidenceFlag: 1,
-        //     placeOfDomicile: "青岛市市北区时代国际广场",
-        //     currentResidence: "青岛市李沧区建安小区",
-        //     disabilityCategoryCode: "tingli",
-        //     disabilityLevel: "1",
-        //     disabilityNum: "545461564512167",
-        //     subsistenceAllowanceFlag: 1,
-        //     retirementAmount: 1,
-        //     monthIncome: 200.111,
-        //     contactName: "刘备",
-        //     contactMobile: "15655555454",
-        //     remark: "备注",
-        //   };
-        this.formData = { ...obj };
+        this.formData = { ...data };
       } else {
         this.$message.error(msg);
       }
@@ -681,8 +692,8 @@ export default {
         }
         const url =
           this.formType === "edit"
-            ? "/governance/commonDemand/update"
-            : "/governance/commonDemand/save";
+            ? "/actual/base/resiCategorized/veteran/update"
+            : "/actual/base/resiCategorized/veteran/create";
 
         const { data, code, msg } = await requestPost(url, this.formData);
         if (code === 0) {
@@ -704,8 +715,11 @@ export default {
             formCode: "resi_base_info",
           }),
           this.$http.post("sys/dict/data/dictlist", { dictType: "marriage" }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "idCard_type",
+          }),
         ];
-        const dictKeys = ["nationList", "educationList", "marriageList"];
+        const dictKeys = ["nationList", "educationList", "marriageList","idCard_type"];
         const results = await Promise.all(requests);
         results.forEach((result, index) => {
           if (result.data.code === 0) {
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index 1818610d7..4e717dc40 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -319,11 +319,6 @@
           >
             批量删除
           </el-button>
-          <!-- 
-                :on-success="handleExcelSuccess"
-              :before-upload="beforeExcelUpload"
-              :http-request="uploadHttpRequest"
-           -->
           <el-upload
             :headers="$getElUploadHeaders()"
             ref="upload"
@@ -334,6 +329,8 @@
             :with-credentials="true"
             :show-file-list="false"
             :auto-upload="true"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
           >
             <el-button
               type="primary"
@@ -387,7 +384,7 @@
           <el-table-column
             prop="mobile"
             align="center"
-            width="200"
+            width="150"
             label="联系电话"
             :show-overflow-tooltip="true"
           >
@@ -403,10 +400,13 @@
           <el-table-column
             prop="birthday"
             align="center"
-            width="200"
-            label="证件号"
+            width="150"
+            label="出生日期"
             :show-overflow-tooltip="true"
           >
+         <template slot-scope="scope">
+            {{scope.row.birthday?scope.row.birthday.substr(0,10):'--'}}
+         </template>
           </el-table-column>
           <el-table-column
             prop="genderName"
@@ -505,7 +505,6 @@
                 >查看</el-button
               >
               <el-button
-                v-if="scope.row.serviceStatus === 'in_service'"
                 @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
@@ -548,29 +547,10 @@
       <add-form
         ref="ref_add_form"
         :formType="formType"
-        @handleOk="handleOk"
+        @handleComfirm="handleComfirm"
         @handleClose="handleClose"
       ></add-form>
     </el-dialog>
-    <el-dialog
-      v-if="showDetail"
-      :visible.sync="showDetail"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="detailDiaTitle"
-      :modal-append-to-body="false"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaDetailClose"
-    >
-      <detail-form
-        ref="ref_detail_form"
-        :statusArray="statusArray"
-        @diaDetailClose="diaDetailClose"
-      >
-      </detail-form>
-    </el-dialog>
   </div>
 </template>
     
@@ -585,9 +565,6 @@ 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() {
@@ -613,31 +590,31 @@ export default {
       tableLoading: false,
       user: {},
       agencyId: "",
-      searchH: 170,
+      searchH: 110,
       tableData: [],
       genderList,
       binaryOptionList,
       politicsStatusList,
       formData: {
-        name: "程合存华",
-        mobile: "18164434336",
-        idNum: null,
+        name: "",
+        mobile: "",
+        idNum: "",
         birthdayStartTime: "",
         birthdayEndTime: "",
-        gender: 7,
-        nation: null,
-        politicsStatus: 36,
-        cultureLevel: null,
+        gender: null,
+        nation: "",
+        politicsStatus: null,
+        cultureLevel: "",
         joinArmyStartTime: "",
         joinArmyEndTime: "",
         leaveArmyStartTime: "",
         leaveArmyEndTime: "",
-        serviceUnit: "enim laboris",
-        receiveUnit: null,
+        serviceUnit: "",
+        receiveUnit: "",
         joinWarStartTime: "",
         joinWarEndTime: "",
-        pubWelfareJobFlag: 16,
-        remark: null,
+        pubWelfareJobFlag: null,
+        remark: "",
       },
       showSercahStatus: false,
       pageNo: 1,
@@ -753,8 +730,7 @@ export default {
     //   查看详情触发事件
     async handleDetail(row) {
       this.addDiaTitle = "详情";
-      this.showDetail = true;
-      this.formType = "add";
+      this.formType = "detail";
       this.showAdd = true;
       this.$nextTick(() => {
         this.$refs.ref_add_form.initForm("detail", row);
@@ -766,16 +742,22 @@ export default {
       this.showDetail = false;
     },
     //   编辑触发事件
-    async handleEdit(row) {},
+    async handleEdit(row) {
+      this.addDiaTitle = "详情";
+      this.formType = "edit";
+      this.showAdd = true;
+      this.$nextTick(() => {
+        this.$refs.ref_add_form.initForm("edit", row);
+      });
+    },
     //  新增弹出框组件取消事件
     handleClose() {
       this.formType = "";
       this.showAdd = false;
-      this.showDetail = false;
       this.showEdit = false;
     },
     //  新增弹出框组件确定事件
-    handleOk() {
+    handleComfirm() {
       this.handleClose();
       this.pageNo = 1;
       this.getTableData();
@@ -788,7 +770,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.cancelFuwu([row.id]);
+          this.cancelFuwu([row.categorizedResiId]);
         })
         .catch((err) => {
           if (err == "cancel") {
@@ -797,7 +779,7 @@ export default {
     },
     //   删除处理
     async cancelFuwu(id) {
-      const url = "/governance/icServiceRecordV2/delete";
+      const url = "/actual/base/resiCategorized/veteran/deleteBatch";
       const { data, code, msg } = await requestPost(url, id);
       if (code === 0) {
         this.$message.success("取消成功！");
@@ -809,7 +791,7 @@ export default {
     //   获取列表
     async getTableData() {
       this.tableLoading = true;
-      const url = "/actual/base/resiDisability/page";
+      const url = "/actual/base/resiCategorized/veteran/page";
 
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
@@ -825,9 +807,58 @@ export default {
         this.$message.error(msg);
       }
     },
+    // 导入
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return fileType && isLt1M;
+    },
+
+    async uploadHttpRequest(file) {
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message:
+          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000,
+      });
+      let than = this;
+      document.getElementById("clickA").addEventListener("click", function () {
+        than.$router.replace("/main/importRecord-index");
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post("/actual/base/resiCategorized/veteran/import", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.$message.success("导入成功");
+            this.getTableData();
+            this.$refs.upload.clearFiles();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+    },
     //   导出
     async handleExport() {
-      const url = "/governance/icServiceRecordV2/export";
+      const url = "/actual/base/resiCategorized/veteran/export";
       const { pageSize, pageNo, formData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,