- {createSimpleTable(this.tableId, {
- // showCheck: true,
- showIndex: true,
- selectedChange: this.selectedChange.bind(this)
- })}
-
-
- {ShowHideFlag&&createModal('reprotModal',{
- title:this.state.json['20020RECON-000026'],/* 国际化处理： 结账报告*/
- content:this.showReporModal(),
- userControl: true, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
- noFooter : true, //是否需要底部按钮,默认有footer,有false,没有true
- })
- }
+ handleOutput() {
+ }
-
-
- {this.state.json['20020RECON-000015']&&createModal('rebuildbalance', {
- className:"repeatexl",
- title: this.state.json['20020RECON-000015'],// 弹框表头信息/* 国际化处理： 重建余额表*/
- content: rebuildBalanceItem(this,loadQuery), //弹框内容，可以是字符串或dom
- beSureBtnClick: rebuildBalanceComfirm.bind(this), //点击确定按钮事件
- userControl: false, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
- size: 'lg', // 模态框大小 sm/lg/xlg
- rightBtnName: this.state.json['20020RECON-000016'], //左侧按钮名称,默认关闭/* 国际化处理： 关闭*/
- leftBtnName: this.state.json['20020RECON-000017'], //右侧按钮名称， 默认确认/* 国际化处理： 确认*/
- })}
-
- {
- this.setState({
- showPrintModal: false
- })
- }}
- />
-
-
- {isQueryShow&&createModal('UploadTaxModal',{
- title:this.state.json['uptoload-000004'],/* 国际化处理： 上传税务云*/
- content:(
-
- ),
- className:'senior',
- userControl: true, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
- beSureBtnClick:this.beSureBtnClick,//点击确定按钮事件
- cancelBtnClick:this.cancelBtnClick//取消按钮事件
- })
- }
-
-
- {ShowHideFlag&&createModal('reportReconciModal',{
- title:this.state.json['20020RECON-000034'],/* 国际化处理： 对账*/
- content:(
11111111
),
- userControl: true, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
- noFooter : true, //是否需要底部按钮,默认有footer,有false,没有true
- })
- }
-
{json['20020RECON-000004']}
),/* 国际化处理： 会计期间 */
+ dataIndex: "dispReckedMonth",
+ key: "dispReckedMonth",
+ width: 100,
+ render: (text, record, index) => {
+ return {!text ? : text}
+ }
+ },
+ {
+ title: ({json['20020RECON-000005']}
),/* 国际化处理： 是否结账*/
+ dataIndex: "dispReckedOrNot",
+ key: "dispReckedOrNot",
+ width: 100,
+ render: (text, record, index) => {
+ return {!text ? : text}
+ }
+ },
+ {
+ title: ({json['20020RECON-000006']}
),/* 国际化处理： 结账人*/
+ dataIndex: "endaccuser",
+ key: "endaccuser",
+ width: 100,
+ render: (text, record, index) => {
+ return {!text ? : text}
+ }
+ },
+ {
+ title: ({json['20020RECON-000007']}
),/* 国际化处理： 结账时间*/
+ dataIndex: "endacctime",
+ key: "endacctime",
+ width: 100,
+ render: (text, record, index) => {
+ return {!text ? : text}
+ }
+ },
+ {
+ title: ({json['20020RECON-000008']}
),/* 国际化处理： 取消结账*/
+ dataIndex: "unendaccuser",
+ key: "unendaccuser",
+ width: 100,
+ render: (text, record, index) => {
+ return {!text ? : text}
+ }
+ },
+ {
+ title: ({json['20020RECON-000009']}
),/* 国际化处理： 取消结账时间*/
+ dataIndex: "unendacctime",
+ key: "unendacctime",
+ width: 100,
+ render: (text, record, index) => {
+ return {!text ? : text}
+ }
+ }
+
+ ];
+ this.setState({
+ json: json,
+ }, () => {
+ initTemplate.call(this, this.props);
+ })
+ }
+ getMultiLang({moduleId: ['20020RECON', 'uptoload'], domainName: 'gl', currentLocale: 'simpchn', callback});
+ }
+
+ selectedChange = (props, newVal, oldVal) => {//选中行发生变化
+
+ }
+ showReporModal = () => {
+ let {
+ ShowHideFlag,
+ reportDataSum,
+ reportSumTitle,
+ reportSumFont,
+ reportData,
+ reportTitle,
+ reportFont
+ } = this.state;
+ let reportSum = {
+ reportSumData: reportDataSum,
+ reportSumTitle: reportSumTitle,
+ reportSumFont: reportSumFont,
+ }
+ let reportDetail = {
+ reportDetailData: reportData,
+ reportDetailTitle: reportTitle,
+ reportDetailFont: reportFont
+ }
+ return (
+
+ )
+ }
+ /*对账弹框*/
+ showReconciModal = () => {
+ let {
+ ShowHideFlag,
+ reportDataSum,
+ reportSumTitle,
+ reportSumFont,
+ reportData,
+ reportTitle,
+ reportFont
+ } = this.state;
+ let reportSum = {
+ reportSumData: reportDataSum,
+ reportSumTitle: reportSumTitle,
+ reportSumFont: reportSumFont,
+ }
+ let reportDetail = {
+ reportDetailData: reportData,
+ reportDetailTitle: reportTitle,
+ reportDetailFont: reportFont
+ }
+ return (
+
+ )
+ }
+ onRef = (ref) => {
+ this.UploadTax = ref;
+ }
+
+ render() {
+ let {taxcloudurl, pk_periodscheme, up_pk_accountingbook, pk_display, period} = this.state
+
+ let {
+ accountingbook, columnsVerify, reckonintData, listItem, ShowHideFlag, isQueryShow,
+ reportDataSum, reportSumTitle, reportSumFont, reportData, reportTitle, reportFont
+ } = this.state;
+ let {modal} = this.props;
+ let {createModal} = modal;
+ if (columnsVerify.length == 0) {
+ columnsVerify = this.Defaultcolumns ? this.Defaultcolumns : [];
+ }
+ let {table} = this.props;
+ let {createSimpleTable} = table;
+ let reportSum = {
+ reportSumData: reportDataSum,
+ reportSumTitle: reportSumTitle,
+ reportSumFont: reportSumFont,
+ }
+ let reportDetail = {
+ reportDetailData: reportData,
+ reportDetailTitle: reportTitle,
+ reportDetailFont: reportFont
+ }
+ const loadQuery = [
+ {
+ itemName: this.state.json['20020RECON-000000'],/* 国际化处理： 核算账簿*/
+ itemType: 'refer',
+ itemKey: 'pk_accountingbook',
+ config: {refCode: "uapbd/refer/org/AccountBookTreeRef"},
+ showMast: true
+ },
+ {
+ itemName: this.state.json['20020RECON-000002'],/* 国际化处理： 会计科目*/
+ itemType: "refer",
+ itemKey: "pk_accasoa",
+ config: {refCode: "uapbd/refer/fiacc/AccountDefaultGridTreeRef"},
+ showMast: false
+ },
+ // {
+ // itemName: this.state.json['20020RECON-000003'], itemType: 'Dbselect', itemKey: ['year', 'period'],/* 国际化处理： 会计期间*/
+ // itemChild: []
+ // }
+ ]
+ return (
+
+
+
+ {this.getHeadData()}
+
+
+ {createSimpleTable(this.tableId, {
+ // showCheck: true,
+ showIndex: true,
+ selectedChange: this.selectedChange.bind(this)
+ })}
+
+
+ {ShowHideFlag && createModal('reprotModal', {
+ title: this.state.json['20020RECON-000026'],/* 国际化处理： 结账报告*/
+ content: this.showReporModal(),
+ userControl: true, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
+ noFooter: true, //是否需要底部按钮,默认有footer,有false,没有true
+ })
+ }
+
+
+
+ {this.state.json['20020RECON-000015'] && createModal('rebuildbalance', {
+ className: "repeatexl",
+ title: this.state.json['20020RECON-000015'],// 弹框表头信息/* 国际化处理： 重建余额表*/
+ content: rebuildBalanceItem(this, loadQuery), //弹框内容，可以是字符串或dom
+ beSureBtnClick: rebuildBalanceComfirm.bind(this), //点击确定按钮事件
+ userControl: false, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
+ size: 'lg', // 模态框大小 sm/lg/xlg
+ rightBtnName: this.state.json['20020RECON-000016'], //左侧按钮名称,默认关闭/* 国际化处理： 关闭*/
+ leftBtnName: this.state.json['20020RECON-000017'], //右侧按钮名称， 默认确认/* 国际化处理： 确认*/
+ })}
+
+ {
+ this.setState({
+ showPrintModal: false
+ })
+ }}
+ />
+
+
+ {isQueryShow && createModal('UploadTaxModal', {
+ title: this.state.json['uptoload-000004'],/* 国际化处理： 上传税务云*/
+ content: (
+
+ ),
+ className: 'senior',
+ userControl: true, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
+ beSureBtnClick: this.beSureBtnClick,//点击确定按钮事件
+ cancelBtnClick: this.cancelBtnClick//取消按钮事件
+ })
+ }
+
+
+ {ShowHideFlag && createModal('reportReconciModal', {
+ title: this.state.json['20020RECON-000039'],/* 国际化处理： 对账*/
+ content: this.showReconciModal(),
+ userControl: true, // 点确定按钮后，是否自动关闭弹出框.true:手动关。false:自动关
+ noFooter: true, //是否需要底部按钮,默认有footer,有false,没有true
+ })
+ }
+
+
+
+ )
+
+ }
+
+ getMonthDays(year, month) {
+ var stratDate = new Date(year, month - 1, 1),
+ endData = new Date(year, month, 1);
+ var days = (endData - stratDate) / (1000 * 60 * 60 * 24);
+ return days;
+ }
}
+
Reckon = createPage({
- // initTemplate:initTemplate
+ // initTemplate:initTemplate
})(Reckon);
-ReactDOM.render(,document.querySelector('#app'));
+ReactDOM.render(, document.querySelector('#app'));
/*pbHnlLNCpsWdx+f6QNDErXUJ9hVUkCPC2/wKKBoJVMo=*/
diff --git a/src/gl/finalTreatment/reckoning/list/index.less b/src/gl/finalTreatment/reckoning/list/index.less
index cf911bf..a6116c0 100644
--- a/src/gl/finalTreatment/reckoning/list/index.less
+++ b/src/gl/finalTreatment/reckoning/list/index.less
@@ -68,7 +68,91 @@
}
}
}
-
+
+}
+
+#reconci_report{
+ .btn{text-align: right}
+ //开始结账
+ .tryto{
+ .detail{
+ color: #fff;
+ font-size: 12px !important;
+ }
+ .u-button.undefined.nc-button-wrapper.button-primary {
+ font-size: 12px !important;
+ }
+ .reportTitle{
+ text-align:center;
+ line-height: 40px;
+ }
+ .reportSumTitle{
+ position: absolute;
+ top: 9px;
+ color:red;
+ }
+ .u-table-scroll{
+ .u-table-thead{
+ .thTitle{
+ width: 100%;
+ justify-content: center;
+ }
+ }
+ .u-table-body{
+ tr:first-child{
+ td{
+ background-color: #dde3ee;
+ }
+ }
+ .tdSecondBox{
+ display: flex;
+ div{
+ overflow: hidden;
+ text-overflow: ellipsis;
+
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 1;
+ }
+ div:not(last-child){
+ margin-right: 5px;
+ }
+ }
+ /*.u-table-tbody{
+ pre{
+ white-space: pre-wrap;
+ word-wrap: break-word;
+ word-break: normal;
+ }
+ }*/
+ }
+ }
+ .u-button-group{
+ float: right;
+ margin: 5px 0 0 0 !important;
+ .u-button{
+ margin-left: 6px;
+ border-radius: 4px;
+ }
+ .noprimary{
+ font-size: 13px;
+ border-radius: 3px;
+ min-width: 60px;
+ line-height: 0px;
+ background: #fff;
+ color: #111;
+ border: 1px solid #D0D0D0;
+ -webkit-box-shadow: 0 1px 1px #d0d0d0;
+ box-shadow: 0 1px 1px #d0d0d0;
+ }
+ .noprimary:hover{
+ background: #FFF;
+ border: 1px solid #E14C46;
+ color: #E14C46;
+ }
+ }
+ }
+
}
.u-form-item .u-input-group-outer .u-input-after, .u-form-item .u-input-group-outer .u-input-before{
border:none !important;
@@ -95,6 +179,7 @@
}
span:nth-of-type(2){
.u-col-md-2.u-col-sm-2.u-col-xs-2:nth-of-type(1){
+ width: 0 !important;
//width: 110px !important;
}
}
@@ -103,7 +188,7 @@
min-height: auto !important;
// padding: 0 !important;
}
-
+
}
.u-col-md-2{
padding: 0;
@@ -147,7 +232,7 @@
width: 240px;
}
}
- .changesm:nth-of-type(2){
+ .changesm:nth-of-type(3){
div:nth-of-type(1){
width: auto !important;
}
@@ -160,7 +245,7 @@
// left: 113px;
// width: 82px;
}
- span:nth-of-type(2){
+ span:nth-of-type(3){
.u-form-item.u-form-inline{
// position: absolute;
// left: 118px;
@@ -211,7 +296,7 @@
.line{
height: 40px;
line-height: 40px;
- .title{
+ .title{
float: left;
margin-right: 20px;
width: 124px;
@@ -231,9 +316,9 @@
float: left;
}
}
-
-
+
+
}
.prompt-box.nc-modal.u-modal .u-modal-dialog .u-modal-content .u-modal-body{
overflow: hidden;
-}
\ No newline at end of file
+}
diff --git a/src/gl/finalTreatment/reckoning/list/reconciReportModal/index.js b/src/gl/finalTreatment/reckoning/list/reconciReportModal/index.js
index eb53ac7..8a43100 100644
--- a/src/gl/finalTreatment/reckoning/list/reconciReportModal/index.js
+++ b/src/gl/finalTreatment/reckoning/list/reconciReportModal/index.js
@@ -1,36 +1,64 @@
/*qZ5a1x5ign4IdlZuRO5Ax6TjC2a3u5fVc0DIn53oa4I=*/
-import React, { Component } from 'react';
-import {high,base,ajax,getMultiLang } from 'nc-lightapp-front';
-const { NCFormControl: FormControl,NCDatePicker:DatePicker,NCButton: Button,NCRadio:Radio,NCBreadcrumb:Breadcrumb,
- NCRow:Row,NCCol:Col,NCTree:Tree,NCMessage:Message,NCIcon:Icon,NCLoading:Loading,NCTable:Table,NCSelect:Select,
- NCCheckbox:Checkbox,NCNumber,AutoComplete,NCDropdown:Dropdown,NCPanel:Panel,NCModal:Modal,NCForm,NCButtonGroup:ButtonGroup,NCDiv
+import React, {Component} from 'react';
+import {high, base, ajax, getMultiLang} from 'nc-lightapp-front';
+
+const {
+ NCFormControl: FormControl,
+ NCDatePicker: DatePicker,
+ NCButton: Button,
+ NCRadio: Radio,
+ NCBreadcrumb: Breadcrumb,
+ NCRow: Row,
+ NCCol: Col,
+ NCTree: Tree,
+ NCMessage: Message,
+ NCIcon: Icon,
+ NCLoading: Loading,
+ NCTable: Table,
+ NCSelect: Select,
+ NCCheckbox: Checkbox,
+ NCNumber,
+ AutoComplete,
+ NCDropdown: Dropdown,
+ NCPanel: Panel,
+ NCModal: Modal,
+ NCForm,
+ NCButtonGroup: ButtonGroup,
+ NCDiv
} = base;
-const { NCFormItem:FormItem } = NCForm;
+const {NCFormItem: FormItem} = NCForm;
import '../index.less';
-export default class ReportModal extends Component{
- constructor(props){
+
+export default class ReportModal extends Component {
+ constructor(props) {
super(props)
this.columns_report = [
{
- title: "",
+ title: (5235235
),
dataIndex: "strRowOne",
key: "strRowOne",
width: 300,
- render:(text, record, index)=>{
- let {reportTableData}=this.state;
- let redFlag=false;
- for(let k in reportTableData.reportDetailFont){
- if(k==text){
- redFlag=true;
+ render: (text, record, index) => {
+ let {reportTableData} = this.state;
+ let redFlag = false;
+ for (let k in reportTableData.reportDetailFont) {
+ if (k == text) {
+ redFlag = true;
}
}
- if(redFlag){
- return(
-
+ if (redFlag) {
+ return (
+ //
+
)
- }else{
- return(
-
+ } else {
+ return (
+ //
+
)
}
@@ -41,210 +69,173 @@ export default class ReportModal extends Component{
dataIndex: "strRowTwo",
key: "strRowTwo",
width: 350,
- render:(text, record, index)=>{
- let {reportTableData}=this.state;
- let redFlag=false;
- for(let k in reportTableData.reportDetailFont){
- if(k==text){
- redFlag=true;
+ render: (text, record, index) => {
+ let {reportTableData} = this.state;
+ let redFlag = false;
+ for (let k in reportTableData.reportDetailFont) {
+ if (k == text) {
+ redFlag = true;
}
}
- if(redFlag){
- return(
-
+ if (redFlag) {
+ return (
+
)
- }else{
- return(
-
+ } else {
+ return (
+
)
}
}
}
]
- this.state={
- json:{},
- reportTableData:this.props.reportDetail||[],
- reportTableDataSum:this.props.reportSum||[],
- reportTableTitle:'',
- fontStr:{},
- columns_report:this.columns_report,
- columns_reportSum:[],
- sumOrDetail:'sum'//默认像是汇总table数据
+ this.state = {
+ json: {},
+ reportTableData: this.props.reportDetail || [],
+ reportTableDataSum: this.props.reportSum || [],
+ reportTableTitle: '',
+ fontStr: {},
+ columns_report: this.columns_report,
+ columns_reportSum: [],
+ sumOrDetail: 'sum'//默认像是汇总table数据
}
}
+
componentWillMount() {
- let callback= (json) =>{
+ let callback = (json) => {
+ // console.log(json)
this.columns_reportSum = [
{
- title: ({json['20020RECON-000023']}
),/* 国际化处理： 检查项*/
- dataIndex: "strRowOne",
- key: "strRowOne",
+ title: ({json['20020RECON-000034']}
),/* 国际化处理： 总账余额表*/
+ dataIndex: "field1",
+ key: "field1",
width: 300,
- render:(text, record, index)=>{
- let {reportTableDataSum}=this.state;
- let redFlag=false;
- for(let k in reportTableDataSum.reportSumFont){
- if(k==text){
- redFlag=true;
- }
- }
- if(redFlag){
- return(
-
- )
- }else{
- return(
-
- )
- }
-
+ render: (text, record, index) => {
+ return (
+
+ {/*会计科目*/}
+
{record.paccname}
+ {/*期末余额*/}
+
{record.pendlocamount}
+
{json['20020RECON-000024']}
),/* 国际化处理： 是否通过*/
- dataIndex: "strRowTwo",
- key: "strRowTwo",
- width: 80,
- render:(text, record, index)=>{
- let {reportTableDataSum}=this.state;
- let redFlag=false;
- for(let k in reportTableDataSum.reportSumFont){
- if(k==text){
- redFlag=true;
- }
- }
- if(redFlag){
- return(
-
- )
- }else{
- return(
-
- )
- }
+ title: ({json['20020RECON-000035']}
),/* 国际化处理： 总账辅助余额表*/
+ dataIndex: "field2",
+ key: "field2",
+ width: 500,
+ render: (text, record, index) => {
+ return (
+
+ {/*会计科目*/}
+
{record.accname}
+ {/*辅助核算*/}
+
{record.assname}
+ {/*期末余额*/}
+
{record.endlocamount}
+
{json['20020RECON-000025']}
),/* 国际化处理： 说明*/
- dataIndex: "strRowThree",
- key: "strRowThree",
- width: 310,
- render:(text, record, index)=>{
- let {reportTableDataSum}=this.state;
- let redFlag=false;
- for(let k in reportTableDataSum.reportSumFont){
- if(k==text){
- redFlag=true;
- }
- }
- if(redFlag){
- return(
-
- )
- }else{
- return(
-
- )
- }
+ /*{
+ title: ({json['20020RECON-000036']}
),/!* 国际化处理： 总账辅助明细账*!/
+ dataIndex: "field3",
+ key: "field3",
+ width: 680,
+ render: (text, record, index) => {
+ return (
+
+
{record.field6}
{/!*会计科目*!/}
+
{record.field7}
{/!*辅助核算*!/}
+
{record.field8}
{/!*凭证号*!/}
+
{record.field9}
{/!*余额*!/}
+
{json['20020RECON-000037']}
),/* 国际化处理： 差异*/
+ dataIndex: "field4",
+ key: "field4",
+ width: 300,
+ render: (text, record, index) => {
+ return (
+
+ {/*会计科目*/}
+
{record.paccname}
+ {/*金额*/}
+
{record.difference}
+
-
-
- {sumOrDetail == 'detail' ?
- /* 国际化处理： 返回*/
- : null}
- {sumOrDetail == 'sum' ?
- /* 国际化处理： 查看详情*/
- : null}
- {sumOrDetail == 'detail' ?
- /* 国际化处理： 打印*/
- : null}
- {sumOrDetail == 'detail' ?
- /* 国际化处理： 模板输出*/
- : null}
- {/* */}
-
-
{reportTableData.reportDetailTitle}
- {(sumOrDetail == 'sum') ?
-
{reportTableDataSum.reportSumTitle}
- : null}
- {(sumOrDetail == 'sum') ?
-
- 8 ? (100 + (columns_reportSum.length - 8) * 15) + "%" : '100%', y: 320 }}
- />
- : null}
- {(sumOrDetail == 'detail') ?
+
+ render() {
+ let {columns_reportSum} = this.state;
+ let {reportDetail} = this.props;
+ let reportTableData = reportDetail;
+ return (
+
+
+
+ {/*
账账相对
*/}
+ {
+ 8 ? (100 + (columns_reportSum.length - 8) * 15) + "%" : '100%',
+ y: 320
+ }}
+ />
+ }
+ {/*{(sumOrDetail == 'detail') ?
8 ? (100 + (columns_report.length - 8) * 15) + "%" : '100%', y: 320 }}
+ scroll={{
+ x: columns_report.length > 8 ? (100 + (columns_report.length - 8) * 15) + "%" : '100%',
+ y: 320
+ }}
/>
- : null}
+ : null}*/}
)
diff --git a/src/gl/public/lang/standard/simpchn/20020RECON.json b/src/gl/public/lang/standard/simpchn/20020RECON.json
index dd2acbd..518dab2 100644
--- a/src/gl/public/lang/standard/simpchn/20020RECON.json
+++ b/src/gl/public/lang/standard/simpchn/20020RECON.json
@@ -32,5 +32,11 @@
"20020RECON-000030": "模板输出",
"20020RECON-000031": "年",
"20020RECON-000032": "月",
- "20020RECON-000033": "重建余额表成功"
-}
\ No newline at end of file
+ "20020RECON-000033": "重建余额表成功",
+ "20020RECON-000034": "总账余额表",
+ "20020RECON-000035": "总账辅助余额表",
+ "20020RECON-000036": "总账辅助明细表",
+ "20020RECON-000037": "差异",
+ "20020RECON-000038": "请先选择会计科目",
+ "20020RECON-000039": "账账相对报表"
+}