Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

wujianwei

2025-12-23 8194a67f3b9248cc80137c78bd3e005949ec38dc

 ui/admin-ui3/src/views/cwgl/receivableFeeManagement/index.vue

@@ -26,8 +26,8 @@
        </el-button>
      </template>
      <template #menu="{ size, row, index }">
        <el-link class="link-btn"  type="primary" :underline="false" plain
          :size="size" icon="View" @click="handleExamine(row)" v-hasPermi="['cwgl:receivableFeeManagement:view']"> 查看
        <el-link class="link-btn" type="primary" :underline="false" plain :size="size" icon="View"
          @click="handleExamine(row)" v-hasPermi="['cwgl:receivableFeeManagement:view']"> 查看
        </el-link>
        <el-link class="link-btn" v-if="row.status == 0" type="primary" :underline="false" plain :size="size"
          icon="el-icon-edit" @click="handleEdit(row)" v-hasPermi="['cwgl:receivableFeeManagement:edit']"> 编辑
@@ -54,7 +54,7 @@
<script setup name="receivableFeeManagement" lang="ts">
import {
  ReceivableFeeManagementI, addReceivableFeeManagement, delReceivableFeeManagement, exportReceivableFeeManagement, getReceivableFeeManagement, listReceivableFeeManagement, updateReceivableFeeManagement,
  getStatistics, addCreateBill,receivableFeeManagementVoid
  getStatistics, addCreateBill, receivableFeeManagementVoid
} from "@/api/cwgl/receivableFeeManagement";
import useCurrentInstance from "@/utils/useCurrentInstance";
import { computed, reactive, ref, toRefs } from "vue";
@@ -65,7 +65,7 @@
import GenerateBillDialog from '@/components/GenerateBillDialog/index.vue';
import DetailModal from '@/components/DetailModal/index.vue';
import OperationLogModal from '@/components/OperationLogModal/index.vue';
  import { listReceivableFeeManagementLog} from "@/api/cwgl/receivableFeeManagementLog";
import { listReceivableFeeManagementLog } from "@/api/cwgl/receivableFeeManagementLog";



@@ -167,6 +167,21 @@
        }
      ],
    },
    receivableAmountStr: {
      label: '应收金额描述',
      minWidth: 150,
      search: true,
      formatter: (row) => {
        if (!row.receivableAmountStr) return '-';
        // 将空格替换为换行符。如果后端返回的是 "0港币 2420人民币"
        // 我们将其转换为 "0港币\n2420人民币"
        return row.receivableAmountStr.replace(/\s+/g, '\n');
      },
      styles: {
        whiteSpace: 'pre-wrap',
        lineHeight: '1.5'
      },
    },
    documentNo: {
      label: '单据编号',
      minWidth: 150,
@@ -178,7 +193,7 @@
        }
      ],
    },
     isInternalSettlement: {
    isInternalSettlement: {
      label: '是否内部结算',
      search: true,
      minWidth: 120,
@@ -193,7 +208,7 @@
    internalSettlementUnit: {
      label: '内部结算单位',
      minWidth: 150,
       search: true,
      search: true,
    },
    customerName: {
      label: '客户名称',
@@ -319,7 +334,6 @@
      search: true,
      label: '状态',
      fixed: 'right',
      search: true,
      minWidth: 120,
      type: 'select', dataType: 'string', dicUrl: '/system/dict/data/type/sys_charge',
    },
@@ -435,6 +449,7 @@
  getStatistics(ids).then((res) => {
    if (res.code === 200) {
      // 打开弹窗并传入数据
      console.log(selectionList.valu);
      billDialogRef.value.open(res.data, selectionList.value);
    }
  });
@@ -446,9 +461,9 @@
    billType: obj.billType,
    billName: obj.billName,
    statisticsData: statisticsData,
     customerName: selectionList.value[0].customerName,
     isInternalSettlement: selectionList.value[0].isInternalSettlement, 
     internalSettlementUnit: selectionList.value[0].internalSettlementUnit, 
    customerName: selectionList.value[0].customerName,
    isInternalSettlement: selectionList.value[0].isInternalSettlement,
    internalSettlementUnit: selectionList.value[0].internalSettlementUnit,

  };
  addCreateBill(payload).then((res) => {
@@ -487,9 +502,9 @@
const handleFlow = (row: any) => {
  // 这里可以从 row 中直接获取日志，或者调用后端接口查询
  // 示例模拟数据
  listReceivableFeeManagementLog({receivableFeeId:row.id}).then((res) => {
  listReceivableFeeManagementLog({ receivableFeeId: row.id }).then((res) => {
    if (res.code == 200) {
     logModalRef.value.open(res.rows);
      logModalRef.value.open(res.rows,'listReceivableFeeManagementLog');

    }
  });
@@ -504,3 +519,10 @@
};

</script>
<style scoped>
/* 确保 el-table 能够识别换行符 */
:deep(.el-table .cell) {
  white-space: pre-wrap !important;
  word-break: break-all;
}
</style>