Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
b4df30800d
|
@ -36,9 +36,11 @@ function backtotransfer(props) {
|
||||||
props.delUrlParam('usecache');
|
props.delUrlParam('usecache');
|
||||||
let type = getUrlParam(props.getUrlParam, 'type');
|
let type = getUrlParam(props.getUrlParam, 'type');
|
||||||
console.log('backtotransfer-type = ', type);
|
console.log('backtotransfer-type = ', type);
|
||||||
|
let pagecode = '400400000_422Xto4455';
|
||||||
|
if (type == 'refBljh') pagecode = '50080102_Bljhto4455';
|
||||||
props.pushTo('/' + type, {
|
props.pushTo('/' + type, {
|
||||||
type: 'ref422x',
|
type: type,
|
||||||
pagecode: '400400000_422Xto4455'// TODO pushTo
|
pagecode: pagecode // TODO pushTo
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,9 +55,11 @@ function cancel(props, index, queryDatas) {
|
||||||
//只剩一个,点了取消,返回到列表
|
//只剩一个,点了取消,返回到列表
|
||||||
props.delUrlParam('usecache');
|
props.delUrlParam('usecache');
|
||||||
let type = getUrlParam(props.getUrlParam, 'type');
|
let type = getUrlParam(props.getUrlParam, 'type');
|
||||||
|
let pagecode = '400400000_422Xto4455';
|
||||||
|
if (type == 'refBljh') pagecode = '50080102_Bljhto4455';
|
||||||
props.pushTo('/' + type, {
|
props.pushTo('/' + type, {
|
||||||
type: 'ref422x',
|
type: type,
|
||||||
pagecode: '400400000_422Xto4455' // TODO pushTo
|
pagecode: pagecode // TODO pushTo
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
props.transferTable.setTransformFormStatus(FIELD.left, {
|
props.transferTable.setTransformFormStatus(FIELD.left, {
|
||||||
|
|
|
@ -73,9 +73,11 @@ const deleteCard = (props, skipCodes, queryDatas, _this) => {
|
||||||
deleteCacheData(props, FIELD.cgeneralhid, id, FIELD.CacheKey);
|
deleteCacheData(props, FIELD.cgeneralhid, id, FIELD.CacheKey);
|
||||||
if (props.transferTable.getTransformFormAmount(FIELD.left) == 1) {
|
if (props.transferTable.getTransformFormAmount(FIELD.left) == 1) {
|
||||||
props.delUrlParam('usecache');
|
props.delUrlParam('usecache');
|
||||||
|
let pagecode = '400400000_422Xto4455';
|
||||||
|
if (type == 'refBljh') pagecode = '50080102_Bljhto4455';
|
||||||
props.pushTo(URL.gotoTransfer, {
|
props.pushTo(URL.gotoTransfer, {
|
||||||
type: type,
|
type: type,
|
||||||
pagecode: '400400000_422Xto4455' // TODO pushTo
|
pagecode: pagecode // TODO pushTo
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
props.transferTable.setTransformFormStatus(FIELD.left, {
|
props.transferTable.setTransformFormStatus(FIELD.left, {
|
||||||
|
|
|
@ -18,13 +18,13 @@ export default function(ids) {
|
||||||
};
|
};
|
||||||
let url = URL.transfer
|
let url = URL.transfer
|
||||||
if (ids[0].cbilltype == '55A3') url = URL.transfer2
|
if (ids[0].cbilltype == '55A3') url = URL.transfer2
|
||||||
// debugger
|
// type = refBljh/ref422X
|
||||||
|
let type = getUrlParam(this.props.getUrlParam, 'type');
|
||||||
|
console.log('type = ', type);
|
||||||
ajax({
|
ajax({
|
||||||
url: url,
|
url: url,
|
||||||
data: data,
|
data: data,
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
let type = getUrlParam(this.props.getUrlParam, 'type');
|
|
||||||
console.log('type = ', type);
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
if (res.data) {
|
if (res.data) {
|
||||||
transtypeUtils.setValue.call(this, FIELD.formArea, FIELD.ctrantypeid, FIELD.vtrantypecode);
|
transtypeUtils.setValue.call(this, FIELD.formArea, FIELD.ctrantypeid, FIELD.vtrantypecode);
|
||||||
|
@ -42,7 +42,9 @@ export default function(ids) {
|
||||||
error: (res) => {
|
error: (res) => {
|
||||||
this.props.delUrlParam('usecache');
|
this.props.delUrlParam('usecache');
|
||||||
let type = getUrlParam(this.props.getUrlParam, 'type');
|
let type = getUrlParam(this.props.getUrlParam, 'type');
|
||||||
this.props.pushTo('/' + type, { pagecode: '400400000_422Xto4455' });// TODO pushTo
|
let pagecode = '400400000_422Xto4455';
|
||||||
|
if (type == 'refBljh') pagecode = '50080102_Bljhto4455';
|
||||||
|
this.props.pushTo('/' + type, { pagecode: pagecode });// TODO pushTo
|
||||||
showErrorInfo(null, res.message); /* 国际化处理: 注意*/
|
showErrorInfo(null, res.message); /* 国际化处理: 注意*/
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue