Commit da1630653dcfebad3cf15e4edab3caacd3512bde

Authored by 陈鑫涛
2 parents 30e2f49a b527a514

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

src/components/QuickQuote/index.jsx
@@ -2323,13 +2323,13 @@ const ManyComponent = props => { @@ -2323,13 +2323,13 @@ const ManyComponent = props => {
2323 const [submitLoading, setSubmitLoading] = useState(false); 2323 const [submitLoading, setSubmitLoading] = useState(false);
2324 const [processPercent, setProcessPercent] = useState(0); 2324 const [processPercent, setProcessPercent] = useState(0);
2325 2325
2326 - const [BtnNewQuotation, BtnDraft, BtnPriceverification, BtnConfirmQuantity, btnOrdering, BtnPrintPreview] = props.getI18nNameList( 2326 + const [BtnNewQuotation, BtnDraft, BtnPriceverification, BtnConfirmQuantity, btnOrdering, BtnPriceDetails] = props.getI18nNameList(
2327 ["BtnNewQuotation", "新报价"], 2327 ["BtnNewQuotation", "新报价"],
2328 ["BtnDraft", "存草稿"], 2328 ["BtnDraft", "存草稿"],
2329 ["BtnPriceverification", "核价"], 2329 ["BtnPriceverification", "核价"],
2330 ["BtnConfirmQuantity", "确认下单数量"], 2330 ["BtnConfirmQuantity", "确认下单数量"],
2331 ["btnOrdering", "下单中..."], 2331 ["btnOrdering", "下单中..."],
2332 - ["BtnPrintPreview", "打印预览"] 2332 + ["BtnPriceDetails", "价格明细"]
2333 ); 2333 );
2334 2334
2335 // 核价事件 2335 // 核价事件
@@ -2426,7 +2426,7 @@ const ManyComponent = props => { @@ -2426,7 +2426,7 @@ const ManyComponent = props => {
2426 manyData: state.manyData, 2426 manyData: state.manyData,
2427 })); 2427 }));
2428 }, 2428 },
2429 - fixedHeight: 185, 2429 + fixedHeight: 145,
2430 }; 2430 };
2431 2431
2432 return ( 2432 return (
@@ -2447,8 +2447,19 @@ const ManyComponent = props => { @@ -2447,8 +2447,19 @@ const ManyComponent = props => {
2447 > 2447 >
2448 {BtnDraft} 2448 {BtnDraft}
2449 </Button> 2449 </Button>
2450 - <Button type="primary" size="large" onClick={() => {}}>  
2451 - {BtnPrintPreview} 2450 + <Button
  2451 + type="primary"
  2452 + size="large"
  2453 + onClick={() => {
  2454 + const { report = [] } = props;
  2455 + const reportDataOne = report[0];
  2456 + if (!reportDataOne) return;
  2457 +
  2458 + const { sId } = reportDataOne;
  2459 + props.onBtnPrint(sId, false, `BtnPrint.${sId}`);
  2460 + }}
  2461 + >
  2462 + {BtnPriceDetails}
2452 </Button> 2463 </Button>
2453 <Button type="primary" size="large" loading={loading || calcPriceLoading} className={styles.calcPrice} onClick={onCalcPrice}> 2464 <Button type="primary" size="large" loading={loading || calcPriceLoading} className={styles.calcPrice} onClick={onCalcPrice}>
2454 {calcPriceLoading ? `核价中【进度${processPercent}%】...` : BtnPriceverification} 2465 {calcPriceLoading ? `核价中【进度${processPercent}%】...` : BtnPriceverification}
src/components/QuickQuote/index.less
@@ -307,7 +307,7 @@ @@ -307,7 +307,7 @@
307 307
308 .many { 308 .many {
309 width: 100%; 309 width: 100%;
310 - height: 235px; 310 + height: 185px;
311 padding: 0 10px 0 10px; 311 padding: 0 10px 0 10px;
312 position: relative; 312 position: relative;
313 313