Merge branch '周五演示分支' into preview

src/components/GridTree/nodeWrap.vue

@@ -35,7 +35,7 @@
                     </div>
                   </div>
                   <div v-if="item.level === 'unit_chief'">
-                    <div @click="gotoPersonnel(item)" :class="[item.categoryWarn === 'red' ? 'dyzxhRed' : item.categoryWarn === 'yellow' ? 'dyzxhYellow' : item.categoryWarn === 'green' ? 'dyzxhGreen' : '', item.children && item.children.length > 0 ? 'dyzxhHover' : 'dyzxh']" :title="item.organizationName">
+                    <div @click="gotoPersonnel(item)" :class="[ item.id === '1704434839867420673'?'dyzxhYellow':'dyzxhGreen']" :title="item.organizationName">
                       <!-- {{ spliceNameFun(item.organizationName, 3) }} -->
                       {{ item.organizationName }}
                     </div>

src/views/components/resiSearch.vue

@@ -78,14 +78,7 @@
 
           </el-select>
         </el-form-item>
-        <el-form-item label="关注人群">
-          <el-select v-model="form.attentionCrowds" collapse-tags multiple class="u-item-width-normal" clearable
-            size="small">
-            <template v-for="item in resiClass">
-              <el-option :label='item.label' :value='item.value'> </el-option>
-            </template>
-          </el-select>
-        </el-form-item>
+      
         <el-form-item label="名称模糊查询">
           <el-select v-model="basicType" class="u-item-width-service" clearable size="small">
             <template >
@@ -113,7 +106,22 @@
             placeholder="请输入" clearable size="small">
           </el-input>
         </el-form-item>
+        <el-form-item label="关注人群">
+          <el-select v-model="form.attentionCrowds" collapse-tags multiple class="u-item-width-normal" clearable
+            size="small">
+            <template v-for="item in resiClass">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="身份">
+          <el-select v-model="form.projectStaff" class="u-item-width-normal" clearable size="small">
+            <template v-for="item in projectStaffList">
+              <el-option :label='item.label' :value='item.value'> </el-option>
+            </template>
 
+          </el-select>
+        </el-form-item>
         <el-form-item label="特殊人群">
           <el-select v-model="form.specialCategoryCodes" class="u-item-width-normal" clearable size="small" collapse-tags
             multiple>
@@ -312,19 +320,19 @@ export default {
       projectStaffList: [
         {
           label: '志愿者',
-          value: 'volunteerFlag'
+          value: 'VOLUNTEER_FLAG'
         },
         {
           label: '楼长',
-          value: 'buildingChiefFlag'
+          value: 'BUILDING_CHIEF_FLAG'
         },
         {
           label: '单元长',
-          value: 'unitChiefFlag'
+          value: 'UNIT_CHIEF_FLAG'
         },
         {
           label: '公益岗',
-          value: 'publicWelfareFlag'
+          value: 'PUBLIC_WELFARE_FLAG'
         }
       ],
       specialCategoryList: [

src/views/dataBoard/organizational/dangTree/index.vue

@@ -124,7 +124,7 @@ export default {
         [5, "党委"],
         [6, "党总支"],
         [7, "党支部"],
-        [8, "楼院党小组"],
+        [8, "党小组"],
         [9, "党员中心户"],
         [10, "联系家庭"],
       ]);

src/views/dataBoard/organizational/index.vue

@@ -32,7 +32,7 @@ export default {
       levelArr: [1, 2, 3, 4],
       navList: [
         {
-          name: "动力主轴",
+          name: "党委架构",
           key: "1",
           path: "/organizational/dangTree",
         },