qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

todo

This commit is contained in:
MustangDeng 2022-06-07 10:22:06 +08:00
parent c7128fcfb0
commit d9c2aef5ae
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc4mobx/hrmSalary/index.js
View File

@ -27,6 +27,7 @@ import GenerateDeclarationDetail from "./pages/declare/generateDeclarationDetail
import BaseForm from "./components"; import BaseForm from "./components";
import TemplatePreview from "./pages/payroll/templatePreview"; import TemplatePreview from "./pages/payroll/templatePreview";
import MobilePayroll from './pages/mobilePayroll' import MobilePayroll from './pages/mobilePayroll'
import WeaDraggableTable from './components/testWeatable'
import stores from "./stores"; import stores from "./stores";
import "./style/index"; import "./style/index";

2
pc4mobx/hrmSalary/pages/ledger/salaryItemForm.js
View File

@ -120,7 +120,7 @@ export default class SalaryItemForm extends React.Component {
if(item.items) { if(item.items) {
item.items && item.items.map(i => {i.key = i.id}) item.items && item.items.map(i => {i.key = i.id})
return ( return (
<CanMoveItem dataSource={item.items} <CanMoveItem dataSource={toJS(item.items)}
onDataSourceChange={(dataSource) => {this.handleItemDataSourceChange(dataSource, item)}} title={item.name} onDataSourceChange={(dataSource) => {this.handleItemDataSourceChange(dataSource, item)}} title={item.name}
onGroupDelete={() => {this.handleGroupDelete(item)}} onGroupDelete={() => {this.handleGroupDelete(item)}}
onTitleChange={(value) => {this.handleItemTitleChange(item, value)}} onChange={(dataSource) => {this.handleCanMoveItemChange(dataSource, item)}}/> onTitleChange={(value) => {this.handleItemTitleChange(item, value)}} onChange={(dataSource) => {this.handleCanMoveItemChange(dataSource, item)}}/>

6
pc4mobx/hrmSalary/pages/ledger/step3/canMoveItem.js
View File

@ -6,13 +6,15 @@ import AddSalaryItemModal from './AddSalaryItemModal'
import { inject, observer } from 'mobx-react'; import { inject, observer } from 'mobx-react';
import FormalFormModal from '../../salaryItem/formalFormModal' import FormalFormModal from '../../salaryItem/formalFormModal'
import AddCategoryModal from '../step3/AddCategoryModal' import AddCategoryModal from '../step3/AddCategoryModal'
import { toJS } from 'mobx';
@inject('ledgerStore') @inject('ledgerStore')
@observer @observer
export default class CanMoveItem extends React.Component { export default class CanMoveItem extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props)
let columns = slideStep3Columns.map(item => { let columns = slideStep3Columns
.map(item => {
item = {...item} item = {...item}
if(item.key == "formulaContent") { if(item.key == "formulaContent") {
item.render = (text, record) => { item.render = (text, record) => {
@ -126,8 +128,8 @@ export default class CanMoveItem extends React.Component {
} }
handleTableDrop = (datas) => { handleTableDrop = (datas) => {
// TODO
console.log("datas:", datas); console.log("datas:", datas);
console.log("datas.parent():", $(datas).parent());
} }
render() { render() {