Commit 05119a2ae8e0e3ced8fb49e2270426a95823354a
1 parent
7956107b
弹窗复制到走tmpinfo
Showing
2 changed files
with
51 additions
and
19 deletions
src/mes/common/commonModelComponent/index.js
| ... | ... | @@ -440,21 +440,53 @@ const useCommonModelEvent = props => { |
| 440 | 440 | } |
| 441 | 441 | if (props.masterData.sBillNo) return |
| 442 | 442 | if (!copyToConfig) return |
| 443 | + const { app } = props; | |
| 444 | + const { token } = app; | |
| 443 | 445 | const addState = {}; // 始终初始化为对象 |
| 444 | 446 | if (Array.isArray(copyToConfig) && copyToConfig.length > 0) { |
| 445 | - copyToConfig.forEach(item => { | |
| 447 | + copyToConfig.forEach(async item => { | |
| 446 | 448 | if (item?.sControlName) { |
| 447 | - const nameList = item.sControlName.split('.'); | |
| 448 | - if (nameList && nameList.length > 2) { | |
| 449 | - const name = nameList.pop() | |
| 450 | - addState[`${name}Data`] = [{ | |
| 451 | - ...commonFunc.getDefaultData(props[`${name}Config`]), | |
| 452 | - handleType: "add", | |
| 453 | - sId: commonUtils.createSid(), | |
| 454 | - sParentId: props.masterData.sId, | |
| 455 | - ...commonFunc.getAssignFieldValue(item.sAssignField, record) | |
| 456 | - }]; | |
| 449 | + if (item.sControlName.includes('tmpInfoBySql')) { | |
| 450 | + const dataUrl = `${commonConfig.server_host}salesorder/getTmpInfo/?sModelsId=${sModelsId}`; | |
| 451 | + const sConfigformId = commonUtils.isEmpty(copyToConfig) ? '' : copyToConfig[0].sParentId; | |
| 452 | + const sControlName = commonUtils.isNotEmptyObject(name) ? name : 'BtnCopyTo.tmpInfo'; | |
| 453 | + let sSqlCondition = ''; | |
| 454 | + let sRowData = [record] | |
| 455 | + const values = { sConfigformId, sControlName, sRowData }; | |
| 456 | + if (true) { | |
| 457 | + const dataReturn = (await commonServices.postValueService(token, values, dataUrl)).data; | |
| 458 | + if (dataReturn.code === 1) { | |
| 459 | + const returnData = dataReturn.dataset.rows[0]; | |
| 460 | + if (commonUtils.isNotEmptyObject(returnData)) { | |
| 461 | + for (const key of Object.keys(returnData)) { | |
| 462 | + const sName = `${key}Data`; | |
| 463 | + addState[sName] = returnData[key]; | |
| 464 | + } | |
| 465 | + if (commonUtils.isNotEmptyArr(addState.masterData) && Array.isArray(addState.masterData)) { | |
| 466 | + addState.masterData = addState.masterData[0]; | |
| 467 | + } | |
| 468 | + } | |
| 469 | + } else { | |
| 470 | + props.getServiceError(dataReturn); | |
| 471 | + } | |
| 472 | + } else { | |
| 473 | + message.warn('数据未配置!不能生成!'); | |
| 474 | + return; | |
| 475 | + } | |
| 476 | + } else { | |
| 477 | + const nameList = item.sControlName.split('.'); | |
| 478 | + if (nameList && nameList.length > 2) { | |
| 479 | + const name = nameList.pop() | |
| 480 | + addState[`${name}Data`] = [{ | |
| 481 | + ...commonFunc.getDefaultData(props[`${name}Config`]), | |
| 482 | + handleType: "add", | |
| 483 | + sId: commonUtils.createSid(), | |
| 484 | + sParentId: props.masterData.sId, | |
| 485 | + ...commonFunc.getAssignFieldValue(item.sAssignField, record) | |
| 486 | + }]; | |
| 487 | + } | |
| 457 | 488 | } |
| 489 | + | |
| 458 | 490 | } |
| 459 | 491 | }); |
| 460 | 492 | } |
| ... | ... | @@ -1181,8 +1213,8 @@ const useCommonModelEvent = props => { |
| 1181 | 1213 | const sReturnArray = outData[0].sReturn.split('|'); |
| 1182 | 1214 | if (outData[0].sReturn.split('-').length < 2) { |
| 1183 | 1215 | // 正常业务提示,非审核模板 |
| 1184 | - // if (this.props.app.currentPane.refresh !== undefined) { | |
| 1185 | - // this.props.app.currentPane.refresh(); | |
| 1216 | + // if (props.app.currentPane.refresh !== undefined) { | |
| 1217 | + // props.app.currentPane.refresh(); | |
| 1186 | 1218 | // } |
| 1187 | 1219 | message.error(check + outData[0].sReturn); |
| 1188 | 1220 | return; |
| ... | ... | @@ -1208,12 +1240,12 @@ const useCommonModelEvent = props => { |
| 1208 | 1240 | checkPersonData.forEach((item) => { |
| 1209 | 1241 | item.key = commonUtils.createSid(); |
| 1210 | 1242 | }); |
| 1211 | - this.props.onSaveState({ | |
| 1243 | + props.onSaveState({ | |
| 1212 | 1244 | checkConditions, checkPersonData, sCheckModelId, visible: true, |
| 1213 | 1245 | }); |
| 1214 | 1246 | return true; |
| 1215 | 1247 | } else { /* 失败 */ |
| 1216 | - this.props.getServiceError({ msg: check + dataReturn }); | |
| 1248 | + props.getServiceError({ msg: check + dataReturn }); | |
| 1217 | 1249 | } |
| 1218 | 1250 | } |
| 1219 | 1251 | } else { |
| ... | ... | @@ -1225,8 +1257,8 @@ const useCommonModelEvent = props => { |
| 1225 | 1257 | if (commonUtils.isNotEmptyStr(outData[0].sReturn)) { |
| 1226 | 1258 | message.error(outData[0].sReturn); |
| 1227 | 1259 | } else { |
| 1228 | - // if (this.props.app.currentPane.refresh !== undefined) { | |
| 1229 | - // this.props.app.currentPane.refresh(); | |
| 1260 | + // if (props.app.currentPane.refresh !== undefined) { | |
| 1261 | + // props.app.currentPane.refresh(); | |
| 1230 | 1262 | // } |
| 1231 | 1263 | message.success(BtnCancelExamine + returnData.msg); |
| 1232 | 1264 | } |
| ... | ... | @@ -1238,7 +1270,7 @@ const useCommonModelEvent = props => { |
| 1238 | 1270 | await handleGetOneMemoData('orderDetail', orderDetailConfig); |
| 1239 | 1271 | } |
| 1240 | 1272 | // if (props.app.currentPane.refresh !== undefined) { |
| 1241 | - // this.props.app.currentPane.refresh(); | |
| 1273 | + // props.app.currentPane.refresh(); | |
| 1242 | 1274 | // } |
| 1243 | 1275 | } else if (returnData.code === -8) { |
| 1244 | 1276 | Modal.info({ | ... | ... |
src/mes/scheduledTasks/machineTasks/index.js
| ... | ... | @@ -585,7 +585,7 @@ const MachineTasks = baseProps => { |
| 585 | 585 | if (!bStartWork) { |
| 586 | 586 | sDefault = "${false}"; |
| 587 | 587 | } |
| 588 | - | |
| 588 | + | |
| 589 | 589 | const outPut = bManual ? [actProduceReportConfig, |
| 590 | 590 | { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, |
| 591 | 591 | { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] | ... | ... |