Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

src/views/user_informationg/index.vue

@@ -5,11 +5,45 @@
         <el-form-item label="公司名称" prop="company_id">
           <el-input
             class="w-[280px]"
-            v-model="queryParams.name"
+            v-model="queryParams.company_name"
             clearable
             placeholder="请输入公司"
           />
         </el-form-item>
+        <el-form-item label="队长姓名" prop="company_id">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.nickname"
+            clearable
+            placeholder="请输入队长姓名"
+          />
+        </el-form-item>
+        <el-form-item label="档案名称" prop="company_id">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.name"
+            clearable
+            placeholder="请输入档案姓名"
+          />
+        </el-form-item>
+        <el-form-item label="小队" prop="company_id">
+          <ElSelect
+            v-model="queryParams.brigade"
+            placeholder="请选择小队"
+            clearable
+            :style="{ width: '100%' }"
+          >
+            <el-option
+              v-for="(item, index) in [
+                { brigade_name: '1队', id: '1' },
+                { brigade_name: '2队', id: '2' },
+              ]"
+              :key="index"
+              :label="item.brigade_name"
+              :value="item.id"
+            ></el-option>
+          </ElSelect>
+        </el-form-item>
 
         <el-form-item>
           <el-button type="primary" @click="resetPage">查询</el-button>
@@ -24,16 +58,13 @@
               {{ row.extend?.company_name }}
             </template>
           </el-table-column>
-          <el-table-column label="所属地区" show-overflow-tooltip>
+          <el-table-column width="260px" label="所属地区" show-overflow-tooltip>
             <template #default="{ row }">
               <!-- <dict-value :options="dictData.show_status" :value="row.status" /> -->
-
+              {{ row.area_name + row.street_name + row.village_name }}
-              {{
+              <text v-for="(item, index) in row.brigade_name" :key="index">{{
-                row.area_name +
+                item.brigade_name
-                row.street_name +
+              }}</text>
-                row.village_name +
-                row.brigade_name
-              }}
             </template>
           </el-table-column>
           <el-table-column label="队长姓名" prop="phone" show-overflow-tooltip>
@@ -118,6 +149,9 @@ const showEdit = ref(false);
 // 查询条件
 const queryParams = reactive({
   name: "",
+  company_name: "",
+  nickname: "",
+  brigade: "",
 });
 
 // 选中数据