Browse Source

公出信息显示,细节优化

dev01 2 years ago
parent
commit
b4ce60d999

+ 1 - 1
js/component/manageCenter/channelList/channelunit/detail/visitDetail.jsx

@@ -492,7 +492,7 @@ const VisitDetail = React.createClass({
                         wrapperCol={{ span: 16 }}
                         label="公出地点"
                       >
-                        <span>{this.state.followDtails.userName}</span>
+                        <span>{this.state.followDtails.districtName}</span>
                       </FormItem>
                       <FormItem
                         labelCol={{ span: 4 }}

+ 1 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visitDetail.jsx

@@ -490,7 +490,7 @@ const VisitDetail = React.createClass({
                         wrapperCol={{ span: 16 }}
                         label="公出地点"
                       >
-                        <span>{this.state.followDtails.userName}</span>
+                        <span>{this.state.followDtails.districtName}</span>
                       </FormItem>
                       <FormItem
                         labelCol={{ span: 4 }}

+ 1 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/intentionDetail.jsx

@@ -115,7 +115,7 @@ const IntentionDetail = React.createClass({
 				{this.state.modalVisible ? <Modal
 					className="customeDetails"
 					title="意向客户详情"
-					width='1800px'
+					width='92%'
 					visible={this.state.modalVisible}
 					onOk={this.detailsModal}
 					onCancel={this.detailsModal}

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx

@@ -428,7 +428,7 @@ const VisitDetail = React.createClass({
 												labelCol={{ span: 4 }}
 												wrapperCol={{ span: 16 }}
 												label="公出地点" >
-												<span>{this.state.followDtails.userName}</span>
+												<span>{this.state.followDtails.districtName}</span>
 											</FormItem>
 											<FormItem
 												labelCol={{ span: 4 }}

+ 38 - 20
js/component/manageCenter/customer/managementFollow/followUpSummary/index.jsx

@@ -28,7 +28,7 @@ class FollowUpSummary extends Component {
     super(props);
     this.state = {
       loading: false,
-      changeList: [],
+      changeList: undefined,// 子组件改变的表格title数组
       columns: [
         {
           title: "客户名称",
@@ -91,17 +91,18 @@ class FollowUpSummary extends Component {
           title: "跟进说明",
           dataIndex: "result",
           key: "result",
-          width: 150,
           render: (text, record) => {
             return (
               <Tooltip placement="topLeft" title={<div style={{ wordBreak: "break-all" }}>{text}</div>}>
-                <div style={{
-                  cursor: "pointer",
-                  width: '150px',
-                  whiteSpace: 'nowrap',
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                }}>
+                <div
+                  style={{
+                    // cursor: "pointer",
+                    // width: '150px',
+                    // whiteSpace: 'nowrap',
+                    // overflow: 'hidden',
+                    // textOverflow: 'ellipsis',
+                  }}
+                >
                   {text}
                 </div>
               </Tooltip>
@@ -122,17 +123,18 @@ class FollowUpSummary extends Component {
           title: "指导意见",
           dataIndex: "guidance",
           key: "guidance",
-          width: 150,
           render: (text, record) => {
             return (
               <Tooltip placement="topLeft" title={<div style={{ wordBreak: "break-all" }}>{(record.guidanceName ? '(' + record.guidanceName + ')' : '') + text}</div>}>
-                <div style={{
-                  cursor: "pointer",
-                  width: '150px',
-                  whiteSpace: 'nowrap',
-                  overflow: 'hidden',
-                  textOverflow: 'ellipsis',
-                }}>
+                <div
+                  style={{
+                    // cursor: "pointer",
+                    // width: '150px',
+                    // whiteSpace: 'nowrap',
+                    // overflow: 'hidden',
+                    // textOverflow: 'ellipsis',
+                  }}
+                >
                   {record.guidanceName ? '(' + record.guidanceName + ')' : null}
                   {text}
                 </div>
@@ -184,6 +186,7 @@ class FollowUpSummary extends Component {
     this.closeDesc = this.closeDesc.bind(this);
     this.tableRowClick = this.tableRowClick.bind(this);
     this.export = this.export.bind(this);
+    this.changeList = this.changeList.bind(this);
   }
 
   componentWillReceiveProps(prevProps) {
@@ -421,6 +424,21 @@ class FollowUpSummary extends Component {
     })
   }
 
+  // 更改表格显示数据
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach((item) => {
+      arr.forEach((val) => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr,
+    });
+  }
+
   render() {
     return (
       <div className="user-content">
@@ -596,9 +614,9 @@ class FollowUpSummary extends Component {
           <Spin spinning={this.state.loading}>
             <Table
               columns={
-                this.state.changeList.length
-                  ? this.state.changeList
-                  : this.state.columns
+                this.state.changeList == undefined
+                  ? this.state.columns
+                  : this.state.changeList
               }
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}

+ 48 - 29
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -47,8 +47,8 @@ class DetailedList extends Component {
         },
         {
           title: "客户名称",
-          dataIndex: "nickname",
-          key: "nickname",
+          dataIndex: "userName",
+          key: "userName",
           width: 120,
           fixed: "left",
           render: (text) => {
@@ -59,8 +59,8 @@ class DetailedList extends Component {
         },
         {
           title: "公出地点",
-          dataIndex: "userName",
-          key: "userName",
+          dataIndex: "districtName",
+          key: "districtName",
           width: 120,
           render: (text) => {
             return (
@@ -139,23 +139,27 @@ class DetailedList extends Component {
           key: "status",
           width: 200,
           render: (text, record) => (
-            <div style={{ display: "flex", flexDirection: "row" }}>
-              <Tag
-                color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
-              >
-                {
-                  record.type === 0
-                    ? "业务公出" : record.type === 1
-                      ? "技术公出" : record.type === 2
-                        ? "行政公出" : record.type === 3
-                          ? "技术协单" : record.type === 4
-                            ? "协单助手" : ""
-                }
-              </Tag>
-              <Tag color={getClockState(text).color}>
-                {getClockState(text).title}
-              </Tag>
-              {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
+            <div>
+              <div style={{ display: "flex", flexDirection: "row" }}>
+                <Tag
+                  color={["#45b97c", "#69541b", "#f47920", "#8552a1", "#228fbd"][record.type]}
+                >
+                  {
+                    record.type === 0
+                      ? "业务公出" : record.type === 1
+                        ? "技术公出" : record.type === 2
+                          ? "行政公出" : record.type === 3
+                            ? "技术协单" : record.type === 4
+                              ? "协单助手" : ""
+                  }
+                </Tag>
+                <Tag color={getClockState(text).color}>
+                  {getClockState(text).title}
+                </Tag>
+                {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
+              </div>
+              {record.type === 1 && <div style={{ marginTop: 5 }}>{record.contractNo}</div>}
+              {record.type === 1 && <div>{record.totalAmout + "(万元)"}</div>}
             </div>
           ),
         },
@@ -355,6 +359,7 @@ class DetailedList extends Component {
       theTypes: props.aid,
       theTypes1: undefined,
       theCustomerTypes: undefined,
+      contractNo: undefined,
     };
     this.loadData = this.loadData.bind(this);
     this.resetAll = this.resetAll.bind(this);
@@ -466,6 +471,7 @@ class DetailedList extends Component {
         status: this.state.status,
         clockIn: this.state.clockIn,
         publicType: this.state.type,
+        contractNo: this.state.contractNo || undefined,
       },
       success: function (data) {
         ShowModal(this);
@@ -513,9 +519,10 @@ class DetailedList extends Component {
         auto: "",
         auto1: "",
         customer: "",
-        theTypes: undefined,
+        theTypes: this.props.aid,
         theTypes1: undefined,
         type: undefined,
+        contractNo: undefined,
       },
       () => {
         this.loadData();
@@ -818,7 +825,19 @@ class DetailedList extends Component {
                     marginRight: "10px",
                   }}
                 >
-                  <span style={{ marginRight: "10px" }}>
+                  <span>
+                    <Input
+                      placeholder="合同编号"
+                      style={{ width: 120, marginRight: 10 }}
+                      value={this.state.contractNo}
+                      onChange={(e) => {
+                        this.setState({
+                          contractNo: e.target.value,
+                        });
+                      }}
+                    />
+                  </span>
+                  <span>
                     <AutoComplete
                       className="certain-category-search"
                       dropdownClassName="certain-category-search-dropdown"
@@ -835,7 +854,7 @@ class DetailedList extends Component {
                       <Input />
                     </AutoComplete>
                   </span>
-                  <span style={{ marginRight: "10px" }}>
+                  <span>
                     <Select
                       placeholder="请选择审核状态"
                       style={{ width: 120, marginLeft: 10 }}
@@ -851,7 +870,7 @@ class DetailedList extends Component {
                       ))}
                     </Select>
                   </span>
-                  <span style={{ marginRight: "10px" }}>
+                  <span>
                     <Select
                       placeholder="请选择打卡状态"
                       style={{ width: 120, marginLeft: 10 }}
@@ -865,7 +884,7 @@ class DetailedList extends Component {
                       <Select.Option value={3}>异常打卡</Select.Option>
                     </Select>
                   </span>
-                  <span style={{ marginRight: "10px" }}>
+                  <span>
                     <Select
                       placeholder="请选择公出类型"
                       style={{ width: 120, marginLeft: 10 }}
@@ -898,7 +917,7 @@ class DetailedList extends Component {
                       <Input />
                     </AutoComplete>
                   </span> */}
-                  <span style={{ marginRight: "10px" }}>
+                  <span>
                     <AutoComplete
                       className="certain-category-search"
                       dropdownClassName="certain-category-search-dropdown"
@@ -920,7 +939,7 @@ class DetailedList extends Component {
                       创建时间 :
                     </span>
                     <RangePicker
-                      style={{ marginRight: "10px", marginBottom: "10px" }}
+                      style={{ width: 200, marginRight: "10px", marginBottom: "10px" }}
                       value={[
                         this.state.createReleaseDate[0]
                           ? moment(this.state.createReleaseDate[0])
@@ -939,7 +958,7 @@ class DetailedList extends Component {
                       公出时间 :
                     </span>
                     <RangePicker
-                      style={{ marginRight: "10px", marginBottom: "10px" }}
+                      style={{ width: 200, marginRight: "10px", marginBottom: "10px" }}
                       value={[
                         this.state.releaseDate[0]
                           ? moment(this.state.releaseDate[0])

+ 27 - 10
js/component/manageCenter/customer/publicSummary/index.jsx

@@ -46,8 +46,8 @@ class PublicSummary extends Component {
         },
         {
           title: "客户名称",
-          dataIndex: "nickname",
-          key: "nickname",
+          dataIndex: "userName",
+          key: "userName",
           width: 150,
           fixed: "left",
           render: (text) => {
@@ -58,8 +58,8 @@ class PublicSummary extends Component {
         },
         {
           title: "公出地点",
-          dataIndex: "userName",
-          key: "userName",
+          dataIndex: "districtName",
+          key: "districtName",
           width: 120,
           render: (text) => {
             return (
@@ -334,6 +334,7 @@ class PublicSummary extends Component {
       theTypes: undefined,
       theTypes1: undefined,
       theCustomerTypes: undefined,
+      contractNo: undefined,
     };
     this.loadData = this.loadData.bind(this);
     this.resetAll = this.resetAll.bind(this);
@@ -431,6 +432,7 @@ class PublicSummary extends Component {
         clockIn: this.state.clockIn,
         deps: this.state.deps || undefined,
         publicType: this.state.type,
+        contractNo: this.state.contractNo || undefined,
       },
       success: function (data) {
         ShowModal(this);
@@ -482,6 +484,7 @@ class PublicSummary extends Component {
         theTypes: undefined,
         theTypes1: undefined,
         type: undefined,
+        contractNo: undefined,
       },
       () => {
         this.Cascaders.empty();
@@ -670,6 +673,8 @@ class PublicSummary extends Component {
       // depId: this.state.depId,
       deps: this.state.deps,
       publicType: this.state.type,
+      contractNo: this.state.contractNo,
+
     };
     for (let i of Object.keys(data)) {
       if (i === "status" || i === "clockIn") {
@@ -775,7 +780,19 @@ class PublicSummary extends Component {
                   marginRight: "10px",
                 }}
               >
-                <span style={{ marginRight: "10px" }}>
+                <span>
+                  <Input
+                    placeholder="合同编号"
+                    style={{ width: 120, marginRight: 10 }}
+                    value={this.state.contractNo}
+                    onChange={(e) => {
+                      this.setState({
+                        contractNo: e.target.value,
+                      });
+                    }}
+                  />
+                </span>
+                <span>
                   <AutoComplete
                     className="certain-category-search"
                     dropdownClassName="certain-category-search-dropdown"
@@ -792,7 +809,7 @@ class PublicSummary extends Component {
                     <Input />
                   </AutoComplete>
                 </span>
-                <span style={{ marginRight: "10px" }}>
+                <span>
                   <Select
                     placeholder="请选择审核状态"
                     style={{ width: 120 }}
@@ -808,7 +825,7 @@ class PublicSummary extends Component {
                     ))}
                   </Select>
                 </span>
-                <span style={{ marginRight: "10px" }}>
+                <span>
                   <Select
                     placeholder="请选择打卡状态"
                     style={{ width: 120 }}
@@ -838,7 +855,7 @@ class PublicSummary extends Component {
                     <Select.Option value={4}>协单助手</Select.Option>
                   </Select>
                 </span>
-                <span style={{ marginRight: "10px" }}>
+                <span>
                   <AutoComplete
                     className="certain-category-search"
                     dropdownClassName="certain-category-search-dropdown"
@@ -855,7 +872,7 @@ class PublicSummary extends Component {
                     <Input />
                   </AutoComplete>
                 </span>
-                <span style={{ marginRight: "10px" }}>
+                <span>
                   <AutoComplete
                     className="certain-category-search"
                     dropdownClassName="certain-category-search-dropdown"
@@ -908,7 +925,7 @@ class PublicSummary extends Component {
                       let iskeep = window.adminData.shiroList.indexOf("11") != -1
                       return iskeep && current && current.valueOf() < Date.now() - 864000000;
                     }}
-                    style={{ marginRight: "10px", marginBottom: "10px" }}
+                    style={{ marginRight: "10px", marginBottom: "10px", width: 200 }}
                     value={[
                       this.state.releaseDate[0]
                         ? moment(this.state.releaseDate[0])

File diff suppressed because it is too large
+ 1130 - 1113
js/component/manageCenter/project/summary/highTechConfig.jsx


+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.2.62",
+  "version": "1.2.63",
   "description": "",
   "main": "index.js",
   "scripts": {