Merge remote-tracking branch 'websoft/master'

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

src/views/payment/bill-payment.vue

@@ -48,6 +48,7 @@ import BillPaymentTable from './components/bill-payment-table.vue';
 const emptyQuery = () => ({
   paymentNo: '',
   deptName: '',
+  deptPath: [],
   paymentDateRange: [],
   approvalStatus: '',
 });

src/views/payment/components/bill-payment-search.vue

@@ -6,18 +6,15 @@
           <el-input v-model="query.paymentNo" clearable placeholder="请输入" />
         </el-form-item>
         <el-form-item label="使用部门">
-          <el-tree-select
-            :model-value="query.deptName"
-            :data="organizationTreeOptions"
-            node-key="id"
-            check-strictly
+          <el-cascader
+            v-model="query.deptPath"
+            :options="organizationTreeOptions"
+            :props="organizationCascaderProps"
             filterable
             clearable
-            render-after-expand
             style="width: 100%"
             placeholder="请选择 所属组织"
-            :props="{ label: 'label', value: 'id', children: 'children' }"
-            @update:model-value="val => { query.deptName = findOrgById(val)?.rawLabel || val }"
+            @change="val => { query.deptName = findOrgById(val)?.rawLabel || '' }"
           />
         </el-form-item>
         <el-form-item label="付款日期">

src/views/payment/invoice-application.vue

@@ -10,18 +10,15 @@
             <el-input v-model="query.projectName" clearable placeholder="请输入" />
           </el-form-item>
           <el-form-item label="所属组织">
-            <el-tree-select
-              :model-value="query.deptName"
-              :data="organizationTreeOptions"
-              node-key="id"
-              check-strictly
+            <el-cascader
+              v-model="query.deptPath"
+              :options="organizationTreeOptions"
+              :props="organizationCascaderProps"
               filterable
               clearable
-              render-after-expand
               style="width: 100%"
               placeholder="请选择 所属组织"
-              :props="{ label: 'label', value: 'id', children: 'children' }"
-              @update:model-value="val => { query.deptName = findOrgById(val)?.rawLabel || val }"
+              @change="val => { query.deptName = findOrgById(val)?.rawLabel || '' }"
             />
           </el-form-item>
           <el-form-item class="invoice-kingdee-item" label="金蝶单据状态">
@@ -252,6 +249,7 @@ const emptyQuery = () => ({
   applicationNo: '',
   projectName: '',
   deptName: '',
+  deptPath: [],
   kingdeeStatus: '',
   approvalStatus: '',
 });

src/views/payment/invoice-receipt.vue

@@ -19,18 +19,15 @@
             <el-input v-model="query.projectName" clearable placeholder="请输入" />
           </el-form-item>
           <el-form-item label="所属组织">
-            <el-tree-select
-              :model-value="query.deptName"
-              :data="organizationTreeOptions"
-              node-key="id"
-              check-strictly
+            <el-cascader
+              v-model="query.deptPath"
+              :options="organizationTreeOptions"
+              :props="organizationCascaderProps"
               filterable
               clearable
-              render-after-expand
               style="width: 100%"
               placeholder="请选择 所属组织"
-              :props="{ label: 'label', value: 'id', children: 'children' }"
-              @update:model-value="val => { query.deptName = findOrgById(val)?.rawLabel || val }"
+              @change="val => { query.deptName = findOrgById(val)?.rawLabel || '' }"
             />
           </el-form-item>
           <el-form-item v-if="searchExpanded" label="审核状态">
@@ -245,6 +242,7 @@ const emptyQuery = () => ({
   invoiceDate: '',
   projectName: '',
   deptName: '',
+  deptPath: [],
   approvalStatus: '',
   kingdeeStatus: '',
 });

src/views/payment/payment-application.vue

@@ -23,18 +23,15 @@
           /></el-form-item>
           <template v-if="searchExpanded">
             <el-form-item label="所属组织"
-              ><el-tree-select
-                :model-value="query.deptName"
-                :data="organizationTreeOptions"
-                node-key="id"
-                check-strictly
+              ><el-cascader
+                v-model="query.deptPath"
+                :options="organizationTreeOptions"
+                :props="organizationCascaderProps"
                 filterable
                 clearable
-                render-after-expand
                 style="width: 100%"
                 placeholder="请选择 所属组织"
-                :props="{ label: 'label', value: 'id', children: 'children' }"
-                @update:model-value="val => { query.deptName = findOrgById(val)?.rawLabel || val }"
+                @change="val => { query.deptName = findOrgById(val)?.rawLabel || '' }"
             /></el-form-item>
             <el-form-item label="关联结算单"
               ><el-input v-model="query.settlementNo" clearable
@@ -243,6 +240,7 @@ const emptyQuery = () => ({
   payeeName: '',
   projectName: '',
   deptName: '',
+  deptPath: [],
   settlementNo: '',
   paymentType: '',
   approvalStatus: '',