Commit eeb5d45356ecdf31c6777f6973b26a5691da24cc

Authored by Min
2 parents b9fc536e 0785aa26

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

src/components/QuickQuote/index.jsx
@@ -2686,7 +2686,7 @@ const MaterialsComponent = props => { @@ -2686,7 +2686,7 @@ const MaterialsComponent = props => {
2686 // 多数量表组件 2686 // 多数量表组件
2687 const ManyComponent = props => { 2687 const ManyComponent = props => {
2688 const { state, setState, enabled, loading } = props; 2688 const { state, setState, enabled, loading } = props;
2689 - const { masterData = {}, calcPriceLoading, calcPriceFinished, manyData = [] } = state; 2689 + const { masterData = {}, calcPriceLoading, calcPriceFinished, manyData = [], selectedNode = {} } = state;
2690 const [submitLoading, setSubmitLoading] = useState(false); 2690 const [submitLoading, setSubmitLoading] = useState(false);
2691 const [processPercent, setProcessPercent] = useState(0); 2691 const [processPercent, setProcessPercent] = useState(0);
2692 2692
@@ -2819,11 +2819,28 @@ const ManyComponent = props => { @@ -2819,11 +2819,28 @@ const ManyComponent = props => {
2819 size="large" 2819 size="large"
2820 loading={loading} 2820 loading={loading}
2821 disabled={!calcPriceFinished} 2821 disabled={!calcPriceFinished}
2822 - onClick={() => { 2822 + onClick={async () => {
2823 const { report = [] } = props; 2823 const { report = [] } = props;
2824 - const reportDataOne = report[0];  
2825 - if (!reportDataOne) return;  
2826 - 2824 + let reportDataOne = report[0];
  2825 + if (selectedNode.sTypeKey === "juantong") {
  2826 + reportDataOne = "";
  2827 + const sModelsId = "101251240115016002356125200";
  2828 + const configUrl = `${commonConfig.server_host}business/getModelBysId/${sModelsId}?sModelsId=${sModelsId}&sName=/commonAuto`;
  2829 + const configReturn = (await commonServices.getService("", configUrl)).data;
  2830 + if (configReturn.code === 1) {
  2831 + const dataReturn = configReturn.dataset.rows;
  2832 + if (commonUtils.isNotEmptyArr(dataReturn)) {
  2833 + const { report = [] } = dataReturn[0];
  2834 + reportDataOne = report[0];
  2835 + }
  2836 + } else {
  2837 + message.error(configReturn.msg);
  2838 + }
  2839 + }
  2840 + if (!reportDataOne) {
  2841 + message.info("报表未配置,请先配置报表!");
  2842 + return;
  2843 + }
2827 const { sId } = reportDataOne; 2844 const { sId } = reportDataOne;
2828 props.onBtnPrint(sId, false, `BtnPrint.${sId}`); 2845 props.onBtnPrint(sId, false, `BtnPrint.${sId}`);
2829 }} 2846 }}