fix: 优化和增加搜索条件

@@ -303,7 +303,7 @@ export default {
     pageSizes: {
       type: Array,
       default() {
-        return [10, 20, 30, 40, 50, 100];
+        return [10, 20, 50, 100, 500, 1000];
       },
     },
     expandRowKeys: {

@@ -56,7 +56,6 @@
         :rowSelectDataType="false"
         :pagination="false"
         :page="1"
-        :pageSizes="[20, 30, 50, 100]"
         :totalCount="0"
         :loading="tableLoading"
         :emptyText="

@@ -23,6 +23,33 @@
             ></el-input>
           </Formitem>
         </el-col>
+        <!-- 选择口岸 -->
+        <el-col :span="5">
+          <Formitem
+            label="选择口岸"
+            prop="dataSource"
+            :activeType="activePortType"
+          >
+            <el-select
+              type="text"
+              id="inputInner--dataSource"
+              v-model="sreachFormData.dataSource"
+              clearable
+              multiple
+              placeholder=""
+              @visible-change="portChange"
+              @remove-tag="removePort"
+              @clear="clearPort"
+            >
+              <el-option
+                v-for="(item, index) in portList"
+                :key="index"
+                :label="item.portName"
+                :value="item.portCode"
+              ></el-option>
+            </el-select>
+          </Formitem>
+        </el-col>
         <!-- 回执状态 -->
         <el-col :span="5">
           <Formitem label="回执状态" prop="receiptStatus">
@@ -134,7 +161,6 @@
       :order="false"
       :loading="loadings.sreachLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"
@@ -271,6 +297,8 @@ import {
 import DialogVue from "./dialog.vue";
 import DataPreview from "../reportingData/data-preview.vue";
 import TimeDialog from "../reportingData/time-dialog.vue";
+import { getPortInfo } from "@/api/system/customer-ai.js";
+
 export default {
   name: "SupervisePlaceManage",
   components: {
@@ -280,6 +308,8 @@ export default {
   },
   data() {
     return {
+      portList: [],
+      activePortType: false,
       // 控制日志弹窗的显示和隐藏
       allLogDataReceiptStatusPopoverType: false,
       // 存储选中的日志数据
@@ -290,6 +320,7 @@ export default {
         receiptStatus: null,
         receiptType: null,
         createTime: [],
+        dataSource: [],
       },
       page: {
         pageIndex: 1,
@@ -390,8 +421,23 @@ export default {
       this.popoverClose();
     },
   },
-
+  mounted() {
+    this.searchPortDictData();
+  },
   methods: {
+    //获取口岸子字典
+    searchPortDictData() {
+      getPortInfo()
+        .then((res) => {
+          console.log(res);
+          if (res.code === "200") {
+            this.portList = res.data;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
     // 申报
     postDeclareData() {
       const obj = {
@@ -580,14 +626,46 @@ export default {
     },
 
     clear() {
-      this.$refs.sreachForm.resetFields();
       //重置数据
       this.sreachFormData = {
         billNo: "",
         receiptStatus: null,
         receiptType: null,
         createTime: [],
+        dataSource: [],
       };
+      this.clearPort();
+      this.$refs.sreachForm.resetFields();
+    },
+    portChange(type) {
+      if (type) {
+        this.activePortType = true;
+      } else {
+        if (this.sreachFormData.dataSource.length > 0) {
+          this.activePortType = true;
+        } else {
+          this.activePortType = false;
+          document
+            .querySelector("#inputInner--dataSource")
+            .classList.remove("inputFocus");
+        }
+      }
+    },
+    removePort(val) {
+      if (this.sreachFormData.dataSource.length > 0) {
+        this.activePortType = true;
+      } else {
+        this.activePortType = false;
+        document
+          .querySelector("#inputInner--dataSource")
+          .classList.remove("inputFocus");
+      }
+    },
+    clearPort() {
+      this.activePortType = false;
+      document
+        .querySelector("#inputInner--dataSource")
+        .classList.remove("inputFocus");
     },
     //查询
     search(val) {

@@ -99,7 +99,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -85,7 +85,6 @@
       noLabel="序号"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -6,7 +6,6 @@
     :order="false"
     :border="false"
     :pagination="false"
-    :pageSizes="[20, 30, 50, 100]"
     noLabel="序号"
     rowKey="index"
     emptyText="暂无数据"

@@ -9,7 +9,6 @@
     :pagination="false"
     :order="false"
     :page="1"
-    :pageSizes="[20, 30, 50, 100]"
     :totalCount="0"
     :selection="false"
     :selectFixed="false"

@@ -131,7 +131,6 @@
       noLabel="序号"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -131,7 +131,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -197,7 +197,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -132,7 +132,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -19,19 +19,19 @@
           </Formitem>
         </el-col>
         <!-- 物流企业代码 -->
-<!--        <el-col :span="5">-->
-<!--          <Formitem label="物流企业代码" prop="logisticsCode">-->
-<!--            <el-input-->
-<!--              type="text"-->
-<!--              class="inputShadow"-->
-<!--              id="inputInner&#45;&#45;logisticsCode"-->
-<!--              resize="none"-->
-<!--              v-model="sreachFormData.logisticsCode"-->
-<!--              clearable-->
-<!--              placeholder=""-->
-<!--            ></el-input>-->
-<!--          </Formitem>-->
-<!--        </el-col>-->
+        <!--        <el-col :span="5">-->
+        <!--          <Formitem label="物流企业代码" prop="logisticsCode">-->
+        <!--            <el-input-->
+        <!--              type="text"-->
+        <!--              class="inputShadow"-->
+        <!--              id="inputInner&#45;&#45;logisticsCode"-->
+        <!--              resize="none"-->
+        <!--              v-model="sreachFormData.logisticsCode"-->
+        <!--              clearable-->
+        <!--              placeholder=""-->
+        <!--            ></el-input>-->
+        <!--          </Formitem>-->
+        <!--        </el-col>-->
         <!-- 回执状态 -->
         <el-col :span="5">
           <Formitem label="回执状态" prop="returnStatus">
@@ -43,7 +43,11 @@
               placeholder=""
             >
               <el-option
-                v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS.filter(fItem => fItem.itemChineseName !== '已提交')"
+                v-for="(
+                  item, index
+                ) in $store.getters.dict.RECEIPT_STATUS.filter(
+                  (fItem) => fItem.itemChineseName !== '已提交'
+                )"
                 :key="index"
                 :label="item.itemChineseName"
                 :value="item.itemValue"
@@ -113,7 +117,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"
@@ -278,7 +281,7 @@ export default {
       if (val == 0) {
         this.page.pageIndex = 1;
       }
-      let obj = {...this.sreachFormData};
+      let obj = { ...this.sreachFormData };
       obj.pageIndex = this.page.pageIndex;
       obj.pageSize = this.page.pageSize;
       obj.createTimeStart = "";
@@ -337,7 +340,7 @@ export default {
         })
         .finally(() => {
           this.$nextTick(() => {
-            this.$store.dispatch('setLoadingState', false)
+            this.$store.dispatch("setLoadingState", false);
             this.$refs.returnStatusPopover.tableLoading = false;
           });
         });

@@ -101,7 +101,6 @@
       :order="false"
       :loading="loadings.sreachLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -122,7 +122,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -120,7 +120,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -122,7 +122,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -56,7 +56,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"
@@ -90,7 +89,6 @@
 <script>
 import { getRoleList } from "@/api/system/user.js";
 import DialogVue from "./dialog.vue";
-import { addMenu, deleteMenu } from "@/api/menu";
 
 export default {
   name: "SupervisePlaceManage",

@@ -101,7 +101,6 @@
       noLabel="序号"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -107,7 +107,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -90,7 +90,6 @@
         :pagination="false"
         :order="false"
         :page="1"
-        :pageSizes="[20, 30, 50, 100]"
         :totalCount="0"
         :selection="false"
         :selectFixed="false"

@@ -89,7 +89,33 @@
           </el-col>
         </el-row>
         <el-row class="backgroundRow">
-          <!-- 回执状态 -->
+          <!-- 选择口岸 -->
+          <el-col :span="5">
+            <Formitem
+              label="选择口岸"
+              prop="dataSource"
+              :activeType="activePortType"
+            >
+              <el-select
+                type="text"
+                id="inputInner--dataSource"
+                v-model="sreachFormData.dataSource"
+                clearable
+                multiple
+                placeholder=""
+                @visible-change="portChange"
+                @remove-tag="removePort"
+                @clear="clearPort"
+              >
+                <el-option
+                  v-for="(item, index) in portList"
+                  :key="index"
+                  :label="item.portName"
+                  :value="item.portCode"
+                ></el-option>
+              </el-select>
+            </Formitem>
+          </el-col>
           <el-col :span="5">
             <Formitem
               label="回执状态"
@@ -105,7 +131,7 @@
                 multiple
                 @visible-change="visibleChange"
                 @remove-tag="removeTag"
-                @clear="clear"
+                @clear="clearStatus"
               >
                 <el-option
                   v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
@@ -276,7 +302,6 @@
       :order="false"
       :loading="loadings.sreachLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"
@@ -494,6 +519,7 @@ import BatchModify from "./batchModify.vue";
 import TimeDialog from "./time-dialog.vue";
 import DataPreview from "./data-preview.vue";
 import WeightAdjust from "./weight-adjust.vue";
+import { getPortInfo } from "@/api/system/customer-ai.js";
 export default {
   name: "ReportingData",
   components: {
@@ -509,6 +535,7 @@ export default {
   data() {
     return {
       activeType: false,
+      activePortType: false,
       // 控制日志弹窗的显示和隐藏
       allLogDataReceiptStatusPopoverType: false,
       // 存储选中的日志数据
@@ -520,6 +547,7 @@ export default {
         receiptStatus: [],
         receiptType: null,
         createTime: [],
+        dataSource: [],
       },
       page: {
         pageIndex: 1,
@@ -695,6 +723,7 @@ export default {
       currentLoadingKey: "",
       paramsOjb: {},
       weightAdjustVisible: false,
+      portList: [],
     };
   },
   created() {
@@ -711,7 +740,7 @@ export default {
     }
   },
   mounted() {
-    console.log(this.tableMaxheight);
+    this.searchPortDictData();
   },
 
   watch: {
@@ -730,6 +759,49 @@ export default {
     });
   },
   methods: {
+    //获取口岸子字典
+    searchPortDictData() {
+      getPortInfo()
+        .then((res) => {
+          console.log(res);
+          if (res.code === "200") {
+            this.portList = res.data;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
+    portChange(type) {
+      if (type) {
+        this.activePortType = true;
+      } else {
+        if (this.sreachFormData.dataSource.length > 0) {
+          this.activePortType = true;
+        } else {
+          this.activePortType = false;
+          document
+            .querySelector("#inputInner--dataSource")
+            .classList.remove("inputFocus");
+        }
+      }
+    },
+    removePort(val) {
+      if (this.sreachFormData.dataSource.length > 0) {
+        this.activePortType = true;
+      } else {
+        this.activePortType = false;
+        document
+          .querySelector("#inputInner--dataSource")
+          .classList.remove("inputFocus");
+      }
+    },
+    clearPort() {
+      this.activePortType = false;
+      document
+        .querySelector("#inputInner--dataSource")
+        .classList.remove("inputFocus");
+    },
     visibleChange(type) {
       if (type) {
         this.activeType = true;
@@ -754,7 +826,7 @@ export default {
           .classList.remove("inputFocus");
       }
     },
-    clear() {
+    clearStatus() {
       this.activeType = false;
       document
         .querySelector("#inputInner--receiptStatus")
@@ -819,7 +891,10 @@ export default {
         receiptStatus: [],
         receiptType: null,
         createTime: [],
+        dataSource: [],
       };
+      this.clearPort();
+      this.clearStatus();
     },
     //上传申报数据
     uploadData() {

@@ -139,10 +139,10 @@ export default {
       //   return;
       // }
 
-      // if (decimalPart.length > 5) {
-      //   callback(new Error("小数部分最多5位"));
-      //   return;
-      // }
+      if (decimalPart.length > 2) {
+        callback(new Error("小数部分最多2位"));
+        return;
+      }
 
       callback();
     };

@@ -56,7 +56,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -200,7 +200,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -28,7 +28,6 @@
       :pagination="true"
       :order="false"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -101,7 +101,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"

@@ -113,7 +113,6 @@
       :order="false"
       :loading="loadings.searchLoading"
       :page="page.pageIndex"
-      :pageSizes="[20, 30, 50, 100]"
       :totalCount="page.total"
       @sizeChange="sizeChange"
       @currentChange="currentChange"