From fcec3fa4f5067568c9ca6951c79f9207752ffe46 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 13 Jun 2022 14:15:58 +0800
Subject: [PATCH] dd

---
 src/views/components/resiForm.vue             | 34 ++++++++++++-------
 .../communityParty/members/crateForm.vue      | 11 +++---
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index db3d6ac9..505fe55c 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -297,18 +297,27 @@ export default {
     let initForm = (obj, arr) => {
       let _form = {}
       console.log('formInfo---obj', obj)
-      if (Object.keys(obj).length > 0) {
-        for(const n in obj) {
-          if (obj[n] == null) obj[n] = ''
-        }
-        _form = { ...obj }
-        return _form
-      }
+      // if (Object.keys(obj).length > 0) {
+      //   for(const n in obj) {
+      //     if (obj[n] == null) obj[n] = ''
+      //   }
+      //   _form = { ...obj }
+      //   return _form
+      // }
+      const len = Object.keys(obj).length
       arr.forEach(item => {
-
-        if (item.multiSelect) _form[item.columnName] = []
-        else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
-        else _form[item.columnName] = ''
+        if (len) {
+          if (obj[item.columnName]) {
+            _form[item.columnName] = obj[item.columnName]
+            item.isChange = true
+          }
+          
+        } else {
+          if (item.multiSelect) _form[item.columnName] = []
+          else if (item.itemType == 'radio' && item.defaultValue == '0') _form[item.columnName] = item.defaultValue
+          else _form[item.columnName] = ''
+        }
+        
 
         // if (item.optionSourceType === 'remote') {
         //   this.getOptionsLists(item.optionSourceValue).then(res => {
@@ -343,9 +352,10 @@ export default {
     let rules = initRules(this.formList)
     console.log('rulessss', rules)
     let tempFormList = [ ...this.formList ].map(item => {
+      const isChange = (item.itemType == 'radio' && item.defaultValue == '0') && true
       return {
         ...item,
-        isChange: (item.itemType == 'radio' && item.defaultValue == '0') ? true : false
+        isChange: isChange || item.isChange || false
       }
     })
     let constForm = {
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index c06c503f..7076fada 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -6,7 +6,7 @@
       <div class="flex-div">
         <el-form-item label="所属党组织" prop="sszb" class="wd50">
           <el-cascader
-                v-model="partyOrgs"
+                v-model="form.sszb"
                 :options="partyList"
                 :props="partyProps"
                 clearable
@@ -252,6 +252,7 @@ export default {
   },
   created() {
     this.getEduList()
+    console.log('partyList', this.partyList)
   },
   mounted() {
     const w = document.getElementsByClassName('dialog-h-content')[0]
@@ -267,10 +268,10 @@ export default {
     },
     handlePartyChange(val) {
       console.log('val------pp', val)
-      if (val.length > 0) {
-        const i = val.length - 1
-        this.form.sszb = val[i]
-      } else this.form.sszb = ''
+      // if (val.length > 0) {
+      //   const i = val.length - 1
+      //   this.form.sszb = val[i]
+      // } else this.form.sszb = ''
     },
     handleValidBlur(n) {
       if (!isCard(this.form.idCard)) return