Merge branch 'stage' into dev0.3

src/views/purchaseManage/purchasePayment/payment/index.vue

@@ -13,7 +13,8 @@
           action: () => purchasePayment(),
         },
       ]"
-      @get-list="getList">
+      @get-list="getList"
+    >
       <template #amount="{ item }">
         <div>
           <span>{{ moneyFormat(item.amount, 2) }}</span>
@@ -25,7 +26,9 @@
       <PaymentPDF :rowData="rowData"></PaymentPDF>
       <template #footer>
         <el-button @click="openPrint = false" size="large">取消</el-button>
-        <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
+        <el-button type="primary" @click="clickDownload()" size="large"
+          >下载PDF</el-button
+        >
       </template>
     </el-dialog>
   </div>
@@ -39,6 +42,7 @@ import PaymentPDF from "@/components/PDF/paymentPDF.vue";
 
 const { proxy } = getCurrentInstance();
 const payStatus = ref([]);
+const payMethod = ref([]);
 const fundsPaymentMethod = ref([]);
 const accountList = ref([]);
 const userList = ref([]);
@@ -114,6 +118,16 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "付款类型",
+        prop: "type",
+        width: 100,
+      },
+      render(type) {
+        return proxy.dictValueLabel(type, payMethod.value);
+      },
+    },
+    {
+      attrs: {
         label: "付款方式",
         prop: "payType",
         width: 160,
@@ -195,48 +209,16 @@ const config = computed(() => {
 });
 const getDict = () => {
   proxy
-    .post("/dictTenantData/page", {
-      pageNum: 1,
-      pageSize: 999,
-      dictCode: "pay_status",
-      tenantId: useUserStore().user.tenantId,
-    })
+    .post("/accountManagement/page", { pageNum: 1, pageSize: 999 })
     .then((res) => {
-      if (res.rows && res.rows.length > 0) {
-        payStatus.value = res.rows.map((item) => {
-          return {
-            label: item.dictValue,
-            value: item.dictKey,
-          };
-        });
-      }
+      accountList.value = res.rows.map((item) => {
+        return {
+          label: item.alias,
+          value: item.id,
+        };
+      });
     });
   proxy
-    .post("/dictTenantData/page", {
-      pageNum: 1,
-      pageSize: 999,
-      dictCode: "funds_payment_method",
-      tenantId: useUserStore().user.tenantId,
-    })
-    .then((res) => {
-      if (res.rows && res.rows.length > 0) {
-        fundsPaymentMethod.value = res.rows.map((item) => {
-          return {
-            label: item.dictValue,
-            value: item.dictKey,
-          };
-        });
-      }
-    });
-  proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 999 }).then((res) => {
-    accountList.value = res.rows.map((item) => {
-      return {
-        label: item.alias,
-        value: item.id,
-      };
-    });
-  });
-  proxy
     .get("/tenantUser/list", {
       pageNum: 1,
       pageSize: 10000,
@@ -253,6 +235,23 @@ const getDict = () => {
         });
       }
     });
+
+  proxy
+    .getDictOne(["funds_payment_method", "pay_method", "pay_status"])
+    .then((res) => {
+      fundsPaymentMethod.value = res["funds_payment_method"].map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      }));
+      payMethod.value = res["pay_method"].map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      }));
+      payStatus.value = res["pay_status"].map((x) => ({
+        label: x.dictValue,
+        value: x.dictKey,
+      }));
+    });
 };
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };