{this.props.json['batchedit-000002']}
@@ -384,7 +416,7 @@ class AttrSelect extends Component {
this.props.config.NODE_TYPE === 'ORG_NODE' &&
this.props.oprFlag === 'directEdit' &&
this.state.tabVal.refcode === this.state.tabArr[3].refcode ?
- 'none' : ''
+ 'none' : '', overflow: 'hidden'
}}>
this.orgSelect = item}
@@ -408,7 +440,7 @@ class AttrSelect extends Component {
queryCondition: function () {
return {
//选择组织的个数不通查到的批改属性不一样，或者列表选择行数的所属组织的个数
- NODE_TYPE: this.props.config.NODE_TYPE,
+ NODE_TYPE: this.props.config.NODE_TYPE == 'ORG_NODE' ? 'GROUP_NODE': this.props.config.NODE_TYPE,
checkedOrgLenth:
this.state.tabVal.refcode !=='baseinfo' ?
this.orgSelect.state.checkedOrg.length :
@@ -433,98 +465,4 @@ class AttrSelect extends Component {
}
}
-
-//银行档案参照
-function ReferLoader(props = {}) {
- var conf = {
- multiLang: {
- domainName: 'uapbd',
- currentLocale: 'zh-CN',
- moduleId: 'refer_uapbd',
- },
- refType: 'gridTree',
- refName: 'refer-000546',/* 国际化处理： 银行档案*/
- refCode: 'uapbd.refer.bankacc.BankDocDefaultGridTreeRef',
- queryGridUrl: '/nccloud/uapbd/ref/BankDocDefaultGridRef.do',
- queryTreeUrl: '/nccloud/uapbd/ref/BankDocDefaultTreeRef.do',
- isMultiSelectedEnabled: false,
- columnConfig: [{ name: ['refer-000047', 'refer-000547', 'refer-000548', 'refer-000250', 'refer-000549', 'refer-000550', 'refer-000551', 'refer-000015'],
- code: ['org_name', 'refcode', 'refname', 'shortname', 'pk_fatherbank', 'province', 'city', 'ttname'],checked:{'ttname':false} }],
- checkStrictly: false
- };
- return
-}
-
-//客户银行账户参照
-function CustBankRefer(props = {}) {
- var conf = {
- multiLang: {
- domainName: 'uapbd',
- currentLocale: 'zh-CN',
- moduleId: 'refer_uapbd',
- },
- refType: 'grid',
- refName: 'refer-000393',/* 国际化处理： 客户银行账户*/
- refCode: 'uapbd.refer.pub.CustBankAccGridRef',
- queryGridUrl: '/nccloud/uapbd/ref/CustBankAccGridRef.do',
- isMultiSelectedEnabled: false,
- columnConfig:[{
- name: [ 'refer-000012', 'refer-000013','refer-000381','refer-000015','refer-000384' ],/* 国际化处理： 账号,户名,开户银行,银行类别,币种*/
- code: [ "accnum", "accname", "bankdoc_name", "banktype_name", "currtype_name" ]
- }],
- checkStrictly: false,
- fieldDisplayed: 'refcode'
- };
- return
-}
-
-//购买方开户行字段输入框与参照的交互
-function RenderCus(props) {
- const [name, setName] = useState("");
- const changeBuyerbankname = (val) => {
- const {form} = props;
- setName(val);
- form.setFormItemsValue("custBatchEditForm", {
- buyerbankname: {
- display: val.refname,
- value: val.refname
- }
- });
- props.onFormAfterEdit(props, "custBatchEditForm", "buyerbankname", {
- display: val.refname,
- value: val.refname
- });
- }
- return (
-
- {changeBuyerbankname(value)}}/>
-
- )
-}
-
-//购买方银行账户字段输入框与参照的交互
-function RenderCustBank(props) {
- const [name, setName] = useState("");
- const changeBuyerbanknum = (val) => {
- const {form} = props;
- setName(val);
- //手动输入时refcode为null，故取refname
- form.setFormItemsValue("custBatchEditForm", {
- buyerbanknum: {
- display: val.refcode,
- value: val.refcode === null ? val.refname : val.refcode
- }
- });
- props.onFormAfterEdit(props, "custBatchEditForm", "buyerbanknum", {
- display: val.refcode,
- value: val.refcode === null ? val.refname : val.refcode
- });
- }
- return (
-
- {changeBuyerbanknum(value)}}/>
-
- )
-}
-
export default AttrSelect
\ No newline at end of file
diff --git a/src/uapbd/public/pubComponent/HeaderArea/index.less b/src/uapbd/public/pubComponent/HeaderArea/index.less
index e0dba6b9..9091eb48 100644
--- a/src/uapbd/public/pubComponent/HeaderArea/index.less
+++ b/src/uapbd/public/pubComponent/HeaderArea/index.less
@@ -15,4 +15,9 @@
display: inline-block;
}
}
+ .BillHeadInfoWrap {
+ .back-btn{
+ margin-top:0
+ }
+ }
}
\ No newline at end of file
diff --git a/src/uapbd/public/pubComponent/OrgSelect.js b/src/uapbd/public/pubComponent/OrgSelect.js
index 92626510..e12fabc9 100644
--- a/src/uapbd/public/pubComponent/OrgSelect.js
+++ b/src/uapbd/public/pubComponent/OrgSelect.js
@@ -3,8 +3,8 @@
* @version:
* @Author: Chendch
* @Date: 2020-09-30 13:27:04
- * @LastEditors: Chendch
- * @LastEditTime: 2022-05-08 18:18:54
+ * @LastEditors: xiadling xiadling@yonyou.com
+ * @LastEditTime: 2023-10-27 16:22:35
*/
import React, {Component} from 'react';
import {base, ajax} from 'nc-lightapp-front';
@@ -43,7 +43,9 @@ class OrgSelect extends Component {
reset(beforeName = "code") {
this.beforeName = beforeName;
let callback = (json,status,inlt) => {
- if(!status) return ;
+ if(!status) {
+ return ;
+ }
let renderState = this.gerState(json);
this.loadAssignTreeData(renderState, json);
}
@@ -123,7 +125,7 @@ class OrgSelect extends Component {
main: this,
rowKey: 'id',
fielid:'lefttable',
- lazyload: false,
+ // lazyload: false,
columns: [{
title: codeDisplay || json['orgselect-000001'],/* 国际化处理： 组织编码*/
dataIndex: 'code',
@@ -168,7 +170,9 @@ class OrgSelect extends Component {
this.props.syncTree.setNodeChecked(this.treeId,"")
}
expandFirstNode = (treeData, id, that) => {
- if(!treeData || !id || !that) return ;
+ if(!treeData || !id || !that) {
+ return ;
+ }
let pks = [];
treeData.map( (item, index) => {
@@ -183,7 +187,7 @@ class OrgSelect extends Component {
if (Array.isArray(data)) {
data.forEach((e) => {
list.push(e);
- if (e && e.hasOwnProperty('children') && e.children.length>0 ) {
+ if (e && e.hasOwnProperty('children') && Array.isArray(e.children) && e.children.length>0 ) {
this.treeToList(e.children, list);
}
});
@@ -244,7 +248,7 @@ class OrgSelect extends Component {
result.push(
item.id
);
- if(item.hasOwnProperty('children') && item.children.length>0 ){
+ if(item.hasOwnProperty('children') && Array.isArray(item.children) && item.children.length>0 ){
getcheckedKeys(item.children,result);
}
})
@@ -285,16 +289,17 @@ class OrgSelect extends Component {
refname:item.name
});
}
- if(item.hasOwnProperty('children') && item.children.length>0 ){
+ if(item.hasOwnProperty('children') && Array.isArray(item.children) && item.children.length>0 ){
getItem(item.children,pks,result);
}
})
return result;
- }
+ };
let tableDatas = getItem(this.state.tree.datas,checkedKeys,new Array());
- tableDatas = tableDatas.filter(d => {return d.nodeData && (d.root || d.nodeData.orgclazz != 'orgtype')})
+ tableDatas = tableDatas.filter(d => {return d.nodeData && (d.root || d.nodeData.orgclazz != 'orgtype')});
this.state.selectData.datas=tableDatas;
- this.setState({tableDatas, selectData: this.state.selectData})
+ this.setState({tableDatas, selectData: this.state.selectData});
+
}
resetOrgSelect = () => {
@@ -418,13 +423,18 @@ class OrgSelect extends Component {
{Object.keys(json).length > 0 &&
this.dom = dom} style={{marginLeft:30,height:'100%',pbackground:'rgba(249,249,249,1)',width:'calc(50% - 15px)',overflow:'hidden'}}>
10 ? (this.dom.clientHeight-31) + "px" : 413,
- maxHeight: this.dom && this.dom.clientHeight > 10 ? (this.dom.clientHeight-31) + "px" : 413,
- minHeight: 120
- },
addBlankCol: false,
useFixedHeader: true,
+ bodyStyle: {
+ height: this.dom && this.dom.clientHeight > 10 ? (this.dom.clientHeight-31) + "px" : 409,
+ maxHeight: this.dom && this.dom.clientHeight > 10 ? (this.dom.clientHeight-31) + "px" : 409,
+ minHeight: 120,
+ },
+ scroll:{
+ y: this.dom && this.dom.clientHeight > 10 ? (this.dom.clientHeight-31) : 409,
+ },
+ inModal: true,
+ lazyload: true
}}>
}
diff --git a/src/uapbd/public/pubComponent/OrgtypeSelector.js b/src/uapbd/public/pubComponent/OrgtypeSelector.js
index 53df4dcb..3c40dc10 100644
--- a/src/uapbd/public/pubComponent/OrgtypeSelector.js
+++ b/src/uapbd/public/pubComponent/OrgtypeSelector.js
@@ -3,8 +3,8 @@
* @version:
* @Author: zhenmx
* @Date: 2021-11-20 14:52:24
- * @LastEditors: Chendch
- * @LastEditTime: 2022-06-14 10:26:32
+ * @LastEditors: xiadling xiadling@yonyou.com
+ * @LastEditTime: 2023-10-19 16:36:14
*/
import React, {Component} from 'react';
import FinanceOrgTreeRef from '../../refer/org/FinanceOrgTreeRef';
@@ -91,110 +91,128 @@ class OrgtypeSelector extends Component {
});
}
- renderRef = () => {
- let {currentOrgType} = this.state;
- let {table} = this.state;
- let {datas} = this.state.selectData;
- let {NODE_TYPE} = this.props.config;
- let {oprFlag, height} = this.props;
- const bodyStyle = height ? {bodyHeight: height} : {adaptionHeight:true, inModal:true};
- return (
-
-
-
- {currentOrgType === 'sale_info' ?
- this.props.json['OrgtypeSelector-004'] : currentOrgType === 'credit_info' ?
- this.props.json['OrgtypeSelector-005'] : currentOrgType === 'finance_info' ?
- this.props.json['OrgtypeSelector-006'] : currentOrgType === 'tax_info' ?
- this.props.json['OrgtypeSelector-006'] : this.props.json['OrgtypeSelector-007']}
-
-
- {currentOrgType === 'sale_info' ? SaleOrgTreeRef({
- fieldid:"SaleOrgTreeRef",
- value: this.state.checkedOrg,
- isMultiSelectedEnabled: true,
- onChange: this.onChange.bind(this),
- queryCondition: () => {
- return {
- AppCode : this.props.config.appcode,
- orgType : 'SALEORGTYPE000000000',
- TreeRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
- }
- }
- }) : currentOrgType === 'credit_info' ? CreditCtlRegionGridRef({
- fieldid:"CreditCtlRegionGridRef",
- value: this.state.checkedOrg,
- isMultiSelectedEnabled: true,
- onChange: this.onChange.bind(this),
- queryCondition: () => {
- return {
- AppCode : this.props.config.appcode,
- orgType : 'CREDITCTLREGION00000',
- GridRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
- }
- }
-
- }) : currentOrgType === 'finance_info' ? FinanceOrgTreeRef({
- fieldid:"FinanceOrgTreeRef",
- value: this.state.checkedOrg,
- isMultiSelectedEnabled: true,
- onChange: this.onChange.bind(this),
- isShowUnit: this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ? true : false,
- defaultUnitValue: {
- refname: businessInfo.groupName,
- refpk: businessInfo.groupId
- },
- queryCondition: () => {
- return this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ?
- {}:
- {
- AppCode : this.props.config.appcode,
- orgType : 'FINANCEORGTYPE000000',
- TreeRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
- }
- }
- }) : currentOrgType === 'tax_info' ? FinanceOrgTreeRef({
- fieldid:"FinanceOrgTreeRef",
- value: this.state.checkedOrg,
- isMultiSelectedEnabled: true,
- onChange: this.onChange.bind(this),
- isShowUnit: this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ? true : false,
- defaultUnitValue: {
- refname: businessInfo.groupName,
- refpk: businessInfo.groupId
- },
- queryCondition: () => {
- return this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ?
- {}:
- {
- AppCode : this.props.config.appcode,
- orgType : 'FINANCEORGTYPE000000',
- TreeRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
- }
- }
- }) : currentOrgType === 'baseinfo' && NODE_TYPE === 'ORG_NODE' && oprFlag === 'stepEdit' ? BusinessUnitTreeRef({
- fieldid:"BusinessUnitTreeRef",
- value: this.state.checkedOrg,
- isMultiSelectedEnabled: true,
- onChange: this.onChange.bind(this),
- queryCondition: () => {
- return {
- TreeRefActionExt: 'nccloud.web.uapbd.rateschema.action.PrimaryOrgSQLBuilderData'
- }
- }
- }) : ''}
-
-
-
-
-
- );
- }
+ // renderRef = () => {
+
+ // }
getData() {
return this.state.selectData.datas.map(n => n.id);
}
render() {
+ let {currentOrgType} = this.state;
+ let {table} = this.state;
+ let {datas} = this.state.selectData;
+ let {NODE_TYPE} = this.props.config;
+ let {oprFlag, height} = this.props;
+ const bodyStyle = {adaptionHeight:true, inModal:true};
+ return (
+
+
+
+ {currentOrgType === 'sale_info' ?
+ this.props.json['OrgtypeSelector-004'] : currentOrgType === 'credit_info' ?
+ this.props.json['OrgtypeSelector-005'] : currentOrgType === 'finance_info' ?
+ this.props.json['OrgtypeSelector-006'] : currentOrgType === 'tax_info' ?
+ this.props.json['OrgtypeSelector-006'] : this.props.json['OrgtypeSelector-007']}
+
+
+ {currentOrgType === 'sale_info' ? SaleOrgTreeRef({
+ fieldid:"SaleOrgTreeRef",
+ value: this.state.checkedOrg,
+ isMultiSelectedEnabled: true,
+ onChange: this.onChange.bind(this),
+ queryCondition: () => {
+ return {
+ AppCode : this.props.config.appcode,
+ orgType : 'SALEORGTYPE000000000',
+ TreeRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
+ }
+ }
+ }) : currentOrgType === 'credit_info' ? CreditCtlRegionGridRef({
+ fieldid:"CreditCtlRegionGridRef",
+ value: this.state.checkedOrg,
+ isMultiSelectedEnabled: true,
+ onChange: this.onChange.bind(this),
+ queryCondition: () => {
+ return {
+ AppCode : this.props.config.appcode,
+ orgType : 'CREDITCTLREGION00000',
+ GridRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
+ }
+ }
+
+ }) : currentOrgType === 'finance_info' ? FinanceOrgTreeRef({
+ fieldid:"FinanceOrgTreeRef",
+ value: this.state.checkedOrg,
+ isMultiSelectedEnabled: true,
+ onChange: this.onChange.bind(this),
+ isShowUnit: this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ? true : false,
+ defaultUnitValue: {
+ refname: businessInfo.groupName,
+ refpk: businessInfo.groupId
+ },
+ queryCondition: () => {
+ return this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ?
+ {}:
+ {
+ AppCode : this.props.config.appcode,
+ orgType : 'FINANCEORGTYPE000000',
+ TreeRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
+ }
+ }
+ }) : currentOrgType === 'tax_info' ? FinanceOrgTreeRef({
+ fieldid:"FinanceOrgTreeRef",
+ value: this.state.checkedOrg,
+ isMultiSelectedEnabled: true,
+ onChange: this.onChange.bind(this),
+ isShowUnit: this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ? true : false,
+ defaultUnitValue: {
+ refname: businessInfo.groupName,
+ refpk: businessInfo.groupId
+ },
+ queryCondition: () => {
+ return this.props.config.appcode === '10140BACCG' || this.props.config.appcode === '10140BACCO' ?
+ {}:
+ {
+ AppCode : this.props.config.appcode,
+ orgType : 'FINANCEORGTYPE000000',
+ TreeRefActionExt:'nccloud.web.uapbd.material.action.PrimaryOrgSQLBuilderByOrgType'
+ }
+ }
+ }) : currentOrgType === 'baseinfo' && NODE_TYPE === 'ORG_NODE' && oprFlag === 'stepEdit' ? BusinessUnitTreeRef({
+ fieldid:"BusinessUnitTreeRef",
+ value: this.state.checkedOrg,
+ isMultiSelectedEnabled: true,
+ onChange: this.onChange.bind(this),
+ queryCondition: () => {
+ return {
+ TreeRefActionExt: 'nccloud.web.uapbd.rateschema.action.PrimaryOrgSQLBuilderData'
+ }
+ }
+ }) : ''}
+
+
+
this.dom = dom}>
+ 10 ? (this.dom.clientHeight-10) + "px" : 200,
+ maxHeight: this.dom && this.dom.clientHeight > 10 ? (this.dom.clientHeight-10) + "px" : 200,
+ }}
+ />
+
+
+
+
+
+ );
+
+ // return (
+
+ // )
+ }
+}
+export default OrgtypeSelector;
diff --git a/src/uapbd/public/pubComponent/ResultGrid.js b/src/uapbd/public/pubComponent/ResultGrid.js
index 3f019b8a..3165683a 100644
--- a/src/uapbd/public/pubComponent/ResultGrid.js
+++ b/src/uapbd/public/pubComponent/ResultGrid.js
@@ -24,7 +24,7 @@ class ResultGrid extends Component {
}
onSelected = (props, moduleId, record, index, status) => {
- this.state.selectedPKs = [];
+ // this.state.selectedPKs = [];
if(status){
this.state.selectedPKs.push(record.pk_customer.value);
}else{
@@ -36,50 +36,66 @@ class ResultGrid extends Component {
this.setState(this.state);
}
onSelectedAll = (props, moduleId, status, length) => {
-
+ debugger;
if(status){
let tablecheckrows = props.table.getCheckedRows(moduleId);
tablecheckrows.map((e)=>{
- this.state.selectedPKs.push(e.data.values.pk_customer.value);
+ let index = this.state.selectedPKs.indexOf(e.data.values.pk_customer.value);
+ if (index < 0) {
+ this.state.selectedPKs.push(e.data.values.pk_customer.value);
+ }
+
});
}else{
let alltabledata = props.table.getAllTableData(moduleId);
alltabledata.rows.map((e)=>{
let index = this.state.selectedPKs.indexOf(e.values.pk_customer.value);
-
if(index> -1){
this.state.selectedPKs.splice(index,1);
}
})
}
- this.setState(this.state);
+ // this.setState(this.state);
}
getCurrPageSelArr = () => {
const {getTablePageInfo, getPks} = this.props.pageprops.table;
const pageInfo = getTablePageInfo(this.state.gridId);
const {pageIndex, pageSize} = pageInfo;
- const pks = getPks(this.state.gridId, pageIndex, pageSize);
+ const pks = getPks(this.state.gridId, pageIndex, pageSize) || [];
const selIndexArr = Array.from(new Array(pks.length + pageIndex*pageSize).keys());
+ // const temp = pageIndex * pageSize;
selIndexArr.splice(0, pageIndex* pageSize);
- return selIndexArr;
+ const finalArr = [];
+ selIndexArr.map((item,index) => finalArr.push(index));
+ const data = {
+ pks: pks,
+ selIndexArr: finalArr
+ }
+ return data;
}
handlePageCheck =()=>{
- const {getCheckedRows, selectTableRows} = this.props.pageprops.table;
- const selIndexArr = this.getCurrPageSelArr();
- selectTableRows(this.state.gridId,selIndexArr, true);
- getCheckedRows(this.state.gridId).map((e)=>{
- this.state.selectedPKs.push(e.data.values.pk_customer.value);
+ debugger;
+ const gridId = this.state.gridId;
+ const {pks,selIndexArr}= this.getCurrPageSelArr();
+ this.props.pageprops.table.selectTableRows(this.state.gridId,selIndexArr, true);
+ // const checkedRows = getCheckedRows(gridId);
+ pks.map((pk)=>{
+ let index = this.state.selectedPKs.indexOf(pk);
+ if (index < 0) {
+ this.state.selectedPKs.push(pk);
+ }
+
})
- this.setState(this.state);
+ // this.setState(this.state);
}
handlePageCancel = ()=>{
- const selIndexArr = this.getCurrPageSelArr();
+ const {pks,selIndexArr}= this.getCurrPageSelArr();
this.props.pageprops.table.selectTableRows(this.state.gridId,selIndexArr,false);
- let alltabledata = this.props.pageprops.table.getAllTableData(this.state.gridId);
- alltabledata.rows.map((e)=>{
- var index = this.state.selectedPKs.indexOf(e.values.pk_customer.value);
+ // let alltabledata = this.props.pageprops.table.getAllTableData(this.state.gridId);
+ pks.map((pk)=>{
+ var index = this.state.selectedPKs.indexOf(pk);
if(index > -1){
this.state.selectedPKs.splice(index,1);
}
@@ -90,10 +106,13 @@ class ResultGrid extends Component {
handleAllCheck=()=>{
this.props.pageprops.table.selectAllRows(this.state.gridId,true);
let alltabledata = this.props.pageprops.table.getAllTableData(this.state.gridId);
- this.state.selectedPKs = alltabledata.allpks;
- this.state.selectAllFlag = true;
- this.setState(this.state);
-
+ // this.state.selectedPKs = alltabledata.allpks;
+ // this.state.selectAllFlag = true;
+ // this.setState(this.state);
+ this.setState({
+ selectedPKs: alltabledata.allpks,
+ selectAllFlag: true
+ })
}
//先临时这样搞，后面有需求让适配跨页全选了再改
@@ -115,10 +134,20 @@ class ResultGrid extends Component {
}
onClickPageInfo =(props,config,pks)=>{
+ debugger;
this.props.loadResutlGridData(pks,()=>{
- if(this.state.selectAllFlag){
- this.props.pageprops.table.selectAllRows(this.state.gridId,true);
- }
+ // if(this.state.selectAllFlag){
+ // this.props.pageprops.table.selectAllRows(this.state.gridId,true);
+ // }
+ // this.props.pageprops.table.selectTableRows(this.state.gridId, )
+ const {pks, selIndexArr}= this.getCurrPageSelArr();
+ const checkedArr = []
+ pks.map((pk, index) => {
+ if (this.state.selectedPKs.includes(pk)) {
+ checkedArr.push(selIndexArr[index])
+ }
+ })
+ this.props.pageprops.table.selectTableRows(this.state.gridId, checkedArr, true);
});
}
diff --git a/src/uapbd/public/pubComponent/attrSelect.less b/src/uapbd/public/pubComponent/attrSelect.less
new file mode 100644
index 00000000..d269cf34
--- /dev/null
+++ b/src/uapbd/public/pubComponent/attrSelect.less
@@ -0,0 +1,40 @@
+.batch-felx-container {
+ display: flex;
+ flex-direction: column;
+ flex: auto;
+ overflow: hidden;
+}
+.uapbd-form-flex-container{
+ margin-bottom: 6px;
+ min-height: 26px;
+ align-items: center;
+ font-size: 14px;
+ display: flex;
+ // flex: 1;
+ width: 33%;
+ .uapbd-form-flex-label{
+ width: 140px;
+ max-width: 140px;
+ min-width: 140px;
+ line-height: 18px;
+ padding-right: 16px;
+ text-align: right;
+ box-sizing: border-box;
+ color: #2b3441;
+ position: relative;
+ display: inline-block;
+ vertical-align: middle;
+ overflow-wrap: break-word;
+ white-space: pre-wrap;
+ }
+ .uapbd-form-flex-input{
+ width: calc(~"100% - 140px");
+ text-align: left;
+ padding-right: 8px;
+ position: relative;
+ box-sizing: border-box;
+ color: #2b344b;
+ display: inline-block;
+ vertical-align: middle;
+ }
+ }
\ No newline at end of file
diff --git a/src/uapbd/public/pubComponent/batchEditRefer/BatchEditAttrRefer/index.js b/src/uapbd/public/pubComponent/batchEditRefer/BatchEditAttrRefer/index.js
index 1e55103b..699d7ca4 100644
--- a/src/uapbd/public/pubComponent/batchEditRefer/BatchEditAttrRefer/index.js
+++ b/src/uapbd/public/pubComponent/batchEditRefer/BatchEditAttrRefer/index.js
@@ -11,11 +11,16 @@ const { Refer } = high;
export default function (props = {}) {
return
}
diff --git a/src/uapbd/public/pubComponent/confirmUtil/confirmUtil.js b/src/uapbd/public/pubComponent/confirmUtil/confirmUtil.js
index 53736937..89086718 100644
--- a/src/uapbd/public/pubComponent/confirmUtil/confirmUtil.js
+++ b/src/uapbd/public/pubComponent/confirmUtil/confirmUtil.js
@@ -1,4 +1,3 @@
-/*H5STJxafweQy3FG627aMfTI6gilU55u9elaLu01UDvA=*/
/*
* @Descripttion:
* @version:
@@ -32,5 +31,4 @@ export default function ({
closeByClickBackDrop:false,//点击遮罩关闭提示框，默认是true点击关闭，阻止关闭是false
})
-}
-/*H5STJxafweQy3FG627aMfTI6gilU55u9elaLu01UDvA=*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/uapbd/public/pubComponent/datatemplet/importTempletDlg.js b/src/uapbd/public/pubComponent/datatemplet/importTempletDlg.js
index 9f5df606..e22f6705 100644
--- a/src/uapbd/public/pubComponent/datatemplet/importTempletDlg.js
+++ b/src/uapbd/public/pubComponent/datatemplet/importTempletDlg.js
@@ -20,6 +20,7 @@ class ImportTempletDlg extends Component {
show: false,
modalDropup: true,
size: 'lg',
+ includeTable: true,
backdrop: true / false //是否弹出遮罩层/点击遮罩层是否触发关闭事件
},
modalTitle: {
@@ -77,7 +78,6 @@ class ImportTempletDlg extends Component {
//默认模板行记数据
defaultDataTemp: {},
codeIsEdit: ''
-
}
this.initPage = this.props.initPage;
@@ -122,6 +122,9 @@ class ImportTempletDlg extends Component {
});
toast({color: 'success', content: this.props.json['dataTemplet-000003']});/* 国际化处理： 设置默认模板成功！*/
} else {
+ this.setState({
+ defaultExtBillcard: {}
+ });
toast({color: 'success', content: this.props.json['dataTemplet-000004']});/* 国际化处理： 取消默认模板成功！*/
}
@@ -436,7 +439,7 @@ class ImportTempletDlg extends Component {
render() {
var modalCfg = {...this.state.modal}
return (
-
+
{this.state.modalTitle.display}
@@ -468,7 +471,7 @@ class ImportTempletDlg extends Component {
}
fieldid="more_btn_menu"
- show={isAddButtonShow}
- onVisibleChange={isAddButtonShow => {
- this.setState({ isAddButtonShow })
- }}
>