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

src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx

@@ -423,7 +423,7 @@ function PersonInfo() {
             label: (<span>重置密码</span>),
         },
     ];
-    console.log(getEdit);
+
     const submitPersonInfo = () => {
         if (currentPersonInfo.name === '') {
             message.error('请输入姓名')
@@ -654,7 +654,7 @@ function PersonInfo() {
                                             pagination={false}
                                         >
                                             <Column title="序号" dataIndex="id" key="id" align="center" width={100} ellipsis={true} render={(text, record, index) => (<>
-                                                {index + 1}
+                                                {index + 1  + (pageData.pn - 1)*pageData.page_size}
                                             </>)} />
                                             <Column title="姓名" dataIndex="name" key="name" align="center" width={100} ellipsis={true} />
                                             <Column title="手机号" dataIndex="tel" key="tel" align="center" width={200} ellipsis={true} />

src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx

@@ -13,15 +13,15 @@ let array = [];
 
 function ArrearsEtcInquiries() {
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      key: "index",
-      align: "center",
-      render: (_, record, index) => {
-        return index + 1;
-      },
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align: "center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
     {
       title: "车牌号",
       dataIndex: "licensePlateNumber",
@@ -173,6 +173,7 @@ function ArrearsEtcInquiries() {
       mandatory_name={['车牌号或泊位号']}
       pagename="欠费追缴查询"
       pageName={'arrearsInquiries'}
+      showSerial={true}
       otherData={{
         payment_time: 1,
       }}

src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx

@@ -13,15 +13,16 @@ let array = [];
 
 function ArrearsInquiries() {
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      key: "index",
-      align: "center",
-      render: (_, record, index) => {
-        return index + 1;
-      },
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align: "center",
+    //   render: (_, record, index) => {
+    //     console.log(_, record, index)
+    //     return index + 1;
+    //   },
+    // },
     {
       title: "车牌号",
       dataIndex: "licensePlateNumber",
@@ -172,6 +173,7 @@ function ArrearsInquiries() {
       formSearch={formSearch}
       total={total}
       search={fetch}
+      showSerial={true}
       initFormData={initFormData}
       mandatory={['plate','berth_id']}
       mandatory_name={['车牌号或泊位号']}

src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx

@@ -35,15 +35,15 @@ let array = [];
 function DisabledCarParkRecordTotal() {
   const [parkID, setParkID] = useState()
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      key: "index",
-      align: "center",
-      fixed: "left",
-      render: (text, record, index) => index + 1,
-      width: 100,
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align: "center",
+    //   fixed: "left",
+    //   render: (text, record, index) => index + 1,
+    //   width: 100,
+    // },
     {
       title: "停车记录ID",
       dataIndex: "park_id",
@@ -742,6 +742,7 @@ function DisabledCarParkRecordTotal() {
         mandatory_name={'车牌号'}
         pageName={'disabledCarParkRecordTotal'}
         search={search}
+        showSerial={true}
         export_other={{ "type": 1 }}
         exportUrl="/api/bpm/record/get_record_export_cj"
       />

src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx

@@ -13,15 +13,15 @@ let array = [];
 
 function EntryExitOptPDA() {
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      key: "index",
-      align:"center",
-      render: (_, record, index) => {
-        return index + 1;
-      },
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align:"center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
     {
       title: "商户名称",
       dataIndex: "merchantName",
@@ -155,6 +155,7 @@ function EntryExitOptPDA() {
       formSearch={formSearch}
       search={search}
       total={total}
+      showSerial={true}
       mandatory={'parking_num'}
       mandatory_name={'泊位号'}
       pagename="PDA操作记录"

src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx

@@ -14,15 +14,15 @@ let array = [];
 
 function GeomagneticSignalMgm() {
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      key: "index",
-      align: "center",
-      render: (_, record, index) => {
-        return index + 1;
-      },
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   align: "center",
+    //   render: (_, record, index) => {
+    //     return index + 1;
+    //   },
+    // },
     {
       title: "区域",
       dataIndex: "area",
@@ -418,6 +418,7 @@ function GeomagneticSignalMgm() {
         formSearch={formSearch}
         search={search}
         total={total}
+        showSerial={true}
         mandatory={'parkingSpotNumber'}
         mandatory_name={'泊位号'}
         initFormData={initFormData}

src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx

@@ -22,14 +22,14 @@ let array = [];
 
 function PreOrderRecord() {
   const columns = [
-    {
-      title: "序号",
-      dataIndex: "index",
-      key: "index",
-      render(_, record, index) {
-        return index + 1;
-      },
-    },
+    // {
+    //   title: "序号",
+    //   dataIndex: "index",
+    //   key: "index",
+    //   render(_, record, index) {
+    //     return index + 1;
+    //   },
+    // },
     {
       title: "区域",
       dataIndex: "region",
@@ -252,6 +252,7 @@ function PreOrderRecord() {
       <TableModule
         ref={refTable}
         columns={columns}
+        showSerial={true}
         mandatory={'berth_id'}
         mandatory_name={'泊位号'}
         pagename="未登记订单查询"

src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx

@@ -39,7 +39,7 @@ function RoadConf() {
       dataIndex: "index",
       key: "index",
       align: "center",
-      render: (text, record, index) => index + 1,
+      render: (text, record, index) => (pageData.pn - 1) * pageData.page_size + index + 1,
     },
     {
       title: "路段编号",