Commit 4322876c4049b4d9493125b08410d0909a6838ab

Authored by Min
1 parent 108ead62

1.处理列表copyTo提示正在操作

src/components/Common/CommonListEvent.js
@@ -1804,33 +1804,33 @@ export default (ChildComponent) => { @@ -1804,33 +1804,33 @@ export default (ChildComponent) => {
1804 this.props.app.webSocket.onmessageTmp = (msg) => { 1804 this.props.app.webSocket.onmessageTmp = (msg) => {
1805 const rtmsg = JSON.parse(msg.data); 1805 const rtmsg = JSON.parse(msg.data);
1806 if (rtmsg.action === 'execute') { 1806 if (rtmsg.action === 'execute') {
1807 - if (rtmsg.msg === 'continue') {  
1808 - const { formRoute } = this.state;  
1809 - if (commonUtils.isNotEmptyArr(copyToData)) {  
1810 - copyTo.name = name;  
1811 - copyTo.config = copyToConfig;  
1812 - if (name !== 'BtnCopyTo.workOrderToWorkOrder' && !name.includes('BtnCopyTo.tmpInfo') && !name.includes('btncopyto.tmpinfobysql')) {  
1813 - copyTo.masterData = copyToData[0];  
1814 - copyTo.slaveData = copyToData;  
1815 - copyTo.copyOtherData = addcopyOther;  
1816 - copyTo.srcFormRoute = this.props.formRoute; /* 未清来源路由 */  
1817 - }  
1818 - copyTo.copyToDataSid = sId?.split(',');  
1819 - dispatch({  
1820 - type: 'content/onRouter',  
1821 - payload: {  
1822 - url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}&sName=${formRoute}`, /* 接口地址 */  
1823 - copyTo,  
1824 - refresh: getData.bind(this, slaveConfig, slaveFilterCondition, commonUtils.isEmpty(slavePagination) ? 0 : slavePagination.current, slavePagination.pageSize, slaveOrderBy, isRefresh, undefined, undefined, treeFilterCondition),  
1825 - sSrcModelsId: this.props.sModelsId,  
1826 - },  
1827 - });  
1828 - } else {  
1829 - message.warn(commonFunc.showMessage(app.commonConst, 'pleaseChooseData')); // 请选择数据 1807 + if (rtmsg.msg !== 'continue') {
  1808 + message.warning(rtmsg.handlers + commonFunc.showMessage(app.commonConst, 'InOperation'));/* 在操作,请稍后再操作! */
  1809 + }
  1810 + const { formRoute } = this.state;
  1811 + if (commonUtils.isNotEmptyArr(copyToData)) {
  1812 + copyTo.name = name;
  1813 + copyTo.config = copyToConfig;
  1814 + if (name !== 'BtnCopyTo.workOrderToWorkOrder' && !name.includes('BtnCopyTo.tmpInfo') && !name.includes('btncopyto.tmpinfobysql')) {
  1815 + copyTo.masterData = copyToData[0];
  1816 + copyTo.slaveData = copyToData;
  1817 + copyTo.copyOtherData = addcopyOther;
  1818 + copyTo.srcFormRoute = this.props.formRoute; /* 未清来源路由 */
1830 } 1819 }
  1820 + copyTo.copyToDataSid = sId?.split(',');
  1821 + dispatch({
  1822 + type: 'content/onRouter',
  1823 + payload: {
  1824 + url: `${commonConfig.server_host}gdsmodule/getGdsmoduleById/${sActiveId}?sModelsId=${sActiveId}&sName=${formRoute}`, /* 接口地址 */
  1825 + copyTo,
  1826 + refresh: getData.bind(this, slaveConfig, slaveFilterCondition, commonUtils.isEmpty(slavePagination) ? 0 : slavePagination.current, slavePagination.pageSize, slaveOrderBy, isRefresh, undefined, undefined, treeFilterCondition),
  1827 + sSrcModelsId: this.props.sModelsId,
  1828 + },
  1829 + });
1831 } else { 1830 } else {
1832 - message.warning(rtmsg.handlers + commonFunc.showMessage(app.commonConst, 'InOperation'));/* 在操作,请稍后再操作! */ 1831 + message.warn(commonFunc.showMessage(app.commonConst, 'pleaseChooseData')); // 请选择数据
1833 } 1832 }
  1833 +
1834 } 1834 }
1835 }; 1835 };
1836 let sId = sIdArray.toString(); 1836 let sId = sIdArray.toString();