fix(): 处理测试提交的财务管理异常处理模块的bug

src/components/ParkingRecordModal/RecordReviewModal.jsx

@@ -36,7 +36,7 @@ const RecordReviewModal = (props) => {
     { value: 2, label: '变更车牌号' },
     { value: 3, label: '变更订单金额' },
     { value: 4, label: '免费该订单' },
-    { value: 5, label: '作废该订单' }
+    // { value: 5, label: '作废该订单' }
   ];
   // 调整基于
   const adjustment = [

src/components/ParkingRecordModal/dataSource.js

@@ -58,6 +58,19 @@ export const payRecordColumns = [
     dataIndex: "payment_type",
     key: "payment_type",
     align: "center",
+    render: (text, record, index) => {
+      let tem = "";
+      record?.payment_type == 1 ? tem = "场内支付" :
+      record?.payment_type == 2 ? tem = "欠费补缴" :
+      record?.payment_type == 3 ? tem = "欠费追缴" :
+      record?.payment_type == 4 ? tem = "etc欠费追缴" : 
+      tem = "未知"
+
+      return(
+        <span>{tem}</span>
+      )
+    }
+
   },
   {
     title: "支付渠道",

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

@@ -12,7 +12,7 @@ function DealRecordList() {
   // 默认数据
   const defaultData = {
     deal_record_id: "", // 处理记录ID
-    business_type: 0, // 业务订单类型
+    business_type: "0", // 业务订单类型
     park_id: "", // 业务订单ID
     status: 0, // 状态
     start_time: moment().subtract(7, "days").startOf("day").format("YYYY-MM-DD HH:mm:ss"), // 开始时间
@@ -249,7 +249,7 @@ function DealRecordList() {
     if(sessionData && Object.values(sessionData).length > 0) {
       _data = {
         deal_record_id: sessionData?.deal_record_id || "", // 处理记录ID
-        business_type: sessionData?.business_type || 0, // 业务订单类型
+        business_type: sessionData?.business_type || "0", // 业务订单类型
         park_id: sessionData?.park_id || [], // 业务订单ID
         status: sessionData?.status || 0, // 状态
         start_time: sessionData?.start_time || defaultData?.start_time,
@@ -331,7 +331,7 @@ function DealRecordList() {
                 },
               ]}
               value={formData.business_type}
-              onChange={(v) => setFormData({ ...formData, business_type: v || 0})}
+              onChange={(v) => setFormData({ ...formData, business_type: v || "0"})}
             />
           </div>
           <div className="yisa-search">

src/pages/MerchantMgm/MerchantAdmin/loadable.jsx

@@ -277,6 +277,7 @@ function MerchantAdmin() {
 
   //编辑管理员-提交按钮
   const submitUpdate = async () => {
+    console.log(records);
     try {
       var updateFormValue = {}
       await updateForm.validateFields().then(async (value) => {
@@ -287,7 +288,7 @@ function MerchantAdmin() {
           operatorid, phone, full_name, account, email, sex_status
         }
       })
-      const data = { ...updateFormValue }
+      const data = records?.id ?  { ...updateFormValue, id: records?.id } : {...updateFormValue}
       ajax.updateMerchantAdmin(data).then(
         res => {
           if (res.status == 20000) {
@@ -324,7 +325,7 @@ function MerchantAdmin() {
       })
       const data = { ...updateFormValue }
 
-      ajax.addTenant(data).then(
+      ajax.addMerchantAdmin(data).then(
         res => {
           if (res.status == 20000) {
             setCreateVisible(false)

src/pages/OperationCenter/OperationSales/InformationMgm/index.scss

@@ -230,6 +230,12 @@
           color: #409eff;
         }
       }
+      .ant-table-wrapper {
+        height: calc(100% - 45px);
+        .ant-table-body {
+          @include scrollBar(var(--color-user-list-bg), #3b97ff);
+        }
+      }
     }
   }
 

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

@@ -1123,6 +1123,7 @@ function InformationMgm() {
               columns={columns}
               pagination={false}
               loading={tabLoading}
+              scroll={{ y: "calc(100vh - 315px)" }}
             />
             <Pagination {...paginationProps} className="pagination-common" />
           </ResultFlowResult>
@@ -1476,7 +1477,7 @@ function InformationMgm() {
                   <DatePicker
                     showTime
                     placeholder="非必填，按需计划任务"
-                    value={parseDate(rowData?.upperTime, "YYYY-MM-DD HH:mm:ss")}
+                    value={rowData?.upperTime ? parseDate(rowData?.upperTime, "YYYY-MM-DD HH:mm:ss") : ""}
                     onChange={(e, str) => handleForm("upperTime", str)}
                   />
                 </div>
@@ -1487,7 +1488,7 @@ function InformationMgm() {
                   <DatePicker
                     showTime
                     placeholder="非必填，按需计划任务"
-                    value={parseDate(rowData?.lowerTime, "YYYY-MM-DD HH:mm:ss")}
+                    value={rowData?.lowerTime ? parseDate(rowData?.lowerTime, "YYYY-MM-DD HH:mm:ss") : ""}
                     onChange={(e, str) => handleForm("lowerTime", str)}
                   />
                 </div>