up

src/pages/Cledger/C1ledger/index.tsx

@@ -109,80 +109,52 @@ function C1ledger() {
         {
           key: '1',
           label: '入库',
-<<<<<<< HEAD
-          onClick: () => authorityFu(1010, '您没有藏品入库权限！', () => history.push(`/inStorage`))
-=======
           onClick: () =>
             authorityFu(1010, '您没有藏品入库权限！', () => history.push(`/inStorage_edit/1/null`))
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         },
         {
           key: '2',
           label: '移库',
           onClick: () =>
-<<<<<<< HEAD
-            authorityFu(1020, '您没有藏品移库权限！', () => history.push(`/moveStorage`))
-=======
             authorityFu(1020, '您没有藏品移库权限！', () =>
               history.push(`/moveStorage_edit/1/null`)
             )
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         },
         {
           key: '3',
           label: '出库',
           onClick: () =>
-<<<<<<< HEAD
-            authorityFu(1030, '您没有藏品出库权限！', () => history.push(`/outStorage`))
-=======
             authorityFu(1030, '您没有藏品出库权限！', () => history.push(`/outStorage_edit/1/null`))
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         }
       ],
       weihu: [
         {
           key: '1',
           label: '鉴定登记',
-<<<<<<< HEAD
-          onClick: () => authorityFu(230, '您没有藏品鉴定登记权限！', () => history.push(`/auth`))
-=======
           onClick: () =>
             authorityFu(230, '您没有藏品鉴定登记权限！', () => history.push(`/auth_edit/1/null`))
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         },
         {
           key: '2',
           label: '事故登记',
           onClick: () =>
-<<<<<<< HEAD
-            authorityFu(510, '您没有藏品事故登记权限！', () => history.push(`/accident`))
-=======
             authorityFu(510, '您没有藏品事故登记权限！', () =>
               history.push(`/accident_edit/1/null`)
             )
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         },
         {
           key: '3',
           label: '现状登记',
           onClick: () =>
-<<<<<<< HEAD
-            authorityFu(540, '您没有藏品现状登记权限！', () => history.push(`/actuality`))
-=======
             authorityFu(540, '您没有藏品现状登记权限！', () =>
               history.push(`/actuality_edit/1/null`)
             )
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         },
         {
           key: '4',
           label: '修复登记',
-<<<<<<< HEAD
-          onClick: () => authorityFu(550, '您没有藏品修复登记权限！', () => history.push(`/repair`))
-=======
           onClick: () =>
             authorityFu(550, '您没有藏品修复登记权限！', () => history.push(`/repair_edit/1/null`))
->>>>>>> d3df534f955954d364d315b426133b1eeb32f3c8
         }
       ]
     }