diff --git a/src/pages/platform/Custom/index.jsx b/src/pages/platform/Custom/index.jsx index fe46c3ddf68914a9c8553781afb10464401b2c75..3589ff4ed18406f3c1098c313eaa6f89b4170d53 100644 --- a/src/pages/platform/Custom/index.jsx +++ b/src/pages/platform/Custom/index.jsx @@ -7,7 +7,7 @@ import { useRequest } from "umi"; import defaultFields from "./fields"; import { doFetch } from '@/utils/doFetch'; import { deviceprovideDetail, deleteProvideCheck } from "@/services/device"; -import { deviceprovideDetails } from "@/utils/detailTotalCard"; +import { usercusDetails } from "@/utils/detailTotalCard"; import Details from "@/components/Details"; import { useAsyncEffect } from 'ahooks'; import tempfields from '@/utils/tempfields' @@ -48,11 +48,23 @@ function reducer(state, action) { } break; case "cdetails": + let special = action?.dataSource?.customerCharList?.map?.(it => { + return { + "title": it?.fieldName, + "key": it?.fieldCharValue, + } + }) + let extraspecial = [{ + cardTitle: '特殊属性', + itemData: special + }] + + newState = { ...state, details: { dataSource: action.dataSource, - totalCard: [...deviceprovideDetails] + totalCard: [...usercusDetails,...extraspecial] }, visible: true } @@ -304,7 +316,6 @@ const Deviceprovide = (props) => { onClose={() => dispatch({ type: "close" })} destroyOnClose={true} afterVisibleChange={(v) => { - }} width="100%" className="drawerDetails" diff --git a/src/utils/detailTotalCard.js b/src/utils/detailTotalCard.js index 775af16cc621e828a0b17b817311323682bb51a5..19eaf8f6117c4b92f715f1ba9ee5cd51510c415e 100644 --- a/src/utils/detailTotalCard.js +++ b/src/utils/detailTotalCard.js @@ -263,86 +263,167 @@ const userDetails = [ const deviceprovideDetails = [ //设备供应商详情 { - cardTitle: '基本信æ¯', - itemData: [ + cardTitle: '基本信æ¯', + itemData: [ + { + "title": "供应商编å·", + "key": "supplierNo", + }, + { + "title": "供应商åç§°", + "key": "supplierName" + }, + { + "title": "å…¬å¸å®˜ç½‘", + "key": "officialWebsite" + }, + { + "title": "è”系电è¯", + "key": "telephone" + }, + { + "title": "邮箱", + "key": "email" + }, + { + "title": "地å€", + "key": "address" + }, + { + "title": "评分", + "key": "score", + type: "rate", + allowHalf: true, + disabled: true + }, + { + "title": "备注", + "key": "remark", + col: { span: 24 } + } + ] + }, + { + cardTitle: 'è”系人', + itemData: [ + { + "key": "supplierUserList", + type: "table", + col: { span: 24 }, + columns: [ { - "title": "供应商编å·", - "key": "supplierNo", + "title": "è”系人姓å", + "dataIndex": "userName", + "key": "userName", + "search": false }, { - "title": "供应商åç§°", - "key": "supplierName" + "title": "è”系电è¯", + "dataIndex": "telephone", + "key": "telephone", + "search": false }, { - "title": "å…¬å¸å®˜ç½‘", - "key": "officialWebsite" + "title": "邮箱", + "dataIndex": "email", + "key": "email", + "search": false }, { - "title": "è”系电è¯", - "key": "telephone" + "title": "èŒä½", + "dataIndex": "title", + "key": "title", + "search": false }, + ] + } + ] + }, +]; + + + +const usercusDetails = [ //设备客户详情 + { + cardTitle: '基本信æ¯', + itemData: [ + { + "title": "客户编å·", + "key": "customerNo", + }, + { + "title": "客户åç§°", + "key": "customerName" + }, + { + "title": "å…¬å¸å®˜ç½‘", + "key": "officialWebsite" + }, + { + "title": "è”系电è¯", + "key": "telephone" + }, + { + "title": "邮箱", + "key": "email" + }, + { + "title": "地å€", + "key": "address" + }, + { + "title": "评分", + "key": "score", + type: "rate", + allowHalf: true, + disabled: true + }, + { + "title": "备注", + "key": "remark", + col: { span: 24 } + } + ] + }, + { + cardTitle: 'è”系人', + itemData: [ + { + "key": "customerUserList", + type: "table", + col: { span: 24 }, + columns: [ { - "title": "邮箱", - "key": "email" + "title": "è”系人姓å", + "dataIndex": "userName", + "key": "userName", + "search": false }, { - "title": "地å€", - "key": "address" + "title": "è”系电è¯", + "dataIndex": "telephone", + "key": "telephone", + "search": false }, { - "title": "评分", - "key": "score", - type: "rate", - allowHalf: true, - disabled: true + "title": "邮箱", + "dataIndex": "email", + "key": "email", + "search": false }, { - "title": "备注", - "key": "remark", - col: { span: 24 } - } - ] - }, - { - cardTitle: 'è”系人', - itemData: [ - { - "key": "supplierUserList", - type: "table", - col: { span: 24 }, - columns: [ - { - "title": "è”系人姓å", - "dataIndex": "userName", - "key": "userName", - "search": false - }, - { - "title": "è”系电è¯", - "dataIndex": "telephone", - "key": "telephone", - "search": false - }, - { - "title": "邮箱", - "dataIndex": "email", - "key": "email", - "search": false - }, - { - "title": "èŒä½", - "dataIndex": "title", - "key": "title", - "search": false - }, - ] - } - ] + "title": "èŒä½", + "dataIndex": "title", + "key": "title", + "search": false + }, + ] + } + ] }, ]; - const userCheckDetails = [ //个人详情-----å¾…å®¡æ ¸ { @@ -669,7 +750,7 @@ const materielDetail = [ dataIndex: "conversionRate", key: "conversionRate", search: false, - width:200 + width: 200 }, ], }, @@ -1148,5 +1229,6 @@ export { shopplanDetail, dispatchorderDetail, labeltemplateDetail, - deviceprovideDetails + deviceprovideDetails, + usercusDetails };