diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
index 17b8508..b391035 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
@@ -237,7 +237,6 @@ function RoadConf() {
});
}
function getAreaTree() {
- console.log(123);
ajax
.getAreaTree()
.then((res) => {
diff --git a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
index d4d5e37..b603c8f 100644
--- a/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
+++ b/src/pages/MerchantMgm/FunctionMgm/loadable.jsx
@@ -54,6 +54,7 @@ function FunctionMgm() {
key: 'note',
dataIndex: 'note',
align: "center",
+ render: (text, record, index) => record?.note || "--",
},
{
title: '创建时间',
diff --git a/src/pages/MerchantMgm/InvoiceConf/index.jsx b/src/pages/MerchantMgm/InvoiceConf/index.jsx
index a0d4610..14820d4 100644
--- a/src/pages/MerchantMgm/InvoiceConf/index.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/index.jsx
@@ -1,6 +1,16 @@
import React from "react"
+import { connect } from "react-redux";
import loadable from "@loadable/component"
import { LoadingImg } from "@/components"
const InvoiceConfLoadable = loadable(() => import("./loadable"))
-export default (pros) =>
} />
\ No newline at end of file
+export default connect(function mapStateToProps(state) {
+ return {
+ user: state.user,
+ };
+})((props) => {
+
+ return(
+
} />
+ )
+})
\ No newline at end of file
diff --git a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
index 86da40b..7170510 100644
--- a/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
+++ b/src/pages/MerchantMgm/InvoiceConf/loadable.jsx
@@ -10,7 +10,8 @@ import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
const { RangePicker } = DatePicker;
-function InvoiceConf() {
+function InvoiceConf(props) {
+ const uid = props?.user?.userInfo?.user_uid;
const defaultData= {
info_id: "",
type_name: '',
@@ -139,6 +140,7 @@ function InvoiceConf() {
key: 'tenantName',
dataIndex: 'tenantName',
align: "center",
+ render: (text, record, index) => record?.tenantName || "--",
},
{
title: '发票平台',
@@ -559,7 +561,7 @@ function InvoiceConf() {
max_amount,
}
})
- const data = editId ? { ...editFormValue, id: editId } : { ...editFormValue }
+ const data = editId ? { ...editFormValue, id: editId, uid } : { ...editFormValue }
if(data?.mini_amount && data?.max_amount) {
if(parseFloat(data?.mini_amount)> parseFloat(data?.max_amount)) return message.error("最小开票金额不能大于最大开票金额");
}
diff --git a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
index df44fca..4d48c6a 100644
--- a/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantAdmin/loadable.jsx
@@ -63,12 +63,14 @@ function MerchantAdmin() {
key: 'shop_name',
dataIndex: 'shop_name',
align: "center",
+ render: (text, record, index) => record?.shop_name || "--",
},
{
title: '经营业务类型',
key: 'manage_type_name',
dataIndex: 'manage_type_name',
align: "center",
+ render: (text, record, index) => record?.manage_type_name || "--",
},
{
title: '管理员账号',
@@ -81,6 +83,7 @@ function MerchantAdmin() {
key: 'username',
dataIndex: 'username',
align: "center",
+ render: (text, record, index) => record?.username || "--",
},
{
title: '手机号',
@@ -93,6 +96,7 @@ function MerchantAdmin() {
key: 'email',
dataIndex: 'email',
align: "center",
+ render: (text, record, index) => record?.email || "--",
},
{
title: '性别',
@@ -313,7 +317,8 @@ function MerchantAdmin() {
operatorid, phone, full_name, account, email, sex_status
}
})
- const data = records?.id ? { ...updateFormValue, id: records?.id } : {...updateFormValue}
+ console.log(updateFormValue);
+ const data = records?.id ? { ...updateFormValue, id: records?.id, operatorid: records?.operatorid || "" } : {...updateFormValue}
if(data?.email) {
let regEmail = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/;
if(!regEmail.test(data?.email)) {
diff --git a/src/pages/MerchantMgm/MerchantInfo/index.jsx b/src/pages/MerchantMgm/MerchantInfo/index.jsx
index fa7e439..3c23d25 100644
--- a/src/pages/MerchantMgm/MerchantInfo/index.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/index.jsx
@@ -1,6 +1,15 @@
import React from "react"
+import { connect } from "react-redux";
import loadable from "@loadable/component"
import { LoadingImg } from "@/components"
const MerchantInfoLoadable = loadable(() => import("./loadable"))
-export default (pros) =>
} />
\ No newline at end of file
+export default connect(function mapStateToProps(state) {
+ return {
+ user: state.user,
+ };
+})((props) => {
+ return (
+
} />
+ )
+})
\ No newline at end of file
diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
index ae49edf..03b6758 100644
--- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
@@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect } from "react";
+import { useSelector, useDispatch } from "react-redux"
import { useSessionStorageState } from "ahooks";
import { Input, Select, message, Popover, Pagination, Table, DatePicker, Upload,
Modal, Cascader, Button, Form } from "antd";
@@ -10,7 +11,9 @@ import "./index.scss";
import { SearchOutlined, DeleteOutlined } from '@ant-design/icons';
const { RangePicker } = DatePicker;
-function MerchantInfo() {
+const MerchantInfo = (props) => {
+ const uid = props?.user?.userInfo?.user_uid;
+ console.log(uid, props);
const defaultData = {
tenantId: '',
tenantType: '',
@@ -117,18 +120,21 @@ function MerchantInfo() {
dataIndex: 'tenantId',
key: 'tenantId',
align: "center",
+ render: (text, record, index) => record?.tenantId || "--",
},
{
title: '商户编码',
key: 'tenantCode',
dataIndex: 'tenantCode',
align: "center",
+ render: (text, record, index) => record?.tenantCode || "--",
},
{
title: '商户名称',
key: 'tenantName',
dataIndex: 'tenantName',
align: "center",
+ render: (text, record, index) => record?.tenantName || "--",
},
{
title: '商户类型',
@@ -150,12 +156,14 @@ function MerchantInfo() {
key: 'manage_type_name',
dataIndex: 'manage_type_name',
align: "center",
+ render: (text, record, index) => record?.manage_type_name || "--",
},
{
title: '公司名称',
key: 'companyName',
dataIndex: 'companyName',
align: "center",
+ render: (text, record, index) => record?.companyName || "--",
},
{
title: '状态',
@@ -179,12 +187,14 @@ function MerchantInfo() {
key: 'updatePerson',
dataIndex: 'updatePerson',
align: "center",
+ render: (text, record, index) => record?.updatePerson || "--",
},
{
title: '最后修改时间',
key: 'updateAt',
dataIndex: 'updateAt',
align: "center",
+ render: (text, record, index) => record?.updateAt || "--",
},
{
title: '操作',
@@ -574,7 +584,7 @@ function MerchantInfo() {
}
const data = editId ? {...systemFormValue, ...accountFormValue, ...businessFormValue,...clearFormValue,
...qingdaoFormValue, ...weiPayFromValue, ...zhiPayFormValue, ...weiMiniFormValue,
- ...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList, id: editId}
+ ...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList, id: editId, uid}
: {...systemFormValue, ...accountFormValue, ...businessFormValue,...clearFormValue,
...qingdaoFormValue, ...weiPayFromValue, ...zhiPayFormValue, ...weiMiniFormValue,
...zhiMiniFormValue, ...weiPayFrom2Value, ...weiMiniForm2Value, business_license: imgList}
@@ -2012,7 +2022,7 @@ function MerchantInfo() {
商户名称：
{records.tenantName}
商户类型：
{records.shop_type_name}
经营业务类型：
{records.manage_type_name}
-
+
商户有效期：
{records?.start || ""} - {records?.end || ""}