业务审批

src/views/business-approval/by-stages-apply/index.vue

@@ -308,9 +308,15 @@
           width: 60,
           slots: {
             default: ({ row }) => {
-              return (
-                <>{Array.from(new Set(row.loans.map((v) => v?.cpe?.username))).join(',')}</>
-              );
+              if (row.cpe?.username) {
+                return (
+                  <>{row.cpe?.username}</>
+                );
+              } else {
+                return (
+                  <>{Array.from(new Set(row.loans.map((v) => v?.cpe?.username))).join(',')}</>
+                );
+              }
             },
           },
           // search: { el: 'input', props: { clearable: true }, key: 'cpeName', labelWidth: 78 },
@@ -319,9 +325,15 @@
           showOverflow: 'tooltip',
           slots: {
             default: ({ row }) => {
-              return (
-                <>{Array.from(new Set(row.loans.map((v) => v?.tenant?.name))).join(',')}</>
-              );
+              if (row.tenant?.name) {
+                return (
+                  <>{row.tenant?.name}</>
+                );
+              } else {
+                return (
+                  <>{Array.from(new Set(row.loans.map((v) => v?.tenant?.name))).join(',')}</>
+                );
+              }
             },
           },
           enum: () => getTenantPage({ current: 1, size: 999999999, status: 'enable' }),

src/views/business-approval/reduction-apply/index.vue

@@ -255,9 +255,15 @@
           width: 60,
           slots: {
             default: ({ row }) => {
-              return (
-                <>{Array.from(new Set(row.reduceRecords.map((v) => v.loan?.cpe?.username))).join(',')}</>
-              );
+              if (row.cpe?.username) {
+                return (
+                  <>{row.cpe?.username}</>
+                );
+              } else {
+                return (
+                  <>{Array.from(new Set(row.reduceRecords.map((v) => v.loan?.cpe?.username))).join(',')}</>
+                );
+              }
             },
           },
           // search: { el: 'input', props: { clearable: true }, key: 'cpeName', labelWidth: 78 },
@@ -266,9 +272,16 @@
           showOverflow: 'tooltip',
           slots: {
             default: ({ row }) => {
-              return (
-                <>{Array.from(new Set(row.reduceRecords.map((v) => v.loan?.tenant?.name))).join(',')}</>
-              );
+              if (row.tenant?.name) {
+                return (
+                  <>{row.tenant?.name}</>
+                );
+              } else {
+                return (
+                  <>{Array.from(new Set(row.reduceRecords.map((v) => v.loan?.tenant?.name))).join(',')}</>
+                );
+              }
+              
             },
           },
           enum: () => getTenantPage({ current: 1, size: 999999999, status: 'enable' }),

src/views/business-approval/repair-approve/index.vue

@@ -40,6 +40,7 @@
   import { reactive, ref } from 'vue';
   import { getRepairRecord, RepairRecordStatusByIds } from '@/api/property';
   import { ElMessageBox, ElMessage, ElButton } from 'element-plus';
+  import { getTenantPage } from '@/api/tenant';
 
   const tabledata = ref([]);
   const showModal = ref(false);
@@ -144,6 +145,34 @@
           labelWidth: 95,
         },
       },
+      {
+          title: 'CPE',
+          showOverflow: 'tooltip',
+          width: 60,
+          slots: {
+            default: ({ row }) => {
+              return (
+                <>{row.cpe?.username}</>
+              );
+            },
+          },
+          // search: { el: 'input', props: { clearable: true }, key: 'cpeName', labelWidth: 78 },
+        },
+        {
+          showOverflow: 'tooltip',
+          slots: {
+            default: ({ row }) => {
+              return (
+                <>{row.tenant?.name}</>
+              );
+            },
+          },
+          enum: () => getTenantPage({ current: 1, size: 999999999, status: 'enable' }),
+          // search: { el: 'select', props: { filterable: true }, key: 'tenantId', labelWidth: 78 },
+          fieldNames: { label: 'name', value: 'id' },
+          title: '调解中心',
+          width: 100,
+        },
       {
         field: 'kinship',
         title: '与债权人关系',

src/views/business-approval/repayment-approve/index.vue

@@ -144,7 +144,7 @@
               } else if (row.stages && row.stages.loans) {
                 return <>{Array.from(new Set(row.stages.loans.map((v) => v?.cpe?.username))).join(',')}</>;
               } else {
-                return <>{row.loan?.cpe?.username}</>;
+                return <>{row.cpe?.username}</>;
               }
             },
           },
@@ -157,15 +157,15 @@
               if (row.reduce && row.reduce.reduceRecords) {
                 return (
                   <>
-                    {Array.from(new Set(row.reduce.reduceRecords.map((v) => v.loan?.tenant?.username))).join(
+                    {Array.from(new Set(row.reduce.reduceRecords.map((v) => v.loan?.tenant?.name))).join(
                       ','
                     )}
                   </>
                 );
               } else if (row.stages && row.stages.loans) {
-                return <>{Array.from(new Set(row.stages.loans.map((v) => v?.tenant?.username))).join(',')}</>;
+                return <>{Array.from(new Set(row.stages.loans.map((v) => v?.tenant?.name))).join(',')}</>;
               } else {
-                return <>{row.loan?.tenant?.username}</>;
+                return <>{row.tenant?.name}</>;
               }
             },
           },

src/views/property/repair-manage/index.vue

@@ -46,6 +46,8 @@
   import { getRepairRecord, importExcel } from '@/api/property';
   import { Upload } from '@element-plus/icons-vue';
   import { ElMessage } from 'element-plus';
+  import { getTenantPage } from '@/api/tenant';
+
   const uploadRef = ref();
 
   const caseLRef = ref();
@@ -191,6 +193,34 @@
           );
         },
       },
+      {
+          title: 'CPE',
+          showOverflow: 'tooltip',
+          width: 60,
+          slots: {
+            default: ({ row }) => {
+              return (
+                <>{row.cpe?.username}</>
+              );
+            },
+          },
+          // search: { el: 'input', props: { clearable: true }, key: 'cpeName', labelWidth: 78 },
+        },
+        {
+          showOverflow: 'tooltip',
+          slots: {
+            default: ({ row }) => {
+              return (
+                <>{row.tenant?.name}</>
+              );
+            },
+          },
+          enum: () => getTenantPage({ current: 1, size: 999999999, status: 'enable' }),
+          // search: { el: 'select', props: { filterable: true }, key: 'tenantId', labelWidth: 78 },
+          fieldNames: { label: 'name', value: 'id' },
+          title: '调解中心',
+          width: 100,
+        },
       {
         field: 'repairStatus',
         title: '是否修复',