Merge remote-tracking branch 'websoft/master'

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

src/views/settlement/formal-settlement.vue

@@ -27,6 +27,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>
           <div class="formal-page__search-actions">
@@ -168,6 +178,7 @@ import {
   formalSettlementSearchFields,
   paymentStatusOptions,
 } from '@/option/settlement/formalSettlementSearch';
+import organizationSearch from '@/mixins/organization-search';
 import { formalSettlementTableColumns } from '@/option/settlement/formalSettlementTable';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
@@ -176,7 +187,7 @@ const emptyQuery = () => ({
   formalSettlementNo: '',
   preSettlementNo: '',
   projectName: '',
-  deptName: '',
+  deptName: [],
   contractNo: '',
   payerName: '',
   payeeName: '',
@@ -190,6 +201,7 @@ const emptyQuery = () => ({
 export default {
   name: 'FormalSettlement',
   components: { FormalSettlementEditor, FormalSettlementTablePanel },
+  mixins: [organizationSearch],
   data() {
     return {
       ArrowDown,
@@ -231,6 +243,7 @@ export default {
     },
   },
   mounted() {
+    this.loadOrganizationOptions();
     this.loadTable();
     this.openRouteDetail();
   },
@@ -517,7 +530,8 @@ export default {
       XLSX.writeFile(workbook, `正式结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
     },
     buildQueryParams() {
-      const params = { ...this.query };
+      // 所属组织级联返回 id 路径，转成组织名称传给后端（用副本，避免污染搜索框回显）
+      const params = this.normalizeOrganizationSearch({ ...this.query }, 'deptName');
       params.settlementType = this.activeSettlementType;
       const range = params.createDateRange || [];
       delete params.createDateRange;