Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/contract-manage.vue
#	src/views/business/project-apply.vue

src/views/vehicle/customer-archive.vue

@@ -488,7 +488,6 @@
                 >新增联系人</el-button
               >
             </div>
-            <section-card>
               <el-table :data="contactTableData" border class="contact-table">
                 <el-table-column label="序号" prop="__index" width="90" align="center" />
                 <el-table-column label="联系人姓名" prop="contactName" min-width="150" />
@@ -520,7 +519,6 @@
                 @size-change="size => handleDetailSizeChange('contact', size)"
                 @current-change="page => handleDetailCurrentChange('contact', page)"
               />
-            </section-card>
 
           </el-tab-pane>
           <el-tab-pane label="收款信息" name="receiptAccounts">
@@ -1372,6 +1370,8 @@
 </template>
 
 <script>
+import { h } from 'vue';
+import { ElTreeSelect } from 'element-plus';
 import {
   getList,
   getDetail,
@@ -1773,11 +1773,8 @@ export default {
             label: '所属组织',
             prop: 'deptName',
             search: true,
-            searchType: 'select',
             searchOrder: 1,
-            searchValue: '',
             minWidth: 180,
-            dicData: [{ label: '全部', value: '' }],
           },
           {
             label: '准入类型',
@@ -2441,13 +2438,7 @@ export default {
           this.deptOptions = this.flattenDept(this.deptTree);
           this.setDefaultTopLevelDept();
           const deptColumn = this.findColumn(this.option.column, 'deptName');
-          deptColumn.dicData = [
-            { label: '全部', value: '' },
-            ...this.deptOptions.map(item => ({
-              label: item.label,
-              value: item.rawLabel,
-            })),
-          ];
+          deptColumn.renderSearch = scope => this.renderDeptSearch(scope);
         })
         .finally(() => {
           this.deptSearchInitialized = true;
@@ -2669,6 +2660,31 @@ export default {
       this.archiveForm.deptName = deptNames.join(',');
       this.$refs.archiveForm?.validateField('deptName');
     },
+    renderDeptSearch(scope) {
+      // 搜索区所属组织：多选树形下拉（与新增/编辑表单一致）
+      // 多选返回 ID 数组，转换为部门名称按逗号拼接写入 searchForm.deptName
+      return h(ElTreeSelect, {
+        modelValue: Array.isArray(scope.row?.deptName) ? scope.row.deptName : [],
+        'onUpdate:modelValue': value => {
+          // 多选模式：modelValue 必须是 ID 数组，否则 el-tree-select 内部状态会错乱导致无法再次选中
+          const ids = Array.isArray(value) ? value : value ? [value] : [];
+          if (scope.row) scope.row.deptName = ids;
+        },
+        data: this.deptTree,
+        'node-key': 'value',
+        'check-strictly': true,
+        multiple: true,
+        filterable: true,
+        clearable: true,
+        'render-after-expand': false,
+        collapseTags: true,
+        'collapse-tags-tooltip': true,
+        'default-expand-all': false,
+        style: 'width: 100%',
+        placeholder: '请选择 所属组织',
+        props: { label: 'label', value: 'value', children: 'children' },
+      });
+    },
     handleNoFixedTermChange(checked) {
       this.archiveForm.businessTermType = checked ? '长期' : '固定期限';
       if (checked) {
@@ -4529,6 +4545,13 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
+      // 搜索区所属组织多选返回的是部门 ID 数组，需转成部门名称逗号串传给后端（与列表接口 deptName 字段一致）
+      if (Array.isArray(params.deptName)) {
+        params.deptName = params.deptName
+          .map(id => this.deptOptions.find(item => String(item.value) === String(id))?.rawLabel)
+          .filter(Boolean)
+          .join(',');
+      }
       this.query = this.buildQuery(params);
       this.page.currentPage = 1;
       this.onLoad(this.page);