dev01 2 years ago
parent
commit
8ac168ebbf

+ 89 - 88
js/component/manageCenter/financialManage/bonus/bonusDetail.jsx

@@ -1,31 +1,32 @@
 import React from 'react';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import { Form, Spin, message, Modal } from 'antd';
-import {getProjectName,getNewOrderStatus,getJsyPaymentType} from '@/tools.js';
+import { Form, Spin, message, Modal, Tooltip } from 'antd';
+import { getProjectName, getNewOrderStatus, getJsyPaymentType } from '@/tools.js';
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
+import { salesList } from "@/dataDic.js";
 
-const BonusDetail=React.createClass({
+const BonusDetail = React.createClass({
     getInitialState() {
         return {
             loading: false,
-            visible:false,
-            showDesc:false,
+            visible: false,
+            showDesc: false,
         };
     },
-    onCancel(){
-    	this.setState({
-    		visible:false
+    onCancel() {
+        this.setState({
+            visible: false
         })
-        this.props.closeDesc(false,false);
+        this.props.closeDesc(false, false);
     },
     onShow() {
-		this.setState({
-			visible: false,
-		});
-		this.props.closeDesc(false, true);
-	},
+        this.setState({
+            visible: false,
+        });
+        this.props.closeDesc(false, true);
+    },
     componentWillMount() {
     },
     xiangqings(orderNo) {
@@ -45,7 +46,7 @@ const BonusDetail=React.createClass({
                     }
                 } else {
                     this.setState({
-                        deleteSign:thisdata.deleteSign,
+                        deleteSign: thisdata.deleteSign,
                         orderUid: thisdata.uid,
                     });
                 }
@@ -59,11 +60,11 @@ const BonusDetail=React.createClass({
         );
     },
     componentWillReceiveProps(nextProps) {
-        if(nextProps.data.orderNo){
-            this.setState({data:nextProps.data});
+        if (nextProps.data.orderNo) {
+            this.setState({ data: nextProps.data });
             this.xiangqings(nextProps.data.orderNo);
         }
-        this.state.visible=nextProps.showDesc;
+        this.state.visible = nextProps.showDesc;
     },
     render() {
         const theData = this.props.data || {};
@@ -71,79 +72,79 @@ const BonusDetail=React.createClass({
         const formItemLayout = {
             labelCol: { span: 10 },
             wrapperCol: { span: 12 },
-		};
+        };
         return (
             <div className="user-content" >
-	            <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.onShow} onCancel={this.onCancel}
-                        width='1000px'
-                        title='订单详情'
-                        footer=''
-                        className="admin-desc-content">
-			            <Form layout="horizontal" onSubmit={(e)=>{this.handleSubmit(e,0)}} >
-			                <Spin spinning={this.state.loading}>
-                                <div className="clearfix">
-                                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                                        <OrderItemStatus deleteSign={this.state.deleteSign}/>
-                                    </div>
-                                    <FormItem className="half-item" {...formItemLayout} label="订单编号">
-                                        <span>{theData.orderNo}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="签单时间">
-							            <span>{theData.signTime}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="订单负责人">
-                                        <span>{theData.salesName}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="客户名称">
-                                        <span>
-                                            {theData.buyName}
-                                            <EnterpriseNameChange
-                                                type='journal'
-                                                style={{ marginLeft: 10 }}
-                                                enterpriseId={this.state.orderUid}/>
-                                        </span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="签单金额(万元)">
-                                        <span>{theData.totalAmount}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="首付款(万元)">
-                                        <span>{theData.firstAmount}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="已收(万元)">
-                                        <span>{theData.settlementAmount}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="已退(万元)">
-                                        <span>{theData.refundAmount}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="订单状态">
-                                        <span>{getNewOrderStatus(theData.orderStatus)}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="项目状态">
-                                        <span>{getProjectName(theData.projectStatus)}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="发放类型">
-                                        <span>{getJsyPaymentType(theData.bonusSubject)}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="校对后单量">
-                                        <span>{theData.proofCount}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="当月认证项目数量">
-                                        <span>{theData.renzm}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="当月科技项目数量">
-                                        <span>{theData.kejim}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="年度认证项目数量">
-                                        <span>{theData.renzy}</span>
-                                    </FormItem>
-                                    <FormItem className="half-item" {...formItemLayout} label="年度科技项目数量">
-                                        <span>{theData.kejiy}</span>
-                                    </FormItem>
+                <Modal maskClosable={false} visible={this.state.visible}
+                    onOk={this.onShow} onCancel={this.onCancel}
+                    width='1000px'
+                    title='订单详情'
+                    footer=''
+                    className="admin-desc-content">
+                    <Form layout="horizontal" onSubmit={(e) => { this.handleSubmit(e, 0) }} >
+                        <Spin spinning={this.state.loading}>
+                            <div className="clearfix">
+                                <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                                    <OrderItemStatus deleteSign={this.state.deleteSign} />
                                 </div>
-			                </Spin>
-			            </Form>
-			    </Modal>
+                                <FormItem className="half-item" {...formItemLayout} label="订单编号">
+                                    <span>{theData.orderNo}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="签单时间">
+                                    <span>{theData.signTime}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="订单负责人">
+                                    <span>{theData.salesName}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="客户名称">
+                                    <span>
+                                        {theData.buyName}
+                                        <EnterpriseNameChange
+                                            type='journal'
+                                            style={{ marginLeft: 10 }}
+                                            enterpriseId={this.state.orderUid} />
+                                    </span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="签单金额(万元)">
+                                    <span>{theData.totalAmount}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="首付款(万元)">
+                                    <span>{theData.firstAmount}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="已收(万元)">
+                                    <span>{theData.settlementAmount}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="已退(万元)">
+                                    <span>{theData.refundAmount}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="订单状态">
+                                    <span>{getNewOrderStatus(theData.orderStatus)}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="项目状态">
+                                    <span>{getProjectName(theData.projectStatus)}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="发放类型">
+                                    <span>{getJsyPaymentType(theData.bonusSubject)}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="校对后单量">
+                                    <span>{theData.proofCount}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="当月认证项目数量">
+                                    <span>{theData.renzm}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="当月科技项目数量">
+                                    <span>{theData.kejim}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="年度认证项目数量">
+                                    <span>{theData.renzy}</span>
+                                </FormItem>
+                                <FormItem className="half-item" {...formItemLayout} label="年度科技项目数量">
+                                    <span>{theData.kejiy}</span>
+                                </FormItem>
+                            </div>
+                        </Spin>
+                    </Form>
+                </Modal>
             </div>
         );
     }

+ 34 - 34
js/component/manageCenter/financialManage/bonus/yxBonus.jsx

@@ -153,14 +153,14 @@ const YxBonus = React.createClass({
           key: "buyName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -244,8 +244,8 @@ const YxBonus = React.createClass({
                     发放
                   </Button>
                 ) : (
-                    ""
-                  )}
+                  ""
+                )}
                 {recard.bonusSubject != "16" && (
                   <Button
                     type="primary"
@@ -521,11 +521,11 @@ const YxBonus = React.createClass({
           <TabPane tab="更改表格显示数据" key="3">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -537,8 +537,8 @@ const YxBonus = React.createClass({
               bordered
               columns={
                 this.state.changeList
-                    ? this.state.changeList
-                    : this.state.columns
+                  ? this.state.changeList
+                  : this.state.columns
               }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
@@ -594,23 +594,23 @@ const YxBonus = React.createClass({
                   </FormItem>
                 </div>
               ) : (
-                  <div>
-                    <FormItem
-                      labelCol={{ span: 8 }}
-                      wrapperCol={{ span: 10 }}
-                      label="应收人"
-                    >
-                      <span>{this.state.proofData.salesName}</span>
-                    </FormItem>
-                    <FormItem
-                      labelCol={{ span: 8 }}
-                      wrapperCol={{ span: 10 }}
-                      label="发放人"
-                    >
-                      <span>{this.state.proofData.byName}</span>
-                    </FormItem>
-                  </div>
-                )}
+                <div>
+                  <FormItem
+                    labelCol={{ span: 8 }}
+                    wrapperCol={{ span: 10 }}
+                    label="应收人"
+                  >
+                    <span>{this.state.proofData.salesName}</span>
+                  </FormItem>
+                  <FormItem
+                    labelCol={{ span: 8 }}
+                    wrapperCol={{ span: 10 }}
+                    label="发放人"
+                  >
+                    <span>{this.state.proofData.byName}</span>
+                  </FormItem>
+                </div>
+              )}
               <FormItem wrapperCol={{ span: 12, offset: 8 }}>
                 <Button
                   type="primary"

+ 148 - 130
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -42,12 +42,13 @@ import {
 } from '@/tools'
 import { ChooseList } from '../../../../component/manageCenter/order/orderNew/chooseList'
 import ImgList from "../../../common/imgList";
-import {getProjectName} from "../../../tools";
+import { getProjectName } from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import LogPopup from "../../../common/logPopup";
 import ContentUrl from '../../order/orderNew/contentUrl'
+import { salesList } from "@/dataDic.js";
 const FormItem = Form.Item
 
 const approvedOutsourcing = React.createClass({
@@ -193,17 +194,17 @@ const approvedOutsourcing = React.createClass({
           key: 'buyerName',
           className: 'title-table',
           fixed: 'left',
-          width:100,
+          width: 100,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -397,20 +398,20 @@ const approvedOutsourcing = React.createClass({
                   recard.actuallyTotalAmount &&
                   Number(recard.actuallyTotalAmount) > 0
                 ) && (
-                  <Button
-                    type="danger"
-                    style={{
-                      marginLeft: '5px',
-                      display:
-                        recard.processStatus == 3 ? 'inline-block' : 'none',
-                    }}
-                    onClick={(e) => {
-                      e.stopPropagation(), this.reject(recard)
-                    }}
-                  >
-                    驳回
-                  </Button>
-                )}
+                    <Button
+                      type="danger"
+                      style={{
+                        marginLeft: '5px',
+                        display:
+                          recard.processStatus == 3 ? 'inline-block' : 'none',
+                      }}
+                      onClick={(e) => {
+                        e.stopPropagation(), this.reject(recard)
+                      }}
+                    >
+                      驳回
+                    </Button>
+                  )}
                 {
                   // <Button
                   //   type="primary"
@@ -448,17 +449,17 @@ const approvedOutsourcing = React.createClass({
           title: '客户名称',
           dataIndex: 'userName',
           key: 'userName',
-          width:100,
+          width: 100,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -564,17 +565,17 @@ const approvedOutsourcing = React.createClass({
           title: '客户名称',
           dataIndex: 'userName',
           key: 'userName',
-          width:100,
+          width: 100,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -677,17 +678,17 @@ const approvedOutsourcing = React.createClass({
           title: '客户名称',
           dataIndex: 'userName',
           key: 'userName',
-          width:100,
+          width: 100,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -890,17 +891,17 @@ const approvedOutsourcing = React.createClass({
           title: '客户名称',
           dataIndex: 'userName',
           key: 'userName',
-          width:100,
+          width: 100,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -1234,10 +1235,10 @@ const approvedOutsourcing = React.createClass({
             return test[0] === null
               ? ''
               : getprovince(test[0]) +
-                  '/' +
-                  getprovince(test[1]) +
-                  '/' +
-                  getprovince(test[2])
+              '/' +
+              getprovince(test[1]) +
+              '/' +
+              getprovince(test[2])
           },
         },
         {
@@ -1290,17 +1291,17 @@ const approvedOutsourcing = React.createClass({
           title: '客户名称',
           dataIndex: 'buyerName',
           key: 'buyerName',
-          width:100,
+          width: 100,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'100px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '100px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -1677,17 +1678,17 @@ const approvedOutsourcing = React.createClass({
             remarks: thisdata.remarks,
             attachmentUrl: thisdata.attachmentUrl
               ? splitUrl(
-                  thisdata.attachmentUrl,
-                  ',',
-                  globalConfig.avatarHost + '/upload'
-                )
+                thisdata.attachmentUrl,
+                ',',
+                globalConfig.avatarHost + '/upload'
+              )
               : [],
             pictureUrl: thisdata.pictureUrl
               ? splitUrl(
-                  thisdata.pictureUrl,
-                  ',',
-                  globalConfig.avatarHost + '/upload'
-                )
+                thisdata.pictureUrl,
+                ',',
+                globalConfig.avatarHost + '/upload'
+              )
               : [], //图片地址
             amount: thisdata.amount,
             companyName: thisdata.companyName,
@@ -1770,7 +1771,7 @@ const approvedOutsourcing = React.createClass({
           {
             dataSourceW: theArr,
           },
-          () => {}
+          () => { }
         )
       }.bind(this),
     }).always(
@@ -1864,29 +1865,29 @@ const approvedOutsourcing = React.createClass({
           orderRemarks: thisData.orderRemarks,
           orgCodeUrl: thisData.contractPictureUrl
             ? splitUrl(
-                thisData.contractPictureUrl,
-                ',',
-                globalConfig.avatarHost + '/upload'
-              )
+              thisData.contractPictureUrl,
+              ',',
+              globalConfig.avatarHost + '/upload'
+            )
             : [],
           replenishUrl: thisData.agreementUrl
             ? splitUrl(
-                thisData.agreementUrl,
-                ',',
-                globalConfig.avatarHost + '/upload'
-              )
+              thisData.agreementUrl,
+              ',',
+              globalConfig.avatarHost + '/upload'
+            )
             : [],
-            contentUrl:thisData.serviceContent
+          contentUrl: thisData.serviceContent
             ? splitUrl(
-                thisData.serviceContent,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.serviceContent,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [], //图片地址
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
-          deleteSign:thisData.deleteSign,
+          deleteSign: thisData.deleteSign,
         })
       }.bind(this),
     }).always(
@@ -2117,7 +2118,7 @@ const approvedOutsourcing = React.createClass({
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
-              approval:thisdata.approval,//0非特批 1待审核 2审核通过
+              approval: thisdata.approval,//0非特批 1待审核 2审核通过
             })
           }
         }
@@ -2185,8 +2186,8 @@ const approvedOutsourcing = React.createClass({
                 thisdata.type == 0
                   ? '手工'
                   : thisdata.type == 1
-                  ? '批量'
-                  : '合同变更退款',
+                    ? '批量'
+                    : '合同变更退款',
               deleteSign: thisdata.deleteSign,
               deleteTimes: thisdata.deleteTimes,
               refundTimes: thisdata.refundTimes,
@@ -2801,10 +2802,10 @@ const approvedOutsourcing = React.createClass({
           recipientAddress: thisdata.recipientAddress,
           orgCodeUrl: thisdata.voucherUrl
             ? splitUrl(
-                thisdata.voucherUrl,
-                ',',
-                globalConfig.avatarHost + '/upload'
-              )
+              thisdata.voucherUrl,
+              ',',
+              globalConfig.avatarHost + '/upload'
+            )
             : [],
         }
         this.setState({
@@ -2886,10 +2887,10 @@ const approvedOutsourcing = React.createClass({
                 }}
               />
               <DepartmentList
-                  value={this.state.departmenttList}
-                  onChange={e => {
-                    this.setState({ departmenttList: e });
-                  }}/>
+                value={this.state.departmenttList}
+                onChange={e => {
+                  this.setState({ departmenttList: e });
+                }} />
               <Input
                 placeholder="合同编号"
                 value={this.state.contractNoSearch}
@@ -3214,9 +3215,8 @@ const approvedOutsourcing = React.createClass({
             }
             {
               <span>
-                {`合同额总计(万元):${
-                  this.state.totalHui ? this.state.totalHui : '0'
-                }`}
+                {`合同额总计(万元):${this.state.totalHui ? this.state.totalHui : '0'
+                  }`}
               </span>
             }
           </p>
@@ -3235,8 +3235,8 @@ const approvedOutsourcing = React.createClass({
               type="card"
               activeKey={this.state.modKey}
               tabBarExtraContent={
-                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign} />
                 </div>
               }
             >
@@ -3265,9 +3265,27 @@ const approvedOutsourcing = React.createClass({
                       >
                         <span>{theData.userName}</span>
                         <EnterpriseNameChange
-                            type='journal'
-                            style={{ marginLeft: 10 }}
-                            enterpriseId={this.state.orderUid}/>
+                          type='journal'
+                          style={{ marginLeft: 10 }}
+                          enterpriseId={this.state.orderUid} />
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="销售类型"
+                      >
+                        <span>
+                          {(["私有客户-", "签单客户-"][theData.userType] || " ") +
+                            (salesList[theData.salesType] || "")}
+                          {
+                            theData.other != null && theData.other != "" &&
+                            <Tooltip title={theData.other}>
+                              <span>
+                                {"(" + theData.other.toString().slice(0, 10) + (theData.other.toString().length > 9 ? "...)" : ")")}
+                              </span>
+                            </Tooltip>
+                          }
+                        </span>
                       </FormItem>
                       <FormItem
                         className="half-item"
@@ -3341,9 +3359,9 @@ const approvedOutsourcing = React.createClass({
                         {/*    })*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ?  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          <ImgList fileList={this.state.orgCodeUrl} domId={'approvedOutsourcing1'}/>
-                        </div>: <div/>}
+                        {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          <ImgList fileList={this.state.orgCodeUrl} domId={'approvedOutsourcing1'} />
+                        </div> : <div />}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3424,9 +3442,9 @@ const approvedOutsourcing = React.createClass({
                         {/*    })*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ?  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          <ImgList fileList={this.state.replenishUrl} domId={'approvedOutsourcing2'}/>
-                        </div>: <div/>}
+                        {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          <ImgList fileList={this.state.replenishUrl} domId={'approvedOutsourcing2'} />
+                        </div> : <div />}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3483,10 +3501,10 @@ const approvedOutsourcing = React.createClass({
                       </FormItem>
                     </div>
                     <ContentUrl
-                    processStatus={1}
-                    domId = {"sourcingContents"}
-                    contentUrl = {this.state.contentUrl}
-                    imgId = {"sourcingContentsImg"}
+                      processStatus={1}
+                      domId={"sourcingContents"}
+                      contentUrl={this.state.contentUrl}
+                      imgId={"sourcingContentsImg"}
                     />
                     <div className="clearfix">
                       <FormItem
@@ -3672,7 +3690,7 @@ const approvedOutsourcing = React.createClass({
                       </Spin>
                     </div>
                   </Spin>
-                </Form> : <div/>}
+                </Form> : <div />}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -3780,9 +3798,9 @@ const approvedOutsourcing = React.createClass({
                     {/*    })*/}
                     {/*  }}*/}
                     {/*/>*/}
-                    {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ?  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                      <ImgList fileList={this.state.pictureUrl} domId={'approvedOutsourcing3'}/>
-                    </div>: <div/>}
+                    {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                      <ImgList fileList={this.state.pictureUrl} domId={'approvedOutsourcing3'} />
+                    </div> : <div />}
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -3870,7 +3888,7 @@ const approvedOutsourcing = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal> : <div/>}
+          </Modal> : <div />}
         </div>
         <div className="patent-desc">
           <Modal

+ 135 - 117
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -40,11 +40,12 @@ import {
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import ImgList from "../../../common/imgList";
-import {getProjectName} from "../../../tools";
+import { getProjectName } from "../../../tools";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import LogPopup from "../../../common/logPopup";
 import ContentUrl from "../../order/orderNew/contentUrl";
+import { salesList } from '@/dataDic.js'
 const FormItem = Form.Item;
 
 const approvedOutsourcing = React.createClass({
@@ -228,17 +229,17 @@ const approvedOutsourcing = React.createClass({
           key: "buyerName",
           className: "title-table",
           fixed: "left",
-          width:150,
+          width: 150,
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -596,14 +597,14 @@ const approvedOutsourcing = React.createClass({
           key: "userName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -711,14 +712,14 @@ const approvedOutsourcing = React.createClass({
           key: "userName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -819,14 +820,14 @@ const approvedOutsourcing = React.createClass({
           key: "userName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -938,14 +939,14 @@ const approvedOutsourcing = React.createClass({
           key: "buyerName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -1180,10 +1181,10 @@ const approvedOutsourcing = React.createClass({
             return test[0] === null
               ? ""
               : getprovince(test[0]) +
-                  "/" +
-                  getprovince(test[1]) +
-                  "/" +
-                  getprovince(test[2]);
+              "/" +
+              getprovince(test[1]) +
+              "/" +
+              getprovince(test[2]);
           },
         },
         {
@@ -1238,14 +1239,14 @@ const approvedOutsourcing = React.createClass({
           key: "buyerName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -1435,14 +1436,14 @@ const approvedOutsourcing = React.createClass({
           key: "userName",
           render: text => {
             return (
-                <Tooltip title={text}>
-                  <div style={{
-                    maxWidth:'150px',
-                    overflow:'hidden',
-                    textOverflow: "ellipsis",
-                    whiteSpace:'nowrap',
-                  }}>{text}</div>
-                </Tooltip>
+              <Tooltip title={text}>
+                <div style={{
+                  maxWidth: '150px',
+                  overflow: 'hidden',
+                  textOverflow: "ellipsis",
+                  whiteSpace: 'nowrap',
+                }}>{text}</div>
+              </Tooltip>
             )
           }
         },
@@ -1693,17 +1694,17 @@ const approvedOutsourcing = React.createClass({
             remarks: thisdata.remarks,
             attachmentUrl: thisdata.attachmentUrl
               ? splitUrl(
-                  thisdata.attachmentUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.attachmentUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
             pictureUrl: thisdata.pictureUrl
               ? splitUrl(
-                  thisdata.pictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.pictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [], //图片地址
             amount: thisdata.amount,
             companyName: thisdata.companyName,
@@ -1772,7 +1773,7 @@ const approvedOutsourcing = React.createClass({
           {
             dataSourceW: theArr,
           },
-          () => {}
+          () => { }
         );
       }.bind(this),
     }).always(
@@ -1866,29 +1867,29 @@ const approvedOutsourcing = React.createClass({
           orderRemarks: thisData.orderRemarks,
           orgCodeUrl: thisData.contractPictureUrl
             ? splitUrl(
-                thisData.contractPictureUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.contractPictureUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
           replenishUrl: thisData.agreementUrl
             ? splitUrl(
-                thisData.agreementUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.agreementUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
-          contentUrl:thisData.serviceContent
+          contentUrl: thisData.serviceContent
             ? splitUrl(
-                thisData.serviceContent,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.serviceContent,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [], //图片地址
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
-          deleteSign:thisData.deleteSign,
+          deleteSign: thisData.deleteSign,
         });
       }.bind(this),
     }).always(
@@ -2119,7 +2120,7 @@ const approvedOutsourcing = React.createClass({
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
-              approval:thisdata.approval,//0非特批 1待审核 2审核通过
+              approval: thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }
@@ -2187,8 +2188,8 @@ const approvedOutsourcing = React.createClass({
                 thisdata.type == 0
                   ? "手工"
                   : thisdata.type == 1
-                  ? "批量"
-                  : "合同变更退款",
+                    ? "批量"
+                    : "合同变更退款",
               deleteSign: thisdata.deleteSign,
               deleteTimes: thisdata.deleteTimes,
               refundTimes: thisdata.refundTimes,
@@ -2755,10 +2756,10 @@ const approvedOutsourcing = React.createClass({
           recipientAddress: thisdata.recipientAddress,
           orgCodeUrl: thisdata.voucherUrl
             ? splitUrl(
-                thisdata.voucherUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisdata.voucherUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
         };
         this.setState({
@@ -3127,11 +3128,11 @@ const approvedOutsourcing = React.createClass({
           <TabPane tab="更改表格显示数据" key="1">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -3178,9 +3179,8 @@ const approvedOutsourcing = React.createClass({
             }
             {
               <span>
-                {`合同额总计(万元):${
-                  this.state.totalHui ? this.state.totalHui : "0"
-                }`}
+                {`合同额总计(万元):${this.state.totalHui ? this.state.totalHui : "0"
+                  }`}
               </span>
             }
           </p>
@@ -3199,8 +3199,8 @@ const approvedOutsourcing = React.createClass({
               type="card"
               activeKey={this.state.modKey}
               tabBarExtraContent={
-                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign} />
                 </div>
               }
             >
@@ -3229,9 +3229,27 @@ const approvedOutsourcing = React.createClass({
                       >
                         <span>{theData.userName}</span>
                         <EnterpriseNameChange
-                            type='journal'
-                            style={{ marginLeft: 10 }}
-                            enterpriseId={this.state.orderUid}/>
+                          type='journal'
+                          style={{ marginLeft: 10 }}
+                          enterpriseId={this.state.orderUid} />
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="销售类型"
+                      >
+                        <span>
+                          {(["私有客户-", "签单客户-"][theData.userType] || " ") +
+                            (salesList[theData.salesType] || "")}
+                          {
+                            theData.other != null && theData.other != "" &&
+                            <Tooltip title={theData.other}>
+                              <span>
+                                {"(" + theData.other.toString().slice(0, 10) + (theData.other.toString().length > 9 ? "...)" : ")")}
+                              </span>
+                            </Tooltip>
+                          }
+                        </span>
                       </FormItem>
                       <FormItem
                         className="half-item"
@@ -3305,8 +3323,8 @@ const approvedOutsourcing = React.createClass({
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.orgCodeUrl && this.state.modKey === '1' ? <ImgList domId={'approvedOutsourcingAll1'} fileList={this.state.orgCodeUrl}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.orgCodeUrl && this.state.modKey === '1' ? <ImgList domId={'approvedOutsourcingAll1'} fileList={this.state.orgCodeUrl} /> : <div />}
                         </div>
                         <Modal
                           maskClosable={false}
@@ -3388,8 +3406,8 @@ const approvedOutsourcing = React.createClass({
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.replenishUrl && this.state.modKey === '1' ? <ImgList fileList={this.state.replenishUrl}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.replenishUrl && this.state.modKey === '1' ? <ImgList fileList={this.state.replenishUrl} /> : <div />}
                         </div>
                         <Modal
                           maskClosable={false}
@@ -3447,10 +3465,10 @@ const approvedOutsourcing = React.createClass({
                       </FormItem>
                     </div>
                     <ContentUrl
-                    processStatus={1}
-                    domId = {"approvedContents"}
-                    contentUrl = {this.state.contentUrl}
-                    imgId = {"approvedContentsImg"}
+                      processStatus={1}
+                      domId={"approvedContents"}
+                      contentUrl={this.state.contentUrl}
+                      imgId={"approvedContentsImg"}
                     />
                     <div className="clearfix">
                       <FormItem
@@ -3636,7 +3654,7 @@ const approvedOutsourcing = React.createClass({
                       </Spin>
                     </div>
                   </Spin>
-                </Form> : <div/>}
+                </Form> : <div />}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -3743,8 +3761,8 @@ const approvedOutsourcing = React.createClass({
                     {/*    });*/}
                     {/*  }}*/}
                     {/*/>*/}
-                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                      {this.state.pictureUrl && this.state.modKey === '3' ? <ImgList domId={'approvedOutsourcingAll2'} fileList={this.state.pictureUrl}/> : <div/>}
+                    <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                      {this.state.pictureUrl && this.state.modKey === '3' ? <ImgList domId={'approvedOutsourcingAll2'} fileList={this.state.pictureUrl} /> : <div />}
                     </div>
                     <Modal
                       maskClosable={false}
@@ -3833,7 +3851,7 @@ const approvedOutsourcing = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal> : <div/>}
+          </Modal> : <div />}
         </div>
         <div className="patent-desc">
           <Modal

+ 99 - 79
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -14,7 +14,8 @@ import {
   Modal,
   Upload,
   Tabs,
-  Tag
+  Tag,
+  Tooltip
 } from "antd";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ResolutionDetail from "@/resolutionDetail";
@@ -29,11 +30,12 @@ import {
   getprovince
 } from "@/tools";
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "../../order/orderNew/chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "../../order/orderNew/chooseList";
+import { getProjectName } from "../../../tools";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import ContentUrl from "../../order/orderNew/contentUrl";
+import { salesList } from "@/dataDic.js";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -328,10 +330,10 @@ const outsourcingPaiDan = React.createClass({
             return test[0] === null
               ? ""
               : getprovince(test[0]) +
-                  "/" +
-                  getprovince(test[1]) +
-                  "/" +
-                  getprovince(test[2]);
+              "/" +
+              getprovince(test[1]) +
+              "/" +
+              getprovince(test[2]);
           },
         },
         {
@@ -563,7 +565,7 @@ const outsourcingPaiDan = React.createClass({
           {
             dataSourceW: theArr,
           },
-          () => {}
+          () => { }
         );
       }.bind(this),
     }).always(
@@ -658,29 +660,29 @@ const outsourcingPaiDan = React.createClass({
           orderRemarks: thisData.orderRemarks,
           orgCodeUrl: thisData.contractPictureUrl
             ? splitUrl(
-                thisData.contractPictureUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.contractPictureUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
           replenishUrl: thisData.agreementUrl
             ? splitUrl(
-                thisData.agreementUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.agreementUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
-            contentUrl:thisData.serviceContent
+          contentUrl: thisData.serviceContent
             ? splitUrl(
-                thisData.serviceContent,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.serviceContent,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [], //图片地址
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
-          deleteSign:thisData.deleteSign,
+          deleteSign: thisData.deleteSign,
         });
       }.bind(this),
     }).always(
@@ -903,48 +905,48 @@ const outsourcingPaiDan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                  placeholder="客户名称"
-                  value={this.state.nameSearch}
-                  onChange={(e) => {
-                    this.setState({ nameSearch: e.target.value });
-                  }}
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={(e) => {
+                  this.setState({ nameSearch: e.target.value });
+                }}
               />
               <Input
-                  placeholder="订单编号"
-                  value={this.state.orderNoSearch}
-                  onChange={(e) => {
-                    this.setState({ orderNoSearch: e.target.value });
-                  }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
+                onChange={(e) => {
+                  this.setState({ orderNoSearch: e.target.value });
+                }}
               />
               <Select
-                  placeholder="流程状态"
-                  onChange={(e) => {
-                    this.setState({ processStatus: e });
-                  }}
-                  style={{ width: 160, marginRight: 5 }}
-                  value={this.state.processStatus}
+                placeholder="流程状态"
+                onChange={(e) => {
+                  this.setState({ processStatus: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.processStatus}
               >
                 <Option value="2">未分配</Option>
                 <Option value="3">已分配</Option>
               </Select>
               <span style={{ marginRight: 10 }}>下单时间 :</span>
               <RangePicker
-                  value={[
-                    this.state.releaseDate[0]
-                        ? moment(this.state.releaseDate[0])
-                        : null,
-                    this.state.releaseDate[1]
-                        ? moment(this.state.releaseDate[1])
-                        : null,
-                  ]}
-                  onChange={(data, dataString) => {
-                    this.setState({ releaseDate: dataString });
-                  }}
+                value={[
+                  this.state.releaseDate[0]
+                    ? moment(this.state.releaseDate[0])
+                    : null,
+                  this.state.releaseDate[1]
+                    ? moment(this.state.releaseDate[1])
+                    : null,
+                ]}
+                onChange={(data, dataString) => {
+                  this.setState({ releaseDate: dataString });
+                }}
               />
               <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: 10 }}
+                type="primary"
+                onClick={this.search}
+                style={{ marginLeft: 10 }}
               >
                 搜索
               </Button>
@@ -954,11 +956,11 @@ const outsourcingPaiDan = React.createClass({
           <TabPane tab="更改表格显示数据" key="2">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -966,11 +968,11 @@ const outsourcingPaiDan = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-                columns={
-                  this.state.changeList
-                      ? this.state.changeList
-                      : this.state.columns
-                }
+              columns={
+                this.state.changeList
+                  ? this.state.changeList
+                  : this.state.columns
+              }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
               size="small"
@@ -995,8 +997,8 @@ const outsourcingPaiDan = React.createClass({
               type="card"
               activeKey={this.state.modKey}
               tabBarExtraContent={
-                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign} />
                 </div>
               }
             >
@@ -1025,9 +1027,27 @@ const outsourcingPaiDan = React.createClass({
                       >
                         <span>{theData.userName}</span>
                         <EnterpriseNameChange
-                            type='journal'
-                            style={{ marginLeft: 10 }}
-                            enterpriseId={this.state.orderUid}/>
+                          type='journal'
+                          style={{ marginLeft: 10 }}
+                          enterpriseId={this.state.orderUid} />
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="销售类型"
+                      >
+                        <span>
+                          {(["私有客户-", "签单客户-"][theData.userType] || " ") +
+                            (salesList[theData.salesType] || "")}
+                          {
+                            theData.other != null && theData.other != "" &&
+                            <Tooltip title={theData.other}>
+                              <span>
+                                {"(" + theData.other.toString().slice(0, 10) + (theData.other.toString().length > 9 ? "...)" : ")")}
+                              </span>
+                            </Tooltip>
+                          }
+                        </span>
                       </FormItem>
                       <FormItem
                         className="half-item"
@@ -1101,9 +1121,9 @@ const outsourcingPaiDan = React.createClass({
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        {this.state.visible && this.state.orgCodeUrl && this.state.modKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          <ImgList fileList={this.state.orgCodeUrl} domId={'outOutsourcingList1'}/>
-                        </div> : <div/>}
+                        {this.state.visible && this.state.orgCodeUrl && this.state.modKey === "1" ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          <ImgList fileList={this.state.orgCodeUrl} domId={'outOutsourcingList1'} />
+                        </div> : <div />}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1184,9 +1204,9 @@ const outsourcingPaiDan = React.createClass({
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        {this.state.visible && this.state.replenishUrl && this.state.modKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          <ImgList fileList={this.state.replenishUrl} domId={'outOutsourcingList2'}/>
-                        </div> : <div/>}
+                        {this.state.visible && this.state.replenishUrl && this.state.modKey === "1" ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          <ImgList fileList={this.state.replenishUrl} domId={'outOutsourcingList2'} />
+                        </div> : <div />}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1243,10 +1263,10 @@ const outsourcingPaiDan = React.createClass({
                       </FormItem>
                     </div>
                     <ContentUrl
-                    processStatus={1}
-                    domId = {"cingListContents"}
-                    contentUrl = {this.state.contentUrl}
-                    imgId = {"cingListContentsImg"}
+                      processStatus={1}
+                      domId={"cingListContents"}
+                      contentUrl={this.state.contentUrl}
+                      imgId={"cingListContentsImg"}
                     />
                     <div className="clearfix">
                       <FormItem
@@ -1355,7 +1375,7 @@ const outsourcingPaiDan = React.createClass({
                       </div>
                     </div>
                   </Spin>
-                </Form> : <div/>}
+                </Form> : <div />}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -1378,7 +1398,7 @@ const outsourcingPaiDan = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal> : <div/>}
+          </Modal> : <div />}
         </div>
         <Assign
           title="订单"

+ 123 - 103
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -14,7 +14,8 @@ import {
   Modal,
   Upload,
   Tabs,
-  Tag
+  Tag,
+  Tooltip
 } from "antd";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ResolutionDetail from "@/resolutionDetail";
@@ -29,11 +30,12 @@ import {
   getRefundStatus
 } from "@/tools";
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "../../order/orderNew/chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "../../order/orderNew/chooseList";
+import { getProjectName } from "../../../tools";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import ContentUrl from "../../order/orderNew/contentUrl";
+import { salesList } from "@/dataDic.js";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -376,10 +378,10 @@ const outsourcingPaiDan = React.createClass({
             return test[0] === null
               ? ""
               : getprovince(test[0]) +
-                  "/" +
-                  getprovince(test[1]) +
-                  "/" +
-                  getprovince(test[2]);
+              "/" +
+              getprovince(test[1]) +
+              "/" +
+              getprovince(test[2]);
           },
         },
         {
@@ -595,17 +597,17 @@ const outsourcingPaiDan = React.createClass({
             remarks: thisdata.remarks,
             attachmentUrl: thisdata.attachmentUrl
               ? splitUrl(
-                  thisdata.attachmentUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.attachmentUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
             pictureUrl: thisdata.pictureUrl
               ? splitUrl(
-                  thisdata.pictureUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.pictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [], //图片地址
             amount: thisdata.amount,
             companyName: thisdata.companyName,
@@ -674,7 +676,7 @@ const outsourcingPaiDan = React.createClass({
           {
             dataSourceW: theArr,
           },
-          () => {}
+          () => { }
         );
       }.bind(this),
     }).always(
@@ -767,29 +769,29 @@ const outsourcingPaiDan = React.createClass({
           orderRemarks: thisData.orderRemarks,
           orgCodeUrl: thisData.contractPictureUrl
             ? splitUrl(
-                thisData.contractPictureUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.contractPictureUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
           replenishUrl: thisData.agreementUrl
             ? splitUrl(
-                thisData.agreementUrl,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.agreementUrl,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [],
-            contentUrl:thisData.serviceContent
+          contentUrl: thisData.serviceContent
             ? splitUrl(
-                thisData.serviceContent,
-                ",",
-                globalConfig.avatarHost + "/upload"
-              )
+              thisData.serviceContent,
+              ",",
+              globalConfig.avatarHost + "/upload"
+            )
             : [], //图片地址
           orderNo: thisData.orderNo, //订单编号
           buyerId: thisData.buyerId,
           depName: thisData.depName,
-          deleteSign:thisData.deleteSign,
+          deleteSign: thisData.deleteSign,
         });
       }.bind(this),
     }).always(
@@ -1035,69 +1037,69 @@ const outsourcingPaiDan = React.createClass({
           <TabPane tab="搜索" key="1">
             <div className="user-search">
               <Input
-                  placeholder="客户名称"
-                  value={this.state.nameSearch}
-                  onChange={(e) => {
-                    this.setState({ nameSearch: e.target.value });
-                  }}
+                placeholder="客户名称"
+                value={this.state.nameSearch}
+                onChange={(e) => {
+                  this.setState({ nameSearch: e.target.value });
+                }}
               />
               <Input
-                  placeholder="订单编号"
-                  value={this.state.orderNoSearch}
-                  onChange={(e) => {
-                    this.setState({ orderNoSearch: e.target.value });
-                  }}
+                placeholder="订单编号"
+                value={this.state.orderNoSearch}
+                onChange={(e) => {
+                  this.setState({ orderNoSearch: e.target.value });
+                }}
               />
               <Select
-                  placeholder="订单部门"
-                  style={{ width: 150, marginRight: 10 }}
-                  value={this.state.departmenttList}
-                  onChange={(e) => {
-                    this.setState({ departmenttList: e });
-                  }}
+                placeholder="订单部门"
+                style={{ width: 150, marginRight: 10 }}
+                value={this.state.departmenttList}
+                onChange={(e) => {
+                  this.setState({ departmenttList: e });
+                }}
               >
                 {departmentArr.map(function (item) {
                   return <Select.Option key={item.id}>{item.name}</Select.Option>;
                 })}
               </Select>
               <Select
-                  placeholder="流程状态"
-                  onChange={(e) => {
-                    this.setState({ processStatusSearch: e });
-                  }}
-                  style={{ width: 160, marginRight: 5 }}
-                  value={this.state.processStatusSearch}
+                placeholder="流程状态"
+                onChange={(e) => {
+                  this.setState({ processStatusSearch: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.processStatusSearch}
               >
                 <Option value="2">未分配</Option>
                 <Option value="3">已分配</Option>
               </Select>
               <Input
-                  placeholder="合同编号"
-                  value={this.state.contractNoSearch}
-                  onChange={(e) => {
-                    this.setState({
-                      contractNoSearch: e.target.value,
-                    });
-                  }}
+                placeholder="合同编号"
+                value={this.state.contractNoSearch}
+                onChange={(e) => {
+                  this.setState({
+                    contractNoSearch: e.target.value,
+                  });
+                }}
               />
               <span style={{ marginRight: 10 }}>下单时间 :</span>
               <RangePicker
-                  value={[
-                    this.state.releaseDate[0]
-                        ? moment(this.state.releaseDate[0])
-                        : null,
-                    this.state.releaseDate[1]
-                        ? moment(this.state.releaseDate[1])
-                        : null,
-                  ]}
-                  onChange={(data, dataString) => {
-                    this.setState({ releaseDate: dataString });
-                  }}
+                value={[
+                  this.state.releaseDate[0]
+                    ? moment(this.state.releaseDate[0])
+                    : null,
+                  this.state.releaseDate[1]
+                    ? moment(this.state.releaseDate[1])
+                    : null,
+                ]}
+                onChange={(data, dataString) => {
+                  this.setState({ releaseDate: dataString });
+                }}
               />
               <Button
-                  type="primary"
-                  onClick={this.search}
-                  style={{ marginLeft: 10 }}
+                type="primary"
+                onClick={this.search}
+                style={{ marginLeft: 10 }}
               >
                 搜索
               </Button>
@@ -1107,11 +1109,11 @@ const outsourcingPaiDan = React.createClass({
           <TabPane tab="更改表格显示数据" key="2">
             <div style={{ marginLeft: 10 }}>
               <ChooseList
-                  columns={this.state.columns}
-                  changeFn={this.changeList}
-                  changeList={this.state.changeList}
-                  top={55}
-                  margin={11}
+                columns={this.state.columns}
+                changeFn={this.changeList}
+                changeList={this.state.changeList}
+                top={55}
+                margin={11}
               />
             </div>
           </TabPane>
@@ -1119,11 +1121,11 @@ const outsourcingPaiDan = React.createClass({
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-                columns={
-                  this.state.changeList
-                      ? this.state.changeList
-                      : this.state.columns
-                }
+              columns={
+                this.state.changeList
+                  ? this.state.changeList
+                  : this.state.columns
+              }
               dataSource={this.state.dataSource}
               scroll={{ x: 1500, y: 0 }}
               rowSelection={false}
@@ -1151,8 +1153,8 @@ const outsourcingPaiDan = React.createClass({
               type="card"
               activeKey={this.state.modKey}
               tabBarExtraContent={
-                <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                  <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                  <OrderItemStatus deleteSign={this.state.deleteSign} />
                 </div>
               }
             >
@@ -1181,9 +1183,27 @@ const outsourcingPaiDan = React.createClass({
                       >
                         <span>{theData.userName}</span>
                         <EnterpriseNameChange
-                            type='journal'
-                            style={{ marginLeft: 10 }}
-                            enterpriseId={this.state.orderUid}/>
+                          type='journal'
+                          style={{ marginLeft: 10 }}
+                          enterpriseId={this.state.orderUid} />
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="销售类型"
+                      >
+                        <span>
+                          {(["私有客户-", "签单客户-"][theData.userType] || " ") +
+                            (salesList[theData.salesType] || "")}
+                          {
+                            theData.other != null && theData.other != "" &&
+                            <Tooltip title={theData.other}>
+                              <span>
+                                {"(" + theData.other.toString().slice(0, 10) + (theData.other.toString().length > 9 ? "...)" : ")")}
+                              </span>
+                            </Tooltip>
+                          }
+                        </span>
                       </FormItem>
                       <FormItem
                         className="half-item"
@@ -1257,9 +1277,9 @@ const outsourcingPaiDan = React.createClass({
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          <ImgList fileList={this.state.orgCodeUrl} domId={'outsourcingPaiDan1'}/>
-                        </div> : <div/>}
+                        {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          <ImgList fileList={this.state.orgCodeUrl} domId={'outsourcingPaiDan1'} />
+                        </div> : <div />}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1340,9 +1360,9 @@ const outsourcingPaiDan = React.createClass({
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          <ImgList fileList={this.state.replenishUrl} domId={'outsourcingPaiDan2'}/>
-                        </div> : <div/>}
+                        {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          <ImgList fileList={this.state.replenishUrl} domId={'outsourcingPaiDan2'} />
+                        </div> : <div />}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1399,10 +1419,10 @@ const outsourcingPaiDan = React.createClass({
                       </FormItem>
                     </div>
                     <ContentUrl
-                    processStatus={1}
-                    domId = {"paidanContents"}
-                    contentUrl = {this.state.contentUrl}
-                    imgId = {"paidanContentsImg"}
+                      processStatus={1}
+                      domId={"paidanContents"}
+                      contentUrl={this.state.contentUrl}
+                      imgId={"paidanContentsImg"}
                     />
                     <div className="clearfix">
                       <FormItem
@@ -1516,7 +1536,7 @@ const outsourcingPaiDan = React.createClass({
                       </div>
                     </div>
                   </Spin>
-                </Form>:<div/>}
+                </Form> : <div />}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -1620,9 +1640,9 @@ const outsourcingPaiDan = React.createClass({
                     {/*    });*/}
                     {/*  }}*/}
                     {/*/>*/}
-                    {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                      <ImgList fileList={this.state.pictureUrl} domId={'outsourcingPaiDan3'}/>
-                    </div> : <div/>}
+                    {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                      <ImgList fileList={this.state.pictureUrl} domId={'outsourcingPaiDan3'} />
+                    </div> : <div />}
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -1671,7 +1691,7 @@ const outsourcingPaiDan = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal> : <div/>}
+          </Modal> : <div />}
         </div>
         <Assign
           title="订单"

+ 61 - 40
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -1,4 +1,4 @@
-import React,{Component} from 'react';
+import React, { Component } from 'react';
 import {
     Button,
     Cascader,
@@ -25,14 +25,14 @@ import {
     getprovince,
     ShowModal,
 } from '@/tools'
-import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
+import { taskStatus, projectStatus, cuiJieDian, salesList } from '@/dataDic.js'
 import { areaSelect } from '@/NewDicProvinceList'
 import '@/manageCenter/financialManage/distribute/public.less'
 import '@/manageCenter/financialManage/distribute/shouKuan.less'
 import OrderRiZi from '@/orderRiZi.jsx'
 import moment from "moment";
 import $ from "jquery";
-import {getProjectName} from "../../../../../tools";
+import { getProjectName } from "../../../../../tools";
 import EnterpriseNameChange from "../../../../../common/enterpriseNameChange";
 import ProjectOperation from "../../../../../common/projectOperation";
 
@@ -67,10 +67,10 @@ const utils = {
     },
 }
 
-class projectOverview extends Component{
+class projectOverview extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: false,
             projectStatus: props.projectStatus,
             pagination: {
@@ -111,7 +111,7 @@ class projectOverview extends Component{
                         if (record.splitStatus == 1) {
                             return (
                                 <span>
-                  {text}{' '}
+                                    {text}{' '}
                                     <Tag
                                         color="#108ee9"
                                         onClick={(e) => {
@@ -119,9 +119,9 @@ class projectOverview extends Component{
                                             this.showRes(record)
                                         }}
                                     >
-                    已拆
-                  </Tag>
-                </span>
+                                        已拆
+                                    </Tag>
+                                </span>
                             )
                         } else {
                             return text
@@ -432,6 +432,9 @@ class projectOverview extends Component{
                 } else {
                     this.setState({
                         orderUid: thisdata.uid,
+                        userType: thisdata.userType,//
+                        salesType: thisdata.salesType, //销售类型
+                        other: thisdata.other,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -500,14 +503,14 @@ class projectOverview extends Component{
 
     tableRowClickX(record) {
         this.setState({
-            editFw:record,
+            editFw: record,
             addnextVisible: true,
         })
     }
 
     render() {
-        const {editFw} = this.state;
-        return(
+        const { editFw } = this.state;
+        return (
             <Form
                 layout="horizontal"
                 onSubmit={this.handleSubmit}
@@ -552,11 +555,29 @@ class projectOverview extends Component{
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
+                                label="销售类型"
+                            >
+                                <span>
+                                    {(["私有客户-", "签单客户-"][this.state.userType] || " ") +
+                                        (salesList[this.state.salesType] || "")}
+                                    {
+                                        this.state.other != null && this.state.other != "" &&
+                                        <Tooltip title={this.state.other}>
+                                            <span>
+                                                {"(" + this.state.other.toString().slice(0, 10) + (this.state.other.toString().length > 9 ? "...)" : ")")}
+                                            </span>
+                                        </Tooltip>
+                                    }
+                                </span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
                                 label="结算状态"
                             >
-                      <span>
-                        {getLiquidationStatus(this.state.liquidationStatus)}
-                      </span>
+                                <span>
+                                    {getLiquidationStatus(this.state.liquidationStatus)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -586,11 +607,11 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="满意度表格"
                             >
-                      <span>
-                        {utils.getSatisfaction(this.state.formRetrieve)}
-                      </span>
+                                <span>
+                                    {utils.getSatisfaction(this.state.formRetrieve)}
+                                </span>
                             </FormItem>
-                            <FormItem/>
+                            <FormItem />
                             {/*<FormItem*/}
                             {/*    className="half-item"*/}
                             {/*    {...formItemLayout}*/}
@@ -609,7 +630,7 @@ class projectOverview extends Component{
                                     <span>{this.state.retrieveContent}</span>
                                 </FormItem>
                             }
-                            <FormItem/>
+                            <FormItem />
                             {/*{*/}
                             {/*    <FormItem*/}
                             {/*        className="half-item"*/}
@@ -692,7 +713,7 @@ class projectOverview extends Component{
                                     <EnterpriseNameChange
                                         type='journal'
                                         style={{ marginLeft: 10 }}
-                                        enterpriseId={this.state.orderUid}/>
+                                        enterpriseId={this.state.orderUid} />
                                 </span>
                             </FormItem>
                             <FormItem
@@ -728,11 +749,11 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="企业地址"
                             >
-                      <span>
-                        {getprovince(this.state.locationProvince)}/
-                          {getprovince(this.state.locationCity)}/
-                          {getprovince(this.state.locationArea)}
-                      </span>
+                                <span>
+                                    {getprovince(this.state.locationProvince)}/
+                                    {getprovince(this.state.locationCity)}/
+                                    {getprovince(this.state.locationArea)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -740,9 +761,9 @@ class projectOverview extends Component{
                                 label=""
                             ></FormItem>
                             <FormItem className="half-item" {...formItemLayout}>
-                      <span style={{ paddingLeft: '12em' }}>
-                        {this.state.postalAddress}
-                      </span>
+                                <span style={{ paddingLeft: '12em' }}>
+                                    {this.state.postalAddress}
+                                </span>
                             </FormItem>
                         </div>
                         {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
@@ -753,12 +774,12 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="负责人"
                             >
-                      <span>
-                        {this.state.salesmanName +
-                        '(' +
-                        this.state.depName +
-                        ')'}
-                      </span>
+                                <span>
+                                    {this.state.salesmanName +
+                                        '(' +
+                                        this.state.depName +
+                                        ')'}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -895,9 +916,9 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="是否到款"
                             >
-                      <span>
-                        {this.state.arrivalMoney ? '已到企业' : '未到企业'}
-                      </span>
+                                <span>
+                                    {this.state.arrivalMoney ? '已到企业' : '未到企业'}
+                                </span>
                             </FormItem>
                         </div>
                         <div className="clearfix">
@@ -1003,10 +1024,10 @@ class projectOverview extends Component{
                     orderNo={this.state.orderNo}
                     visible={this.state.addnextVisible}
                     dataInfor={editFw}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
                             addnextVisible: false,
-                            editFw:{},
+                            editFw: {},
                         })
                     }}
                 /> : null}

+ 63 - 41
js/component/manageCenter/order/orderNew/glCostAuditList/detailsModal/projectOverview.js

@@ -1,4 +1,4 @@
-import React,{Component} from 'react';
+import React, { Component } from 'react';
 import {
     Button,
     Cascader,
@@ -13,7 +13,8 @@ import {
     Table,
     Tabs,
     Tag,
-    Upload
+    Upload,
+    Tooltip
 } from "antd";
 import Picture from '@/manageCenter/publicComponent/picture'
 import {
@@ -28,7 +29,7 @@ import {
     ShowModal,
     getProjectName,
 } from '@/tools'
-import { taskStatus, projectStatus, cuiJieDian } from '@/dataDic.js'
+import { taskStatus, projectStatus, cuiJieDian, salesList } from '@/dataDic.js'
 import { areaSelect } from '@/NewDicProvinceList'
 import '@/manageCenter/financialManage/distribute/public.less'
 import '@/manageCenter/financialManage/distribute/shouKuan.less'
@@ -69,10 +70,10 @@ const utils = {
     },
 }
 
-class projectOverview extends Component{
+class projectOverview extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: false,
             projectStatus: props.projectStatus,
             pagination: {
@@ -113,7 +114,7 @@ class projectOverview extends Component{
                         if (record.splitStatus == 1) {
                             return (
                                 <span>
-                  {text}{' '}
+                                    {text}{' '}
                                     <Tag
                                         color="#108ee9"
                                         onClick={(e) => {
@@ -121,9 +122,9 @@ class projectOverview extends Component{
                                             this.showRes(record)
                                         }}
                                     >
-                    已拆
-                  </Tag>
-                </span>
+                                        已拆
+                                    </Tag>
+                                </span>
                             )
                         } else {
                             return text
@@ -434,6 +435,9 @@ class projectOverview extends Component{
                 } else {
                     this.setState({
                         orderUid: thisdata.uid,
+                        userType: thisdata.userType,//
+                        salesType: thisdata.salesType, //销售类型
+                        other: thisdata.other,
                         processStatus: thisdata.processStatus, //流程状态
                         liquidationStatus: thisdata.liquidationStatus, //结算状态
                         approval: thisdata.approval, //特批状态
@@ -502,14 +506,14 @@ class projectOverview extends Component{
 
     tableRowClickX(record) {
         this.setState({
-            editFw:record,
+            editFw: record,
             projectOperationVisible: true,
         })
     }
 
     render() {
-        const {editFw} = this.state;
-        return(
+        const { editFw } = this.state;
+        return (
             <Form
                 layout="horizontal"
                 onSubmit={this.handleSubmit}
@@ -558,6 +562,24 @@ class projectOverview extends Component{
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
+                                label="销售类型"
+                            >
+                                <span>
+                                    {(["私有客户-", "签单客户-"][this.state.userType] || " ") +
+                                        (salesList[this.state.salesType] || "")}
+                                    {
+                                        this.state.other != null && this.state.other != "" &&
+                                        <Tooltip title={this.state.other}>
+                                            <span>
+                                                {"(" + this.state.other.toString().slice(0, 10) + (this.state.other.toString().length > 9 ? "...)" : ")")}
+                                            </span>
+                                        </Tooltip>
+                                    }
+                                </span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
                                 label="是否特批"
                             >
                                 <span>{getApproval(this.state.approval)}</span>
@@ -567,9 +589,9 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="结算状态"
                             >
-                      <span>
-                        {getLiquidationStatus(this.state.liquidationStatus)}
-                      </span>
+                                <span>
+                                    {getLiquidationStatus(this.state.liquidationStatus)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -599,11 +621,11 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="满意度表格"
                             >
-                      <span>
-                        {utils.getSatisfaction(this.state.formRetrieve)}
-                      </span>
+                                <span>
+                                    {utils.getSatisfaction(this.state.formRetrieve)}
+                                </span>
                             </FormItem>
-                            <FormItem/>
+                            <FormItem />
                             {/*<FormItem*/}
                             {/*    className="half-item"*/}
                             {/*    {...formItemLayout}*/}
@@ -631,7 +653,7 @@ class projectOverview extends Component{
                             {/*        <span>{this.state.refundContent}</span>*/}
                             {/*    </FormItem>*/}
                             {/*}*/}
-                            <FormItem/>
+                            <FormItem />
                         </div>
                         <div className="clearfix">
                             <h3 className="sub-title">任务信息</h3>
@@ -705,7 +727,7 @@ class projectOverview extends Component{
                                     <EnterpriseNameChange
                                         type='journal'
                                         style={{ marginLeft: 10 }}
-                                        enterpriseId={this.state.orderUid}/>
+                                        enterpriseId={this.state.orderUid} />
                                 </span>
                             </FormItem>
                             <FormItem
@@ -741,11 +763,11 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="企业地址"
                             >
-                      <span>
-                        {getprovince(this.state.locationProvince)}/
-                          {getprovince(this.state.locationCity)}/
-                          {getprovince(this.state.locationArea)}
-                      </span>
+                                <span>
+                                    {getprovince(this.state.locationProvince)}/
+                                    {getprovince(this.state.locationCity)}/
+                                    {getprovince(this.state.locationArea)}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -753,9 +775,9 @@ class projectOverview extends Component{
                                 label=""
                             ></FormItem>
                             <FormItem className="half-item" {...formItemLayout}>
-                      <span style={{ paddingLeft: '12em' }}>
-                        {this.state.postalAddress}
-                      </span>
+                                <span style={{ paddingLeft: '12em' }}>
+                                    {this.state.postalAddress}
+                                </span>
                             </FormItem>
                         </div>
                         {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
@@ -766,12 +788,12 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="负责人"
                             >
-                      <span>
-                        {this.state.salesmanName +
-                        '(' +
-                        this.state.depName +
-                        ')'}
-                      </span>
+                                <span>
+                                    {this.state.salesmanName +
+                                        '(' +
+                                        this.state.depName +
+                                        ')'}
+                                </span>
                             </FormItem>
                             <FormItem
                                 className="half-item"
@@ -908,9 +930,9 @@ class projectOverview extends Component{
                                 {...formItemLayout}
                                 label="是否到款"
                             >
-                      <span>
-                        {this.state.arrivalMoney ? '已到企业' : '未到企业'}
-                      </span>
+                                <span>
+                                    {this.state.arrivalMoney ? '已到企业' : '未到企业'}
+                                </span>
                             </FormItem>
                         </div>
                         <div className="clearfix">
@@ -1015,11 +1037,11 @@ class projectOverview extends Component{
                     orderNo={this.state.orderNo}
                     visible={this.state.projectOperationVisible}
                     dataInfor={this.state.editFw}
-                    onCancel={()=>{
+                    onCancel={() => {
                         this.setState({
                             projectOperationVisible: false,
-                            editFw:{},
-                        },()=>{
+                            editFw: {},
+                        }, () => {
                             this.xiangmu(this.state.orderNo);
                         });
                     }}

+ 153 - 153
js/component/manageCenter/order/orderNew/glCostAuditList/index.js

@@ -1,26 +1,26 @@
-import React,{Component} from 'react';
+import React, { Component } from 'react';
 import $ from "jquery/src/ajax";
 import {
     Spin,
     Table,
     message,
-    Tooltip, Tabs, Button,Modal
+    Tooltip, Tabs, Button, Modal
 } from "antd";
-import {ShowModal,getProjectName} from "@/tools";
+import { ShowModal, getProjectName } from "@/tools";
 import FilterColumn from './filterColumn';
 import DetailsModal from './detailsModal/index';
 import OrderPaymentModal from './component/orderPaymentModal';
 import './index.less';
 import "../customer.less";
 import PayRecord from "../../../components/checkProject/payRecord";
-import {ChooseList} from "../chooseList";
+import { ChooseList } from "../chooseList";
 
 const { TabPane } = Tabs;
 
-class CostAuditList extends Component{
+class CostAuditList extends Component {
     constructor(props) {
         super(props);
-        this.state={
+        this.state = {
             loading: true,
             columns: [
                 {
@@ -70,10 +70,10 @@ class CostAuditList extends Component{
                         return (
                             <Tooltip placement="bottom" title={text}>
                                 <div style={{
-                                    maxWidth:'150px',
-                                    overflow:'hidden',
+                                    maxWidth: '150px',
+                                    overflow: 'hidden',
                                     textOverflow: "ellipsis",
-                                    whiteSpace:'nowrap',
+                                    whiteSpace: 'nowrap',
                                 }}>{text}</div>
                             </Tooltip>
                         )
@@ -102,7 +102,7 @@ class CostAuditList extends Component{
                     key: "chooseType",
                     render: (text) => {
                         return text == 0 ? '第三方成本' :
-                                text == 1 ? '催款节点' :'官费';
+                            text == 1 ? '催款节点' : '官费';
                     },
                 },
                 {
@@ -142,10 +142,10 @@ class CostAuditList extends Component{
                     key: "status",
                     render: (text) => {
                         return text === 0 ? '审核' :
-                                    text === 1 ? '待支付' :
-                                        text === 2 ? '驳回' :
-                                            text === 3 ? '已支付' :
-                                                text === 4 ? '已取消' : '';
+                            text === 1 ? '待支付' :
+                                text === 2 ? '驳回' :
+                                    text === 3 ? '已支付' :
+                                        text === 4 ? '已取消' : '';
                     },
                 },
                 {
@@ -160,8 +160,8 @@ class CostAuditList extends Component{
                     render: (text, record) => {
                         return (
                             <div style={{
-                                display:'flex',
-                                alignItems:'center',
+                                display: 'flex',
+                                alignItems: 'center',
                             }}>
                                 <Button type="primary" size="small" onClick={(e) => {
                                     e.stopPropagation();
@@ -193,7 +193,7 @@ class CostAuditList extends Component{
                                             tid: record.tid,
                                             projectType: record.projectType,
                                         })
-                                }}>
+                                    }}>
                                     付款记录
                                 </Button>
                             </div>
@@ -209,7 +209,7 @@ class CostAuditList extends Component{
                 showQuickJumper: true,
                 pageSize: 10,
                 onChange: function (page) {
-                    this.loadData(page,this.state.searchInfor);
+                    this.loadData(page, this.state.searchInfor);
                 }.bind(this),
                 showTotal: function (total) {
                     return "共" + total + "条数据";
@@ -232,7 +232,7 @@ class CostAuditList extends Component{
         this.loadData()
     }
 
-    loadData(pageNo,data={}) {
+    loadData(pageNo, data = {}) {
         this.setState({
             loading: true,
         });
@@ -283,7 +283,7 @@ class CostAuditList extends Component{
         );
     }
 
-    tableRowClick(record){
+    tableRowClick(record) {
         this.setState({
             visible: true,
             selectInfor: record,
@@ -292,15 +292,15 @@ class CostAuditList extends Component{
 
     //导出
     exportExec() {
-        let data = Object.assign({},this.state.searchInfor);
-        for (let key in data){
-            if(!data[key]){
+        let data = Object.assign({}, this.state.searchInfor);
+        for (let key in data) {
+            if (!data[key]) {
                 delete data[key]
             }
         }
         data.pageSize = 9999999;
         data.pageNo = 1;
-        window.location.href=(globalConfig.context+'/api/admin/company/exportPaymentList?'+$.param(data));
+        window.location.href = (globalConfig.context + '/api/admin/company/exportPaymentList?' + $.param(data));
     }
 
     changeList(arr) {
@@ -319,135 +319,135 @@ class CostAuditList extends Component{
 
     render() {
         return (
-          <div className="user-content">
-              <div className="content-title">
-                  <span>成本付款申请</span>
-              </div>
-              <Tabs defaultActiveKey="1" className="test">
-                  <TabPane tab="搜索" key="1">
-                      <div style={{paddingTop:'10px'}}>
-                          <FilterColumn
-                              {...this.props}
-                              onSearch={(data)=>{
-                                  this.setState({
-                                      searchInfor: data
-                                  });
-                                  this.loadData(1,data);
-                              }}
-                              onResetSearch={()=>{
-                                  this.setState({
-                                      searchInfor: {}
-                                  });
-                                  this.loadData();
-                              }}
-                          />
-                      </div>
-                  </TabPane>
-                  <TabPane tab="操作" key="2">
-                      <Button
-                          type="primary"
-                          onClick={this.exportExec}
-                          style={{ margin: "11px 0px 10px 10px" }}
-                      >
-                          导出财务成本列表
-                      </Button>
-                  </TabPane>
-                  <TabPane tab="更改表格显示数据" key="3">
-                      <div style={{ marginLeft: 10 }}>
-                          <ChooseList
-                              columns={this.state.columns}
-                              changeFn={this.changeList}
-                              changeList={this.state.changeList}
-                              top={55}
-                              margin={11}
-                          />
-                      </div>
-                  </TabPane>
-              </Tabs>
-              <div className="patent-table">
-                  <Spin spinning={this.state.loading}>
-                      <Table
-                          columns={
-                              this.state.changeList
-                                  ? this.state.changeList
-                                  : this.state.columns
-                          }
-                          dataSource={this.state.dataSource}
-                          pagination={this.state.pagination}
-                          onRowClick={(record)=>{
-                              this.tableRowClick(record)
-                          }}
-                          style={{
-                              cursor: 'pointer',
-                          }}
-                          scroll={{ x: "max-content", y: 0 }}
-                          bordered
-                          size="small"
-                      />
-                  </Spin>
-              </div>
-              {
-                  this.state.visible ?
-                      <DetailsModal
-                          tid={this.state.selectInfor.tid}
-                          orderNo={this.state.selectInfor.orderNo}
-                          projectType={this.state.selectInfor.projectType}
-                          projectStatus={this.state.selectInfor.projectStatus}
-                          taskName={this.state.selectInfor.pname}
-                          taskID={this.state.selectInfor.tid}
-                          visible={this.state.visible}
-                          refreshList={()=>{
-                              this.loadData(this.state.page,this.state.searchInfor);
-                          }}
-                          visitCancel={()=>{
-                              this.setState({
-                                  visible: false
-                              })
-                              this.loadData(this.state.page,this.state.searchInfor);
-                          }}/> : <div/>
-              }
-              {this.state.paymentVisible ?
-                  <OrderPaymentModal
-                      tid={this.state.tid}
-                      visible={this.state.paymentVisible}
-                      projectType={this.state.projectType}
-                      isAuditPaymentGLY={true}
-                      onCancer={()=>{
-                          this.setState({
-                              paymentVisible: false,
-                              tid: 0,
-                              projectType: 0,
-                          });
-                          this.loadData(this.state.page,this.state.searchInfor);
-                      }}
-                      onSuccess={()=>{
-                          this.setState({
-                              paymentVisible: false,
-                              tid: 0,
-                              projectType: 0,
-                          });
-                          this.loadData(this.state.page,this.state.searchInfor);
-                  }}/> :
-                  <div/>
-              }
-              {this.state.payRecordVisible ? <PayRecord
-                  {...this.props}
-                  payId={this.state.orderPaymentsId}
-                  visible={this.state.payRecordVisible}
-                  tid={this.state.tid}
-                  isAuditPaymentGLY={true}
-                  projectType={this.state.projectType}
-                  changeVisible={()=>{
-                      this.loadData(this.state.page,this.state.searchInfor);
-                      this.setState({
-                          payRecordVisible: false,
-                          orderPaymentsId: 0,
-                          tid: 0,
-                          projectType: 0,
-                      })
-                  }}
-              /> : <div/>}
-          </div>
+            <div className="user-content">
+                <div className="content-title" style={{ marginBottom: 10 }}>
+                    <span style={{ fontWeight: 900, fontSize: 16 }}>成本付款申请</span>
+                </div>
+                <Tabs defaultActiveKey="1" className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div style={{ paddingTop: '10px' }}>
+                            <FilterColumn
+                                {...this.props}
+                                onSearch={(data) => {
+                                    this.setState({
+                                        searchInfor: data
+                                    });
+                                    this.loadData(1, data);
+                                }}
+                                onResetSearch={() => {
+                                    this.setState({
+                                        searchInfor: {}
+                                    });
+                                    this.loadData();
+                                }}
+                            />
+                        </div>
+                    </TabPane>
+                    <TabPane tab="操作" key="2">
+                        <Button
+                            type="primary"
+                            onClick={this.exportExec}
+                            style={{ margin: "11px 0px 10px 10px" }}
+                        >
+                            导出财务成本列表
+                        </Button>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="3">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
+                <div className="patent-table">
+                    <Spin spinning={this.state.loading}>
+                        <Table
+                            columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
+                            dataSource={this.state.dataSource}
+                            pagination={this.state.pagination}
+                            onRowClick={(record) => {
+                                this.tableRowClick(record)
+                            }}
+                            style={{
+                                cursor: 'pointer',
+                            }}
+                            scroll={{ x: "max-content", y: 0 }}
+                            bordered
+                            size="small"
+                        />
+                    </Spin>
+                </div>
+                {
+                    this.state.visible ?
+                        <DetailsModal
+                            tid={this.state.selectInfor.tid}
+                            orderNo={this.state.selectInfor.orderNo}
+                            projectType={this.state.selectInfor.projectType}
+                            projectStatus={this.state.selectInfor.projectStatus}
+                            taskName={this.state.selectInfor.pname}
+                            taskID={this.state.selectInfor.tid}
+                            visible={this.state.visible}
+                            refreshList={() => {
+                                this.loadData(this.state.page, this.state.searchInfor);
+                            }}
+                            visitCancel={() => {
+                                this.setState({
+                                    visible: false
+                                })
+                                this.loadData(this.state.page, this.state.searchInfor);
+                            }} /> : <div />
+                }
+                {this.state.paymentVisible ?
+                    <OrderPaymentModal
+                        tid={this.state.tid}
+                        visible={this.state.paymentVisible}
+                        projectType={this.state.projectType}
+                        isAuditPaymentGLY={true}
+                        onCancer={() => {
+                            this.setState({
+                                paymentVisible: false,
+                                tid: 0,
+                                projectType: 0,
+                            });
+                            this.loadData(this.state.page, this.state.searchInfor);
+                        }}
+                        onSuccess={() => {
+                            this.setState({
+                                paymentVisible: false,
+                                tid: 0,
+                                projectType: 0,
+                            });
+                            this.loadData(this.state.page, this.state.searchInfor);
+                        }} /> :
+                    <div />
+                }
+                {this.state.payRecordVisible ? <PayRecord
+                    {...this.props}
+                    payId={this.state.orderPaymentsId}
+                    visible={this.state.payRecordVisible}
+                    tid={this.state.tid}
+                    isAuditPaymentGLY={true}
+                    projectType={this.state.projectType}
+                    changeVisible={() => {
+                        this.loadData(this.state.page, this.state.searchInfor);
+                        this.setState({
+                            payRecordVisible: false,
+                            orderPaymentsId: 0,
+                            tid: 0,
+                            projectType: 0,
+                        })
+                    }}
+                /> : <div />}
+            </div>
         );
     }
 }

File diff suppressed because it is too large
+ 1457 - 1457
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageDetaile.jsx


File diff suppressed because it is too large
+ 530 - 530
js/component/manageCenter/servicesManage/projectOrder/projectManagement/projectManageNew.jsx