dev01 2 years ago
parent
commit
308561f873

+ 4 - 0
js/component/common/logPopup/viplogs.jsx

@@ -8,6 +8,7 @@ class VipLogs extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      loading: false,
       visible: false,
       columnsDate: [
         {
@@ -48,6 +49,9 @@ class VipLogs extends Component {
   componentDidMount() { }
 
   getData() {
+    this.setState({
+      loading: true,
+    });
     $.ajax({
       method: "get",
       dataType: "json",

+ 5 - 1
js/component/common/projectOperation/vip.jsx

@@ -96,7 +96,11 @@ class ProjectOperationVip extends Component {
           loading: false,
         });
         if (!data.error.length) {
-          message.success("保存成功!");
+          Modal.success({
+            title: '保存成功!',
+            content: '已提出会员项目申请!请在“订单管理-我的会员项目”跟进查看会员项目的审核状态,审核通过,即表示添加会员项目完成!!!',
+          });
+          // message.success("保存成功!");
           this.props.onCancel();
         } else {
           message.warning(data.error[0].message);

+ 26 - 20
js/component/manageCenter/financialManage/orderDetail/orderDesc.jsx

@@ -7,7 +7,7 @@ class DemandDesc extends React.Component {
 		super(props);
 		this.state = {
 			loading: false,
-			showState:false
+			showState: false
 		};
 	}
 	handleCancel() {
@@ -28,27 +28,33 @@ class DemandDesc extends React.Component {
 	render() {
 		return (
 			<div className="patent-desc">
-				{this.state.visible ? <Modal
-					maskClosable={false}
-					visible={this.state.visible}
-					onOk={this.handOk.bind(this)}
-					onCancel={this.handleCancel.bind(this)}
-					width="1000px"
-					title='订单详情'
-					footer=""
-					className="admin-desc-content"
-				>
-					<div>
+				{
+					this.state.visible &&
+					<Modal
+						maskClosable={false}
+						visible={this.state.visible}
+						onOk={this.handOk.bind(this)}
+						onCancel={this.handleCancel.bind(this)}
+						width="1000px"
+						title='订单详情'
+						footer=""
+						className="admin-desc-content"
+					>
 						<div>
-							<OrderDetaiel
-								closeDesc={this.handleCancel.bind(this)}
-								data={this.props.data}
-								visible={this.state.visible}
-								handOk={this.handOk.bind(this)}
-							/>
+							<div>
+								{
+									this.state.visible &&
+									<OrderDetaiel
+										closeDesc={this.handleCancel.bind(this)}
+										data={this.props.data}
+										visible={this.state.visible}
+										handOk={this.handOk.bind(this)}
+									/>
+								}
+							</div>
 						</div>
-					</div>
-				</Modal> : <div/>}
+					</Modal>
+				}
 			</div>
 		);
 	}

+ 9 - 8
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -167,14 +167,15 @@ const OrderDetail = Form.create()(
             width: 200,
             render: (text) => {
               return (
-                <Tooltip
-                  title={text}
-                >
-                  <div>
-                    {
-                      text && text.length > 16 ? <span title={text}>{text.substr(0, 16)}...</span> : text
-                    }
-                  </div>
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 180,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 18 - 12
js/component/manageCenter/order/orderNew/addService.jsx

@@ -399,12 +399,15 @@ const NewService = Form.create()(
             width: 200,
             render: (text) => {
               return (
-                <Tooltip
-                  title={text}
-                >
-                  <div>
-                    {text && text.length > 16 ? text.substr(0, 16) + "…" : text}
-                  </div>
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 180,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
                 </Tooltip>
               )
             },
@@ -646,12 +649,15 @@ const NewService = Form.create()(
             width: 250,
             render: (text) => {
               return (
-                <Tooltip
-                  title={text}
-                >
-                  <div>
-                    {text && text.length > 18 ? text.substr(0, 18) + "…" : text}
-                  </div>
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 230,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
                 </Tooltip>
               )
             },

+ 9 - 6
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -341,12 +341,15 @@ const PaiDan = React.createClass({
           width: 200,
           render: (text) => {
             return (
-              <Tooltip
-                title={text}
-              >
-                <div>
-                  {text && text.length > 15 ? text.substr(0, 15) + "…" : text}
-                </div>
+              <Tooltip title={text}>
+                <div
+                  style={{
+                    width: 180,
+                    overflow: "hidden",
+                    whiteSpace: "nowrap",
+                    textOverflow: "ellipsis",
+                  }}
+                >{text}</div>
               </Tooltip>
             )
           },