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

src/components/ParkingRecordModal/index.jsx

@@ -157,7 +157,7 @@ const ParkingRecordModal = (props) => {
     key == "5" ? ajax.getStartExceptionHistoryList : null;  // 历史处理
     url({park_record_id: tableData?.park_id}).then((res) => {
       setLoading(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setPayRecord(res?.data?.list || []);
       } else {
         message.error(res.message);
@@ -186,7 +186,7 @@ const ParkingRecordModal = (props) => {
   // 历史记录操作详情
   const $historyOperation = (id, value) => {
     ajax.getStartExceptionParkingRecordsInfo({...id}).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setRecordReviewModal({open: true, data: res?.data || []});
           $processView(value);
       } else {
@@ -201,7 +201,7 @@ const ParkingRecordModal = (props) => {
   const $processView = (deal_record_id) => {
     if(deal_record_id) {
       ajax.getStartExceptionProcessView({deal_record_id}).then((res) => {
-        if (res.status === 20000 || res.status == 0) {
+        if (res.status === 20000) {
           setProcessViewData(res?.data || []);
         } else {
           message.error(res.message);

src/pages/FinancialMgm/ExceptionDeal/DealRecordAudit/index.jsx

@@ -198,7 +198,7 @@ function DealRecordAudit() {
   const $dispose = (id, value) => {
     if(!id) return message.error("获取业务订单ID失败,请重新选择！");
     ajax.getDealRecordActionListView({...id}).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setRecordReviewModal({open: true, data: res?.data || []});
         $processView(value);
         setAuditSubmitId(id);
@@ -214,7 +214,7 @@ function DealRecordAudit() {
   const $processView = (deal_record_id) => {
     if(deal_record_id) {
       ajax.getStartExceptionProcessView({deal_record_id}).then((res) => {
-        if (res.status === 20000 || res.status == 0) {
+        if (res.status === 20000) {
           setProcessViewData(res?.data || []);
         } else {
           message.error(res.message);
@@ -256,7 +256,7 @@ function DealRecordAudit() {
     setLoading(true);
     ajax.getDealRecordAuditTableData(_data).then((res) => {
       setLoading(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setResultData(res?.data || {});
       } else {
         message.error(res.message);

src/pages/FinancialMgm/ExceptionDeal/DealRecordList/index.jsx

@@ -213,7 +213,7 @@ function DealRecordList() {
   const $processView = (deal_record_id) => {
     if(deal_record_id) {
       ajax.getStartExceptionProcessView({deal_record_id}).then((res) => {
-        if (res.status === 20000 || res.status == 0) {
+        if (res.status === 20000) {
           setProcessViewData(res?.data || []);
         } else {
           message.error(res.message);
@@ -234,7 +234,7 @@ function DealRecordList() {
     setResultData({list: [], total: 0});
     ajax.getDealRecordListTableData(_data).then((res) => {
       setLoading(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setResultData(res?.data || {});
       } else {
         message.error(res.message);

src/pages/FinancialMgm/ExceptionDeal/StartExceptionDeal/index.jsx

@@ -223,7 +223,7 @@ function StartExceptionDeal() {
     ajax.ElectInvoice
       .getSelectOperator()
       .then((res) => {
-        if (res.status === 20000 || res.status == 0) {
+        if (res.status === 20000) {
           setOperatorList(res.data || { value: "0", label: "全部" });
         } else {
           message.error(res.message);
@@ -239,7 +239,7 @@ function StartExceptionDeal() {
     ajax
       .getAreaTree()
       .then((res) => {
-        if (res.status === 20000 || res.status == 0) {
+        if (res.status === 20000) {
           setAreaList(
             res.data || [{ name: "全部", id: 0, level: 1, children: [] }]
           );
@@ -262,7 +262,7 @@ function StartExceptionDeal() {
     setLoading(true);
     ajax.getStartExceptionTableData(_data).then((res) => {
       setLoading(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setResultData(res?.data || {});
       } else {
         message.error(res.message);
@@ -276,7 +276,7 @@ function StartExceptionDeal() {
   const $dispose = (id) => {
     if(!id?.length) return message.error("获取停车订单ID失败,请重新选择！");
     ajax.getStartExceptionParkingRecordsInfo({id}).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setRecordReviewModal({open: true, data: res?.data || []});
         setAuditSubmitId(id);
       } else {
@@ -302,7 +302,7 @@ function StartExceptionDeal() {
     };
     ajax.getStartExceptionSendAbnormal(_data).then((res) => {
       setButtonLoad(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         message.success(res?.message || "提交审核成功");
         setRecordReviewModal({open: false, data: []})
         $getTableList()

src/pages/MerchantMgm/FunctionMgm/loadable.jsx

@@ -192,7 +192,7 @@ function FunctionMgm() {
   //编辑
   const updateBtn = (record) => {
     ajax.getOrgRoleNodeList().then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setBindTreeData(res?.data || [])
       } else {
         message.error(res.message);
@@ -226,7 +226,7 @@ function FunctionMgm() {
       tenantId: formData?.tenantId
     };
     ajax.getFunctionMgmEdit(value).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         message.success(res?.message || "编辑成功")
         getTable(formData)
         setUpdateVisible(false)

src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx

@@ -193,7 +193,7 @@ const YardDiscount = () => {
   const $fetchActivityList = (value) => {
     // console.log(value);
     return ajax.fetchActivityData({ ...value }).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         if (res?.data?.length) return res.data;
       } else {
         message.error(res.message);
@@ -226,7 +226,7 @@ const YardDiscount = () => {
   const $deleteConfirm = (id, type) => {
     let url = type == "下架" ? ajax.yardDiscountDown : ajax.yardDiscountDelete;
     url({ id }).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         message.success(res.message || `${type}成功`);
         $getTableList();
       } else {
@@ -248,7 +248,7 @@ const YardDiscount = () => {
     setLoading(true);
     ajax.yardDiscountTableData(_data).then((res) => {
       setLoading(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setResultData(res?.data || { total: 0, list: [] });
       } else {
         message.error(res.message);
@@ -274,7 +274,7 @@ const YardDiscount = () => {
     if(!data?.end_time) return message.error("请选择结束时间！");
     let _data = {...data, ...road};
     ajax.handleYardDiscount(_data, type).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         message.success(res.message || `${type}成功`);
         setModalData(defaultModal);
         setModalVisible({open: false, title: ""});

src/pages/SystemMgm/SystemLog/loadable.jsx

@@ -5,7 +5,7 @@ import moment from "moment";
 import ajax from '@/services'
 import { TableModule, ExportBtnNew } from "@/components";
 import { useSessionStorageState } from "ahooks";
-import { dictionary } from "@/config/common.js";
+import { dictionary, utils } from "@/config/common.js";
 import "./index.scss";
 
 const SystemLog = () => {
@@ -184,7 +184,7 @@ const SystemLog = () => {
   // 获取功能模块数据
   const $subsystemList = () => {
     ajax.getSystemLogMenu().then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setSubsystemData(res?.data || []);
       } else {
         message.error(res.message);
@@ -197,7 +197,7 @@ const SystemLog = () => {
   // 获取操作类型数据
   const $operationTypeList = () => {
     ajax.getSystemLogOperation().then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         setOperationTypeData(res?.data || []);
       } else {
         message.error(res.message);
@@ -212,7 +212,8 @@ const SystemLog = () => {
     setLoading(true);
     ajax.getSystemLogList(value).then((res) => {
       setLoading(false);
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
+        utils.tableScrollTop();
         setResultData(res?.data || { total_records: 0, list: [] });
       } else {
         message.error(res.message);
@@ -228,7 +229,7 @@ const SystemLog = () => {
     if(!modalExport.export_name) return message.error("请输入文件名！");
     let _data = {...formData, export_name: modalExport.export_name}
     ajax.getExportSystemLog(_data).then((res) => {
-      if (res.status === 20000 || res.status == 0) {
+      if (res.status === 20000) {
         let _url = res?.data?.url || "";
         if(!_url) return message.error("返回导出地址为空！");
           var link = document.createElement("a");