dev01 преди 2 години
родител
ревизия
6d13829765

+ 2 - 2
js/component/manageCenter/customer/publicStatistics/index.jsx

@@ -20,7 +20,7 @@ class ProjecCount extends Component {
         this.state = {
             pageNo: 1,
             loading: false,
-            changeList: [],
+            changeList: undefined,
             columns: [
                 {
                     title: "编号",
@@ -452,7 +452,7 @@ class ProjecCount extends Component {
                             size="middle"
                             scroll={{ x: 800, y: 0 }}
                             columns={
-                                this.state.changeList.length > 0
+                                this.state.changeList
                                     ? this.state.changeList
                                     : this.state.columns
                             }

+ 46 - 136
js/component/manageCenter/customer/publicSummary/index.jsx

@@ -30,7 +30,7 @@ class PublicSummary extends Component {
     this.state = {
       pageNo: 1,
       loading: false,
-      changeList: [],
+      changeList: undefined,
       annexUrlArr: [],
       photoUrlArr: [],
       imgListVisible: false,
@@ -46,7 +46,7 @@ class PublicSummary extends Component {
           title: "客户名称",
           dataIndex: "nickname",
           key: "nickname",
-          width: 80,
+          width: 150,
           fixed: "left",
           render: (text) => {
             return (
@@ -62,23 +62,25 @@ class PublicSummary extends Component {
           },
         },
         {
+          title: "公出地点",
+          dataIndex: "userName",
+          key: "userName",
+          width: 120,
+          render: (text) => {
+            return (
+              <div>{text}</div>
+            );
+          },
+        },
+        {
           title: "跟单人",
           dataIndex: "sname",
           key: "sname",
           width: 90,
-          render: (text) => {
+          render: (text, record) => {
             return (
               <Tooltip title={text}>
-                <div
-                  style={{
-                    width: 90,
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
-                >
-                  {text}
-                </div>
+                <div>{text}</div>
               </Tooltip>
             );
           },
@@ -87,19 +89,13 @@ class PublicSummary extends Component {
           title: "公出打卡人",
           dataIndex: "aname",
           key: "aname",
-          width: 90,
-          render: (text) => {
+          width: 130,
+          render: (text, record) => {
             return (
               <Tooltip title={text}>
-                <div
-                  style={{
-                    width: 90,
-                    overflow: "hidden",
-                    textOverflow: "ellipsis",
-                    whiteSpace: "nowrap",
-                  }}
-                >
+                <div>
                   {text}
+                  {record.assist !== 0 && <span>(协单人:{record.assistAidName})</span>}
                 </div>
               </Tooltip>
             );
@@ -109,7 +105,7 @@ class PublicSummary extends Component {
           title: "申请时间",
           dataIndex: "createTimes",
           key: "createTimes",
-          width: 130,
+          width: 80,
         },
         {
           title: "公出时间",
@@ -125,26 +121,6 @@ class PublicSummary extends Component {
           ),
         },
         {
-          title: "公出地点",
-          dataIndex: "userName",
-          key: "userName",
-          width: 120,
-          render: (text) => {
-            return (
-              <div
-              // style={{
-              //   width: 120,
-              //   overflow: "hidden",
-              //   textOverflow: "ellipsis",
-              //   whiteSpace: "nowrap",
-              // }}
-              >
-                {text}
-              </div>
-            );
-          },
-        },
-        {
           title: "公出时长(时)",
           dataIndex: "duration",
           key: "duration",
@@ -154,73 +130,47 @@ class PublicSummary extends Component {
           title: "打卡时间",
           dataIndex: "clockInTimes",
           key: "clockInTimes",
-          width: 130,
+          width: 80,
+          render: (text, record) => (
+            <div>
+              {text}
+              <Tag color={["#F21212", "#34DE38"][record.clockIn]}>{["未打卡", "已打卡"][record.clockIn]}</Tag>
+            </div>
+          )
         },
         {
-          title: "审核状态",
+          title: "标签",
           dataIndex: "status",
           key: "status",
-          width: 40,
+          width: 200,
           render: (text, record) => (
             <div style={{ display: "flex", flexDirection: "row" }}>
+              <Tag
+                color={["#45b97c", "#69541b", "#f47920", "#8552a1"][record.type]}
+              >
+                {
+                  record.type === 0
+                    ? "业务公出" : record.type === 1
+                      ? "技术公出" : record.type === 2
+                        ? "行政公出" : record.type === 3
+                          ? "技术协单" : ""
+                }
+              </Tag>
               <Tag color={getClockState(text).color}>
                 {getClockState(text).title}
               </Tag>
               {record.updateStatus == 1 && <Tag color="#1E90FF">改</Tag>}
             </div>
-            // <Tag color={getClockState(text).color}>
-            //   {getClockState(text).title}
-            // </Tag>
           ),
         },
         {
-          title: "打卡状态",
-          dataIndex: "clockIn",
-          key: "clockIn",
-          width: 70,
-          render: (text) => (
-            <span
-              style={{ color: ["#F21212", "#34DE38"][text] }}
-            >
-              {["未打卡", "已打卡"][text]}
-            </span>
-          )
-        },
-        {
-          title: "公出类型",
-          dataIndex: "type",
-          key: "type",
-          width: 70,
-          render: (text) =>
-            <span
-              style={{ color: ["#1D4FEA", "#1E90FF", "#FF5500", "red"][text] }}
-            >
-              {
-                text === 0
-                  ? "业务公出" : text === 1
-                    ? "技术公出" : text === 2
-                      ? "行政公出" : text === 3
-                        ? "技术协单" : ""
-              }
-            </span>
-        },
-        {
           title: "公出目标",
           dataIndex: "remarks",
           key: "remarks",
           width: 280,
           render: (text) => {
             return (
-              <div
-              // style={{
-              //   width: 60,
-              //   overflow: "hidden",
-              //   textOverflow: "ellipsis",
-              //   whiteSpace: "nowrap",
-              // }}
-              >
-                {text}
-              </div>
+              <div>{text}</div>
             );
           },
         },
@@ -231,17 +181,7 @@ class PublicSummary extends Component {
           width: 280,
           render: (text) => {
             return (
-              <div
-              // style={{
-              //   width: 60,
-              //   overflow: "hidden",
-              //   textOverflow: "ellipsis",
-              //   whiteSpace: "nowrap",
-              // }}
-              // title={text}
-              >
-                {text}
-              </div>
+              <div>{text}</div>
             );
           },
         },
@@ -252,17 +192,7 @@ class PublicSummary extends Component {
           width: 280,
           render: (text) => {
             return (
-              <div
-              // style={{
-              //   width: 60,
-              //   overflow: "hidden",
-              //   textOverflow: "ellipsis",
-              //   whiteSpace: "nowrap",
-              // }}
-              // title={text}
-              >
-                {text}
-              </div>
+              <div>{text}</div>
             );
           },
         },
@@ -273,17 +203,7 @@ class PublicSummary extends Component {
           width: 280,
           render: (text) => {
             return (
-              <div
-              // style={{
-              //   width: 130,
-              //   overflow: "hidden",
-              //   textOverflow: "ellipsis",
-              //   whiteSpace: "nowrap",
-              // }}
-              // title={text}
-              >
-                {text}
-              </div>
+              <div>{text}</div>
             );
           },
         },
@@ -294,17 +214,7 @@ class PublicSummary extends Component {
           width: 280,
           render: (text) => {
             return (
-              <div
-              // style={{
-              //   width: 120,
-              //   overflow: "hidden",
-              //   textOverflow: "ellipsis",
-              //   whiteSpace: "nowrap",
-              // }}
-              // title={text}
-              >
-                {text}
-              </div>
+              <div>{text}</div>
             );
           },
         },
@@ -961,7 +871,7 @@ class PublicSummary extends Component {
                 size="middle"
                 scroll={{ x: "120%" }}
                 columns={
-                  this.state.changeList.length > 0
+                  this.state.changeList
                     ? this.state.changeList
                     : this.state.columns
                 }

+ 131 - 25
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -17,7 +17,8 @@ import {
   Tabs,
   Col,
   Tag,
-  Popconfirm, Tooltip
+  Popconfirm,
+  Tooltip,
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import ResolutionDetail from "@/resolutionDetail";
@@ -42,7 +43,8 @@ import Project from "../../../../component/project"
 import LogPopup from "../../../common/logPopup";
 import { throws } from "assert";
 import { getProjectName, getClockState } from "@/tools";
-import { clockState } from "@/dataDic";
+import { clockState, salesList } from "@/dataDic";
+import OrderItemStatus from "../../../common/orderItemStatus";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 const { TextArea } = Input;
@@ -149,6 +151,8 @@ const ShouKuang = React.createClass({
         contractNo: this.state.contractNoSearch,
         liquidationStatus: this.state.liquidationStatus,
         amountStatus: this.state.amountStatus,
+        approval: this.state.approval,
+        projectType: this.state.projectType,
       },
       success: function (data) {
         let theArr = [];
@@ -1021,17 +1025,64 @@ const ShouKuang = React.createClass({
       ],
       columns: [
         {
+          title: "销售类型",
+          dataIndex: "salesType",
+          key: "salesType",
+          fixed: "left",
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? (!record.other ? "" : "," + record.other) : "")}
+              >
+                <span>
+                  {salesList[text]}
+                </span>
+              </Tooltip>
+            );
+          },
+        },
+        {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo",
-          className: "title-table",
+          // className: "title-table",
           fixed: "left",
+          width: 130,
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={
+                  <Button
+                    type="primary"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      let input = document.getElementById("copyText");
+                      input.value = text;
+                      input.select();
+                      document.execCommand("copy");
+                      message.success("复制成功");
+                    }}
+                  >
+                    复制
+                  </Button>
+                }
+              >
+                <div>
+                  {text}
+                  <div style={{ display: "flex" }}>
+                    <OrderItemStatus deleteSign={record.deleteSign} />
+                    {record.approval == 1 && <Tag color="#ff0000">特批</Tag>}
+                  </div>
+                </div>
+              </Tooltip>
+            );
+          },
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
-          className: "title-table",
+          // className: "title-table",
           fixed: "left",
           width: 150,
           render: text => {
@@ -1051,22 +1102,51 @@ const ShouKuang = React.createClass({
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo",
-          className: "title-table",
-          // fixed: "left"
-        },
-        {
-          title: "特批状态",
-          dataIndex: "approval",
-          key: "approval",
-          className: "title-table",
-          render: (text) => {
-            if (text == 1 || text == 2) {
-              return <Tag color="#f50">{getApproval(text)}</Tag>;
-            }
-            return getApproval(text);
+          // className: "title-table",
+          fixed: "left",
+          width: 140,
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={
+                  <Button
+                    type="primary"
+                    onClick={(e) => {
+                      e.stopPropagation();
+                      let input = document.getElementById("copyText");
+                      input.value = text;
+                      input.select();
+                      document.execCommand("copy");
+                      message.success("复制成功");
+                    }}
+                  >
+                    复制
+                  </Button>
+                }
+              >
+                <div>
+                  {text}
+                  <div>
+                    {record.signTotalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                    {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
+                  </div>
+                </div>
+              </Tooltip>
+            );
           },
         },
-
+        // {
+        //   title: "特批状态",
+        //   dataIndex: "approval",
+        //   key: "approval",
+        //   className: "title-table",
+        //   render: (text) => {
+        //     if (text == 1 || text == 2) {
+        //       return <Tag color="#f50">{getApproval(text)}</Tag>;
+        //     }
+        //     return getApproval(text);
+        //   },
+        // },
         {
           title: "订单部门",
           dataIndex: "departmentName",
@@ -1566,6 +1646,8 @@ const ShouKuang = React.createClass({
     this.state.orderNoSearch = "";
     this.state.departmenttList = undefined;
     this.state.amountStatus = undefined;
+    this.state.approval = undefined;
+    this.state.projectType = undefined;
     this.state.processStatus = [];
     this.state.contractNoSearch = "";
     this.state.liquidationStatus = [];
@@ -2476,7 +2558,7 @@ const ShouKuang = React.createClass({
               />
               <Select
                 placeholder="订单部门"
-                style={{ width: 120, marginRight: 10 }}
+                style={{ width: 180, marginRight: 10 }}
                 value={this.state.departmenttList}
                 onChange={(e) => {
                   this.setState({ departmenttList: e });
@@ -2502,7 +2584,7 @@ const ShouKuang = React.createClass({
                 onChange={(e) => {
                   this.setState({ processStatusSearch: e });
                 }}
-                style={{ width: 120, marginRight: 5 }}
+                style={{ width: 120, marginRight: 10 }}
                 value={this.state.processStatusSearch}
               >
                 <Option value="3">未分配</Option>
@@ -2514,7 +2596,7 @@ const ShouKuang = React.createClass({
                 onChange={(e) => {
                   this.setState({ liquidationStatus: e });
                 }}
-                style={{ width: 120, marginRight: 5 }}
+                style={{ width: 120, marginRight: 10 }}
                 value={this.state.liquidationStatus}
               >
                 <Option value="0">首付待付清</Option>
@@ -2537,9 +2619,34 @@ const ShouKuang = React.createClass({
                 <Option value="3">30~40万元</Option>
                 <Option value="4">40万元以上</Option>
               </Select>
-              <span style={{}}>下单日期:</span>
+              <Select
+                style={{ width: 120 }}
+                placeholder="特批状态"
+                value={this.state.approval}
+                onChange={(e) => {
+                  this.setState({
+                    approval: e,
+                  });
+                }}
+              >
+                <Option value="0">非特批</Option>
+                <Option value="1">特批</Option>
+              </Select>
+              <Select
+                style={{ width: 120 }}
+                placeholder="会员状态"
+                value={this.state.projectType}
+                onChange={(e) => {
+                  this.setState({
+                    projectType: e,
+                  });
+                }}
+              >
+                <Option value="1">会员</Option>
+                <Option value="0">非会员</Option>
+              </Select>
+              <span style={{}}>下单日期:</span>
               <RangePicker
-                style={{ width: 170 }}
                 value={[
                   this.state.releaseDate[0]
                     ? moment(this.state.releaseDate[0])
@@ -2552,9 +2659,8 @@ const ShouKuang = React.createClass({
                   this.setState({ releaseDate: dataString });
                 }}
               />
-              <span style={{}}>最近收款:</span>
+              <span>最近收款:</span>
               <RangePicker
-                style={{ width: 170 }}
                 value={[
                   this.state.shouKuanDate[0]
                     ? moment(this.state.shouKuanDate[0])

+ 67 - 48
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -1,15 +1,16 @@
 import React from 'react';
 import $ from 'jquery/src/ajax';
 import {
-	Modal,
-	message,
-	Spin,
-	Upload,
-	Button,
-    Form,
-    Table,
-    Col,
-    Tag
+  Modal,
+  message,
+  Spin,
+  Upload,
+  Button,
+  Form,
+  Table,
+  Col,
+  Tag,
+  Tooltip
 } from 'antd';
 import {
   getjiedian,
@@ -24,12 +25,13 @@ import {
 import OrderRiZi from "@/orderRiZi.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
-import {getProjectName} from "../../../tools";
+import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from '../../order/orderNew/changeComponent/orderCoor';
 import ContentUrl from '../../order/orderNew/contentUrl';
+import { salesList } from "@/dataDic.js";
 const OrderDetail = Form.create()(
   React.createClass({
     loadXmu(record) {
@@ -75,13 +77,13 @@ const OrderDetail = Form.create()(
     getInitialState() {
       return {
         rotateDeg: 0,
-        orderNos:'',
+        orderNos: '',
         visible: false,
         avisible: false,
         loading: false,
         declarationBatch: 1,
         dataInfor: {},
-        addnextVisible:false,
+        addnextVisible: false,
         jsDate: [],
         replenishUrl: [],
         auditStatus: 0,
@@ -299,7 +301,7 @@ const OrderDetail = Form.create()(
           costReduction: record.costReduction,
           officialCost: record.officialCost,
         });
-      }else{
+      } else {
         this.setState({
           displayFees: "none",
         });
@@ -313,7 +315,7 @@ const OrderDetail = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0,
       });
     },
@@ -368,30 +370,30 @@ const OrderDetail = Form.create()(
             orderRemarks: thisData.orderRemarks,
             orgCodeUrl: thisData.contractPictureUrl
               ? splitUrl(
-                  thisData.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisData.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
             replenishUrl: thisData.agreementUrl
               ? splitUrl(
-                  thisData.agreementUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisData.agreementUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
-              contentUrl:thisData.serviceContent
-            ? splitUrl(
+            contentUrl: thisData.serviceContent
+              ? splitUrl(
                 thisData.serviceContent,
                 ",",
                 globalConfig.avatarHost + "/upload"
               )
-            : [], //图片地址
+              : [], //图片地址
             orderNo: thisData.orderNo, //订单编号
             buyerId: thisData.buyerId,
             depName: thisData.depName,
             outsource: thisData.outsource == 0 ? "否" : "是",
-            deleteSign:thisData.deleteSign,
+            deleteSign: thisData.deleteSign,
           });
         }.bind(this),
       }).always(
@@ -495,7 +497,7 @@ const OrderDetail = Form.create()(
     componentWillMount() {
       if (this.props.data.orderNo) {
         this.setState({
-          orderNos:this.props.data.orderNo
+          orderNos: this.props.data.orderNo
         })
         this.loadData();
         this.loadXmu();
@@ -512,7 +514,7 @@ const OrderDetail = Form.create()(
         this.state.videoFileList = [];
         if (nextProps.data.orderNo) {
           this.setState({
-            orderNos:nextProps.data.orderNo
+            orderNos: nextProps.data.orderNo
           })
           this.loadData(nextProps.data);
           this.loadXmu(nextProps.data);
@@ -720,8 +722,8 @@ const OrderDetail = Form.create()(
       const cuiDataList = this.state.contactList || [];
       return (
         <div className="login">
-          <div style={{position:"absolute",top:'12px',left:'81px',zIndex:10000}}>
-            <OrderItemStatus deleteSign={this.state.deleteSign}/>
+          <div style={{ position: "absolute", top: '12px', left: '81px', zIndex: 10000 }}>
+            <OrderItemStatus deleteSign={this.state.deleteSign} />
           </div>
           {this.state.resVisible ? (
             <ResolutionDetail
@@ -758,9 +760,26 @@ const OrderDetail = Form.create()(
                   <span>
                     {theData.userName}
                     <EnterpriseNameChange
-                        type='journal'
-                        style={{ marginLeft: 10 }}
-                        enterpriseId={this.state.orderUid}/>
+                      type='journal'
+                      style={{ marginLeft: 10 }}
+                      enterpriseId={this.state.orderUid} />
+                  </span>
+                </FormItem>
+                <FormItem className="half-item"
+                  {...formItemLayout}
+                  label="销售类型"
+                >
+                  <span>
+                    {(["私有客户-", "签单客户-"][theData.userType] || " ") +
+                      (salesList[theData.salesType] || "")}
+                    {
+                      theData.other != null && theData.other != "" &&
+                      <Tooltip title={theData.other}>
+                        <span>
+                          {"(" + theData.other.toString().slice(0, 10) + (theData.other.toString().length > 9 ? "...)" : ")")}
+                        </span>
+                      </Tooltip>
+                    }
                   </span>
                 </FormItem>
                 <FormItem
@@ -846,8 +865,8 @@ const OrderDetail = Form.create()(
                   {/*    });*/}
                   {/*  }}*/}
                   {/*/>*/}
-                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                    {this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                  <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                    {this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                   </div>
                   <Modal
                     maskClosable={false}
@@ -1010,8 +1029,8 @@ const OrderDetail = Form.create()(
                   {/*    });*/}
                   {/*  }}*/}
                   {/*/>*/}
-                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                    {this.state.replenishUrl ? <ImgList domId={'orderDetail1'} fileList={this.state.replenishUrl}/> : <div/>}
+                  <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                    {this.state.replenishUrl ? <ImgList domId={'orderDetail1'} fileList={this.state.replenishUrl} /> : <div />}
                   </div>
                   <Modal
                     maskClosable={false}
@@ -1149,13 +1168,13 @@ const OrderDetail = Form.create()(
                   </Modal>
                 </FormItem>
               </div>
-              <div style={{marginLeft:"56px"}}>
-              <ContentUrl
-               processStatus={1}
-               domId = {"detailContents"}
-               contentUrl = {this.state.contentUrl}
-               imgId = {"detailContentsImg"}
-               />
+              <div style={{ marginLeft: "56px" }}>
+                <ContentUrl
+                  processStatus={1}
+                  domId={"detailContents"}
+                  contentUrl={this.state.contentUrl}
+                  imgId={"detailContentsImg"}
+                />
               </div>
               <div className="clearfix">
                 <FormItem
@@ -1286,7 +1305,7 @@ const OrderDetail = Form.create()(
                 visible={this.state.avisible}
                 loading={this.state.loading}
               />
-              <OrderCoor orderNo={this.state.orderNos} mrs={'20px'} mro={'64px'}/>
+              <OrderCoor orderNo={this.state.orderNos} mrs={'20px'} mro={'64px'} />
               <div className="clearfix" style={{ marginBottom: 10 }}>
                 <p style={{ fontSize: 18, marginLeft: 20 }}>项目业务</p>
                 <div className="patent-table">
@@ -1345,9 +1364,9 @@ const OrderDetail = Form.create()(
             </Spin>
           </Form>
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       );

+ 14 - 2
js/component/manageCenter/order/orderNew/addService.jsx

@@ -5048,8 +5048,20 @@ const NewService = Form.create()(
                               {...formItemLayout}
                               label="销售类型"
                             >
-                              <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
-                                (salesList[this.state.updatas.salesType] || "")}</span>
+                              <span>
+                                {(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
+                                  (salesList[this.state.updatas.salesType] || "")}
+                                {
+                                  this.state.updatas.other != null && this.state.updatas.other != "" &&
+                                  <Tooltip title={this.state.updatas.other}>
+                                    <span>
+                                      {"(" + this.state.updatas.other.toString().slice(0, 10) + (this.state.updatas.other.toString().length > 9 ? "...)" : ")")}
+                                    </span>
+                                  </Tooltip>
+                                }
+                              </span>
+                              {/* <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
+                                (salesList[this.state.updatas.salesType] || "")}</span> */}
                               {
                                 this.state.processStatus === 0 &&
                                 <UpdateSales

+ 13 - 12
js/component/manageCenter/order/orderNew/billing.jsx

@@ -486,7 +486,7 @@ const MyService = Form.create()(
             title: "合同编号",
             dataIndex: "contractNo",
             key: "contractNo",
-            width: 112,
+            width: 130,
             render: (text, record) => {
               return (
                 <Tooltip
@@ -508,8 +508,9 @@ const MyService = Form.create()(
                 >
                   <div>
                     {text}
-                    <div style={{ height: 22 }}>
+                    <div style={{ display: "flex" }}>
                       <OrderItemStatus deleteSign={record.deleteSign} />
+                      {record.approval == 1 && <Tag color="#ff0000">特批</Tag>}
                     </div>
                   </div>
                 </Tooltip>
@@ -542,9 +543,9 @@ const MyService = Form.create()(
                 >
                   <div>
                     {text}
-                    <div style={{ height: 22 }}>
+                    <div>
                       {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
-                      {record.totalAmount == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
+                      {record.projectType == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
                     </div>
                   </div>
                 </Tooltip>
@@ -659,14 +660,14 @@ const MyService = Form.create()(
               return getLiquidationStatus(text);
             },
           },
-          {
-            title: "是否特批",
-            dataIndex: "approval",
-            key: "approval",
-            render: (text) => {
-              return getApprovedState(text);
-            },
-          },
+          // {
+          //   title: "是否特批",
+          //   dataIndex: "approval",
+          //   key: "approval",
+          //   render: (text) => {
+          //     return getApprovedState(text);
+          //   },
+          // },
           {
             title: "订单状态",
             dataIndex: "orderStatus",

+ 20 - 3
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -456,9 +456,26 @@ class OrderDetail extends Component {
             style={{ marginLeft: 10 }}
             enterpriseId={this.props.orderUid} />
         </FormItem>
-        <FormItem className="half-item" {...formItemLayout} label="销售类型">
-          <span>{(["私有客户-", "签单客户-"][data.userType] || " ") +
-            (salesList[data.salesType] || "")}</span>
+        <FormItem
+          className="half-item"
+          {...formItemLayout}
+          label="销售类型"
+        >
+          <span>
+            {(["私有客户-", "签单客户-"][data.userType] || " ") +
+              (salesList[data.salesType] || "")}
+            {
+              data.other != null && data.other != "" &&
+              <Tooltip title={data.other}>
+                <span>
+                  {"(" + data.other.toString().slice(0, 10) + (data.other.toString().length > 9 ? "...)" : ")")}
+                </span>
+              </Tooltip>
+            }
+          </span>
+
+          {/* <span>{(["私有客户-", "签单客户-"][data.userType] || " ") +
+            (salesList[data.salesType] || "")}</span> */}
         </FormItem>
         <FormItem
           className="half-item"

+ 20 - 3
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1553,9 +1553,26 @@ const IntentionCustomer = Form.create()(
                             style={{ marginLeft: 10 }}
                             enterpriseId={this.state.orderUid} />
                         </FormItem>
-                        <FormItem className="half-item" {...formItemLayout} label="销售类型">
-                          <span>{(["私有客户-", "签单客户-"][this.state.userType] || " ") +
-                            (salesList[this.state.salesType] || "")}</span>
+                        <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="销售类型"
+                        >
+                          <span>
+                            {(["私有客户-", "签单客户-"][this.state.userType] || " ") +
+                              (salesList[this.state.salesType] || "")}
+                            {
+                              this.state.other != null && this.state.other != "" &&
+                              <Tooltip title={this.state.other}>
+                                <span>
+                                  {"(" + this.state.other.toString().slice(0, 10) + (this.state.other.toString().length > 9 ? "...)" : ")")}
+                                </span>
+                              </Tooltip>
+                            }
+                          </span>
+                          {/* <span>{(["私有客户-", "签单客户-"][this.state.userType] || " ") +
+                            (salesList[this.state.salesType] || "")}
+                          </span> */}
                         </FormItem>
                         <FormItem
                           className="half-item"

+ 14 - 2
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -4085,8 +4085,20 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="销售类型"
                     >
-                      <span>{(["私有客户-", "签单客户-"][this.state.userType] || " ") +
-                        (salesList[this.state.salesType] || "")}</span>
+                      <span>
+                        {(["私有客户-", "签单客户-"][this.state.userType] || " ") +
+                          (salesList[this.state.salesType] || "")}
+                        {
+                          this.state.other != null && this.state.other != "" &&
+                          <Tooltip title={this.state.other}>
+                            <span>
+                              {"(" + this.state.other.toString().slice(0, 10) + (this.state.other.toString().length > 9 ? "...)" : ")")}
+                            </span>
+                          </Tooltip>
+                        }
+                      </span>
+                      {/* <span>{(["私有客户-", "签单客户-"][this.state.userType] || " ") +
+                        (salesList[this.state.salesType] || "")}</span> */}
                     </FormItem>
                     <FormItem
                       className="half-item"

+ 15 - 2
js/component/manageCenter/order/orderNew/reject.jsx

@@ -2060,8 +2060,21 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="销售类型"
                     >
-                      <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
-                        (salesList[this.state.updatas.salesType] || "")}</span>
+                      <span>
+                        {(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
+                          (salesList[this.state.updatas.salesType] || "")}
+                        {
+                          this.state.updatas.other != null && this.state.updatas.other != "" &&
+                          <Tooltip title={this.state.updatas.other}>
+                            <span>
+                              {"(" + this.state.updatas.other.toString().slice(0, 10) + (this.state.updatas.other.toString().length > 9 ? "...)" : ")")}
+                            </span>
+                          </Tooltip>
+                        }
+                      </span>
+
+                      {/* <span>{(["私有客户-", "签单客户-"][this.state.updatas.userType] || " ") +
+                        (salesList[this.state.updatas.salesType] || "")}</span> */}
                       <UpdateSales
                         orderNo={this.state.orderNo}
                         updatas={this.state.updatas}

+ 4 - 4
js/component/manageCenter/order/pressMoney/index.jsx

@@ -32,13 +32,13 @@ class PressMoney extends Component {
           title: "序号",
           dataIndex: "key",
           key: "key",
-          width: 45,
+          width: 35,
         },
         {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo",
-          width:70,
+          width:90,
         },
         {
           title: "客户名称",
@@ -50,7 +50,7 @@ class PressMoney extends Component {
           title: "订单负责人",
           dataIndex: "salesmanName",
           key: "salesmanName",
-          width: 110,
+          width: 100,
         },
         {
           title: "订单部门",
@@ -92,7 +92,7 @@ class PressMoney extends Component {
           title: "自动移交法务(天)",
           dataIndex: "daysRemaining",
           key: "daysRemaining",
-          width: 100,
+          width: 90,
           render: (text) => {
             return text === 0 ? "已移交法务" : text + "天";
           },

+ 1 - 0
js/component/manageCenter/order/source/order.jsx

@@ -365,6 +365,7 @@ class OrderList extends Component {
       () => {
         this.xiangqing(record.orderNo)
         this.createTabs(record.orderNo)
+        this.xiangmu(record.orderNo)
       }
     );
   }

+ 56 - 52
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import $ from "jquery/src/ajax";
 import "@/manageCenter/financialManage/distribute/public.less";
-import {Button, Form, Input, Select, Spin, Table, message, Modal, Tabs, Tag, Tooltip} from "antd";
+import { Button, Form, Input, Select, Spin, Table, message, Modal, Tabs, Tag, Tooltip } from "antd";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
@@ -17,13 +17,13 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "../task/resolutionPro";
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "../../order/orderNew/changeComponent/orderCoor";
 const FormItem = Form.Item;
-const {TabPane} = Tabs
+const { TabPane } = Tabs
 const OutsourceTaskAssignment = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
@@ -77,6 +77,7 @@ const OutsourceTaskAssignment = React.createClass({
               depName: thisdata.depName, //部门名称
               splitStatus: thisdata.splitStatus, //拆分状态
               splitList: thisdata.splitList,
+              patentTypeName: thisdata.patentTypeName,
             });
           }
         }
@@ -133,14 +134,17 @@ const OutsourceTaskAssignment = React.createClass({
       },
       columns: [
         {
-          title: "任务编号",
+          title: "编号",
           dataIndex: "id",
           key: "id",
         },
         {
-          title: "任务名称",
+          title: "项目名称",
           dataIndex: "taskName",
           key: "taskName",
+          render: (text, record) => {
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+          }
         },
         {
           title: "订单编号",
@@ -158,14 +162,14 @@ const OutsourceTaskAssignment = React.createClass({
           key: "userName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -266,9 +270,9 @@ const OutsourceTaskAssignment = React.createClass({
           key: "commodityName",
           render: (text, record) => {
             return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
             )
-        }
+          }
         },
         {
           title: "项目类别",
@@ -415,10 +419,10 @@ const OutsourceTaskAssignment = React.createClass({
             orderRemarks: thisdata.orderRemarks, //订单留言
             orgCodeUrl: thisdata.contractPictureUrl
               ? splitUrl(
-                  thisdata.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [], //图片地址
             salesmanName: thisdata.salesmanName, //营销员名称
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -429,7 +433,7 @@ const OutsourceTaskAssignment = React.createClass({
             nowFinance: thisdata.nowFinance, //财务名称
             nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName, //订单部门
-            deleteSign:thisdata.deleteSign,
+            deleteSign: thisdata.deleteSign,
           });
         }
       }.bind(this),
@@ -521,7 +525,7 @@ const OutsourceTaskAssignment = React.createClass({
         costReduction: record.costReduction,
         officialCost: record.officialCost,
       });
-    }else{
+    } else {
       this.setState({
         displayFees: "none",
       });
@@ -535,7 +539,7 @@ const OutsourceTaskAssignment = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
-      dataInfor:record,
+      dataInfor: record,
       addState: 0,
     });
   },
@@ -795,12 +799,12 @@ const OutsourceTaskAssignment = React.createClass({
             isAddition: thisdata.additionalOrder ? true : false,
             contractPictureUrl: thisdata.contractPictureUrl
               ? splitUrl(
-                  thisdata.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
-            deleteSign:thisdata.deleteSign,
+            deleteSign: thisdata.deleteSign,
           });
         }
       }.bind(this),
@@ -854,14 +858,14 @@ const OutsourceTaskAssignment = React.createClass({
             key: "userName",
             render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -1033,7 +1037,7 @@ const OutsourceTaskAssignment = React.createClass({
               <Button type="primary" onClick={this.search}>
                 搜索
               </Button>
-              <Button onClick={()=>{
+              <Button onClick={() => {
                 this.reset();
                 this.loadData();
               }}>重置</Button>
@@ -1051,11 +1055,11 @@ const OutsourceTaskAssignment = React.createClass({
           <TabPane tab="更改表格显示数据" key="2">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -1065,8 +1069,8 @@ const OutsourceTaskAssignment = React.createClass({
             <Table
               columns={
                 this.state.changeList
-                    ? this.state.changeList
-                    : this.state.columns
+                  ? this.state.changeList
+                  : this.state.columns
               }
               dataSource={this.state.dataSource}
               expandedRowRender={expandedRowRender}
@@ -1100,8 +1104,8 @@ const OutsourceTaskAssignment = React.createClass({
           onCancel={this.visitCancel}
         >
           <Tabs activeKey={this.state.activeKey} onChange={this.orderChange} tabBarExtraContent={
-            <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-              <OrderItemStatus deleteSign={this.state.deleteSign}/>
+            <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+              <OrderItemStatus deleteSign={this.state.deleteSign} />
             </div>
           }>
             <TabPane tab="任务详情" key="1">
@@ -1134,9 +1138,9 @@ const OutsourceTaskAssignment = React.createClass({
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1325,7 +1329,7 @@ const OutsourceTaskAssignment = React.createClass({
                       visible={this.state.avisible}
                       loading={this.state.loading}
                     />
-                    <OrderCoor orderNo={this.state.orderNo}/>
+                    <OrderCoor orderNo={this.state.orderNo} />
                     <div>
                       <span style={{ marginLeft: "50px", fontSize: "20px" }}>
                         项目业务
@@ -1380,9 +1384,9 @@ const OutsourceTaskAssignment = React.createClass({
           </Tabs>
         </Modal>
         {this.state.addnextVisible && <ProjectDetailsReadOnly
-            infor={this.state.dataInfor}
-            visible={this.state.addnextVisible}
-            onCancel={this.nextCancel}
+          infor={this.state.dataInfor}
+          visible={this.state.addnextVisible}
+          onCancel={this.nextCancel}
         />}
       </div>
     );

+ 3 - 0
js/component/manageCenter/project/task/myTask.jsx

@@ -287,6 +287,9 @@ const Task = React.createClass({
                     key: 'taskName',
                     fixed: 'left',
                     width: 150,
+                    render: (text, record) => {
+                        return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                    }
                 },
                 {
                     title: '项目数量',

+ 3 - 3
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -349,9 +349,9 @@ const MyTaskOutsource = React.createClass({
           title: "项目名称",
           dataIndex: "taskName",
           key: "taskName",
-          render: (text) => {
-            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
-          },
+          render: (text, record) => {
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+          }
         },
         {
           title: "项目数量",

+ 59 - 52
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import $ from "jquery/src/ajax";
 import "@/manageCenter/financialManage/distribute/public.less";
-import {Button, Form, Input, Select, Spin, Table, message, Modal, Tabs, Tag, Tooltip} from "antd";
+import { Button, Form, Input, Select, Spin, Table, message, Modal, Tabs, Tag, Tooltip } from "antd";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ResolutionDetail from "@/resolutionDetail"
 import OrderDetail from "../../order/orderNew/changeComponent/orderDetail";
@@ -17,12 +17,12 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "./resolutionPro"
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 const FormItem = Form.Item;
-const {TabPane} = Tabs
+const { TabPane } = Tabs
 const Task = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
@@ -75,6 +75,7 @@ const Task = React.createClass({
               depName: thisdata.depName, //部门名称
               splitStatus: thisdata.splitStatus, //拆分状态
               splitList: thisdata.splitList,
+              patentTypeName: thisdata.patentTypeName,
             });
           }
         }
@@ -131,14 +132,17 @@ const Task = React.createClass({
       },
       columns: [
         {
-          title: "任务编号",
+          title: "编号",
           dataIndex: "id",
           key: "id",
         },
         {
-          title: "任务名称",
+          title: "项目名称",
           dataIndex: "taskName",
           key: "taskName",
+          render: (text, record) => {
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+          }
         },
         {
           title: "订单编号",
@@ -156,14 +160,14 @@ const Task = React.createClass({
           key: "userName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -265,9 +269,9 @@ const Task = React.createClass({
           key: "commodityName",
           render: (text, record) => {
             return (
-                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
             )
-        }
+          }
         },
         {
           title: "项目类别",
@@ -410,10 +414,10 @@ const Task = React.createClass({
             orderRemarks: thisdata.orderRemarks, //订单留言
             orgCodeUrl: thisdata.contractPictureUrl
               ? splitUrl(
-                  thisdata.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [], //图片地址
             salesmanName: thisdata.salesmanName, //营销员名称
             salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -424,7 +428,7 @@ const Task = React.createClass({
             nowFinance: thisdata.nowFinance, //财务名称
             nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
             depName: thisdata.depName, //订单部门
-            deleteSign:thisdata.deleteSign,
+            deleteSign: thisdata.deleteSign,
           });
         }
       }.bind(this),
@@ -515,7 +519,7 @@ const Task = React.createClass({
         costReduction: record.costReduction,
         officialCost: record.officialCost,
       });
-    }else{
+    } else {
       this.setState({
         displayFees: "none",
       });
@@ -529,7 +533,7 @@ const Task = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
-      dataInfor:record,
+      dataInfor: record,
       addState: 0,
     });
   },
@@ -790,12 +794,12 @@ const Task = React.createClass({
             isAddition: thisdata.additionalOrder ? true : false,
             contractPictureUrl: thisdata.contractPictureUrl
               ? splitUrl(
-                  thisdata.contractPictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
-            deleteSign:thisdata.deleteSign,
+            deleteSign: thisdata.deleteSign,
           });
         }
       }.bind(this),
@@ -821,7 +825,7 @@ const Task = React.createClass({
       if (e.splitList instanceof Array && e.splitList.length) {
         columns = [
           {
-            title: "任务编号",
+            title: "编号",
             dataIndex: "splitSuper",
             key: "splitSuper",
             render: (text, record) => {
@@ -829,9 +833,12 @@ const Task = React.createClass({
             },
           },
           {
-            title: "任务名称",
+            title: "项目名称",
             dataIndex: "taskName",
             key: "taskName",
+            render: (text, record) => {
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            }
           },
           {
             title: "订单编号",
@@ -849,14 +856,14 @@ const Task = React.createClass({
             key: "userName",
             render: text => {
               return (
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -1041,11 +1048,11 @@ const Task = React.createClass({
           <TabPane tab="更改表格显示数据" key="2">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -1055,8 +1062,8 @@ const Task = React.createClass({
             <Table
               columns={
                 this.state.changeList
-                    ? this.state.changeList
-                    : this.state.columns
+                  ? this.state.changeList
+                  : this.state.columns
               }
               dataSource={this.state.dataSource}
               expandedRowRender={expandedRowRender}
@@ -1091,8 +1098,8 @@ const Task = React.createClass({
           onCancel={this.visitCancel}
         >
           <Tabs activeKey={this.state.activeKey} onChange={this.orderChange} tabBarExtraContent={
-            <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-              <OrderItemStatus deleteSign={this.state.deleteSign}/>
+            <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+              <OrderItemStatus deleteSign={this.state.deleteSign} />
             </div>
           }>
             <TabPane tab="任务详情" key="1">
@@ -1125,9 +1132,9 @@ const Task = React.createClass({
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1370,9 +1377,9 @@ const Task = React.createClass({
           </Tabs>
         </Modal>
         {this.state.addnextVisible && <ProjectDetailsReadOnly
-            infor={this.state.dataInfor}
-            visible={this.state.addnextVisible}
-            onCancel={this.nextCancel}
+          infor={this.state.dataInfor}
+          visible={this.state.addnextVisible}
+          onCancel={this.nextCancel}
         />}
       </div>
     );

Файловите разлики са ограничени, защото са твърде много
+ 617 - 614
js/component/manageCenter/project/task/taskQuery.jsx