Merge remote-tracking branch 'origin/master'

k94314517

2024-10-17 e93b1dddf4f99f83d05688baceeb59cacdd82ec8

 admin/src/views/business/relativeMember.vue

@@ -102,7 +102,7 @@
        <el-table-column prop="isDangyuan" label="是否党员" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.isDangyuan ==1 " style="color: green">党员</span>
            <span v-else >非党员</span>
            <span v-if="row.isDangyuan ==0">非党员</span>
          </template>
        </el-table-column>
        <el-table-column prop="jobDate" label="入职日期" min-width="100px">  </el-table-column>
@@ -228,7 +228,7 @@
        name: '',
        status: '',
        hkStatus: '',
        includeChild: false,
        includeChild: true,
        canVisit: '',
        keyword: '',
        type: 2,
@@ -244,8 +244,8 @@
      working: false,
      canvisiting: false,
      companyTree: [],
      department: [],
      positionList: [],
      department: []
    }
  },
  created () {