dev01 %!s(int64=2) %!d(string=hai) anos
pai
achega
021906ac2a

+ 2 - 0
js/component/manageCenter/channelList/channelunit/index.jsx

@@ -23,6 +23,7 @@ import ChannelLog from "./channellog"; //转交日志
 import ChangeLog from "./changelog"; //更名日志
 import ChannelDetail from "./channeldetail"; //渠道详情
 import FollowDetail from "../../../../component/manageCenter/customer/NEW/intentionCustomer/followDetail";//新增渠道跟进
+import ShowModalDiv from "@/showModal.jsx";
 
 const { TabPane } = Tabs;
 const FormItem = Form.Item;
@@ -636,6 +637,7 @@ class ChannelUnit extends Component {
     ));
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>私有渠道列表</span>
         </div>

+ 2 - 0
js/component/manageCenter/channelList/channelunit/publist.jsx

@@ -23,6 +23,7 @@ import ChannelLog from "./channellog"; //转交日志
 import ChangeLog from "./changelog"; //更名日志
 import ChannelDetail from "./channeldetail"; //渠道详情
 import FollowDetail from "../../../../component/manageCenter/customer/NEW/intentionCustomer/followDetail";
+import ShowModalDiv from "@/showModal.jsx";
 
 const { TabPane } = Tabs;
 const FormItem = Form.Item;
@@ -275,6 +276,7 @@ class ChannelUnit extends Component {
     const hasSelected = this.state.selectedRowKeys.length > 0;
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>公共渠道列表</span>
         </div>

+ 3 - 2
js/component/manageCenter/financialManage/distribute/projectvip.jsx

@@ -8,6 +8,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
+import ShowModalDiv from "@/showModal.jsx";
 const { TabPane } = Tabs;
 
 //财务专员会员项目审核
@@ -180,8 +181,7 @@ const ProjectVip = React.createClass({
           dataIndex: "taskComment",
           key: "taskComment",
           className: "title-table",
-          width: 
-          300,
+          width: 300,
         },
         {
           title: "状态",
@@ -551,6 +551,7 @@ const ProjectVip = React.createClass({
     ));
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目审核</span>
         </div>

+ 2 - 0
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -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 ShowModalDiv from "@/showModal.jsx";
 const { TabPane } = Tabs;
 
 
@@ -467,6 +468,7 @@ const ProjectVipAll = React.createClass({
     ));
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目(all)</span>
         </div>

+ 28 - 7
js/component/manageCenter/index/content.jsx

@@ -51,6 +51,9 @@ const MessageModal = React.createClass({
                     dataIndex: 'noticeTypeName',
                     key: 'noticeTypeName',
                     width: 120,
+                    render: (text, record) => {
+                        return <span style={{ color: record.noticeType == 59 && "red" }}>{text}</span>;
+                    },
                 }, {
                     title: '时间',
                     dataIndex: 'createTimeFormattedDate',
@@ -65,6 +68,7 @@ const MessageModal = React.createClass({
                         return (
                             <Tooltip placement="topLeft" title={text}>
                                 <div style={{
+                                    color: record.noticeType == 59 && "red",
                                     width: 1189,
                                     textOverflow: "ellipsis",
                                     whiteSpace: "nowrap",
@@ -127,6 +131,11 @@ const MessageModal = React.createClass({
                     dataIndex: 'noticeTypeName',
                     key: 'noticeTypeName',
                     width: 120,
+                    render: (text, record) => {
+                        return (
+                            <div style={{ color: record.noticeType == 59 && "red" }}>{text}</div>
+                        )
+                    }
                 }, {
                     title: '时间',
                     dataIndex: 'createTimeFormattedDate',
@@ -140,12 +149,14 @@ const MessageModal = React.createClass({
                     render: (text, record) => {
                         return (
                             <Tooltip placement="topLeft" title={text}>
-                                <div style={{
-                                    width: 610,
-                                    textOverflow: "ellipsis",
-                                    whiteSpace: "nowrap",
-                                    overflow: 'hidden',
-                                }}>
+                                <div
+                                    style={{
+                                        color: record.noticeType == 59 && "red",
+                                        width: 610,
+                                        textOverflow: "ellipsis",
+                                        whiteSpace: "nowrap",
+                                        overflow: 'hidden',
+                                    }}>
                                     {text}
                                 </div>
                             </Tooltip>
@@ -542,7 +553,17 @@ const MessageModal = React.createClass({
                                 <Tabs.TabPane
                                     key={v.id + ''}
                                     tab={<div>
-                                        {v.list.length === 0 || v.isRead ? null : <div style={{ width: '8px', height: "8px", borderRadius: '8px', background: '#f00', position: 'absolute', right: '5px', top: '2px' }} />}
+                                        {v.list.length === 0 || v.isRead ? null :
+                                            <div
+                                                style={{
+                                                    width: '8px',
+                                                    height: "8px",
+                                                    borderRadius: '8px',
+                                                    background: '#f00',
+                                                    position: 'absolute',
+                                                    right: '5px',
+                                                    top: '2px'
+                                                }} />}
                                         {v.name}
                                     </div>
                                     } />

+ 2 - 0
js/component/manageCenter/order/orderNew/approvedvipproject.jsx

@@ -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 ShowModalDiv from "@/showModal.jsx";
 const { TabPane } = Tabs;
 
 //总裁特批会员项目
@@ -548,6 +549,7 @@ const ApprovedVipProject = React.createClass({
     ));
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>会员项目审核</span>
         </div>

+ 2 - 0
js/component/manageCenter/order/orderNew/myprojectvip.jsx

@@ -7,6 +7,7 @@ import { ChooseList } from "../../order/orderNew/chooseList"
 import ReactToPrint from "react-to-print";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import ProjectOperationVip from ".././../../common/projectOperation/vip";
+import ShowModalDiv from "@/showModal.jsx";
 const { TabPane } = Tabs;
 
 //我的会员项目列表
@@ -502,6 +503,7 @@ const MyProjectVip = React.createClass({
     ));
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>我的会员项目</span>
         </div>

+ 2 - 0
js/component/manageCenter/order/source/index.jsx

@@ -18,6 +18,7 @@ import { provinceSelect, getProvince } from "../../../NewDicProvinceList";
 import { ChooseList } from "../../../manageCenter/order/orderNew/chooseList";
 import OrderList from "./order"; //客户订单列表
 import './index.less';
+import ShowModalDiv from "@/showModal.jsx";
 
 const { TabPane } = Tabs;
 const FormItem = Form.Item;
@@ -441,6 +442,7 @@ class Source extends Component {
     const { searchValues, onelist, columns, changeList, contactsOption, visible, datas, params } = this.state;
     return (
       <div className="user-content">
+        <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16, }}>销售来源统计表 &nbsp;<spn style={{ color: "rgb(49,49,255)" }}>注:可通过签单数、签单金额查询统计</spn></span>
         </div>

+ 4 - 1
js/component/manageCenter/topTab.jsx

@@ -62,7 +62,7 @@ const MessageModal = React.createClass({
           dataIndex: "noticeType",
           key: "noticeType",
           render: (text, record) => {
-            return <span>{record.noticeTypeName}</span>;
+            return <span style={{ color: record.noticeType == 59 && "red" }}>{record.noticeTypeName}</span>;
           },
         },
         {
@@ -74,6 +74,9 @@ const MessageModal = React.createClass({
           title: "内容",
           dataIndex: "content",
           key: "content",
+          render: (text, record) => {
+            return <span style={{ color: record.noticeType == 59 && "red" }}>{text}</span>;
+          },
         },
         {
           title: "操作",