Merge branch 'dev' into test

src/views/financialManage/invoiceManage/components/collectionPlanDialog.vue

@@ -126,7 +126,7 @@
   import dictMixins from '@/mixins/dictMixins';
   import tabMixins from '@/mixins/tableColumnsMixin';
   import accountInfoDialog from './accountInfoDialog.vue';
-  import { shippingModeOp, transactionMethodsOp, paymentStatus, paymentType, invoiceStatusOp } from '@/enum/dict.js';
+  import { shippingModeOp, transactionMethodsOp, paymentStatus, paymentType, invoiceStatusOp, paymentTypeOp, shippingModePurchaseOp } from '@/enum/dict.js';
   import { receiptPaymentPlanPage } from '@/api/financialManage/payAndCollectPlan';
   import customerList from '@/views/saleManage/contact/components/parentList.vue';
   import supplierList from '@/views/purchasingManage/supplierManage/components/parentList.vue';
@@ -161,6 +161,9 @@
       }
     },
     computed: {
+      shippingModeOptions() {
+        return this.type == 2 ? shippingModePurchaseOp : shippingModeOp;
+      },
       columns() {
         return [
           {
@@ -291,12 +294,12 @@
           },
           {
             prop: 'deliveryMode',
-            label: '发货模式',
+            label: this.type == 2 ? '收货模式' : '发货模式',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 130,
             formatter: (row) => {
-              return this.shippingModeOp.find(item => item.value == row.deliveryMode)?.label || '';
+              return this.shippingModeOptions.find(item => item.value == row.deliveryMode)?.label || '';
             }
           },
 
@@ -312,7 +315,10 @@
             label: '款项类型',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 200
+            minWidth: 200,
+            formatter: (row) => {
+            return this.paymentTypeOp.find(item => item.value == row.paymentType)?.label || '';
+          }
           },
           {
             prop: 'moneyName',
@@ -326,7 +332,10 @@
             label: '比例',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 140
+            minWidth: 140,
+            formatter: (row) => {
+              return row.paymentRatio + '%';
+            }
           },
           {
             prop: 'planPaymentAmount',
@@ -404,7 +413,7 @@
             align: 'center',
             showOverflowTooltip: true,
             formatter: (_row, _column, cellValue) => {
-              let options = this.menu === 'purchase' ? [
+              let options = this.type == 2 ? [
                 { value: 0, label: '待收货' },
                 { value: 1, label: '部分收货' },
                 { value: 2, label: '全部收货' }
@@ -507,7 +516,8 @@
         selection: [],
         paymentStatus,
         paymentType,
-        invoiceStatusOp
+        invoiceStatusOp,
+        paymentTypeOp
       };
     },
     created() {