Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

zhengyiming

3 天以前 0a83c5e811ff2a3ab0bb63b045ae35dc34198128

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient

 src/router/index.ts

@@ -256,19 +256,19 @@
          icon: 'home',
        },
      },
      {
        path: '/BalanceManage',
        name: 'BalanceManage',
        hidden: false,
        alwaysShow: true,
        component: () => import('@/views/ServiceChargeManage/BalanceManage.vue'),
        meta: {
          rank: 10042,
          title: '余额管理',
          // rootMenu: true,
          icon: 'home',
        },
      },
      // {
      //   path: '/BalanceManage',
      //   name: 'BalanceManage',
      //   hidden: false,
      //   alwaysShow: true,
      //   component: () => import('@/views/ServiceChargeManage/BalanceManage.vue'),
      //   meta: {
      //     rank: 10042,
      //     title: '余额管理',
      //     // rootMenu: true,
      //     icon: 'home',
      //   },
      // },
      {
        path: '/ServiceChargeDetail/:id',
        name: 'ServiceChargeDetail',

 src/views/ServiceChargeManage/ServiceChargeDetail.vue

@@ -90,7 +90,7 @@
          :auto-height="false"
          ref="proTable"
          :tableProps="{
            maxHeight: '400px',
            maxHeight: '250px',
          }"
        >
        </ProTableV2>

 src/views/ServiceChargeManage/ServiceChargeManage.vue

@@ -201,7 +201,7 @@
      onClick: (role) => handleExport(role),
    },
    extraProps: {
      hide: () => false,
      hide: () => true,
    },
  },
]);
@@ -288,7 +288,6 @@
});

async function handleAddOrEdit() {
  console.log('editForm: ', editForm);
  goDetail(editForm.id, editForm.settlementUrl[0]?.path);
}