Skip to content

W
wms
Commit ae3d951b authored by wuhao's avatar wuhao 🎯
Browse files
Options

asder

parent f1164823
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 66 deletions
src/pages/platform/Custom/index.jsx
View file @ ae3d951b
...@@ -7,7 +7,7 @@ import { useRequest } from "umi"; ...@@ -7,7 +7,7 @@ import { useRequest } from "umi";
import defaultFields from "./fields"; import defaultFields from "./fields";
import { doFetch } from '@/utils/doFetch'; import { doFetch } from '@/utils/doFetch';
import { deviceprovideDetail, deleteProvideCheck } from "@/services/device"; import { deviceprovideDetail, deleteProvideCheck } from "@/services/device";
import { deviceprovideDetails } from "@/utils/detailTotalCard"; import { usercusDetails } from "@/utils/detailTotalCard";
import Details from "@/components/Details"; import Details from "@/components/Details";
import { useAsyncEffect } from 'ahooks'; import { useAsyncEffect } from 'ahooks';
import tempfields from '@/utils/tempfields' import tempfields from '@/utils/tempfields'
...@@ -48,11 +48,23 @@ function reducer(state, action) { ...@@ -48,11 +48,23 @@ function reducer(state, action) {
} }
break; break;
case "cdetails": case "cdetails":
let special = action?.dataSource?.customerCharList?.map?.(it => {
return {
"title": it?.fieldName,
"key": it?.fieldCharValue,
}
})
let extraspecial = [{
cardTitle: '特殊属性',
itemData: special
}]
newState = { newState = {
...state, ...state,
details: { details: {
dataSource: action.dataSource, dataSource: action.dataSource,
totalCard: [...deviceprovideDetails] totalCard: [...usercusDetails,...extraspecial]
}, },
visible: true visible: true
} }
...@@ -304,7 +316,6 @@ const Deviceprovide = (props) => { ...@@ -304,7 +316,6 @@ const Deviceprovide = (props) => {
onClose={() => dispatch({ type: "close" })} onClose={() => dispatch({ type: "close" })}
destroyOnClose={true} destroyOnClose={true}
afterVisibleChange={(v) => { afterVisibleChange={(v) => {
}} }}
width="100%" width="100%"
className="drawerDetails" className="drawerDetails"
......
src/utils/detailTotalCard.js
View file @ ae3d951b
...@@ -263,86 +263,167 @@ const userDetails = [ ...@@ -263,86 +263,167 @@ const userDetails = [
const deviceprovideDetails = [ //设备供应商详情 const deviceprovideDetails = [ //设备供应商详情
{ {
cardTitle: '基本信息', cardTitle: '基本信息',
itemData: [ 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": "供应商编号", "title": "联系人姓名",
"key": "supplierNo", "dataIndex": "userName",
"key": "userName",
"search": false
}, },
{ {
"title": "供应商名称", "title": "联系电话",
"key": "supplierName" "dataIndex": "telephone",
"key": "telephone",
"search": false
}, },
{ {
"title": "公司官网", "title": "邮箱",
"key": "officialWebsite" "dataIndex": "email",
"key": "email",
"search": false
}, },
{ {
"title": "联系电话", "title": "职位",
"key": "telephone" "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": "邮箱", "title": "联系人姓名",
"key": "email" "dataIndex": "userName",
"key": "userName",
"search": false
}, },
{ {
"title": "地址", "title": "联系电话",
"key": "address" "dataIndex": "telephone",
"key": "telephone",
"search": false
}, },
{ {
"title": "评分", "title": "邮箱",
"key": "score", "dataIndex": "email",
type: "rate", "key": "email",
allowHalf: true, "search": false
disabled: true
}, },
{ {
"title": "备注", "title": "职位",
"key": "remark", "dataIndex": "title",
col: { span: 24 } "key": "title",
} "search": false
] },
}, ]
{ }
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
},
]
}
]
}, },
]; ];
const userCheckDetails = [ const userCheckDetails = [
//个人详情-----待审核 //个人详情-----待审核
{ {
...@@ -669,7 +750,7 @@ const materielDetail = [ ...@@ -669,7 +750,7 @@ const materielDetail = [
dataIndex: "conversionRate", dataIndex: "conversionRate",
key: "conversionRate", key: "conversionRate",
search: false, search: false,
width:200 width: 200
}, },
], ],
}, },
...@@ -1148,5 +1229,6 @@ export { ...@@ -1148,5 +1229,6 @@ export {
shopplanDetail, shopplanDetail,
dispatchorderDetail, dispatchorderDetail,
labeltemplateDetail, labeltemplateDetail,
deviceprovideDetails deviceprovideDetails,
usercusDetails
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment