dev01 2 years ago
parent
commit
b07b78d746
58 changed files with 6652 additions and 6471 deletions
  1. 191 173
      js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx
  2. 2 2
      js/component/manageCenter/customer/operationalData/reexamine/details.jsx
  3. 19 9
      js/component/manageCenter/customer/publicStatistics/detailedList.jsx
  4. 22 15
      js/component/manageCenter/customer/publicSummary/index.jsx
  5. 2 2
      js/component/manageCenter/customerService/administration/followUpDetails.jsx
  6. 2 2
      js/component/manageCenter/customerService/administration/order.jsx
  7. 2 6
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  8. 2 6
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  9. 3 7
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  10. 3 7
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  11. 2 8
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  12. 5 0
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  13. 1223 1218
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  14. 1616 1611
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  15. 482 477
      js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx
  16. 423 418
      js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx
  17. 13 8
      js/component/manageCenter/order/orderNew/addService.jsx
  18. 5 0
      js/component/manageCenter/order/orderNew/addorders.js
  19. 1 1
      js/component/manageCenter/order/orderNew/approveds.jsx
  20. 4 4
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  21. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  22. 4 4
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  23. 1 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  24. 2 2
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  25. 6 1
      js/component/manageCenter/order/orderNew/contractCwjl.js
  26. 6 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  27. 6 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  28. 6 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  29. 6 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  30. 6 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  31. 6 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  32. 6 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  33. 5 0
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  34. 1 1
      js/component/manageCenter/order/orderNew/examine.jsx
  35. 5 0
      js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js
  36. 1 1
      js/component/manageCenter/order/orderNew/inquiry.jsx
  37. 1 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  38. 1 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  39. 1 1
      js/component/manageCenter/order/orderNew/reject.jsx
  40. 683 678
      js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx
  41. 465 460
      js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx
  42. 5 0
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  43. 5 0
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  44. 6 1
      js/component/manageCenter/project/project/projectAssignment.jsx
  45. 6 1
      js/component/manageCenter/project/project/projectQuery.jsx
  46. 6 1
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  47. 5 0
      js/component/manageCenter/project/summary/projectDetails.jsx
  48. 39 41
      js/component/manageCenter/project/task/businessManagement/orderInfor.jsx
  49. 467 462
      js/component/manageCenter/project/task/myTask.jsx
  50. 6 1
      js/component/manageCenter/project/task/myTaskCount.jsx
  51. 5 0
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  52. 5 0
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  53. 5 0
      js/component/manageCenter/project/task/taskAssignment.jsx
  54. 6 1
      js/component/manageCenter/project/task/taskCount.jsx
  55. 5 0
      js/component/manageCenter/project/task/taskQuery.jsx
  56. 680 675
      js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx
  57. 159 154
      js/component/project.jsx
  58. 1 1
      package.json

+ 191 - 173
js/component/manageCenter/customer/operationalData/interviewStatistics/detailedList.jsx

@@ -1,17 +1,17 @@
-import React,{ Component } from 'react';
-import {Button, Modal, Tag, Tooltip,} from "antd";
+import React, { Component } from 'react';
+import { Button, Modal, Tag, Tooltip, } from "antd";
 import './index.less';
 import TabelContent from "../../../../common/tabelContent";
-import {splitUrl,getClockState} from "@/tools";
+import { splitUrl, getClockState } from "@/tools";
 import ImgList from "../../../../common/imgList";
-import {clockState} from "@/dataDic";
-import {getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus} from "../../../../tools";
+import { clockState } from "@/dataDic";
+import { getApprovedState, getLiquidationStatus, getNewOrderStatus, getProcessStatus } from "../../../../tools";
 import moment from 'moment';
 
