打款:付款方式显示问题, 部门费用管理交易金额显示bug

src/views/finance/fundManage/accountPayment/index.vue

@@ -83,6 +83,7 @@ let rules = ref({
 const accountCurrency = ref([]);
 const accountList = ref([]);
 const fundsType = ref([]);
+const fundsPaymentMethod = ref([]);
 const { proxy } = getCurrentInstance();
 const selectConfig = computed(() => {
   return [
@@ -113,7 +114,7 @@ const config = computed(() => {
         prop: "type",
       },
       render(type) {
-        if (type != '20') {
+        if (type != "20") {
           return "请款: " + proxy.dictValueLabel(type, fundsType.value);
         } else {
           return "采购付款 - 申请";
@@ -229,10 +230,11 @@ const formConfig = computed(() => {
       disabled: true,
     },
     {
-      type: "input",
+      type: "select",
       prop: "paymentMethod",
       label: "付款方式",
       disabled: true,
+      data: fundsPaymentMethod.value,
     },
     {
       type: "input",
@@ -324,7 +326,7 @@ const generatePassword = () => {
   return password;
 };
 const getDict = () => {
-  proxy.getDict(["account_currency", "founds_type"]).then((res) => {
+  proxy.getDict(["account_currency", "founds_type", "funds_payment_method"]).then((res) => {
     accountCurrency.value = res.account_currency.map((item) => {
       return {
         label: item.dictValue,
@@ -337,6 +339,12 @@ const getDict = () => {
         value: item.dictKey,
       };
     });
+    fundsPaymentMethod.value = res.funds_payment_method.map((item) => {
+      return {
+        label: item.dictValue,
+        value: item.dictKey,
+      };
+    });
   });
   proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 9999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {

src/views/finance/fundManage/depExpenses/index.vue

@@ -15,8 +15,10 @@
         :action-list="[]"
         @get-list="getList">
         <template #amount="{ item }">
-          <div :style="`color: ${item.amount <= 0 ? 'red' : '#39C55A'}`">
-            {{ item.currency + item.amount }}
+          <div :style="'color: ' + (item.status === '10' ? '#04cb04;' : 'red;')">
+            <span style="padding-right: 4px">{{ item.currency }}</span>
+            <span v-if="item.status === '20'">-</span>
+            <span>{{ moneyFormat(item.amount, 2) }}</span>
           </div>
         </template>
       </byTable>