todo
This commit is contained in:
parent
c7128fcfb0
commit
d9c2aef5ae
|
|
@ -27,6 +27,7 @@ import GenerateDeclarationDetail from "./pages/declare/generateDeclarationDetail
|
|||
import BaseForm from "./components";
|
||||
import TemplatePreview from "./pages/payroll/templatePreview";
|
||||
import MobilePayroll from './pages/mobilePayroll'
|
||||
import WeaDraggableTable from './components/testWeatable'
|
||||
|
||||
import stores from "./stores";
|
||||
import "./style/index";
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ export default class SalaryItemForm extends React.Component {
|
|||
if(item.items) {
|
||||
item.items && item.items.map(i => {i.key = i.id})
|
||||
return (
|
||||
<CanMoveItem dataSource={item.items}
|
||||
<CanMoveItem dataSource={toJS(item.items)}
|
||||
onDataSourceChange={(dataSource) => {this.handleItemDataSourceChange(dataSource, item)}} title={item.name}
|
||||
onGroupDelete={() => {this.handleGroupDelete(item)}}
|
||||
onTitleChange={(value) => {this.handleItemTitleChange(item, value)}} onChange={(dataSource) => {this.handleCanMoveItemChange(dataSource, item)}}/>
|
||||
|
|
|
|||
|
|
@ -6,13 +6,15 @@ import AddSalaryItemModal from './AddSalaryItemModal'
|
|||
import { inject, observer } from 'mobx-react';
|
||||
import FormalFormModal from '../../salaryItem/formalFormModal'
|
||||
import AddCategoryModal from '../step3/AddCategoryModal'
|
||||
import { toJS } from 'mobx';
|
||||
|
||||
@inject('ledgerStore')
|
||||
@observer
|
||||
export default class CanMoveItem extends React.Component {
|
||||
constructor(props) {
|
||||
super(props)
|
||||
let columns = slideStep3Columns.map(item => {
|
||||
let columns = slideStep3Columns
|
||||
.map(item => {
|
||||
item = {...item}
|
||||
if(item.key == "formulaContent") {
|
||||
item.render = (text, record) => {
|
||||
|
|
@ -126,8 +128,8 @@ export default class CanMoveItem extends React.Component {
|
|||
}
|
||||
|
||||
handleTableDrop = (datas) => {
|
||||
// TODO
|
||||
console.log("datas:", datas);
|
||||
console.log("datas.parent():", $(datas).parent());
|
||||
}
|
||||
|
||||
render() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue