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

src/components/TableModule/index.jsx

@@ -211,21 +211,16 @@ const TableModule = forwardRef((props, ref) => {
     }
     if (limitCon && limitCon(form)) return
     //setLoading(true);
-    setGetForm(form);
+    console.log(form);
     search(form);
   }
   //重置
   function reset() {
+    setAreaSelectedList([])
     searchForm.resetFields();
-    setFormData({ ...searchForm.getFieldsValue() })
-    //  search(getForm)
-    // fetch()
-    // setTimeout(()=>{
-    //   // setAreaSelectedList([])
-    //   console.log(getForm);
-
-    // },800)
-    console.log(getForm);
+     setFormData({ ...searchForm.getFieldsValue() })
+     search({ ...searchForm.getFieldsValue() })
+   
   }
   function cascaderChange(value, options) {
     let res = [];

src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx

@@ -167,7 +167,7 @@ function CreateInvoiceRecord() {
         render: (_, record) => {
           var head = "";
           if (_) {
-            head = Headtype.filter((ele) => ele.value == _)[0]?.label;
+            head = Headtype.filter((ele) => ele.value == _)[0]?.label || "";
           }
           return head;
         },
@@ -229,7 +229,8 @@ function CreateInvoiceRecord() {
         render: (_, record) => {
           var ordertype = "";
           if (_) {
-            ordertype = orderType.filter((ele) => ele.value == _)[0].label;
+            ordertype =
+              orderType.filter((ele) => ele.value == _)[0].label || "";
           }
           return ordertype;
         },
@@ -243,7 +244,7 @@ function CreateInvoiceRecord() {
         render: (_, record) => {
           var buss = "";
           if (_) {
-            buss = Bussinss.filter((ele) => ele.value == _)[0].label;
+            buss = Bussinss.filter((ele) => ele.value == _)[0].label || "";
           }
           return buss;
         },
@@ -257,7 +258,7 @@ function CreateInvoiceRecord() {
         render: (_, record) => {
           var ztas = "";
           if (_) {
-            ztas = Zta.filter((ele) => ele.value == _)[0].label;
+            ztas = Zta.filter((ele) => ele.value == _)[0].label || "";
           }
           return ztas;
         },

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

@@ -378,7 +378,7 @@ function ParkRecordTotal() {
     },
   ];
   const initFormData = {
-    region: null,
+    region: [],
     operator: null,
     road: "",
     road_type: 0,