dev01 2 years ago
parent
commit
bfd52bca81

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

@@ -306,7 +306,7 @@ class ChannelUnit extends Component {
     this.setState({
       mvisible: "",
     });
-    this.loadData(this.pageNo);
+    this.loadData(this.state.pageNo);
   }
   // 转交提示
   showConfirm() {
@@ -599,6 +599,7 @@ class ChannelUnit extends Component {
     this.setState({
       visitModuls: false,
     });
+    this.loadData(this.state.pageNo);
   }
 
   render() {

+ 47 - 52
js/component/manageCenter/order/orderNew/billing.jsx

@@ -270,12 +270,12 @@ const MyService = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                    }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                   >
                     {text}
                   </div>
@@ -381,12 +381,12 @@ const MyService = Form.create()(
               return (
                 <Tooltip title={text}>
                   <div
-                    style={{
-                      maxWidth: "150px",
-                      overflow: "hidden",
-                      textOverflow: "ellipsis",
-                      whiteSpace: "nowrap",
-                    }}
+                  // style={{
+                  //   maxWidth: "150px",
+                  //   overflow: "hidden",
+                  //   textOverflow: "ellipsis",
+                  //   whiteSpace: "nowrap",
+                  // }}
                   >
                     {text}
                   </div>
@@ -532,7 +532,7 @@ const MyService = Form.create()(
             dataIndex: "orderNo",
             key: "orderNo",
             width: 140,
-            render: (text) => {
+            render: (text, record) => {
               return (
                 <Tooltip
                   title={
@@ -551,7 +551,39 @@ const MyService = Form.create()(
                     </Button>
                   }
                 >
-                  {text}
+                  <div>
+                    {text}
+                    {record.totalAmount >= 10 ? (
+                      <div
+                        style={{
+                          background: "#ef7207",
+                          color: "#FFF",
+                          padding: "1px 7px",
+                          borderRadius: "5px",
+                          fontSize: "12px",
+                          display: "inline-block",
+                          marginRight: "10px",
+                        }}
+                      >
+                        大客户
+                      </div>
+                    ) : null}
+                    {record.projectType == 1 ? (
+                      <div
+                        style={{
+                          background: "rgb(22, 155, 213)",
+                          color: "#FFF",
+                          padding: "1px 7px",
+                          borderRadius: "5px",
+                          fontSize: "12px",
+                          display: "inline-block",
+                          marginRight: "10px",
+                        }}
+                      >
+                        会员
+                      </div>
+                    ) : null}
+                  </div>
                 </Tooltip>
               );
             },
@@ -583,44 +615,7 @@ const MyService = Form.create()(
                       </span>
                     }
                   >
-                    <div
-                      style={{
-                        maxWidth: "150px",
-                        overflow: "hidden",
-                        textOverflow: "ellipsis",
-                        whiteSpace: "nowrap",
-                      }}
-                    >
-                      {record.totalAmount >= 10 ? (
-                        <div
-                          style={{
-                            background: "#ef7207",
-                            color: "#FFF",
-                            padding: "1px 7px",
-                            borderRadius: "5px",
-                            fontSize: "12px",
-                            display: "inline-block",
-                            marginRight: "10px",
-                          }}
-                        >
-                          大客户
-                        </div>
-                      ) : null}
-                      {record.projectType == 1 ? (
-                        <div
-                          style={{
-                            background: "rgb(22, 155, 213)",
-                            color: "#FFF",
-                            padding: "1px 7px",
-                            borderRadius: "5px",
-                            fontSize: "12px",
-                            display: "inline-block",
-                            marginRight: "10px",
-                          }}
-                        >
-                          会员
-                        </div>
-                      ) : null}
+                    <div style={{ width: "180px" }}>
                       {text}
                     </div>
                   </Tooltip>

+ 13 - 13
js/component/manageCenter/order/orderNew/reject.jsx

@@ -1732,7 +1732,7 @@ const IntentionCustomer = Form.create()(
       });
     },
     resets() {
-      this.state.orderNo = "";
+      this.state.orderNoSearch = "";
       this.state.customerName = "";
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
@@ -1958,18 +1958,7 @@ const IntentionCustomer = Form.create()(
               onChange={this.callback}
               className="test"
             >
-              <TabPane tab="更改表格显示数据" key="1">
-                <div style={{ marginLeft: 10 }}>
-                  <ChooseList
-                    columns={this.state.columns}
-                    changeFn={this.changeList}
-                    changeList={this.state.changeList}
-                    top={55}
-                    margin={11}
-                  />
-                </div>
-              </TabPane>
-              <TabPane tab="搜索" key="2">
+              <TabPane tab="搜索" key="1">
                 <Input
                   placeholder="客户名称"
                   style={{
@@ -2015,6 +2004,17 @@ const IntentionCustomer = Form.create()(
                 </Button>
                 <Button onClick={this.resets}>重置</Button>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="2">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
+                  />
+                </div>
+              </TabPane>
             </Tabs>
             <div className="patent-table">
               <Spin spinning={this.state.loading}>