Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

1 year ago · 9bfc8b5354
11 changed files with 62 additions and 41 deletions
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/index.scss
@ -42,6 +42,7 @@ $color-primary : var(--color-primary);
      margin-top: 22px;
        .btnBox{
          display:flex ;
+          justify-content: right;
          .yisa-btn{
            margin-left: 40px;
            margin-top: 20px;
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx
@ -180,7 +180,7 @@ function CouponDistribute(props) {
                !showEdit ? 
                <>
                    <div className="coupon-distribute-search">
-                        <label className="search">查询条件</label>
+                        <label className="search" style={{marginBottom: '20px',display:'block'}}>查询条件</label>
                        <FormInput
                            yisaLabel="活动名称"
                            placeholder="输入活动名称"
@ -194,15 +194,19 @@ function CouponDistribute(props) {
                                <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
                                    查询
                                </Button>
-                                <Button type="primary" className="yisa-btn" onClick={() => { setShowEdit(true) ; setHandleStatus('1') }}>
-                                    添加
-                                </Button>
+                                
                            </div>
                        </div>
                    </div>
                    <div className="coupon-distribute-result">
                        <div className="result">
+                            <div className="result-info-row">
                                <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                                <Button type="primary" className="yisa-btn" onClick={() => { setShowEdit(true) ; setHandleStatus('1') }}>
+                                    添加
+                                </Button>
+                            </div>
+                            
                            <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.list ? resultData.list : []}>
                                <Table
                                    bordered
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/index.scss
@ -35,7 +35,7 @@ $color-primary : var(--color-primary);
    }
  }
  .total-row-wrapper{
-    justify-content: flex-start;
+    // justify-content: flex-start;
    align-items: center;
    .export-content{
      width: 68px;
@ -77,7 +77,10 @@ $color-primary : var(--color-primary);
  }
  .bottomBox{
    display: flex;
-    justify-content: space-between;
+    // .ant-btn-primary{
+    //   min-width: 200px;
+    // }
+    justify-content:right !important;
  }
 }
 .coupon-info{
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx
@ -574,8 +574,8 @@ function CouponRules() {
                                />

                                <div className="bottomBox">
-                                    <Button type="primary"  onClick={addCoupon }>添加</Button>
-                                    <Button type="primary" loading={loading}  onClick={search}>查询</Button>
+                                    
+                                    <Button type="primary"   onClick={search}>查询</Button>
                                </div>
                            </div>
                        </div>
@ -588,13 +588,13 @@ function CouponRules() {
                                resultData={resultData.list}
                                message={"暂无数据"}
                            >
-                                <div className="total-row-wrapper">
-                                    {/* <ExportBtn {...exportParams} ><div className="export-content">导出</div></ExportBtn> */}
+                                <div className="total-row-wrapper result-info-row">
                                    <span className="number-wrapper">
                                        <span className="letter">共查询到</span>
                                        <span className="total-number"> {resultData.total} </span>
                                        <span className="letter">条结果</span>
                                    </span>
+                                    <Button type="primary"  onClick={addCoupon }>添加</Button>
                                </div>
                                <div className="table-wrap">
                                    <Table
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/index.scss
@ -34,7 +34,7 @@ $color-primary : var(--color-primary);
      }
    }
    .total-row-wrapper{
-      justify-content: flex-start;
+      // justify-content: flex-start;
      align-items: center;
      .export-content{
        width: 68px;
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx
@ -338,8 +338,8 @@ function WriteOffDetail() {
                        // ]}
                    />
                    <div className="bottomBox">
-                        <Button type="primary" onClick={exportData} >导出</Button>
-                        <Button type="primary" onClick={reset}>重置</Button>
+                        
+                        <Button  onClick={reset}>重置</Button>
                        <Button type="primary" loading={loading}  onClick={search}>查询</Button>
                    </div>
                </div>
@ -350,13 +350,14 @@ function WriteOffDetail() {
                        resultData={resultData.list}
                        message={"暂无数据"}
                    >
-                        <div className="total-row-wrapper">
+                        <div className="total-row-wrapper result-info-row">
                            {/* <ExportBtn {...exportParams} ><div className="export-content">导出</div></ExportBtn> */}
                            <span className="number-wrapper">
                                <span className="letter">共查询到</span>
                                <span className="total-number"> {resultData.total} </span>
                                <span className="letter">条结果</span>
                            </span>
+                            <Button type="primary" onClick={exportData} >导出</Button>
                        </div>
                        <div className="table-wrap">
                            <Table
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/index.scss
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/index.scss
@ -71,7 +71,8 @@ $color-primary : var(--color-primary);
  }
  .write-off-stat-result{
    width: 100%;
-    height: 800px;
+    // height: 800px;
+    height: 757px;
    background: #505a6f;
    border-radius: 20px;
    margin-left: 17px;
--- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
+++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx
@ -208,21 +208,26 @@ function WriteOffStat(props) {
                        // ]}
                    />
                    <div className="btnBox">
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
-                        查询
-                        </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
+                        <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
                            重置
                        </Button>
-                        <Button type="primary" className="yisa-btn" onClick={() => { exportData() }}>
-                            导出
+                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
+                        查询
                        </Button>
+                        
+                        
                    </div>
                </div>
            </div>
            <div className="write-off-stat-result">
                <div className="result">
+                    <div className="result-info-row">
                        <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                        <Button type="primary" className="yisa-btn" onClick={() => { exportData() }}>
+                                导出
+                            </Button>
+                    </div>
+                    
                    <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.list ? resultData.list : []}>
                        <Table
                            bordered
--- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx
@ -506,24 +506,30 @@ function ZombieCarCleanRecord(props) {
                </div>
                <div className="timePicker ">
                    <div className="btnBox">
+                       
+                        <Button  className="yisa-btn"  onClick={() => { getResetData() }}>
+                            重置
+                        </Button>
                        <Button type="primary" className="yisa-btn"  onClick={() => { getSearchData() }}>
                            查询
                        </Button>
-                        <Button type="primary" className="yisa-btn"  onClick={() => { getResetData() }}>
-                            重置
-                        </Button>
+                        
+                    </div>
+                </div>
+            </div>
+            <div className="paid-result">
+                <div className="result">
+                    <div className="result-info-row">
+                         <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
+                        <div>
                            <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
                                导出
-                        </Button>
+                            </Button>&emsp;
                            <Button type="primary" className="yisa-btn" disabled={true} onClick={() => { sameBtn() }}>
                                同步
                            </Button>
                        </div>
                    </div>
-            </div>
-            <div className="paid-result">
-                <div className="result">
-                    <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
                    <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                        <Table
                            bordered
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/LEDConfiguration.jsx
@ -170,7 +170,7 @@ function LEDConfiguration({ id }) {
    setDelModal({ visible: false, id: null });
  }
  function getLEDBusiness() {
-    ajax.getLEDBusiness({ road_id: id }).then((res) => {
+    ajax.getLEDBusiness().then((res) => {
      if (res.status == 20000) {
        setBusinessList(res.data)
      } else {
@ -180,7 +180,7 @@ function LEDConfiguration({ id }) {
    setDelModal({ visible: false, id: null });
  }
  function getModalLEDBusiness() {
-    ajax.getLEDBusiness().then((res) => {
+    ajax.getLEDBusiness({ road_id: id }).then((res) => {
      if (res.status == 20000) {
        setModalBusinessList(res.data)
      } else {
@ -241,7 +241,7 @@ function LEDConfiguration({ id }) {
            rules={[{ required: true }]}
            name="business_type"
          >
-            <Select options={modalBusinessList|| []} disabled={modalData.status === "edit"} />
+            <Select options={(modalData.status === "add"?modalBusinessList:businessList)|| []} disabled={modalData.status === "edit"} />
          </Form.Item>
          <Form.Item
            label="LED显示文案"
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/index.scss
@ -279,17 +279,17 @@ $color-primary: var(--color-primary);
    color: red;
 }
 .open_method_modal{
-    .ant-select-selection-placeholder{
-        flex:none
-    }
    .ant-form-item-label{
        label{
            min-width: 85px;
        }
    }
+    .submitBtn{
        .ant-form-item-control-input-content{
            text-align: center;
        }
+    }
+    
    .ant-btn{
        width: 120px;
        margin-left: 8px;