From 9bbd28130dfcf2ab854394c2df1f1118eb3e8065 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 19 Oct 2023 16:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8E=E4=BF=9D=E4=BA=BA=E5=91=98=E9=80=80?=
 =?UTF-8?q?=E4=BC=91=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../residentManagement/subsistenceAllowance/addForm.vue  | 9 ++-------
 .../subsistenceAllowance/subsistenceAllowance.vue        | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
index 245015e50..39ff63726 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
@@ -118,7 +118,7 @@
                 formData.localResidenceFlag != null
                 ? formData.localResidenceFlag == 1
                   ? "是"
-                  : formData.gender == 2
+                  : formData.localResidenceFlag == 0
                     ? "否"
                     : "--"
                 : "--"
@@ -220,7 +220,7 @@
               <span>{{ formData.retireTime || '--' }}</span>
             </div>
             <el-form-item label-width="100px" label="离退休时间" v-else>
-              <el-date-picker v-model="formData.retireTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+              <el-date-picker v-model="formData.retireTime" type="date" value-format="yyyy-MM-dd"
                 placeholder="选择日期" style="width: 202px" clearable>
               </el-date-picker>
             </el-form-item>
@@ -262,10 +262,6 @@ export default {
       type: String,
       default: "manage",
     },
-    formType: {
-      type: Object,
-      default: "add"
-    }
   },
 
   data() {
@@ -310,7 +306,6 @@ export default {
       dataRule: {
         name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
         idNum: [{ required: true, message: "证件号不能为空", trigger: "bulr" }],
-
         idType: [
           { required: true, message: "证件类型不能为空", trigger: "bulr" },
         ],
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
index f9588c005..0323a38e0 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/subsistenceAllowance.vue
@@ -357,6 +357,9 @@ export default {
       this.addDiaTitle = "新增";
       this.formType = "add";
       this.showAdd = true;
+      this.$nextTick(() => {
+        this.$refs.ref_add_form.initForm("add");
+      });
     },
     //   查看详情触发事件
     async handleDetail(row) {