-class DetailedList extends Component{
+class DetailedList extends Component {
     constructor(props) {
         super(props);
-        this.state= {
+        this.state = {
             columns: [
                 {
                     title: "编号",
@@ -30,7 +30,7 @@ class DetailedList extends Component{
                     dataIndex: "newUser",
                     key: "newUser",
                     width: 100,
-                    render:(text)=>(
+                    render: (text) => (
                         text === 0 ? '新客户' :
                             text === 1 ? '老客户' : ''
                     )
@@ -52,7 +52,7 @@ class DetailedList extends Component{
                         this.setState({
                             visible1: true,
                             uid: record.uid,
-                            depId:record.id,
+                            depId: record.id,
                         })
                     },
                 },
@@ -67,7 +67,7 @@ class DetailedList extends Component{
                         this.setState({
                             visible2: true,
                             uid: record.uid,
-                            depId:record.id,
+                            depId: record.id,
                         })
                     },
                 },
@@ -87,8 +87,8 @@ class DetailedList extends Component{
                     render: (text) => {
                         return (
                             <div style={{
-                                width:140,
-                                wordBreak:'break-all',
+                                width: 140,
+                                wordBreak: 'break-all',
                             }}>{text}</div>
                         )
                     },
@@ -102,10 +102,10 @@ class DetailedList extends Component{
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    width:100,
-                                    overflow:'hidden',
+                                    width: 100,
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -120,10 +120,10 @@ class DetailedList extends Component{
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    width:100,
-                                    overflow:'hidden',
+                                    width: 100,
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -143,7 +143,7 @@ class DetailedList extends Component{
                     render: (text, record) => (
                         <div>
                             <div>{text}</div>
-                            <div style={{paddingLeft:'44px'}}>至</div>
+                            <div style={{ paddingLeft: '44px' }}>至</div>
                             <div>{record.releaseEnds}</div>
                         </div>
                     )
@@ -157,10 +157,10 @@ class DetailedList extends Component{
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    width:120,
-                                    overflow:'hidden',
+                                    width: 120,
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -183,15 +183,15 @@ class DetailedList extends Component{
                     dataIndex: "status",
                     key: "status",
                     width: 40,
-                    render: (text,record) => (
+                    render: (text, record) => (
                         <div style={{ display: "flex", flexDirection: "row" }}>
-                        <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>
+                            {record.updateStatus === 1 && (
+                                <Tag color="#1E90FF">改</Tag>
+                            )}
+                        </div>
                         // <Tag color={getClockState(text).color}>{getClockState(text).title}</Tag>
                     )
                 },
@@ -201,8 +201,11 @@ class DetailedList extends Component{
                     key: "clockIn",
                     width: 60,
                     render: (text) => (
-                        text === 1 ? '已打卡' :
-                            text === 0 ? '未打卡' : ''
+                        <span
+                            style={{ color: ["#F21212", "#34DE38"][text] }}
+                        >
+                            {["未打卡", "已打卡"][text]}
+                        </span>
                     )
                 },
                 {
@@ -211,15 +214,25 @@ class DetailedList extends Component{
                     key: "type",
                     width: 70,
                     render: (text) =>
-                      text === 1 ? "技术公出" : text === 0 ? "业务/行政公出" : "",
-                  },
+                        <span
+                            style={{ color: ["#1D4FEA", "#1E90FF", "#FF5500", "red"][text] }}
+                        >
+                            {
+                                text === 0
+                                    ? "业务公出" : text === 1
+                                        ? "技术公出" : text === 2
+                                            ? "行政公出" : text === 3
+                                                ? "技术协单" : ""
+                            }
+                        </span>
+                },
                 {
                     title: "公出原因/计划",
                     dataIndex: "remarks",
                     key: "remarks",
                     width: 155,
                     render: (text) => {
-                        return (<div style={{wordBreak:"break-all"}}>{text}</div>)
+                        return (<div style={{ wordBreak: "break-all" }}>{text}</div>)
                     },
                 },
                 {
@@ -228,7 +241,7 @@ class DetailedList extends Component{
                     key: "supplement",
                     width: 155,
                     render: (text) => {
-                        return (<div style={{wordBreak:"break-all"}}>{text}</div>)
+                        return (<div style={{ wordBreak: "break-all" }}>{text}</div>)
                     },
                 },
                 {
@@ -237,14 +250,14 @@ class DetailedList extends Component{
                     key: "auditInfo",
                     width: 155,
                     render: (text) => {
-                        return (<div style={{wordBreak:"break-all"}}>{text}</div>)
+                        return (<div style={{ wordBreak: "break-all" }}>{text}</div>)
                     },
                 },
                 {
                     title: "操作",
                     dataIndex: "annexUrl",
                     key: "annexUrl",
-                    render: (text,record) => (
+                    render: (text, record) => (
                         <div>
                             <Button
                                 type={"primary"}
@@ -253,11 +266,11 @@ class DetailedList extends Component{
                                     let arr1 = text || [];
                                     let arr2 = record.photoUrl || [];
                                     this.setState({
-                                        annexUrlArr:splitUrl(arr1, ",", globalConfig.avatarHost + "/upload"),
-                                        photoUrlArr:splitUrl(arr2, ",", globalConfig.avatarHost + "/upload"),
-                                    },()=>{
+                                        annexUrlArr: splitUrl(arr1, ",", globalConfig.avatarHost + "/upload"),
+                                        photoUrlArr: splitUrl(arr2, ",", globalConfig.avatarHost + "/upload"),
+                                    }, () => {
                                         this.setState({
-                                            imgListVisible:true
+                                            imgListVisible: true
                                         })
                                     })
                                 }}
@@ -268,66 +281,66 @@ class DetailedList extends Component{
                     )
                 },
             ],
-            searchList:[
+            searchList: [
                 {
-                    type:'departmentSelect',
-                    dataKey:'depId',
-                    placeholder:'请选择部门'
+                    type: 'departmentSelect',
+                    dataKey: 'depId',
+                    placeholder: '请选择部门'
                 },
                 {
-                    type:'times',
-                    title:'公出时间',
-                    dataKey:'date',
+                    type: 'times',
+                    title: '公出时间',
+                    dataKey: 'date',
                     format: 'YYYY/MM'
                 },
             ],
-            searchList1:[
+            searchList1: [
                 {
-                    type:'select',
-                    dataKey:'status',
-                    placeholder:'请选择审核状态',
-                    selectList:()=>{
+                    type: 'select',
+                    dataKey: 'status',
+                    placeholder: '请选择审核状态',
+                    selectList: () => {
                         let arr = [];
-                        for(let i of clockState){
+                        for (let i of clockState) {
                             arr.push({
-                                value:i.id,
-                                label:i.title
+                                value: i.id,
+                                label: i.title
                             })
                         }
                         return arr;
                     }
                 },
                 {
-                    type:'select',
-                    dataKey:'clockIn',
-                    placeholder:'请选择打卡状态',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'clockIn',
+                    placeholder: '请选择打卡状态',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'已打卡'
+                            value: '0',
+                            label: '已打卡'
                         },
                         {
-                            value:'1',
-                            label:'未打卡'
+                            value: '1',
+                            label: '未打卡'
                         }
                     ]
                 },
                 {
-                    type:'autoComplete',
-                    dataKey:'aid',
-                    api:'/api/admin/customer/listAdminByName',
-                    search:'adminName',
-                    placeholder:'请输入公出申请人'
+                    type: 'autoComplete',
+                    dataKey: 'aid',
+                    api: '/api/admin/customer/listAdminByName',
+                    search: 'adminName',
+                    placeholder: '请输入公出申请人'
                 },
                 {
-                    type:'autoComplete',
-                    dataKey:'sid',
-                    api:'/api/admin/customer/listAdminByName',
-                    search:'adminName',
-                    placeholder:'请输入跟单人'
+                    type: 'autoComplete',
+                    dataKey: 'sid',
+                    api: '/api/admin/customer/listAdminByName',
+                    search: 'adminName',
+                    placeholder: '请输入跟单人'
                 },
             ],
-            columns2:[
+            columns2: [
                 {
                     title: "合同编号",
                     dataIndex: "contractNo",
@@ -342,14 +355,14 @@ class DetailedList extends Component{
                     title: "客户名称",
                     dataIndex: "userName",
                     key: "userName",
-                    render:text=>{
+                    render: text => {
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
+                                    maxWidth: '150px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -423,85 +436,85 @@ class DetailedList extends Component{
                     key: "financeName",
                 },
             ],
-            searchList2:[
+            searchList2: [
                 {
-                    type:'text',
-                    placeholder:'请输入订单编号',
-                    dataKey:'orderNo',
+                    type: 'text',
+                    placeholder: '请输入订单编号',
+                    dataKey: 'orderNo',
                 },
                 {
-                    type:'text',
-                    placeholder:'请输入客户名称',
-                    dataKey:'name',
+                    type: 'text',
+                    placeholder: '请输入客户名称',
+                    dataKey: 'name',
                 },
                 {
-                    type:'text',
-                    placeholder:'请输入合同编号',
-                    dataKey:'contractNo',
+                    type: 'text',
+                    placeholder: '请输入合同编号',
+                    dataKey: 'contractNo',
                 },
                 {
-                    type:'select',
-                    dataKey:'liquidationStatus',
-                    placeholder:'请选择结算状态',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'liquidationStatus',
+                    placeholder: '请选择结算状态',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'首付待付请'
+                            value: '0',
+                            label: '首付待付请'
                         },
                         {
-                            value:'1',
-                            label:'尾款待付清'
+                            value: '1',
+                            label: '尾款待付清'
                         },
                         {
-                            value:'2',
-                            label:'已付清'
+                            value: '2',
+                            label: '已付清'
                         },
                     ]
                 },
                 {
-                    type:'select',
-                    dataKey:'approval',
-                    placeholder:'请选择特批状态',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'approval',
+                    placeholder: '请选择特批状态',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'非特批'
+                            value: '0',
+                            label: '非特批'
                         },
                         {
-                            value:'1',
-                            label:'特批'
+                            value: '1',
+                            label: '特批'
                         },
                     ]
                 },
                 {
-                    type:'select',
-                    dataKey:'amountStatus',
-                    placeholder:'请选择签单金额',
-                    selectList:[
+                    type: 'select',
+                    dataKey: 'amountStatus',
+                    placeholder: '请选择签单金额',
+                    selectList: [
                         {
-                            value:'0',
-                            label:'10万元以下'
+                            value: '0',
+                            label: '10万元以下'
                         },
                         {
-                            value:'1',
-                            label:'10~20万元'
+                            value: '1',
+                            label: '10~20万元'
                         },
                         {
-                            value:'2',
-                            label:'20~30万元'
+                            value: '2',
+                            label: '20~30万元'
                         },
                         {
-                            value:'3',
-                            label:'30~40万元'
+                            value: '3',
+                            label: '30~40万元'
                         },
                         {
-                            value:'4',
-                            label:'40万元以上'
+                            value: '4',
+                            label: '40万元以上'
                         },
                     ]
                 },
             ],
-            searchConfig:{}
+            searchConfig: {}
         }
     }
 
@@ -519,31 +532,32 @@ class DetailedList extends Component{
                     className="admin-desc-content">
                     <div className="user-content">
                         <TabelContent
-                            scroll={{ x: 0, y: 500}}
+                            scroll={{ x: 0, y: 500 }}
                             searchList={this.state.searchList}
                             columns={this.state.columns}
                             searchConfig={this.props.searchConfig}
                             tabelApi={'/api/admin/provinceFollowStatisticsList'}
                             exportApi={'/api/admin/provinceFollowStatisticsListExport'}
                             query={{
-                                province:this.props.recordInfor.id,
-                                type:this.props.recordInfor.type
+                                province: this.props.recordInfor.id,
+                                type: this.props.recordInfor.type
                             }}
-                            onRowClick={()=>{}}
-                            searchOperation={(value)=>{
-                                for(let i of Object.keys(value)){
-                                    if(i === 'sort' || i === 'pageNo' || i === 'pageSize'){
+                            onRowClick={() => { }}
+                            searchOperation={(value) => {
+                                for (let i of Object.keys(value)) {
+                                    if (i === 'sort' || i === 'pageNo' || i === 'pageSize') {
                                         delete value[i]
                                     }
 
                                 }
-                                this.setState({searchConfig:value})}
+                                this.setState({ searchConfig: value })
                             }
-                            dataProcessing={(data)=>{
+                            }
+                            dataProcessing={(data) => {
                                 let theArr = [];
                                 for (let i = 0; i < data.data.length; i++) {
                                     let thisdata = data.data[i];
-                                    thisdata.key=i + 1;
+                                    thisdata.key = i + 1;
                                     theArr.push(thisdata);
                                 }
                                 return theArr;
@@ -553,18 +567,18 @@ class DetailedList extends Component{
                     {this.state.visible1 && <Modal
                         maskClosable={false}
                         visible={this.state.visible1}
-                        onOk={()=>{
+                        onOk={() => {
                             this.setState({
-                                visible1:false,
-                                uid:'',
-                                depId:''
+                                visible1: false,
+                                uid: '',
+                                depId: ''
                             })
                         }}
-                        onCancel={()=>{
+                        onCancel={() => {
                             this.setState({
-                                visible1:false,
-                                uid:'',
-                                depId:''
+                                visible1: false,
+                                uid: '',
+                                depId: ''
                             })
                         }}
                         width='1600px'
@@ -580,22 +594,22 @@ class DetailedList extends Component{
                                 tabelApi={'/api/admin/release/publicReleaseDtails'}
                                 exportApi={'/api/admin/release/publicReleaseDtails/export'}
                                 query={{
-                                    uid:this.state.uid,
-                                    depId:this.state.depId,
-                                    releaseStart:moment(this.state.searchConfig.date).startOf('month').format('YYYY-MM-DD'),
-                                    releaseEnd:moment(this.state.searchConfig.date).endOf('month').format('YYYY-MM-DD')
+                                    uid: this.state.uid,
+                                    depId: this.state.depId,
+                                    releaseStart: moment(this.state.searchConfig.date).startOf('month').format('YYYY-MM-DD'),
+                                    releaseEnd: moment(this.state.searchConfig.date).endOf('month').format('YYYY-MM-DD')
                                 }}
-                                exportExecProcessing={(data)=>{
+                                exportExecProcessing={(data) => {
                                     data.uid = this.state.uid;
                                     data.depId = this.state.depId;
                                     return data;
                                 }}
-                                onRowClick={()=>{}}
-                                dataProcessing={(data)=>{
+                                onRowClick={() => { }}
+                                dataProcessing={(data) => {
                                     let theArr = [];
                                     for (let i = 0; i < data.data.list.length; i++) {
                                         let thisdata = data.data.list[i];
-                                        thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                                        thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
                                         theArr.push(thisdata);
                                     }
                                     return theArr;
@@ -607,18 +621,18 @@ class DetailedList extends Component{
                     {this.state.visible2 && <Modal
                         maskClosable={false}
                         visible={this.state.visible2}
-                        onOk={()=>{
+                        onOk={() => {
                             this.setState({
-                                visible2:false,
-                                uid:'',
-                                depId:''
+                                visible2: false,
+                                uid: '',
+                                depId: ''
                             })
                         }}
-                        onCancel={()=>{
+                        onCancel={() => {
                             this.setState({
-                                visible2:false,
-                                uid:'',
-                                depId:''
+                                visible2: false,
+                                uid: '',
+                                depId: ''
                             })
                         }}
                         width='1600px'
@@ -633,18 +647,18 @@ class DetailedList extends Component{
                                 columns={this.state.columns2}
                                 tabelApi={'/api/admin/newOrder/orderNewList'}
                                 query={{
-                                    uid:this.state.uid,
-                                    depId:this.state.depId,
+                                    uid: this.state.uid,
+                                    depId: this.state.depId,
                                     specially: 8,
-                                    starTime:moment(this.state.searchConfig.date).startOf('month').format('YYYY-MM-DD'),
-                                    endTime:moment(this.state.searchConfig.date).endOf('month').format('YYYY-MM-DD')
+                                    starTime: moment(this.state.searchConfig.date).startOf('month').format('YYYY-MM-DD'),
+                                    endTime: moment(this.state.searchConfig.date).endOf('month').format('YYYY-MM-DD')
                                 }}
-                                onRowClick={()=>{}}
-                                dataProcessing={(data)=>{
+                                onRowClick={() => { }}
+                                dataProcessing={(data) => {
                                     let theArr = [];
                                     for (let i = 0; i < data.data.list.length; i++) {
                                         let thisdata = data.data.list[i];
-                                        thisdata.key=(data.data.pageNo - 1) * data.data.pageSize + i + 1;
+                                        thisdata.key = (data.data.pageNo - 1) * data.data.pageSize + i + 1;
                                         theArr.push(thisdata);
                                     }
                                     return theArr;
@@ -658,20 +672,24 @@ class DetailedList extends Component{
                 {this.state.imgListVisible ? <Modal
                     maskClosable={false}
                     visible={this.state.imgListVisible}
-                    onOk={()=>{this.setState({
-                        imgListVisible:false
-                    })}}
-                    onCancel={()=>{this.setState({
-                        imgListVisible:false
-                    })}}
+                    onOk={() => {
+                        this.setState({
+                            imgListVisible: false
+                        })
+                    }}
+                    onCancel={() => {
+                        this.setState({
+                            imgListVisible: false
+                        })
+                    }}
                     width='500px'
                     title='图片'
                     footer=''>
                     <div>
                         <div>申请附件</div>
-                        <ImgList fileList={this.state.annexUrlArr} domId='publicStatistics'/>
-                        <div style={{paddingTop:'35px'}}>打卡照片</div>
-                        <ImgList fileList={this.state.photoUrlArr} domId='publicStatistics1'/>
+                        <ImgList fileList={this.state.annexUrlArr} domId='publicStatistics' />
+                        <div style={{ paddingTop: '35px' }}>打卡照片</div>
+                        <ImgList fileList={this.state.photoUrlArr} domId='publicStatistics1' />
                     </div>
                 </Modal> : null}
             </div>

+ 2 - 2
js/component/manageCenter/customer/operationalData/reexamine/details.jsx

@@ -34,8 +34,8 @@ class Details extends Component{
                     dataIndex: "commodityName",
                     key: "commodityName",
                     render: (text, record) => {
-                        return text + "-" + record.id
-                    }
+                        return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                      }
                 },
                 {
                     title: "项目类别",

+ 19 - 9
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -185,8 +185,13 @@ class DetailedList extends Component {
           dataIndex: "clockIn",
           key: "clockIn",
           width: 70,
-          render: (text) =>
-            text === 1 ? "已打卡" : text === 0 ? "未打卡" : "",
+          render: (text) => (
+            <span
+              style={{ color: ["#F21212", "#34DE38"][text] }}
+            >
+              {["未打卡", "已打卡"][text]}
+            </span>
+          )
         },
         {
           title: "公出类型",
@@ -194,13 +199,17 @@ class DetailedList extends Component {
           key: "type",
           width: 70,
           render: (text) =>
-            text === 2
-              ? "行政公出"
-              : text === 1
-                ? "技术公出"
-                : text === 0
-                  ? "业务公出"
-                  : "",
+            <span
+              style={{ color: ["#1D4FEA", "#1E90FF", "#FF5500", "red"][text] }}
+            >
+              {
+                text === 0
+                  ? "业务公出" : text === 1
+                    ? "技术公出" : text === 2
+                      ? "行政公出" : text === 3
+                        ? "技术协单" : ""
+              }
+            </span>
         },
         {
           title: "公出目标",
@@ -888,6 +897,7 @@ class DetailedList extends Component {
                       <Select.Option value={0}>业务打卡</Select.Option>
                       <Select.Option value={1}>技术打卡</Select.Option>
                       <Select.Option value={2}>行政打卡</Select.Option>
+                      <Select.Option value={3}>技术协单</Select.Option>
                     </Select>
                   </span>
                   <span style={{ marginRight: "10px" }}>

+ 22 - 15
js/component/manageCenter/customer/publicSummary/index.jsx

@@ -178,8 +178,13 @@ class PublicSummary extends Component {
           dataIndex: "clockIn",
           key: "clockIn",
           width: 70,
-          render: (text) =>
-            text === 1 ? "已打卡" : text === 0 ? "未打卡" : "",
+          render: (text) => (
+            <span
+              style={{ color: ["#F21212", "#34DE38"][text] }}
+            >
+              {["未打卡", "已打卡"][text]}
+            </span>
+          )
         },
         {
           title: "公出类型",
@@ -187,14 +192,17 @@ class PublicSummary extends Component {
           key: "type",
           width: 70,
           render: (text) =>
-            text === 2
-              ? "行政公出"
-              : text === 1
-              ? "技术公出"
-              : text === 0
-              ? "业务公出"
-              : "",
-          // text === 1 ? "技术公出" : text === 0 ? "业务/行政公出" : "",
+            <span
+              style={{ color: ["#1D4FEA", "#1E90FF", "#FF5500", "red"][text] }}
+            >
+              {
+                text === 0
+                  ? "业务公出" : text === 1
+                    ? "技术公出" : text === 2
+                      ? "行政公出" : text === 3
+                        ? "技术协单" : ""
+              }
+            </span>
         },
         {
           title: "公出目标",
@@ -534,7 +542,7 @@ class PublicSummary extends Component {
           message.warning(data.error[0].message);
         }
       }.bind(this),
-    }).always(function () {}.bind(this));
+    }).always(function () { }.bind(this));
   }
 
   supervisor1(e) {
@@ -555,7 +563,7 @@ class PublicSummary extends Component {
           message.warning(data.error[0].message);
         }
       }.bind(this),
-    }).always(function () {}.bind(this));
+    }).always(function () { }.bind(this));
   }
 
   httpChange(e) {
@@ -621,7 +629,7 @@ class PublicSummary extends Component {
           message.warning(data.error[0].message);
         }
       }.bind(this),
-    }).always(function () {}.bind(this));
+    }).always(function () { }.bind(this));
   }
 
   blurCustomerChange(e) {
@@ -826,8 +834,7 @@ class PublicSummary extends Component {
                     <Select.Option value={0}>业务打卡</Select.Option>
                     <Select.Option value={1}>技术打卡</Select.Option>
                     <Select.Option value={2}>行政打卡</Select.Option>
-                    {/* <Select.Option value={0}>营销打卡</Select.Option>
-                    <Select.Option value={1}>技术打卡</Select.Option> */}
+                    <Select.Option value={3}>技术协单</Select.Option>
                   </Select>
                 </span>
                 <span style={{ marginRight: "10px" }}>

+ 2 - 2
js/component/manageCenter/customerService/administration/followUpDetails.jsx

@@ -35,8 +35,8 @@ class FollowUpDetails extends Component{
                     dataIndex: "commodityName",
                     key: "commodityName",
                     render: (text, record) => {
-                        return text + "-" + record.id
-                    }
+                        return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+                      }
                 },
                 {
                     title: "项目类别",

+ 2 - 2
js/component/manageCenter/customerService/administration/order.jsx

@@ -263,8 +263,8 @@ const Order = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id;
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",

+ 2 - 6
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -1088,12 +1088,8 @@ const approvedOutsourcing = React.createClass({
           dataIndex: 'commodityName',
           key: 'commodityName',
           render: (text, record) => {
-            return text && text.length > 6 ? (
-              <span title={text}>{text.substr(0, 8) + '-' + record.id}...</span>
-            ) : (
-              text + '-' + record.id
-            )
-          },
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+          }
         },
         {
           title: '项目类别',

+ 2 - 6
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1037,12 +1037,8 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return text && text.length > 6 ? (
-              <span title={text}>{text.substr(0, 8) + "-" + record.id}...</span>
-            ) : (
-              text + "-" + record.id
-            );
-          },
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+          }
         },
         {
           title: "项目类别",

+ 3 - 7
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -214,13 +214,9 @@ const outsourcingPaiDan = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: (text) => {
-            return text && text.length > 6 ? (
-              <span title={text}>{text.substr(0, 8)}...</span>
-            ) : (
-              text
-            );
-          },
+          render: (text, record) => {
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+          }
         },
         {
           title: "项目类别",

+ 3 - 7
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -262,13 +262,9 @@ const outsourcingPaiDan = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: (text) => {
-            return text && text.length > 6 ? (
-              <span title={text}>{text.substr(0, 8)}...</span>
-            ) : (
-              text
-            );
-          },
+          render: (text, record) => {
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+          }
         },
         {
           title: "项目类别",

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

@@ -96,14 +96,8 @@ const OrderDetail = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text && text.length > 6 ? (
-                <span title={text}>
-                  {text.substr(0, 8) + "-" + record.id}...
-                </span>
-              ) : (
-                text + "-" + record.id
-              );
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",

+ 5 - 0
js/component/manageCenter/operate/personnel/personnelAll.jsx

@@ -263,6 +263,11 @@ const PersonnelAll = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

File diff suppressed because it is too large
+ 1223 - 1218
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx


File diff suppressed because it is too large
+ 1616 - 1611
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx


File diff suppressed because it is too large
+ 482 - 477
js/component/manageCenter/order/orderManagement/approveOrder/approveOrderDetaile.jsx


+ 423 - 418
js/component/manageCenter/order/orderManagement/publicOrder/publicOrderDetaile.jsx

@@ -1,201 +1,206 @@
 import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form, Upload, Popconfirm, AutoComplete } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import { getApprovedState, getPaymentState, getOrderState, getProjectState, getOrderChannel, getOrderType, getTransactionProject, getTransactionChannel } from '../../../../tools.js';
 import ProjectOperation from "../../../../common/projectOperation";
 
 const ApproveDetaile = Form.create()(React.createClass({
 	loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
-            data: {
-            	orderNo:record?record.orderNo:this.props.datauser.orderNo
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             orderNo:thisdata.orderNo,
-                             commodityName:thisdata.commodityName,
-                             commodityType:thisdata.commodityType,
-                             commodityMode:thisdata.commodityMode,
-                             commodityQuantity:thisdata.commodityQuantity,
-                             commodityPrice:thisdata.commodityPrice,
-                             discountPrice:thisdata.discountPrice,
-                             commodityFirstPayment:thisdata.commodityFirstPayment,
-                             createTimes:thisdata.createTimes,
-                             discountFirstPayment:thisdata.discountFirstPayment,
-                             remarks:thisdata.remarks,
-                        });
-                    };
-                   }
-                this.setState({
-                    dataSource: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getOrderCommodity',
+			data: {
+				orderNo: record ? record.orderNo : this.props.datauser.orderNo
+			},
+			success: function (data) {
+				let theArr = [];
+				if (!data.data) {
+					if (data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for (let i = 0; i < data.data.length; i++) {
+						let thisdata = data.data[i];
+						theArr.push({
+							key: i,
+							id: thisdata.id,
+							orderNo: thisdata.orderNo,
+							commodityName: thisdata.commodityName,
+							commodityType: thisdata.commodityType,
+							commodityMode: thisdata.commodityMode,
+							commodityQuantity: thisdata.commodityQuantity,
+							commodityPrice: thisdata.commodityPrice,
+							discountPrice: thisdata.discountPrice,
+							commodityFirstPayment: thisdata.commodityFirstPayment,
+							createTimes: thisdata.createTimes,
+							discountFirstPayment: thisdata.discountFirstPayment,
+							remarks: thisdata.remarks,
+						});
+					};
+				}
+				this.setState({
+					dataSource: theArr,
+				});
+			}.bind(this),
+		}).always(function () {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	getInitialState() {
 		return {
 			loading: false,
 			visible: false,
-			lookState:true,
-			orgCodeUrl:[],
-			lookflowList:[],
+			lookState: true,
+			orgCodeUrl: [],
+			lookflowList: [],
 			checkedKeys: [],
 			columns: [
 				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'commodityType',
-                    key: 'commodityType',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
-                },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '服务市价(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '实签价格(万元)',
-                    dataIndex: 'discountPrice',
-                    key: 'discountPrice'
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'createTimes',
-                    key: 'createTimes'
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
+					title: '业务项目名称',
+					dataIndex: 'commodityName',
+					key: 'commodityName',
+					render: (text, record) => {
+						return (
+								<span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+						)
+				}
+				}, {
+					title: '项目类别',
+					dataIndex: 'commodityType',
+					key: 'commodityType',
+					render: (text) => {
+						return (getOrderType(text))
+					}
+				}, {
+					title: '项目数量',
+					dataIndex: 'commodityQuantity',
+					key: 'commodityQuantity'
+				}, {
+					title: '服务市价(万元)',
+					dataIndex: 'commodityPrice',
+					key: 'commodityPrice'
+				}, {
+					title: '实签价格(万元)',
+					dataIndex: 'discountPrice',
+					key: 'discountPrice'
+				}, {
+					title: '下单时间',
+					dataIndex: 'createTimes',
+					key: 'createTimes'
+				}, {
+					title: '项目说明',
+					dataIndex: 'remarks',
+					key: 'remarks',
+					render: (text) => {
+						return (text && text.length > 8 ? text.substr(0, 8) + '…' : text)
 					}
-                }
+				}
 			],
-			flowList:[
+			flowList: [
 				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水外联',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
+					title: '平台流水号',
+					dataIndex: 'billNo',
+					key: 'billNo',
+				}, {
+					title: '平台流水时间',
+					dataIndex: 'createTime',
+					key: 'createTime'
+				}, {
+					title: '流水金额(万元)',
+					dataIndex: 'transactionAmount',
+					key: 'transactionAmount'
+				}, {
+					title: '付款人名称',
+					dataIndex: 'payerName',
+					key: 'payerName'
+				}, {
+					title: '收款人名称',
+					dataIndex: 'payeeName',
+					key: 'payeeName'
+				},
+				{
+					title: '流水科目',
+					dataIndex: 'transactionSubject',
+					key: 'transactionSubject',
+					render: (text) => { return getTransactionProject(text) }
+				}, {
+					title: '流水外联',
+					dataIndex: 'transactionChannel',
+					key: 'transactionChannel',
+					render: (text) => { return getTransactionChannel(text) }
+				}, {
+					title: '财务流水号',
+					dataIndex: 'financialPayNo',
+					key: 'financialPayNo',
+				}, {
+					title: '财务流水时间',
+					dataIndex: 'financialPayTime',
+					key: 'financialPayTime',
+				}, {
+					title: '流水确认',
+					dataIndex: 'confirmSign',
+					key: 'confirmSign',
+					render: (text) => { return text ? '已确认' : '待确认' }
+				}, {
+					title: '确认时间',
+					dataIndex: 'confirmTime',
+					key: 'confirmTime',
+				}
 			]
 		};
 	},
 	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	this.state.orderList=[]
-    	$.ajax({
-            method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-            data: {
-              orderNo: record.orderNo
-            },
-            success: function (data) {
-                let thisData = data.data;
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					orderAmount:thisData.orderAmount,
-					firstPayment:thisData.firstPayment,
-					signTotalAmount:thisData.signTotalAmount,
-					signFirstPayment:thisData.signFirstPayment,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		//签单
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerName:thisData.buyerName,
-                });
-            }.bind(this),
-       }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-       }
-    },
+	loaduser(record) {
+		if (record) {
+			this.state.orderList = []
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+				data: {
+					orderNo: record.orderNo
+				},
+				success: function (data) {
+					let thisData = data.data;
+					if (!thisData) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						};
+						thisData = {};
+					};
+					this.setState({
+						id: thisData.id,
+						orderList: thisData,
+						orderAmount: thisData.orderAmount,
+						firstPayment: thisData.firstPayment,
+						signTotalAmount: thisData.signTotalAmount,
+						signFirstPayment: thisData.signFirstPayment,
+						approval: thisData.approval == 0 ? thisData.approval.toString() : thisData.approval,
+						orderRemarks: thisData.orderRemarks,
+						orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+						//签单
+						orderNo: thisData.orderNo,//订单编号
+						buyerName: thisData.buyerName,
+					});
+				}.bind(this),
+			}).always(function () {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+		}
+	},
 	handleOk(e) {
 		this.setState({
 			visible: false,
@@ -213,77 +218,77 @@ const ApproveDetaile = Form.create()(React.createClass({
 			addnextVisible: false
 		})
 	},
-	lookflow(){
+	lookflow() {
 		this.setState({
 			loading: true,
-			lookVisible:true,
+			lookVisible: true,
 		})
-		this.state.lookSource=[];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
-            data: {
-            	orderNo:this.props.datauser.orderNo,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-	                         billNo: thisdata.billNo,
-	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime,
-	                         payerName:thisdata.payerName,
-	                         payeeName:thisdata.payeeName,
-	                         transactionSubject:thisdata.transactionSubject,
-	                         transactionChannel:thisdata.transactionChannel,
-	                         financialPayNo:thisdata.financialPayNo,
-	                         financialPayTime:thisdata.financialPayTime,
-	                         orderNo:thisdata.orderNo,
-	                         departmentName:thisdata.departmentName,
-	                         salesmanName:thisdata.salesmanName,
-	                         financeName:thisdata.financeName,
-	                         confirmSign:thisdata.confirmSign,
-	                         deleteSign:thisdata.deleteSign,
-	                         confirmTime:thisdata.confirmTime
-                        });
-                    };
-                };
-                this.setState({
-                    lookflowList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
+		this.state.lookSource = [];
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getBillByOrderNo',
+			data: {
+				orderNo: this.props.datauser.orderNo,
+			},
+			success: function (data) {
+				let theArr = [];
+				if (!data.data) {
+					if (data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for (let i = 0; i < data.data.length; i++) {
+						let thisdata = data.data[i];
+						theArr.push({
+							key: i,
+							billNo: thisdata.billNo,
+							transactionAmount: thisdata.transactionAmount,
+							createTime: thisdata.createTime,
+							payerName: thisdata.payerName,
+							payeeName: thisdata.payeeName,
+							transactionSubject: thisdata.transactionSubject,
+							transactionChannel: thisdata.transactionChannel,
+							financialPayNo: thisdata.financialPayNo,
+							financialPayTime: thisdata.financialPayTime,
+							orderNo: thisdata.orderNo,
+							departmentName: thisdata.departmentName,
+							salesmanName: thisdata.salesmanName,
+							financeName: thisdata.financeName,
+							confirmSign: thisdata.confirmSign,
+							deleteSign: thisdata.deleteSign,
+							confirmTime: thisdata.confirmTime
+						});
+					};
+				};
+				this.setState({
+					lookflowList: theArr,
+				});
+			}.bind(this),
+		}).always(function () {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
 	},
-	lookCancel(){
+	lookCancel() {
 		this.setState({
-			lookVisible:false
+			lookVisible: false
 		})
 	},
 	tableRowClick(record, index) {
-       this.setState({
-        	editFw:record,
-		   projectOperationVisible:true,
-        });
-    },
+		this.setState({
+			editFw: record,
+			projectOperationVisible: true,
+		});
+	},
 	componentWillMount() {
 
 	},
 	componentWillReceiveProps(nextProps) { //props改变时触发
 		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
+		if (nextProps.userDetaile && nextProps.showDesc) {
 			this.loaduser(nextProps.datauser);
 			this.loadData(nextProps.datauser);
 		}
@@ -294,191 +299,191 @@ const ApproveDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
-		const orderDetaiel=this.state.orderList || [];
-		return(
+		const orderDetaiel = this.state.orderList || [];
+		return (
 			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        title='订单详情'
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-		                            <div className="clearfix">
-			                       		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单编号" >
-				                            <span>{orderDetaiel.orderNo}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="客户名称" >
-				                            <span>{orderDetaiel.buyerName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单类型" >
-				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单外联" >
-				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单状态" >
-				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="已收款项" >
-				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="结算状态" >
-				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价订单金额" >
-			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价首款金额" >
-				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
-					                    </FormItem>
-					                    <div className='clearfix'>
-								        	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签订单金额" >
-					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签首款金额" >
-					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="特批立项" >
-					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="合同编号" >
-					                            <span>{orderDetaiel.contractNo}</span>
-				                    		</FormItem>
-					                        <div className='clearfix'>
-									        	<FormItem
-										            labelCol={{ span: 4 }}
-										            wrapperCol={{ span: 16 }}
-										            label="订单留言" >
-									        		<span>{orderDetaiel.orderRemarks}</span>
-										        </FormItem>
-									        </div>
-								        </div>
-			                        </div>
-			                        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >
-				                            <span>{orderDetaiel.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="业务品类" >
-				                            <span>{orderDetaiel.projectType}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="意向时间" >
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="签单时间" >
-				                            <span>{orderDetaiel.signTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >
-						                    <span>{orderDetaiel.financeName}</span>
-						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目负责人" >
-				                            <span>{orderDetaiel.technicianName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="立项时间" >
-				                            <span>{orderDetaiel.setUpTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目状态" >
-				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
-			                    		</FormItem>
-		                    		</div>
-					                <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>业务项目</span>
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table size="middle" columns={this.state.columns}
-					                            dataSource={this.state.dataSource}
-					                            pagination={false}
-					                            onRowClick={this.tableRowClick}
-					                            />
-					                    </Spin>
-						            </div>
-			                    </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-					{this.state.projectOperationVisible ? <ProjectOperation
-						readOnly={true}
-						orderNo={this.state.orderNo}
-						visible={this.state.projectOperationVisible}
-						dataInfor={this.state.editFw}
-						onCancel={()=>{
-							this.setState({
-								projectOperationVisible: false,
-								editFw:{},
-							});
-						}}
-					/> : null}
-			        <Modal maskClosable={false} visible={this.state.lookVisible}
-                        onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1300px'
-                        title= '查看流水'
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-                    	   			<Table columns={this.state.flowList}
-				                           dataSource={this.state.lookflowList}
-				                           pagination={false}
-		                             />
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-    	    </div>
+				<Modal maskClosable={false} visible={this.state.visible}
+					onOk={this.handleOk} onCancel={this.handleCancel}
+					width='1000px'
+					title='订单详情'
+					footer=''
+					className="admin-desc-content">
+					<Form layout="horizontal" id="demand-form" style={{ paddingBottom: '40px' }}  >
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								<div className="clearfix">
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单编号" >
+										<span>{orderDetaiel.orderNo}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="下单时间" >
+										<span>{orderDetaiel.createTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="客户名称" >
+										<span>{orderDetaiel.buyerName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单类型" >
+										<span>{getOrderType(orderDetaiel.orderType)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单外联" >
+										<span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单状态" >
+										<span>{getOrderState(orderDetaiel.orderStatus)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="已收款项" >
+										<span>{orderDetaiel.actuallyTotalAmount + '万元'}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="结算状态" >
+										<span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="市价订单金额" >
+										<span>{orderDetaiel.orderAmount + '万元'}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="市价首款金额" >
+										<span>{orderDetaiel.firstPayment + '万元'}</span>
+									</FormItem>
+									<div className='clearfix'>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="实签订单金额" >
+											<span>{orderDetaiel.signTotalAmount + '万元'}</span>
+										</FormItem>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="实签首款金额" >
+											<span>{orderDetaiel.signFirstPayment + '万元'}</span>
+										</FormItem>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="特批立项" >
+											<span>{getApprovedState(orderDetaiel.approval)}</span>
+										</FormItem>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="合同编号" >
+											<span>{orderDetaiel.contractNo}</span>
+										</FormItem>
+										<div className='clearfix'>
+											<FormItem
+												labelCol={{ span: 4 }}
+												wrapperCol={{ span: 16 }}
+												label="订单留言" >
+												<span>{orderDetaiel.orderRemarks}</span>
+											</FormItem>
+										</div>
+									</div>
+								</div>
+								<div className='clearfix'>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单负责人" >
+										<span>{orderDetaiel.salesmanName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="业务品类" >
+										<span>{orderDetaiel.projectType}</span>
+									</FormItem>
+								</div>
+								<div className='clearfix'>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="意向时间" >
+										<span>{orderDetaiel.createTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="签单时间" >
+										<span>{orderDetaiel.signTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="财务负责人" >
+										<span>{orderDetaiel.financeName}</span>
+										<Button onClick={this.lookflow} style={{ float: 'right' }}>查看流水</Button>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="项目负责人" >
+										<span>{orderDetaiel.technicianName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="立项时间" >
+										<span>{orderDetaiel.setUpTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="项目状态" >
+										<span>{getProjectState(orderDetaiel.projectStage)}</span>
+									</FormItem>
+								</div>
+								<div>
+									<span style={{ marginLeft: '50px', fontSize: '20px' }}>业务项目</span>
+								</div>
+								<div className="patent-table">
+									<Spin spinning={this.state.loading}>
+										<Table size="middle" columns={this.state.columns}
+											dataSource={this.state.dataSource}
+											pagination={false}
+											onRowClick={this.tableRowClick}
+										/>
+									</Spin>
+								</div>
+							</div>
+						</Spin>
+					</Form >
+				</Modal>
+				{this.state.projectOperationVisible ? <ProjectOperation
+					readOnly={true}
+					orderNo={this.state.orderNo}
+					visible={this.state.projectOperationVisible}
+					dataInfor={this.state.editFw}
+					onCancel={() => {
+						this.setState({
+							projectOperationVisible: false,
+							editFw: {},
+						});
+					}}
+				/> : null}
+				<Modal maskClosable={false} visible={this.state.lookVisible}
+					onOk={this.lookCancel} onCancel={this.lookCancel}
+					width='1300px'
+					title='查看流水'
+					footer=''
+					className="admin-desc-content">
+					<Form layout="horizontal" id="demand-form">
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								<Table columns={this.state.flowList}
+									dataSource={this.state.lookflowList}
+									pagination={false}
+								/>
+							</div>
+						</Spin>
+					</Form >
+				</Modal>
+			</div>
 		)
 	}
 }));

+ 13 - 8
js/component/manageCenter/order/orderNew/addService.jsx

@@ -323,8 +323,8 @@ const NewService = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id;
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",
@@ -467,8 +467,8 @@ const NewService = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id;
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",
@@ -582,8 +582,8 @@ const NewService = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id;
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",
@@ -4513,8 +4513,8 @@ const NewService = Form.create()(
               dataIndex: "commodityName",
               key: "commodityName",
               render: (text, record) => {
-                return text + "-" + record.id;
-              },
+                return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+              }
             },
             {
               title: "项目类别",
@@ -4671,6 +4671,11 @@ const NewService = Form.create()(
               title: "业务项目名称",
               dataIndex: "commodityName",
               key: "commodityName",
+              render: (text, record) => {
+                return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                )
+              }
             },
             {
               title: "项目类别",

+ 5 - 0
js/component/manageCenter/order/orderNew/addorders.js

@@ -154,6 +154,11 @@ const Addorders = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 1 - 1
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -349,7 +349,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

+ 4 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -549,8 +549,8 @@ class ChangeApply extends Component {
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return text + "-" + record.id;
-          },
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+          }
         },
         {
           title: "项目类别",
@@ -1732,8 +1732,8 @@ class ChangeApply extends Component {
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id;
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -140,7 +140,7 @@ class OrderDetail extends Component {
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return text + "-" + record.id
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
           }
         },
         {

+ 4 - 4
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -64,8 +64,8 @@ const ProAndCuiList = React.createClass({
           dataIndex: "commodityName",
           key: "commodityName",
           render: (text, record) => {
-            return text + "-" + record.id;
-          },
+            return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+          }
         },
         {
           title: "项目类别",
@@ -377,8 +377,8 @@ const ProAndCuiList = React.createClass({
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id;
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: "项目类别",

+ 1 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -209,7 +209,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

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

@@ -211,8 +211,8 @@ const checkOutsourcing = Form.create()(
             dataIndex: 'commodityName',
             key: 'commodityName',
             render: (text, record) => {
-              return text + '-' + record.id
-            },
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
+            }
           },
           {
             title: '项目类别',

+ 6 - 1
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -245,7 +245,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -242,7 +242,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -245,7 +245,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -242,7 +242,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -238,7 +238,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -240,7 +240,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -236,7 +236,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 6 - 1
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -245,7 +245,12 @@ const contractChange = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 5 - 0
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -92,6 +92,11 @@ class projectOverview extends Component{
                     title: '业务项目名称',
                     dataIndex: 'commodityName',
                     key: 'commodityName',
+                    render: (text, record) => {
+                        return (
+                            <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                        )
+                    }
                 },
                 {
                     title: '项目类别',

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

@@ -321,7 +321,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

+ 5 - 0
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -94,6 +94,11 @@ class projectOverview extends Component{
                     title: '业务项目名称',
                     dataIndex: 'commodityName',
                     key: 'commodityName',
+                    render: (text, record) => {
+                        return (
+                            <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                        )
+                    }
                 },
                 {
                     title: '项目类别',

+ 1 - 1
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -271,7 +271,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

+ 1 - 1
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -586,7 +586,7 @@ const outsourcingList = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

+ 1 - 1
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -316,7 +316,7 @@ const outsourcingPro = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

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

@@ -245,7 +245,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "commodityName",
             key: "commodityName",
             render: (text, record) => {
-              return text + "-" + record.id
+              return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
             }
           },
           {

File diff suppressed because it is too large
+ 683 - 678
js/component/manageCenter/order/settlementOrder/mySettlement/mySettlementDetaile.jsx


+ 465 - 460
js/component/manageCenter/order/settlementOrder/settlementManage/managementDetaile.jsx

@@ -1,200 +1,205 @@
 import React from 'react';
-import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form ,Upload,Popconfirm,AutoComplete} from 'antd';
+import { Icon, Table, Modal, message, Spin, Input, Select, Button, Form, Upload, Popconfirm, AutoComplete } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
-import {getApprovedState,getPaymentState,getOrderState,getProjectState,getOrderChannel,getOrderType,getTransactionProject,getTransactionChannel} from '../../../../tools.js';
+import { getApprovedState, getPaymentState, getOrderState, getProjectState, getOrderChannel, getOrderType, getTransactionProject, getTransactionChannel } from '../../../../tools.js';
 
 const ManagementDetaile = Form.create()(React.createClass({
 	loadData(record) {
-        this.state.data = [];
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/order/getOrderCommodity',
-            data: {
-            	orderNo:record?record.orderNo:this.props.datauser.orderNo
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-                             id:thisdata.id,
-                             orderNo:thisdata.orderNo,
-                             commodityName:thisdata.commodityName,
-                             commodityType:thisdata.commodityType,
-                             commodityMode:thisdata.commodityMode,
-                             commodityQuantity:thisdata.commodityQuantity,
-                             commodityPrice:thisdata.commodityPrice,
-                             discountPrice:thisdata.discountPrice,
-                             commodityFirstPayment:thisdata.commodityFirstPayment,
-                             createTimes:thisdata.createTimes,
-                             discountFirstPayment:thisdata.discountFirstPayment,
-                             remarks:thisdata.remarks,
-                        });
-                    };
-                   }
-                this.setState({
-                    dataSource: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    },
+		this.state.data = [];
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getOrderCommodity',
+			data: {
+				orderNo: record ? record.orderNo : this.props.datauser.orderNo
+			},
+			success: function (data) {
+				let theArr = [];
+				if (!data.data) {
+					if (data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for (let i = 0; i < data.data.length; i++) {
+						let thisdata = data.data[i];
+						theArr.push({
+							key: i,
+							id: thisdata.id,
+							orderNo: thisdata.orderNo,
+							commodityName: thisdata.commodityName,
+							commodityType: thisdata.commodityType,
+							commodityMode: thisdata.commodityMode,
+							commodityQuantity: thisdata.commodityQuantity,
+							commodityPrice: thisdata.commodityPrice,
+							discountPrice: thisdata.discountPrice,
+							commodityFirstPayment: thisdata.commodityFirstPayment,
+							createTimes: thisdata.createTimes,
+							discountFirstPayment: thisdata.discountFirstPayment,
+							remarks: thisdata.remarks,
+						});
+					};
+				}
+				this.setState({
+					dataSource: theArr,
+				});
+			}.bind(this),
+		}).always(function () {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	getInitialState() {
 		return {
 			loading: false,
 			visible: false,
-			lookState:true,
-			orgCodeUrl:[],
+			lookState: true,
+			orgCodeUrl: [],
 			checkedKeys: [],
-			lookflowList:[],
+			lookflowList: [],
 			columns: [
 				{
-                    title: '业务项目名称',
-                    dataIndex: 'commodityName',
-                    key: 'commodityName'
-                }, {
-                    title: '项目类别',
-                    dataIndex: 'commodityType',
-                    key: 'commodityType',
-                    render:(text)=>{
-                    	return (getOrderType(text))
-                    }
-                },{
-                    title: '项目数量',
-                    dataIndex: 'commodityQuantity',
-                    key: 'commodityQuantity'
-                }, {
-                    title: '服务市价(万元)',
-                    dataIndex: 'commodityPrice',
-                    key: 'commodityPrice'
-                }, {
-                    title: '实签价格(万元)',
-                    dataIndex: 'discountPrice',
-                    key: 'discountPrice'
-                }, {
-                    title: '下单时间',
-                    dataIndex: 'createTimes',
-                    key: 'createTimes'
-                }, {
-                    title: '项目说明',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-					render:(text)=>{
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
+					title: '业务项目名称',
+					dataIndex: 'commodityName',
+					key: 'commodityName',
+					render: (text, record) => {
+						return (
+							<span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+						)
 					}
-                }
+				}, {
+					title: '项目类别',
+					dataIndex: 'commodityType',
+					key: 'commodityType',
+					render: (text) => {
+						return (getOrderType(text))
+					}
+				}, {
+					title: '项目数量',
+					dataIndex: 'commodityQuantity',
+					key: 'commodityQuantity'
+				}, {
+					title: '服务市价(万元)',
+					dataIndex: 'commodityPrice',
+					key: 'commodityPrice'
+				}, {
+					title: '实签价格(万元)',
+					dataIndex: 'discountPrice',
+					key: 'discountPrice'
+				}, {
+					title: '下单时间',
+					dataIndex: 'createTimes',
+					key: 'createTimes'
+				}, {
+					title: '项目说明',
+					dataIndex: 'remarks',
+					key: 'remarks',
+					render: (text) => {
+						return (text && text.length > 8 ? text.substr(0, 8) + '…' : text)
+					}
+				}
 			],
-			flowList:[
+			flowList: [
 				{
-                    title: '平台流水号',
-                    dataIndex: 'billNo',
-                    key: 'billNo',
-                }, {
-                    title: '平台流水时间',
-                    dataIndex: 'createTime',
-                    key: 'createTime'
-                }, {
-                    title: '流水金额(万元)',
-                    dataIndex: 'transactionAmount',
-                    key: 'transactionAmount'
-                },{
-                    title: '付款人名称',
-                    dataIndex: 'payerName',
-                    key: 'payerName'
-                }, {
-                    title: '收款人名称',
-                    dataIndex: 'payeeName',
-                    key: 'payeeName'
-                },
-                {
-                    title: '流水科目',
-                    dataIndex: 'transactionSubject',
-                    key: 'transactionSubject',
-                    render:(text)=>{return getTransactionProject(text) }
-                }, {
-                    title: '流水外联',
-                    dataIndex: 'transactionChannel',
-                    key: 'transactionChannel',
-                    render:(text)=>{return getTransactionChannel(text) }
-                },{
-                    title: '财务流水号',
-                    dataIndex: 'financialPayNo',
-                    key: 'financialPayNo',
-                }, {
-                    title: '财务流水时间',
-                    dataIndex: 'financialPayTime',
-                    key: 'financialPayTime',
-                }, {
-                    title: '流水确认',
-                    dataIndex: 'confirmSign',
-                    key: 'confirmSign',
-                    render:(text)=>{return text?'已确认':'待确认' }
-                },{
-                    title: '确认时间',
-                    dataIndex: 'confirmTime',
-                    key: 'confirmTime',
-                }
+					title: '平台流水号',
+					dataIndex: 'billNo',
+					key: 'billNo',
+				}, {
+					title: '平台流水时间',
+					dataIndex: 'createTime',
+					key: 'createTime'
+				}, {
+					title: '流水金额(万元)',
+					dataIndex: 'transactionAmount',
+					key: 'transactionAmount'
+				}, {
+					title: '付款人名称',
+					dataIndex: 'payerName',
+					key: 'payerName'
+				}, {
+					title: '收款人名称',
+					dataIndex: 'payeeName',
+					key: 'payeeName'
+				},
+				{
+					title: '流水科目',
+					dataIndex: 'transactionSubject',
+					key: 'transactionSubject',
+					render: (text) => { return getTransactionProject(text) }
+				}, {
+					title: '流水外联',
+					dataIndex: 'transactionChannel',
+					key: 'transactionChannel',
+					render: (text) => { return getTransactionChannel(text) }
+				}, {
+					title: '财务流水号',
+					dataIndex: 'financialPayNo',
+					key: 'financialPayNo',
+				}, {
+					title: '财务流水时间',
+					dataIndex: 'financialPayTime',
+					key: 'financialPayTime',
+				}, {
+					title: '流水确认',
+					dataIndex: 'confirmSign',
+					key: 'confirmSign',
+					render: (text) => { return text ? '已确认' : '待确认' }
+				}, {
+					title: '确认时间',
+					dataIndex: 'confirmTime',
+					key: 'confirmTime',
+				}
 			]
 		};
 	},
 	//查看基本详情基本信息
-    loaduser(record){
-    	if(record){
-    	this.state.orderList=[]
-    	$.ajax({
-            method: "get",
-			dataType: "json",
-			crossDomain: false,
-			url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
-            data: {
-              orderNo: record.orderNo
-            },
-            success: function (data) {
-                let thisData = data.data;                
-                if (!thisData) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                    thisData = {};
-                };
-                this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					orderAmount:thisData.orderAmount,
-					firstPayment:thisData.firstPayment,
-					signTotalAmount:thisData.signTotalAmount,
-					signFirstPayment:thisData.signFirstPayment,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		//签单
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerName:thisData.buyerName,
-                });
-            }.bind(this),
-       }).always(function () {
-            this.setState({            	
-                loading: false
-            });
-        }.bind(this));  
-       }
-    },
+	loaduser(record) {
+		if (record) {
+			this.state.orderList = []
+			$.ajax({
+				method: "get",
+				dataType: "json",
+				crossDomain: false,
+				url: globalConfig.context + '/api/admin/order/getServiceOrderDetail',
+				data: {
+					orderNo: record.orderNo
+				},
+				success: function (data) {
+					let thisData = data.data;
+					if (!thisData) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						};
+						thisData = {};
+					};
+					this.setState({
+						id: thisData.id,
+						orderList: thisData,
+						orderAmount: thisData.orderAmount,
+						firstPayment: thisData.firstPayment,
+						signTotalAmount: thisData.signTotalAmount,
+						signFirstPayment: thisData.signFirstPayment,
+						approval: thisData.approval == 0 ? thisData.approval.toString() : thisData.approval,
+						orderRemarks: thisData.orderRemarks,
+						orgCodeUrl: thisData.orgCodeUrl ? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],
+						//签单
+						orderNo: thisData.orderNo,//订单编号
+						buyerName: thisData.buyerName,
+					});
+				}.bind(this),
+			}).always(function () {
+				this.setState({
+					loading: false
+				});
+			}.bind(this));
+		}
+	},
 	handleOk(e) {
 		this.setState({
 			visible: false,
@@ -212,78 +217,78 @@ const ManagementDetaile = Form.create()(React.createClass({
 			addnextVisible: false
 		})
 	},
-	lookflow(){
+	lookflow() {
 		this.setState({
 			loading: true,
-			lookVisible:true,
+			lookVisible: true,
 		})
-		this.state.lookSource=[];
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context +'/api/admin/order/getBillByOrderNo',
-            data: {
-            	orderNo:this.props.datauser.orderNo,
-            },
-            success: function (data) {
-                let theArr = [];
-                if (!data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    for (let i = 0; i < data.data.length; i++) {
-                        let thisdata = data.data[i];
-                        theArr.push({
-                             key: i,
-	                         billNo: thisdata.billNo,
-	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
-	                         payerName:thisdata.payerName,
-	                         payeeName:thisdata.payeeName,
-	                         transactionSubject:thisdata.transactionSubject,
-	                         transactionChannel:thisdata.transactionChannel,
-	                         financialPayNo:thisdata.financialPayNo,
-	                         financialPayTime:thisdata.financialPayTime,
-	                         orderNo:thisdata.orderNo,
-	                         departmentName:thisdata.departmentName,
-	                         salesmanName:thisdata.salesmanName,
-	                         financeName:thisdata.financeName,
-	                         confirmSign:thisdata.confirmSign,
-	                         deleteSign:thisdata.deleteSign,
-	                         confirmTime:thisdata.confirmTime
-                        });
-                    };
-                };
-                this.setState({
-                    lookflowList: theArr,
-                });
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
+		this.state.lookSource = [];
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/order/getBillByOrderNo',
+			data: {
+				orderNo: this.props.datauser.orderNo,
+			},
+			success: function (data) {
+				let theArr = [];
+				if (!data.data) {
+					if (data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+				} else {
+					for (let i = 0; i < data.data.length; i++) {
+						let thisdata = data.data[i];
+						theArr.push({
+							key: i,
+							billNo: thisdata.billNo,
+							transactionAmount: thisdata.transactionAmount,
+							createTime: thisdata.createTime,
+							transactionAmount: thisdata.transactionAmount,
+							payerName: thisdata.payerName,
+							payeeName: thisdata.payeeName,
+							transactionSubject: thisdata.transactionSubject,
+							transactionChannel: thisdata.transactionChannel,
+							financialPayNo: thisdata.financialPayNo,
+							financialPayTime: thisdata.financialPayTime,
+							orderNo: thisdata.orderNo,
+							departmentName: thisdata.departmentName,
+							salesmanName: thisdata.salesmanName,
+							financeName: thisdata.financeName,
+							confirmSign: thisdata.confirmSign,
+							deleteSign: thisdata.deleteSign,
+							confirmTime: thisdata.confirmTime
+						});
+					};
+				};
+				this.setState({
+					lookflowList: theArr,
+				});
+			}.bind(this),
+		}).always(function () {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
 	},
-	lookCancel(){
+	lookCancel() {
 		this.setState({
-			lookVisible:false
+			lookVisible: false
 		})
 	},
 	tableRowClick(record, index) {
-       this.setState({
-        	editFw:record,
-        	addnextVisible:true,
-        });
-    },
+		this.setState({
+			editFw: record,
+			addnextVisible: true,
+		});
+	},
 	componentWillMount() {
-		
+
 	},
 	componentWillReceiveProps(nextProps) { //props改变时触发
 		this.state.visible = nextProps.showDesc;
-		if(nextProps.userDetaile && nextProps.showDesc ) {
+		if (nextProps.userDetaile && nextProps.showDesc) {
 			this.loaduser(nextProps.datauser);
 			this.loadData(nextProps.datauser);
 		}
@@ -294,231 +299,231 @@ const ManagementDetaile = Form.create()(React.createClass({
 			labelCol: { span: 8 },
 			wrapperCol: { span: 14 },
 		};
-		const editFws=this.state.editFw || [];
-		const orderDetaiel=this.state.orderList || [];
-		return(
+		const editFws = this.state.editFw || [];
+		const orderDetaiel = this.state.orderList || [];
+		return (
 			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width='1000px'
-                        title='订单详情'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form" style={{paddingBottom:'40px'}}  >
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-		                            <div className="clearfix">
-			                       		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单编号" >
-				                            <span>{orderDetaiel.orderNo}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="下单时间" >  
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="客户名称" >  
-				                            <span>{orderDetaiel.buyerName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单类型" >  
-				                            <span>{getOrderType(orderDetaiel.orderType)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单外联" >  
-				                            <span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单状态" >  
-				                            <span>{getOrderState(orderDetaiel.orderStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="已收款项" >  
-				                            <span>{orderDetaiel.actuallyTotalAmount+'万元'}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="结算状态" >  
-				                            <span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价订单金额" >    
-			                            	<span>{orderDetaiel.orderAmount+'万元'}</span>
-					                    </FormItem>
-					                    <FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="市价首款金额" >   
-				                            <span>{orderDetaiel.firstPayment+'万元'}</span>
-					                    </FormItem>
-					                    <div className='clearfix'>
-								        	<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签订单金额" >   
-					                            <span>{orderDetaiel.signTotalAmount+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="实签首款金额" >   
-					                            <span>{orderDetaiel.signFirstPayment+'万元'}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="特批立项" >   
-					                            <span>{getApprovedState(orderDetaiel.approval)}</span>
-				                    		</FormItem>
-				                    		<FormItem className="half-item"
-					                            {...formItemLayout}
-					                            label="合同编号" >   
-					                            <span>{orderDetaiel.contractNo}</span>
-				                    		</FormItem>
-					                        <div className='clearfix'>
-									        	<FormItem
-										            labelCol={{ span: 4 }}
-										            wrapperCol={{ span: 16 }}
-										            label="订单留言" >
-									        		<span>{orderDetaiel.orderRemarks}</span>
-										        </FormItem>
-									        </div>
-								        </div>
-			                        </div>
-			                        <div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="订单负责人" >  
-				                            <span>{orderDetaiel.salesmanName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="业务品类" >  
-				                            <span>{orderDetaiel.projectType}</span>
-			                    		</FormItem>
-			                    	</div>
-			                    	<div className='clearfix'>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="意向时间" >  
-				                            <span>{orderDetaiel.createTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="签单时间" >  
-				                            <span>{orderDetaiel.signTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="财务负责人" >  
-						                    <span>{orderDetaiel.financeName}</span>
-						                    <Button onClick={this.lookflow} style={{float:'right'}}>查看流水</Button>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目负责人" >  
-				                            <span>{orderDetaiel.technicianName}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="立项时间" >  
-				                            <span>{orderDetaiel.setUpTime}</span>
-			                    		</FormItem>
-			                    		<FormItem className="half-item"
-				                            {...formItemLayout}
-				                            label="项目状态" >  
-				                            <span>{getProjectState(orderDetaiel.projectStage)}</span>
-			                    		</FormItem>
-		                    		</div>
-					                <div>
-					                	<span style={{marginLeft:'50px',fontSize:'20px'}}>项目业务</span>
-					                </div>
-					                <div className="patent-table">
-					                    <Spin spinning={this.state.loading}>
-					                        <Table size="middle" columns={this.state.columns}
-					                            dataSource={this.state.dataSource}
-					                            pagination={false}
-					                            onRowClick={this.tableRowClick} 
-					                            />
-					                    </Spin>
-						            </div>
-			                    </div>
-			                </Spin>
-			            </Form >
-			        </Modal> 
-			        <Modal maskClosable={false} visible={this.state.addnextVisible}
-                        onOk={this.nextCancel} onCancel={this.nextCancel}
-                        width='550px'
-                        title='查看明细服务'                     
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-	                        	   <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务名称" >
-		                    			<span>{editFws.commodityName}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场价格" >
-		                    			<span>{editFws.commodityPrice}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="实签价格" >
-		                    			<span>{editFws.discountPrice+'万元'}</span>
-			                    	</FormItem>
-			                    	<FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="服务数量" >
-		                    			<span>{editFws.commodityQuantity}</span>
-			                    	</FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="市场首付金额" >   
-		                                <span>{editFws.commodityFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="签单首付金额" >   
-		                                <span>{editFws.discountFirstPayment+'万元'}</span>    
-				                    </FormItem>
-				                    <div className='clearfix'>
-				                    	<FormItem 
-				                            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-				                            label="服务说明" >
-			                    			<span>{editFws.remarks}</span>
-				                    	</FormItem>
-			                    	</div>
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-			        <Modal maskClosable={false} visible={this.state.lookVisible}
-                        onOk={this.lookCancel} onCancel={this.lookCancel}
-                        width='1300px'
-                        title= '查看流水'                   
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" id="demand-form">
-			                <Spin spinning={this.state.loading}>
-		                        <div className="clearfix">
-                        	   			<Table size="middle" columns={this.state.flowList}
-					                           dataSource={this.state.lookflowList}
-					                           pagination={false}
-			                             />
-		                        </div>
-			                </Spin>
-			            </Form >
-			        </Modal>
-    	    </div>
+				<Modal maskClosable={false} visible={this.state.visible}
+					onOk={this.handleOk} onCancel={this.handleCancel}
+					width='1000px'
+					title='订单详情'
+					footer=''
+					className="admin-desc-content">
+					<Form layout="horizontal" id="demand-form" style={{ paddingBottom: '40px' }}  >
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								<div className="clearfix">
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单编号" >
+										<span>{orderDetaiel.orderNo}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="下单时间" >
+										<span>{orderDetaiel.createTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="客户名称" >
+										<span>{orderDetaiel.buyerName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单类型" >
+										<span>{getOrderType(orderDetaiel.orderType)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单外联" >
+										<span>{getOrderChannel(orderDetaiel.orderChannel)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单状态" >
+										<span>{getOrderState(orderDetaiel.orderStatus)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="已收款项" >
+										<span>{orderDetaiel.actuallyTotalAmount + '万元'}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="结算状态" >
+										<span>{getPaymentState(orderDetaiel.liquidationStatus)}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="市价订单金额" >
+										<span>{orderDetaiel.orderAmount + '万元'}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="市价首款金额" >
+										<span>{orderDetaiel.firstPayment + '万元'}</span>
+									</FormItem>
+									<div className='clearfix'>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="实签订单金额" >
+											<span>{orderDetaiel.signTotalAmount + '万元'}</span>
+										</FormItem>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="实签首款金额" >
+											<span>{orderDetaiel.signFirstPayment + '万元'}</span>
+										</FormItem>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="特批立项" >
+											<span>{getApprovedState(orderDetaiel.approval)}</span>
+										</FormItem>
+										<FormItem className="half-item"
+											{...formItemLayout}
+											label="合同编号" >
+											<span>{orderDetaiel.contractNo}</span>
+										</FormItem>
+										<div className='clearfix'>
+											<FormItem
+												labelCol={{ span: 4 }}
+												wrapperCol={{ span: 16 }}
+												label="订单留言" >
+												<span>{orderDetaiel.orderRemarks}</span>
+											</FormItem>
+										</div>
+									</div>
+								</div>
+								<div className='clearfix'>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="订单负责人" >
+										<span>{orderDetaiel.salesmanName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="业务品类" >
+										<span>{orderDetaiel.projectType}</span>
+									</FormItem>
+								</div>
+								<div className='clearfix'>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="意向时间" >
+										<span>{orderDetaiel.createTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="签单时间" >
+										<span>{orderDetaiel.signTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="财务负责人" >
+										<span>{orderDetaiel.financeName}</span>
+										<Button onClick={this.lookflow} style={{ float: 'right' }}>查看流水</Button>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="项目负责人" >
+										<span>{orderDetaiel.technicianName}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="立项时间" >
+										<span>{orderDetaiel.setUpTime}</span>
+									</FormItem>
+									<FormItem className="half-item"
+										{...formItemLayout}
+										label="项目状态" >
+										<span>{getProjectState(orderDetaiel.projectStage)}</span>
+									</FormItem>
+								</div>
+								<div>
+									<span style={{ marginLeft: '50px', fontSize: '20px' }}>项目业务</span>
+								</div>
+								<div className="patent-table">
+									<Spin spinning={this.state.loading}>
+										<Table size="middle" columns={this.state.columns}
+											dataSource={this.state.dataSource}
+											pagination={false}
+											onRowClick={this.tableRowClick}
+										/>
+									</Spin>
+								</div>
+							</div>
+						</Spin>
+					</Form >
+				</Modal>
+				<Modal maskClosable={false} visible={this.state.addnextVisible}
+					onOk={this.nextCancel} onCancel={this.nextCancel}
+					width='550px'
+					title='查看明细服务'
+					footer=''
+					className="admin-desc-content">
+					<Form layout="horizontal" id="demand-form">
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								<FormItem className="half-item"
+									{...formItemLayout}
+									label="服务名称" >
+									<span>{editFws.commodityName}</span>
+								</FormItem>
+								<FormItem className="half-item"
+									{...formItemLayout}
+									label="市场价格" >
+									<span>{editFws.commodityPrice}</span>
+								</FormItem>
+								<FormItem className="half-item"
+									{...formItemLayout}
+									label="实签价格" >
+									<span>{editFws.discountPrice + '万元'}</span>
+								</FormItem>
+								<FormItem className="half-item"
+									{...formItemLayout}
+									label="服务数量" >
+									<span>{editFws.commodityQuantity}</span>
+								</FormItem>
+								<FormItem className="half-item"
+									{...formItemLayout}
+									label="市场首付金额" >
+									<span>{editFws.commodityFirstPayment + '万元'}</span>
+								</FormItem>
+								<FormItem className="half-item"
+									{...formItemLayout}
+									label="签单首付金额" >
+									<span>{editFws.discountFirstPayment + '万元'}</span>
+								</FormItem>
+								<div className='clearfix'>
+									<FormItem
+										labelCol={{ span: 4 }}
+										wrapperCol={{ span: 16 }}
+										label="服务说明" >
+										<span>{editFws.remarks}</span>
+									</FormItem>
+								</div>
+							</div>
+						</Spin>
+					</Form >
+				</Modal>
+				<Modal maskClosable={false} visible={this.state.lookVisible}
+					onOk={this.lookCancel} onCancel={this.lookCancel}
+					width='1300px'
+					title='查看流水'
+					footer=''
+					className="admin-desc-content">
+					<Form layout="horizontal" id="demand-form">
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								<Table size="middle" columns={this.state.flowList}
+									dataSource={this.state.lookflowList}
+									pagination={false}
+								/>
+							</div>
+						</Spin>
+					</Form >
+				</Modal>
+			</div>
 		)
 	}
 }));

+ 5 - 0
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -267,6 +267,11 @@ const PersonnelAll = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

+ 5 - 0
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -264,6 +264,11 @@ const OutsourceTaskAssignment = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

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

@@ -271,7 +271,12 @@ const PaiDan = React.createClass({
         {
           title: "业务项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
+          key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

+ 6 - 1
js/component/manageCenter/project/project/projectQuery.jsx

@@ -212,7 +212,12 @@ const PaiDan = React.createClass({
         {
           title: "业务项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
+          key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

+ 6 - 1
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -325,7 +325,12 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         {
           title: "业务项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
+          key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

+ 5 - 0
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -177,6 +177,11 @@ class ProjectDetails extends Component{
                     title: "业务项目名称",
                     dataIndex: "commodityName",
                     key: "commodityName",
+                    render: (text, record) => {
+                        return (
+                            <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                        )
+                    }
                 },
                 {
                     title: "项目类别",

+ 39 - 41
js/component/manageCenter/project/task/businessManagement/orderInfor.jsx

@@ -1,6 +1,6 @@
-import React,{Component} from "react";
-import {Button, Col, DatePicker, Form, Input, message, Modal, Select, Spin, Table, Tag, Tooltip} from "antd";
-import {getApprovedState, getLiquidationStatus, getProcessStatus, getProjectName, splitUrl} from "../../../../tools";
+import React, { Component } from "react";
+import { Button, Col, DatePicker, Form, Input, message, Modal, Select, Spin, Table, Tag, Tooltip } from "antd";
+import { getApprovedState, getLiquidationStatus, getProcessStatus, getProjectName, splitUrl } from "../../../../tools";
 import moment from "moment";
 import EnterpriseNameChange from "../../../../common/enterpriseNameChange";
 import PicturesWall from "../../../order/orderNew/changeComponent/picturesWall";
@@ -16,11 +16,11 @@ const formItemLayout = {
     wrapperCol: { span: 14 },
 };
 
-class OrderInfor extends Component{
+class OrderInfor extends Component {
     constructor(props) {
         super(props);
-        this.state={
-            contactList:[],
+        this.state = {
+            contactList: [],
 
             columns: [
                 {
@@ -28,9 +28,7 @@ class OrderInfor extends Component{
                     dataIndex: "commodityName",
                     key: "commodityName",
                     render: (text, record) => {
-                        return (
-                            text + "-" + record.id
-                        )
+                        return <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span>{"-" + record.id}</span>
                     }
                 },
                 {
@@ -102,10 +100,10 @@ class OrderInfor extends Component{
                         return (
                             <Tooltip title={text}>
                                 <div style={{
-                                    maxWidth:'100px',
-                                    overflow:'hidden',
+                                    maxWidth: '100px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         );
@@ -218,12 +216,12 @@ class OrderInfor extends Component{
                             globalConfig.avatarHost + "/upload"
                         )
                         : [], //图片地址
-                    contentUrl:thisData.serviceContent
+                    contentUrl: thisData.serviceContent
                         ? splitUrl(
                             thisData.serviceContent,
                             ",",
                             globalConfig.avatarHost + "/upload"
-                          )
+                        )
                         : [], //图片地址
                     signDate: thisData.signDate, //签单时间
                     userName: thisData.userName, //客户名称
@@ -243,8 +241,8 @@ class OrderInfor extends Component{
                     depName: thisData.depName,
                     status: thisData.status,
                     outsource: thisData.outsource,
-                    deleteSign:thisData.deleteSign,
-                    orderUid:thisData.uid,
+                    deleteSign: thisData.deleteSign,
+                    orderUid: thisData.uid,
                 });
             }.bind(this),
         }).always(
@@ -316,8 +314,8 @@ class OrderInfor extends Component{
                     <EnterpriseNameChange
                         type='journal'
                         style={{ marginLeft: 10 }}
-                        enterpriseId={this.state.orderUid}/>
-                 </span>,
+                        enterpriseId={this.state.orderUid} />
+                </span>,
             },
             {
                 label: "联系人电话",
@@ -364,20 +362,20 @@ class OrderInfor extends Component{
                             {...formItemLayout}
                             label="流程状态"
                         >
-                              <span>
+                            <span>
                                 {getProcessStatus(this.state.processStatus)}
-                              </span>
+                            </span>
                         </FormItem>
                         <FormItem
                             className="half-item"
                             {...formItemLayout}
                             label="结算状态"
                         >
-                              <span>
+                            <span>
                                 {getLiquidationStatus(
                                     this.state.liquidationStatus
                                 )}
-                              </span>
+                            </span>
                         </FormItem>
                         <div className="clearfix">
                             <FormItem
@@ -385,9 +383,9 @@ class OrderInfor extends Component{
                                 {...formItemLayout}
                                 label="特批立项"
                             >
-                                  <span>
+                                <span>
                                     {getApprovedState(this.state.approval)}
-                                  </span>
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -408,9 +406,9 @@ class OrderInfor extends Component{
                                 {...formItemLayout}
                                 label="是否外包"
                             >
-                                  <span>
+                                <span>
                                     {this.state.outsource == 0 ? "否" : "是"}
-                                  </span>
+                                </span>
                             </FormItem>
                         </div>
                     </div>
@@ -465,7 +463,7 @@ class OrderInfor extends Component{
                                 label="已收款项"
                             >
                                 <span>
-                                  {this.state.settlementAmount + "万元"}
+                                    {this.state.settlementAmount + "万元"}
                                 </span>
                             </FormItem>
                         </div>
@@ -491,7 +489,7 @@ class OrderInfor extends Component{
                                 label="已收款项"
                             >
                                 <span>
-                                  {this.state.settlementAmount + "万元"}
+                                    {this.state.settlementAmount + "万元"}
                                 </span>
                             </FormItem>
                         </div>
@@ -526,8 +524,8 @@ class OrderInfor extends Component{
                                 wrapperCol={{ span: 18 }}
                                 label="合同扫描件"
                             >
-                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                    {this.state.orgCodeUrl && this.state.visible && this.state.activeKey === '1'? <ImgList domId={'addService3'} fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                    {this.state.orgCodeUrl && this.state.visible && this.state.activeKey === '1' ? <ImgList domId={'addService3'} fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                                 </div>
                                 <Modal
                                     maskClosable={false}
@@ -609,11 +607,11 @@ class OrderInfor extends Component{
                                 {/*    });*/}
                                 {/*  }}*/}
                                 {/*/>*/}
-                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
                                     {
-                                        this.state.visible && this.state.activeKey === '1' && this.state.replenishUrl?
-                                            <ImgList domId={'addService4'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> :
-                                            <div/>
+                                        this.state.visible && this.state.activeKey === '1' && this.state.replenishUrl ?
+                                            <ImgList domId={'addService4'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> :
+                                            <div />
                                     }
                                 </div>
                                 <Modal
@@ -673,10 +671,10 @@ class OrderInfor extends Component{
                         </div>
                     </div>
                     <ContentUrl
-                    processStatus={1}
-                    domId = {"inforContents"}
-                    contentUrl = {this.state.contentUrl }
-                    imgId = {"inforContentsImg"}
+                        processStatus={1}
+                        domId={"inforContents"}
+                        contentUrl={this.state.contentUrl}
+                        imgId={"inforContentsImg"}
                     />
                     <div className="clearfix">
                         <FormItem
@@ -759,11 +757,11 @@ class OrderInfor extends Component{
                             <span>{this.state.financeMobile}</span>
                         </FormItem>
                     </div>
-                        {/* 协单人员 */}
-                        <OrderCoor orderNo={this.props.orderNo}/>
+                    {/* 协单人员 */}
+                    <OrderCoor orderNo={this.props.orderNo} />
                     <div>
                         <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                          项目业务
+                            项目业务
                         </span>
                     </div>
                     <div

File diff suppressed because it is too large
+ 467 - 462
js/component/manageCenter/project/task/myTask.jsx


+ 6 - 1
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -374,7 +374,12 @@ const MyTaskCount = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 5 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -537,6 +537,11 @@ const MyTaskOutsource = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

+ 5 - 0
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -98,6 +98,11 @@ class projectOverview extends Component{
                     title: '业务项目名称',
                     dataIndex: 'commodityName',
                     key: 'commodityName',
+                    render: (text, record) => {
+                        return (
+                            <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+                        )
+                    }
                 },
                 {
                     title: '项目类别',

+ 5 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -263,6 +263,11 @@ const Task = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

+ 6 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -336,7 +336,12 @@ const IntentionCustomer = Form.create()(
           {
             title: "业务项目名称",
             dataIndex: "commodityName",
-            key: "commodityName"
+            key: "commodityName",
+            render: (text, record) => {
+              return (
+                  <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+              )
+          }
           },
           {
             title: "项目类别",

+ 5 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -244,6 +244,11 @@ const Task = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
+          render: (text, record) => {
+            return (
+                <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+        }
         },
         {
           title: "项目类别",

File diff suppressed because it is too large
+ 680 - 675
js/component/manageCenter/servicesManage/projectOrder/orderOrder/projectOrderDetaile.jsx


+ 159 - 154
js/component/project.jsx

@@ -28,18 +28,18 @@ import ResolutionDetail from '@/resolutionDetail'
 import ImgList from "./common/imgList";
 import CheckProject from "./manageCenter/components/checkProject";
 import { cuiJieDian } from '@/dataDic.js'
-import {getProjectName} from "./tools";
+import { getProjectName } from "./tools";
 import OrderCoor from './manageCenter/order/orderNew/changeComponent/orderCoor'
 const { TabPane } = Tabs
 const project = React.createClass({
   getInitialState() {
     return {
-      oldInfor:{},
+      oldInfor: {},
       patentNameType: -1,
       patentType: -1,
       paySubject: [],
-      orderNos:'',
-      containOfficialFees:0,//官费缴费情况
+      orderNos: '',
+      containOfficialFees: 0,//官费缴费情况
 
       record: this.props.record,
       paginations: false,
@@ -49,6 +49,11 @@ const project = React.createClass({
           title: '业务项目名称',
           dataIndex: 'commodityName',
           key: 'commodityName',
+          render: (text, record) => {
+            return (
+              <span>{text}<span style={{ color: "red" }}>{record.patentTypeName}</span></span>
+            )
+          }
         },
         {
           title: '项目类别',
@@ -160,10 +165,10 @@ const project = React.createClass({
             return test[0] === null
               ? ''
               : getprovince(test[0]) +
-                  '/' +
-                  getprovince(test[1]) +
-                  '/' +
-                  getprovince(test[2])
+              '/' +
+              getprovince(test[1]) +
+              '/' +
+              getprovince(test[2])
           },
         },
         {
@@ -174,13 +179,13 @@ const project = React.createClass({
       ],
     }
   },
-  componentWillReceiveProps(nextProps){
+  componentWillReceiveProps(nextProps) {
     this.setState({
       record: nextProps.record,
     })
     if (nextProps.record) {
       this.setState({
-        orderNo:nextProps.record
+        orderNo: nextProps.record
       })
       this.xiangqing(nextProps.record.id)
       this.xiangqings(nextProps.record.orderNo)
@@ -232,9 +237,9 @@ const project = React.createClass({
           let thisdata = data.data
           this.setState({
             orderTaskCostReduction: thisdata.costReduction,//费减
-            checkStatus:thisdata.checkStatus,//核对状态
-            commodityQuantity:thisdata.commodityQuantity,//项目数量
-            patentTypeName:thisdata.patentTypeName,//官费类型名称
+            checkStatus: thisdata.checkStatus,//核对状态
+            commodityQuantity: thisdata.commodityQuantity,//项目数量
+            patentTypeName: thisdata.patentTypeName,//官费类型名称
             patentTypeId: thisdata.patentType,//官费专利类型
             id: thisdata.id, //ID
             orderNo: thisdata.orderNo, //订单编号
@@ -248,10 +253,10 @@ const project = React.createClass({
             taskComment: thisdata.taskComment, //说明
             attachmentUrl: thisdata.attachmentUrl
               ? splitUrl(
-                  thisdata.attachmentUrl,
-                  ',',
-                  globalConfig.avatarHost + '/upload'
-                )
+                thisdata.attachmentUrl,
+                ',',
+                globalConfig.avatarHost + '/upload'
+              )
               : [], //图片地址
             salesmanName: thisdata.salesmanName, //订单负责人
             startDate: thisdata.startDate, //启动日期
@@ -282,11 +287,11 @@ const project = React.createClass({
             orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
             sort: thisdata.sort,
           })
-          if(thisdata.patentTransfer){
+          if (thisdata.patentTransfer) {
             this.setState({
               patentType: 1
             })
-          }else{
+          } else {
             this.setState({
               patentType: 0
             })
@@ -540,26 +545,26 @@ const project = React.createClass({
           loading: false,
         })
         if (!data.error.length && data.data) {
-          if(!isNaN(parseFloat(data.data.unitNumber))){
+          if (!isNaN(parseFloat(data.data.unitNumber))) {
             this.setState({
               oldInfor: {
-                companyName:data.data.companyName,
-                unitPrice:data.data.unitPrice,
-                unitNumber:data.data.unitNumber,
-                amount:data.data.amount,
-                outsourceRemarks:data.data.outsourceRemarks,
+                companyName: data.data.companyName,
+                unitPrice: data.data.unitPrice,
+                unitNumber: data.data.unitNumber,
+                amount: data.data.amount,
+                outsourceRemarks: data.data.outsourceRemarks,
                 refundStatus: data.data.refundStatus,
                 pictureUrl: data.data.pictureUrl
-                    ? splitUrl(
-                        data.data.pictureUrl,
-                        ',',
-                        globalConfig.avatarHost + '/upload',
-                        url
-                    )
-                    : [], //图片地址
+                  ? splitUrl(
+                    data.data.pictureUrl,
+                    ',',
+                    globalConfig.avatarHost + '/upload',
+                    url
+                  )
+                  : [], //图片地址
               },
             })
-          }else{
+          } else {
             this.setState({
               oldInfor: {},
             })
@@ -580,11 +585,11 @@ const project = React.createClass({
             unitNumber: data.data.unitNumber,
             pictureUrl: data.data.pictureUrl
               ? splitUrl(
-                  data.data.pictureUrl,
-                  ',',
-                  globalConfig.avatarHost + '/upload',
-                  url
-                )
+                data.data.pictureUrl,
+                ',',
+                globalConfig.avatarHost + '/upload',
+                url
+              )
               : [], //图片地址
             createTimes: data.data.createTimes,
             auditTimes: data.data.auditTimes,
@@ -653,7 +658,7 @@ const project = React.createClass({
   },
   tabChange(e) {
     this.setState({
-      tabsKey:e
+      tabsKey: e
     })
     if (e == 2) {
       this.waiDetail();
@@ -692,28 +697,28 @@ const project = React.createClass({
           for (let i = 0; i < arr.length; i++) {
             thisData = arr[i]
             allTotalAmount =
-                (allTotalAmount * 10000 + thisData.totalAmount * 10000) / 10000
+              (allTotalAmount * 10000 + thisData.totalAmount * 10000) / 10000
             companyNameArr.push(thisData.companyName);
             thisData.key = i;
-            type=thisData.patentType;
+            type = thisData.patentType;
             thisData.patentType = thisData.type;
             theArr.push(thisData);
-            startType=thisData.startType;
-            patentNameType= thisData.patentNameType
+            startType = thisData.startType;
+            patentNameType = thisData.patentNameType
           }
           if (!allTotalAmount) {
             allTotalAmount = 0
           }
 
-          for(let d=0;d<theArr.length;d++){
-            theArr[d].companyName = theArr[d].companyName+ '-' + theArr[d].id;
+          for (let d = 0; d < theArr.length; d++) {
+            theArr[d].companyName = theArr[d].companyName + '-' + theArr[d].id;
             companyNameArr[d] = {
               companyName: theArr[d].companyName,
               id: theArr[d].id,
             }
           }
 
-          if((type === 0 || type === 1) && arr.length > 0){
+          if ((type === 0 || type === 1) && arr.length > 0) {
             this.setState({
               patentType: type === 0 ? 0 : 1,    //0专利申请 1专利买卖
               patentNameType: patentNameType,                         //0实用新型 1发明专利 2外观专利 3 其他
@@ -721,7 +726,7 @@ const project = React.createClass({
           }
 
           //设置项目类型
-          if(arr.length >0){
+          if (arr.length > 0) {
             this.setState({
               startType: startType
             })
@@ -733,14 +738,14 @@ const project = React.createClass({
         }
       }.bind(this),
     }).always(
-        function () {
-          this.setState({
-            thirdInfoLoading: false,
-          })
-        }.bind(this)
+      function () {
+        this.setState({
+          thirdInfoLoading: false,
+        })
+      }.bind(this)
     )
     this.setState({
-      selectCompanyAjaxObj:ajaxObj
+      selectCompanyAjaxObj: ajaxObj
     })
   },
   payNodeTable() {
@@ -775,7 +780,7 @@ const project = React.createClass({
             payNodeArr.push({
               key: i,
               id: thisData.id, //付款节点Id
-              nodeId:  thisData.id, //付款节点Id
+              nodeId: thisData.id, //付款节点Id
               tid: thisData.tid,
               companyName: thisData.companyName, //供应商名称
               projectType: thisData.projectType, //项目分类
@@ -790,8 +795,8 @@ const project = React.createClass({
             })
           }
 
-          for(let d=0;d<payNodeArr.length;d++){
-            payNodeArr[d].companyName = payNodeArr[d].companyName+ '-' + payNodeArr[d].cid;
+          for (let d = 0; d < payNodeArr.length; d++) {
+            payNodeArr[d].companyName = payNodeArr[d].companyName + '-' + payNodeArr[d].cid;
           }
 
           this.setState({
@@ -800,11 +805,11 @@ const project = React.createClass({
         }
       }.bind(this),
     }).always(
-        function () {
-          this.setState({
-            payNodeLoading: false,
-          })
-        }.bind(this)
+      function () {
+        this.setState({
+          payNodeLoading: false,
+        })
+      }.bind(this)
     )
     this.setState({
       selectPaymentNodeAjaxObj: ajaxObj
@@ -838,7 +843,7 @@ const project = React.createClass({
       },
     }
     return (
-        this.props.visible ? <Modal
+      this.props.visible ? <Modal
         className="customeDetails"
         footer=""
         title=""
@@ -874,17 +879,17 @@ const project = React.createClass({
                 <div className="clearfix">
                   <div className="clearfix">
                     <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目状态"
+                      className="half-item"
+                      {...formItemLayout}
+                      label="项目状态"
                     >
                       {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
                       <span>{getProjectName(this.state.projectStatus)}</span>
                       <Button
-                          type="primary"
-                          size="small"
-                          style={{ marginTop: '5px', position: 'absolute' }}
-                          onClick={this.caozuorizhi}
+                        type="primary"
+                        size="small"
+                        style={{ marginTop: '5px', position: 'absolute' }}
+                        onClick={this.caozuorizhi}
                       >
                         操作日志
                       </Button>
@@ -1265,9 +1270,9 @@ const project = React.createClass({
                       {/*    })*/}
                       {/*  }}*/}
                       {/*/>*/}
-                      {this.state.attachmentUrl && this.props.visible && this.state.tabsKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                        <ImgList fileList={this.state.attachmentUrl} ItemWidth={'96px'}/>
-                      </div> : <div/>}
+                      {this.state.attachmentUrl && this.props.visible && this.state.tabsKey === "1" ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                        <ImgList fileList={this.state.attachmentUrl} ItemWidth={'96px'} />
+                      </div> : <div />}
                       <Modal
                         maskClosable={false}
                         footer={null}
@@ -1294,7 +1299,7 @@ const project = React.createClass({
                     </FormItem>
                   </div>
                   {/* 协单人员 */}
-                  <OrderCoor orderNo={this.props.record.orderNo}/>
+                  <OrderCoor orderNo={this.props.record.orderNo} />
                   <div>
                     <h3 className="sub-title">项目业务</h3>
                     {/* {this.state.processStatus == 0 ? (
@@ -1330,91 +1335,91 @@ const project = React.createClass({
                   </div>
                 </div>
               </Spin>
-            </Form> : <div/>}
+            </Form> : <div />}
           </TabPane>
-            <TabPane tab="外包/供应商信息" key="2">
-              {this.state.tabsKey === "2" ? <Spin spinning={this.state.loading}>
-                <div>
-                  {
-                    this.props.visible && this.state.tabsKey === '2' ?
-                        <CheckProject
-                            {...this.props}
-                            tid={this.props.record.id}
-                            sort={this.state.sort}
-                            patentTypeName={this.state.patentTypeName}                  //官费类型
-                            patentTypeId={this.state.patentTypeId}
-                            commodityQuantity={this.state.commodityQuantity}            //项目数量
-                            checkStatus={this.state.checkStatus}                        //核对状态
-                            orderTaskCostReduction={this.state.orderTaskCostReduction}    //是否含费减  0无1有
-                            orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
-                            containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
-                            oldInfor={this.state.oldInfor}
-                            projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
-                            patentNameType={this.state.patentNameType}
-                            isAuditPayment={this.props.isAuditPayment}       //是否为财务
-                            isAuditPaymentGLY={this.props.isAuditPaymentGLY} //是否为财务经理或者为财务管理员
-                            patentName={this.state.patentName}
-                            patentType={this.state.patentType}
-                            status={this.state.refundStatus}
-                            mid={this.state.mid}
-                            thirdInfoList={this.state.thirdInfoList}
-                            dataSource={this.state.payNodeList}
-                            outsourceRemarks={this.state.outsourceRemarks}
-                            fileList={this.state.pictureUrl}
-                            startType={this.state.startType}
-                            projectStatus={this.state.projectStatus}
-                            onRefresh={()=>{
-                              this.waiDetail();
-                              this.thirdTable();
-                              this.payNodeTable()
-                              this.xiangqing(this.state.id);
-                            }}
-                        /> : <div/>
-                  }
-                </div>
+          <TabPane tab="外包/供应商信息" key="2">
+            {this.state.tabsKey === "2" ? <Spin spinning={this.state.loading}>
+              <div>
+                {
+                  this.props.visible && this.state.tabsKey === '2' ?
+                    <CheckProject
+                      {...this.props}
+                      tid={this.props.record.id}
+                      sort={this.state.sort}
+                      patentTypeName={this.state.patentTypeName}                  //官费类型
+                      patentTypeId={this.state.patentTypeId}
+                      commodityQuantity={this.state.commodityQuantity}            //项目数量
+                      checkStatus={this.state.checkStatus}                        //核对状态
+                      orderTaskCostReduction={this.state.orderTaskCostReduction}    //是否含费减  0无1有
+                      orderTaskOfficialCost={this.state.orderTaskOfficialCost}    //是否含官费  0无1有
+                      containOfficialFees={this.state.containOfficialFees}        //0:实际已缴费 1:实际未缴费
+                      oldInfor={this.state.oldInfor}
+                      projectType={this.state.projectType}    //0正常 1专利 2软著 3审计
+                      patentNameType={this.state.patentNameType}
+                      isAuditPayment={this.props.isAuditPayment}       //是否为财务
+                      isAuditPaymentGLY={this.props.isAuditPaymentGLY} //是否为财务经理或者为财务管理员
+                      patentName={this.state.patentName}
+                      patentType={this.state.patentType}
+                      status={this.state.refundStatus}
+                      mid={this.state.mid}
+                      thirdInfoList={this.state.thirdInfoList}
+                      dataSource={this.state.payNodeList}
+                      outsourceRemarks={this.state.outsourceRemarks}
+                      fileList={this.state.pictureUrl}
+                      startType={this.state.startType}
+                      projectStatus={this.state.projectStatus}
+                      onRefresh={() => {
+                        this.waiDetail();
+                        this.thirdTable();
+                        this.payNodeTable()
+                        this.xiangqing(this.state.id);
+                      }}
+                    /> : <div />
+                }
+              </div>
 
-                <div className="clearfix">
-                  <hr className="division" />
-                  <div
-                    className="clearfix"
-                    style={{
-                      display: this.state.refundStatus == 0 ? 'none' : 'block',
-                    }}
+              <div className="clearfix">
+                <hr className="division" />
+                <div
+                  className="clearfix"
+                  style={{
+                    display: this.state.refundStatus == 0 ? 'none' : 'block',
+                  }}
+                >
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="审核意见"
                   >
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核意见"
-                    >
-                      <span>{this.state.remarks}</span>
-                    </FormItem>
-                  </div>
-                  {!(this.state.oldInfor && Object.keys(this.state.oldInfor).length > 0) ? <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核结果"
-                    >
-                      <span>{getRefundStatus(this.state.refundStatus)}</span>
-                    </FormItem>
-                  </div> : <div/>}
-                  <div
-                    className="clearfix"
-                    style={{
-                      display: this.state.refundStatus == 0 ? 'none' : 'block',
-                    }}
+                    <span>{this.state.remarks}</span>
+                  </FormItem>
+                </div>
+                {!(this.state.oldInfor && Object.keys(this.state.oldInfor).length > 0) ? <div className="clearfix">
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="审核结果"
                   >
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="审核时间"
-                    >
-                      <span>{this.state.auditTimes}</span>
-                    </FormItem>
-                  </div>
+                    <span>{getRefundStatus(this.state.refundStatus)}</span>
+                  </FormItem>
+                </div> : <div />}
+                <div
+                  className="clearfix"
+                  style={{
+                    display: this.state.refundStatus == 0 ? 'none' : 'block',
+                  }}
+                >
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="审核时间"
+                  >
+                    <span>{this.state.auditTimes}</span>
+                  </FormItem>
                 </div>
-              </Spin> : <div/>}
-            </TabPane>
+              </div>
+            </Spin> : <div />}
+          </TabPane>
           {/*{this.props.record && this.props.record.outsource == 1 ? (*/}
           {/*  <TabPane tab="外包公司信息" key="3">*/}
           {/*    <div className="patent-table" style={{ marginTop: '10px' }}>*/}
@@ -1457,7 +1462,7 @@ const project = React.createClass({
             </Spin>
           </div>
         </Modal>
-      </Modal> : <div/>
+      </Modal> : <div />
     )
   },
 })

+ 1 - 1
package.json

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