Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/settlement/receivable-payable-detail.vue

src/views/settlement/pre-settlement.vue

@@ -29,6 +29,16 @@
                   :value="item.value"
                 />
               </el-select>
+              <el-cascader
+                v-else-if="field.type === 'cascader'"
+                v-model="query[field.prop]"
+                :options="organizationTreeOptions"
+                :props="organizationCascaderProps"
+                clearable
+                filterable
+                style="width: 100%"
+                placeholder="请选择"
+              />
               <el-input v-else v-model="query[field.prop]" clearable placeholder="请输入" />
             </el-form-item>
           </template>
@@ -283,6 +293,7 @@ import {
   voidBill,
 } from '@/api/settlement/preSettlement';
 import { preSettlementSearchFields } from '@/option/settlement/preSettlementSearch';
+import organizationSearch from '@/mixins/organization-search';
 import { preSettlementTableColumns } from '@/option/settlement/preSettlementTable';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
 import { downloadFile } from '@/utils/util';
@@ -292,7 +303,7 @@ const emptyQuery = () => ({
   preSettlementNo: '',
   advanceNo: '',
   projectName: '',
-  deptName: '',
+  deptName: [],
   contractName: '',
   contractNo: '',
   payeeName: '',
@@ -304,6 +315,7 @@ const emptyQuery = () => ({
 export default {
   name: 'PreSettlement',
   components: { PreSettlementEditor },
+  mixins: [organizationSearch],
   data() {
     return {
       ArrowDown,
@@ -357,6 +369,7 @@ export default {
     },
   },
   created() {
+    this.loadOrganizationOptions();
     this.loadTable();
     this.openRouteDetail();
   },
@@ -377,8 +390,10 @@ export default {
     },
     buildQuery() {
       const range = this.query.createDateRange || [];
+      // 所属组织级联返回 id 路径，转成组织名称传给后端（用副本，避免污染搜索框回显）
+      const query = this.normalizeOrganizationSearch({ ...this.query }, 'deptName');
       return {
-        ...this.query,
+        ...query,
         createDateRange: undefined,
         createStartDate: range[0],
         createEndDate: range[1],