|
@@ -6,6 +6,7 @@ import ResolutionDetail from "@/resolutionDetail";
|
|
|
import { ChooseList } from "../../order/orderNew/chooseList"
|
|
|
import ReactToPrint from "react-to-print";
|
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
|
+import { salesList } from "@/dataDic.js";
|
|
|
import ProjectOperationVip from ".././../../common/projectOperation/vip";
|
|
|
import ShowModalDiv from "@/showModal.jsx";
|
|
|
import VipLogs from "../../../common/logPopup/viplogs";//会员日志
|
|
@@ -39,22 +40,22 @@ const MyProjectVip = React.createClass({
|
|
|
},
|
|
|
},
|
|
|
columns: [
|
|
|
- // {
|
|
|
- // title: "销售类型",
|
|
|
- // dataIndex: "salesType",
|
|
|
- // key: "salesType",
|
|
|
- // render: (text, record) => {
|
|
|
- // return (
|
|
|
- // <Tooltip
|
|
|
- // title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
|
|
|
- // >
|
|
|
- // <span>
|
|
|
- // {salesList[text]}
|
|
|
- // </span>
|
|
|
- // </Tooltip>
|
|
|
- // );
|
|
|
- // },
|
|
|
- // },
|
|
|
+ {
|
|
|
+ title: "销售类型",
|
|
|
+ dataIndex: "salesType",
|
|
|
+ key: "salesType",
|
|
|
+ render: (text, record) => {
|
|
|
+ return (
|
|
|
+ <Tooltip
|
|
|
+ title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
|
|
|
+ >
|
|
|
+ <span>
|
|
|
+ {salesList[text]}
|
|
|
+ </span>
|
|
|
+ </Tooltip>
|
|
|
+ );
|
|
|
+ },
|
|
|
+ },
|
|
|
{
|
|
|
title: "合同编号",
|
|
|
dataIndex: "contractNo",
|
|
@@ -82,7 +83,7 @@ const MyProjectVip = React.createClass({
|
|
|
<div>
|
|
|
{text}
|
|
|
<div style={{ display: "flex" }}>
|
|
|
- {/* <OrderItemStatus deleteSign={record.deleteSign} /> */}
|
|
|
+ <OrderItemStatus deleteSign={record.deleteSign} />
|
|
|
{
|
|
|
record.approval == 1
|
|
|
? <Tag color="#faa755">特批待审</Tag> :
|
|
@@ -134,7 +135,7 @@ const MyProjectVip = React.createClass({
|
|
|
<div>
|
|
|
{text}
|
|
|
<div>
|
|
|
- {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
|
|
|
+ {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
|
|
|
{record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
|
|
|
</div>
|
|
|
</div>
|