From d9c2aef5ae7e16daec925dc6d1f39e34aed44528 Mon Sep 17 00:00:00 2001
From: MustangDeng <670124965@qq.com>
Date: Tue, 7 Jun 2022 10:22:06 +0800
Subject: [PATCH] todo

---
 pc4mobx/hrmSalary/index.js                          | 1 +
 pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js    | 2 +-
 pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/index.js b/pc4mobx/hrmSalary/index.js
index b85aba70..43194114 100644
--- a/pc4mobx/hrmSalary/index.js
+++ b/pc4mobx/hrmSalary/index.js
@@ -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";
diff --git a/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js b/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
index 6ab00d6e..bc37a5bd 100644
--- a/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
@@ -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)}}/>
diff --git a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
index 349ffb11..b9c8316d 100644
--- a/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
+++ b/pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
@@ -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() {