xlyErp / xlyUmi

Commit 3bf6a85b57f45d3b2ad6bcc8b97c5434acf596a3

Authored by 陈鑫涛
2 parents 7c225fe0 c9929a7a

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

Inline Side-by-side
Showing 2 changed files with 13 additions and 8 deletions
src/components/Common/CommonBillEvent.js
  View file @3bf6a85
... ... @@ -6830,6 +6830,7 @@ export default (ChildComponent) => {
6830 6830 });
6831 6831 } else if (name === 'process' && sName === 'sQuoParams') { // 产品工艺卡报价参数
6832 6832 const { processConfig, enabled, sModelsType } = this.props;
  6833 + const NoQuoParameters = commonFunc.showLocalMessage(this.props, 'NoQuoParameters', '无报价参数！');
6833 6834 const slaveSelectOneData = record;
6834 6835 let modalVisible = false;
6835 6836 const sProcessParamsSelects = [];
... ... @@ -6839,7 +6840,7 @@ export default (ChildComponent) => {
6839 6840 paramType = slaveSelectOneData.sProcessParam;
6840 6841 }
6841 6842 if(commonUtils.isEmpty(paramType)) {
6842   - message.warn('无报价参数！');
  6843 + message.warn(NoQuoParameters);
6843 6844 return;
6844 6845 }
6845 6846 /* 工序参数以表格形式展示 列 */
... ... @@ -6949,7 +6950,8 @@ export default (ChildComponent) => {
6949 6950 paramType = slaveSelectOneData.sWorkOrderParam;
6950 6951 }
6951 6952 if(commonUtils.isEmpty(paramType)) {
6952   - message.warn('无工艺参数！');
  6953 + const NoProcessParameters = commonFunc.showLocalMessage(this.props, 'NoProcessParameters', '无工艺参数！');
  6954 + message.warn(NoProcessParameters);
6953 6955 return;
6954 6956 }
6955 6957 /* 工序参数以表格形式展示 列 */
... ... @@ -7313,6 +7315,7 @@ export default (ChildComponent) => {
7313 7315 handleViewChoose= (name, sName, record) => {
7314 7316 const { sId } = record; /* 控制表主键 */
7315 7317 const { enabled, processSelectedRowKeys } = this.props;
  7318 + const NoProcessParameters = commonFunc.showLocalMessage(this.props, 'NoProcessParameters', '无工艺参数！');
7316 7319 const sisColorSelectedRowKeys = [];
7317 7320 let jsonData = [];
7318 7321 if (name === 'process' && sName === 'sColorSerialMemo') {
... ... @@ -7378,7 +7381,7 @@ export default (ChildComponent) => {
7378 7381 paramType = slaveSelectOneData.sReportParam; /* 上报参数 */
7379 7382 }
7380 7383 if (commonUtils.isEmpty(paramType)) {
7381   - message.warn('无工艺参数！');
  7384 + message.warn(NoProcessParameters);
7382 7385 return;
7383 7386 }
7384 7387 /* 工序参数以表格形式展示 列 */
... ...
src/components/QuoQuotation/QuotationPackTableTree/QuotationPackTableTree.js
  View file @3bf6a85
... ... @@ -1012,11 +1012,13 @@ class QuotationPackTableTree extends Component {
1012 1012  
1013 1013 const masterReturn = (await commonServices.postValueService(token, values, url)).data;
1014 1014 if (masterReturn.code === 1) {
1015   - const sBackProcessDataValue = masterReturn.dataset.rows;
1016   - if (isWait) {
1017   - return { sBackProcessData: sBackProcessDataValue };
1018   - } else {
1019   - this.props.onSaveState({ sBackProcessData: sBackProcessDataValue });
  1015 + if(commonUtils.isNotEmptyObject(masterReturn.dataset) && commonUtils.isNotEmptyArr(masterReturn.dataset.rows) ) {
  1016 + const sBackProcessDataValue = masterReturn.dataset.rows;
  1017 + if (isWait) {
  1018 + return { sBackProcessData: sBackProcessDataValue };
  1019 + } else {
  1020 + this.props.onSaveState({ sBackProcessData: sBackProcessDataValue });
  1021 + }
1020 1022 }
1021 1023 } else {
1022 1024 message.warn(masterReturn.msg);
... ...