dd

src/views/components/editResi.vue

@@ -236,6 +236,7 @@
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
                       :disabled="disabled"
+                      :props="{ emitPath: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">

src/views/components/resiForm.vue

@@ -198,6 +198,7 @@
                       v-else-if="n.itemType === 'cascader'"
                       v-model.trim="form[n.columnName]"
                       :options="n.options"
+                      :props="{ emitPath: false }"
                       clearable
                       size="small"
                       class="resi-cell-select">

src/views/modules/communityParty/members/cpts/record.vue

@@ -54,8 +54,8 @@
             <el-date-picker
               v-if="scope.row.isEdit"
               v-model="scope.row.timeRange"
-              type="daterange"
+              type="monthrange"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -64,7 +64,7 @@
             <div v-else class="div-content">{{ scope.row.startDate + ' - ' + scope.row.endDate }}</div>
           </template>
         </el-table-column>
-        <el-table-column v-if="btnType == 'add'" label="操作" align="center" width="120">
+        <el-table-column v-if="!disabled" label="操作" align="center" width="120">
           <template slot-scope="scope">
             <template v-if="scope.row.isEdit">
               <el-button
@@ -80,7 +80,7 @@
                 class="btn-color-edit"
                 >取消</el-button>
             </template>
-            <!-- <template v-else>
+            <template v-else>
               <el-button
                 @click="handleChange(scope.row, 'edit')"
                 type="text"
@@ -101,7 +101,7 @@
                   >删除</el-button
                 >
               </el-popconfirm>
-            </template> -->
+            </template>
           </template>
         </el-table-column>
       </el-table>

src/views/modules/communityParty/members/crateForm.vue

@@ -216,11 +216,11 @@ export default {
         address: '',
         rdsj: '',
         sszb: '',
-        isLd: '',
+        isLd: '0',
         ldzh: '',
-        partyZw: '',
+        partyZw: '0',
-        isDyzxh: '',
+        isDyzxh: '0',
-        isMxx: '',
+        isMxx: '0',
         culture: '',
         remark: ''
       },
@@ -239,6 +239,7 @@ export default {
       handler(val) {
         if (Object.keys(val).length > 0) {
           this.form = { ...val }
+          if (val.icResiUserId) this.isAuto = true
           console.log('val----------in', val)
           this.partyOrgs = val.orgPids.split(':')
           console.log('partyOrgs-----', this.partyOrgs)

src/views/modules/shequ/cpts/people-more.vue

@@ -484,20 +484,9 @@ export default {
       if (Array.isArray(options)) {
         let valueArr = value.split(",");
         if (type == "cascader") {
-          if (valueArr.length > 0) {
+          let finalValue = [];
-            let level1 = options.find((item) => item.value == valueArr[0]);
+          this.getNodePath(options, value, finalValue);
-            if (level1) {
+          return finalValue.join("-");
-              if (valueArr.length > 1 && level1.children) {
-                let level2 = level1.children.find(
-                  (item) => item.value == valueArr[1]
-                );
-                if (level2) {
-                  return level1.label + "-" + level2.label;
-                }
-              }
-              return level1.label;
-            }
-          }
         } else {
           return valueArr
             .map((val) => {
@@ -513,6 +502,24 @@ export default {
       return "--";
     },
 
+    getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id
+      for (let i = 0; i < node.length; i++) {
+        const ele = node[i];
+        if (ele.value === val) {
+          path.push(ele.label);
+          return path
+        } else if (ele.children && ele.children.length > 0) {
+          if (ele.children.some(row => row.value === val)) {
+            path.unshift(ele.label);
+            this.getNodePath(ele.children,val,path);
+          } else {
+            this.getNodePath(ele.children,val,path);
+          }
+        }
+      }
+      return path;
+    },
+
     //加载组织数据
     async getField() {
       const url = "/oper/customize/icform/getcustomerform";