dev01 2 years ago
parent
commit
c61cf5e1f8

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

@@ -203,7 +203,7 @@ const ProjectVip = React.createClass({
           title: "操作",
           dataIndex: "caozuo",
           key: "caouzo",
-          className: "title-table",
+          width: 216,
           render: (text, recard) => {
             return (
               <div>
@@ -350,7 +350,7 @@ const ProjectVip = React.createClass({
   closeDesc(e, s) {
     this.state.showDesc = e;
     if (s) {
-      this.loadData(this.state.page);
+      this.loadData(this.state.pageNo);
     }
   },
   // 搜索

+ 1 - 1
js/component/manageCenter/financialManage/distribute/projectvipall.jsx

@@ -324,7 +324,7 @@ const ProjectVipAll = React.createClass({
   closeDesc(e, s) {
     this.state.showDesc = e;
     if (s) {
-      this.loadData(this.state.page);
+      this.loadData(this.state.pageNo);
     }
   },
   // 搜索

+ 11 - 6
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -133,12 +133,22 @@ const OrderDetail = Form.create()(
             },
           },
           {
-            title: "服务市价(万元)",
+            title: "金额(万元)",
             dataIndex: "commodityPrice",
             key: "commodityPrice",
             width: 100,
           },
           {
+            title: "负责人",
+            dataIndex: "contacts",
+            key: "contacts",
+          },
+          {
+            title: "负责人电话",
+            dataIndex: "contactsMobile",
+            key: "contactsMobile",
+          },
+          {
             title: "项目状态",
             dataIndex: "projectStatus",
             key: "projectStatus",
@@ -147,11 +157,6 @@ const OrderDetail = Form.create()(
             },
           },
           {
-            title: "证书编号",
-            dataIndex: "certificateNumber",
-            key: "certificateNumber",
-          },
-          {
             title: "主要项目",
             dataIndex: "main",
             key: "main",

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

@@ -201,7 +201,7 @@ const ApprovedVipProject = React.createClass({
           title: "操作",
           dataIndex: "caozuo",
           key: "caouzo",
-          className: "title-table",
+          width: 216,
           render: (text, recard) => {
             return (
               <div>
@@ -348,7 +348,7 @@ const ApprovedVipProject = React.createClass({
   closeDesc(e, s) {
     this.state.showDesc = e;
     if (s) {
-      this.loadData(this.state.page);
+      this.loadData(this.state.pageNo);
     }
   },
   // 搜索

+ 14 - 1
js/component/manageCenter/order/orderNew/examine.jsx

@@ -454,6 +454,7 @@ const IntentionCustomer = Form.create()(
             title: "主要项目",
             dataIndex: "main",
             key: "main",
+            width: 50,
             render: (text) => {
               return text ? "是" : "否";
             },
@@ -462,8 +463,20 @@ const IntentionCustomer = Form.create()(
             title: "项目说明",
             dataIndex: "taskComment",
             key: "taskComment",
+            width: 200,
             render: (text) => {
-              return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              return (
+                <Tooltip title={text}>
+                  <div
+                    style={{
+                      width: 180,
+                      overflow: "hidden",
+                      whiteSpace: "nowrap",
+                      textOverflow: "ellipsis",
+                    }}
+                  >{text}</div>
+                </Tooltip>
+              )
             },
           },
         ],

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

@@ -245,7 +245,7 @@ const MyProjectVip = React.createClass({
     this.setState({
       vipVisible: false
     }, () => {
-      this.loadData();
+      this.loadData(this.state.pageNo);
     })
   },
   // 获取订单部门
@@ -346,7 +346,7 @@ const MyProjectVip = React.createClass({
   closeDesc(e, s) {
     this.state.showDesc = e;
     if (s) {
-      this.loadData(this.state.page);
+      this.loadData(this.state.pageNo);
     }
   },
   // 搜索