Merge branch 'dev' into test

src/views/financialManage/payableManage/components/paymentListDialog.vue

@@ -50,7 +50,7 @@
 <script>
   import { finPayablePageListAPI } from '@/api/financialManage/payableManage';
   import detailDialog1 from './detailDialog1.vue';
-  import { paymentStatus, invoiceStatusOp, transactionMethodsOp } from '@/enum/dict.js';
+  import { paymentType, invoiceStatusOp, transactionMethodsOp } from '@/enum/dict.js';
   import { reviewStatus } from '@/enum/dict';
   export default {
     name: 'collectionDialog',