Browse Source

我的转正改造

chenzhfa 2 years ago
parent
commit
2b2b0ccf4a

+ 3 - 1
src/hrtrn/turn_positive/turn_positive/actions/bodyButtonClick.js

@@ -9,8 +9,10 @@ import { bodySelectedEvent } from './bodySelectedEvent';
 export function bodyButtonClick(props, key, text, record, index,tmp) {
     switch (key) {
         case 'add_row':
-            tmp.store.addRow('card_body', {}, {}, true);
+            // tmp.store.addRow('card_body', {}, {}, true);
             // props.editTable.addRow('card_body', {}, {}, true);
+            let len = props.editTable.getAllRows('card_body').length;
+            props.editTable.addRow('card_body', len, true, {});
             break;
         //行 删除
         case 'del_row':

+ 4 - 2
src/hrzz/entry-pc/entry-order/actions/bodyButtonClick.js

@@ -9,8 +9,10 @@ import { bodySelectedEvent } from './bodySelectedEvent';
 export function bodyButtonClick(props, key, text, record, index,tmp) {
     switch (key) {
         case 'add_row':
-            tmp.store.addRow('card_body', {}, {}, true);
-            // props.editTable.addRow('card_body', {}, {}, true);
+            // tmp.store.addRow('card_body', {}, {}, false);
+            // props.editTable.addRow('card_body', {}, {}, false);
+            let len = props.editTable.getAllRows('card_body').length;
+            props.editTable.addRow('card_body', len, true, {});
             break;
         //行 删除
         case 'del_row':

+ 25 - 0
src/hrzz/entry-pc/entry-order/actions/form.js

@@ -70,6 +70,12 @@ export default class FormAction {
             if (res.data.formData) {
                 form.setAllFormValue({card: res.data.formData.card})
             }
+            if(res.data.formBodyData){
+                props.editTable.setTableData('card_body', { rows: res.data.formBodyData.card_body.rows });
+            }else{
+                props.editTable.setTableData('card_body',{rows:[]})
+            }
+            props.editTable.setStatus('card_body', 'edit');
         }
     };
 
@@ -117,6 +123,13 @@ export default class FormAction {
             if (res.data.formData) {
                 form.setAllFormValue({card: res.data.formData.card})
             }
+
+            if(res.data.formBodyData){
+                props.editTable.setTableData('card_body', { rows: res.data.formBodyData.card_body.rows });
+            }else{
+                props.editTable.setTableData('card_body',{rows:[]})
+            }
+            props.editTable.setStatus('card_body', 'edit');
         }
     };
 
@@ -135,9 +148,11 @@ export default class FormAction {
             null
         );
         let formData = form.getAllFormValue('card');
+        let formBodyData = props.editTable.getAllData('card_body');
         let status = form.getFormStatus('card');
         let postData = {
             formData: formData,
+            formBodyData: formBodyData,
             area_code: 'card',
             page_code: '60092040nccloud',
             probationType: '1',
@@ -159,6 +174,12 @@ export default class FormAction {
             });
             form.setFormStatus('card', 'browse');
             form.setAllFormValue({card: res.data.formData.card});
+
+            if(res.data.formBodyData){
+                props.editTable.setTableData('card_body', { rows: res.data.formBodyData.card_body.rows });
+                props.editTable.setStatus('card_body', 'browse');
+            }
+
             const billId = res.data.formData.card.rows[0].values.pk_hi_regapply.value;
             handlePks.add(billId);
             cardPagination.setCardPaginationId({
@@ -482,6 +503,10 @@ export default class FormAction {
             form.openArea('audit_info');
             form.openArea('table_end_info');*/
             form.setAllFormValue({card: res.data.formData.card});
+            if(res.data.formBodyData){
+                props.editTable.setTableData('card_body', { rows: res.data.formBodyData.card_body.rows });
+                props.editTable.setStatus('card_body', 'browse');
+            }
             action.btnAct.updateBtnStatus();
         }
     };

+ 37 - 1
src/hrzz/entry-pc/entry-order/container/index.js

@@ -14,6 +14,13 @@ import {getAppPageConfig} from "src/hrpub/common/utils/utils";
 import AssignApprover from "../components/AssignApprover";
 
 import ApproveDetail from 'uap/common/components/ApproveDetail';
+import { bodyButtonClick } from '../actions/bodyButtonClick';
+
+let tmp = null
+const rowEditTable = (editTable ,ele,options) => {
+    tmp = editTable.createEditTable(ele,options)
+    return tmp
+}
 
 const {Header, Content} = Layout;
 const HomePage = render({
@@ -24,7 +31,7 @@ const HomePage = render({
         formAct: FormAction
     }
 })(({props, action, state}) => {
-    const {button, table, form, main, cardPagination} = props;
+    const {button, table, form, main, cardPagination,editTable} = props;
     const {pageInfo, page, psndoc, showUploader, showFlow, billid, billtype, isEdit, isDisableUpload} = main;
     const {createCardPagination} = cardPagination;
     return (
@@ -61,6 +68,35 @@ const HomePage = render({
                             onBeforeEvent: action.formAct.formBeforeEdit,
                             onAfterEvent: action.formAct.formAfterEdit
                         })}
+                        <div className="shoulder-definition-area" style={{'display':'flex','flex-direction':'row-reverse'}}>
+                            <div className="definition-icons">
+                                    {(page === 'detail' && isEdit) && props.button.createButtonApp({
+                                            area: 'tabs_head',
+                                            onButtonClick: (props, key, text, record, index) => {bodyButtonClick(props, key, text, record, index,tmp.props)},
+                                            popContainer: document.querySelector('.header-button-area')
+                                    })}
+                            </div>
+                        </div>
+                        {/* {editTable.createEditTable('card_body', {
+                            showCheck: true,
+                            showIndex: true,
+                            // onSelected: action.formAct.selectRow,
+                            // onSelectedAll: action.formAct.selectAllRow,
+                            adaptionHeight: false
+                        })} */}
+                        <div className="nc-bill-bottom-area">
+                            <div className="nc-bill-table-area">
+                                    {tmp || rowEditTable(editTable, 'card_body', {
+                                            showCheck: true,
+                                            showIndex: true,
+                                            // onSelected: action.formAct.bodySelectedEvent,
+                                            // onSelectedAll: action.formAct.bodySelectedAllEvent,
+                                            // onBeforeEvent: beforeTableEvent,
+                                            onAfterEvent: action.formAct.afterTableEvent
+                                            // modelSave: buttonClick.bind(this, { ...this.props, json: this.state.json }, CARD_BUTTON.save, undefined, true),
+                                    })}
+                            </div>
+                        </div>
                     </div>
                     <If condition={showUploader}>
                         <Uploader