Browse Source

订单及详情添加销售类型字段

dev01 2 years ago
parent
commit
c531879efc

+ 37 - 33
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -13,7 +13,8 @@ import {
 import img from "./img.png"
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../../common/imgList";
-import {getProjectName} from "../../../../tools";
+import { getProjectName } from "../../../../tools";
+import { salesList } from "@/dataDic.js";
 import ProjectDetailsReadOnly from "../../../../common/projectDetailsReadOnly";
 import EnterpriseNameChange from "../../../../common/enterpriseNameChange";
 import OrderCoor from "./orderCoor"
@@ -23,8 +24,8 @@ class OrderDetail extends Component {
   constructor(props) {
     super(props);
     this.state = {
-      dataInfor:{},
-      contentUrl:[],
+      dataInfor: {},
+      contentUrl: [],
       newContactsLists: [
         {
           title: "项目名称",
@@ -47,7 +48,7 @@ class OrderDetail extends Component {
                 return <span>{str}</span>;
               }
             }
-            if(!str){
+            if (!str) {
               return <span>未知</span>;
             }
           }
@@ -57,7 +58,7 @@ class OrderDetail extends Component {
           dataIndex: "dunTypeName",
           key: "dunTypeName",
           render: (text, record) => {
-            if(record.customizeName) {
+            if (record.customizeName) {
               return text + record.customizeName;
             }
             return <span>{text}</span>;
@@ -288,7 +289,7 @@ class OrderDetail extends Component {
         ",",
         globalConfig.avatarHost + "/upload"
       ).length -
-        1
+      1
     ) {
       return message.warning("已经是最后一张了哦");
     }
@@ -362,7 +363,7 @@ class OrderDetail extends Component {
       num ==
       splitUrl(data.agreementUrl, ",", globalConfig.avatarHost + "/upload")
         .length -
-        1
+      1
     ) {
       return message.warning("已经是最后一张了哦");
     }
@@ -420,10 +421,10 @@ class OrderDetail extends Component {
   }
 
   render() {
-    let domId = this.props.domId ;
-          domId = domId ? domId.substr(0,4) :''
+    let domId = this.props.domId;
+    domId = domId ? domId.substr(0, 4) : ''
     // console.log(typeof domId);
-    
+
     const formItemLayout = {
       labelCol: { span: 8 },
       wrapperCol: { span: 14 }
@@ -451,9 +452,12 @@ class OrderDetail extends Component {
         <FormItem className="half-item" {...formItemLayout} label="客户名称">
           <span>{data.userName}</span>
           <EnterpriseNameChange
-              type='journal'
-              style={{ marginLeft: 10 }}
-              enterpriseId={this.props.orderUid}/>
+            type='journal'
+            style={{ marginLeft: 10 }}
+            enterpriseId={this.props.orderUid} />
+        </FormItem>
+        <FormItem className="half-item" {...formItemLayout} label="销售类型">
+          <span>{salesList[data.salesType]}</span>
         </FormItem>
         <FormItem
           className="half-item"
@@ -537,13 +541,13 @@ class OrderDetail extends Component {
             label="合同扫描件"
           >
             {this.props.orderData && data.contractPictureUrl ?
-                <ImgList
-                    domId={this.props.domId ? this.props.domId : 'orderDetail1'}
-                    fileList={
-                      data.contractPictureUrl ? splitUrl(data.contractPictureUrl, ",", globalConfig.avatarHost + "/upload") : []
-                    }
-                /> :
-                <div/>
+              <ImgList
+                domId={this.props.domId ? this.props.domId : 'orderDetail1'}
+                fileList={
+                  data.contractPictureUrl ? splitUrl(data.contractPictureUrl, ",", globalConfig.avatarHost + "/upload") : []
+                }
+              /> :
+              <div />
             }
             <Modal
               maskClosable={false}
@@ -636,12 +640,12 @@ class OrderDetail extends Component {
             {/*    });*/}
             {/*  }}*/}
             {/*/>*/}
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
               <ImgList
-                  domId={this.props.domId ? this.props.domId+'1' : 'orderDetail2'}
-                  fileList={
-                    data.agreementUrl ? splitUrl(data.agreementUrl, ",", globalConfig.avatarHost + "/upload") : []
-                  }/>
+                domId={this.props.domId ? this.props.domId + '1' : 'orderDetail2'}
+                fileList={
+                  data.agreementUrl ? splitUrl(data.agreementUrl, ",", globalConfig.avatarHost + "/upload") : []
+                } />
             </div>
             <Modal
               maskClosable={false}
@@ -700,10 +704,10 @@ class OrderDetail extends Component {
           </FormItem>
         </div>
         <ContentUrl
-         processStatus={1}
-         domId = {"orderContent"}
-         contentUrl = {data.serviceContent ? splitUrl(data.serviceContent, ",", globalConfig.avatarHost + "/upload") : []}
-         imgId = {"orderImg1x"}
+          processStatus={1}
+          domId={"orderContent"}
+          contentUrl={data.serviceContent ? splitUrl(data.serviceContent, ",", globalConfig.avatarHost + "/upload") : []}
+          imgId={"orderImg1x"}
         //  getContentUrl = {this.getContentUrl}
         />
         <div className="clearfix">
@@ -774,7 +778,7 @@ class OrderDetail extends Component {
             <span>{data.financeMobile}</span>
           </FormItem>
         </div>
-       { domId == 'yuan' ? "" : <OrderCoor orderNo={this.props.orderNo}/>}
+        {domId == 'yuan' ? "" : <OrderCoor orderNo={this.props.orderNo} />}
         <div>
           <span style={{ marginLeft: "50px", fontSize: "20px" }}>项目业务</span>
         </div>
@@ -825,9 +829,9 @@ class OrderDetail extends Component {
           </Form>
         </div>
         {this.state.visible && <ProjectDetailsReadOnly
-            infor={this.state.dataInfor}
-            visible={this.state.visible}
-            onCancel={this.nextCancel}
+          infor={this.state.dataInfor}
+          visible={this.state.visible}
+          onCancel={this.nextCancel}
         />}
       </div>
     );

+ 116 - 94
js/component/manageCenter/order/orderNew/examine.jsx

@@ -35,13 +35,14 @@ import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
-import {ChooseList} from "./chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "./chooseList";
+import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "./changeComponent/orderCoor";
 import ContentUrl from "./contentUrl";
+import { salesList } from "@/dataDic.js";
 const confirm = Modal.confirm;
 const { Option } = Select;
 //图片组件
@@ -108,7 +109,7 @@ const PicturesWall = React.createClass({
           onCancel={this.handleCancel}
         >
           <img alt="example" style={{ width: "100%" }} src={previewImage} />
-        </Modal> : <div/>}
+        </Modal> : <div />}
       </div>
     );
   }
@@ -153,6 +154,7 @@ const IntentionCustomer = Form.create()(
               theArr.push({
                 key: i,
                 id: thisdata.id, //用户ID
+                salesType: thisdata.salesType, //销售类型
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
                 processStatus: thisdata.processStatus, //流程状态
@@ -203,7 +205,7 @@ const IntentionCustomer = Form.create()(
         approvalSearch: undefined,
         processStatusSearch: undefined,
         aloading: false,
-        orderNos:'',
+        orderNos: '',
         pagination: {
           defaultCurrent: 1,
           defaultPageSize: 10,
@@ -218,6 +220,22 @@ const IntentionCustomer = Form.create()(
         },
         columns: [
           {
+            title: "销售类型",
+            dataIndex: "salesType",
+            key: "salesType",
+            render: (text, record) => {
+              return (
+                <Tooltip
+                  title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? "," + record.other : "")}
+                >
+                  <span>
+                    {salesList[text]}
+                  </span>
+                </Tooltip>
+              );
+            },
+          },
+          {
             title: "订单编号",
             dataIndex: "orderNo",
             key: "orderNo",
@@ -238,14 +256,14 @@ const IntentionCustomer = Form.create()(
             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>
               )
             },
           },
@@ -421,7 +439,7 @@ const IntentionCustomer = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text,record) => {
+            render: (text, record) => {
               if (record.customizeName) {
                 return text + record.customizeName;
               }
@@ -492,7 +510,7 @@ const IntentionCustomer = Form.create()(
           },
           {
             title: "金额(万元)",
-            dataIndex: "money",
+            visible订单详情dataIndex: "money",
             key: "money",
           },
           {
@@ -516,7 +534,7 @@ const IntentionCustomer = Form.create()(
         visible: true,
         orderStatus: record.orderStatus,
         id: record.id,
-        orderNos:record.orderNo
+        orderNos: record.orderNo
       });
       this.xiangqing(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -531,7 +549,7 @@ const IntentionCustomer = Form.create()(
           costReduction: record.costReduction,
           officialCost: record.officialCost,
         });
-      }else{
+      } else {
         this.setState({
           displayFees: "none",
         });
@@ -545,7 +563,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0,
       });
     },
@@ -577,6 +595,7 @@ const IntentionCustomer = Form.create()(
             let thisdata = data.data;
             this.setState({
               orderUid: thisdata.uid,
+              salesType: thisdata.salesType, //销售类型
               orderNo: thisdata.orderNo, //订单编号
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
@@ -594,24 +613,24 @@ const IntentionCustomer = Form.create()(
               orderRemarks: thisdata.orderRemarks, //订单留言
               orgCodeUrl: thisdata.contractPictureUrl
                 ? splitUrl(
-                    thisdata.contractPictureUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               replenishUrl: thisdata.agreementUrl
                 ? splitUrl(
-                    thisdata.agreementUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.agreementUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
-                contentUrl:thisdata.serviceContent
+              contentUrl: thisdata.serviceContent
                 ? splitUrl(
-                    thisdata.serviceContent,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.serviceContent,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -623,7 +642,7 @@ const IntentionCustomer = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? "否" : "是",
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -1030,27 +1049,27 @@ const IntentionCustomer = Form.create()(
                 remarks: thisdata.remarks,
                 attachmentUrl: thisdata.attachmentUrl
                   ? splitUrl(
-                      thisdata.attachmentUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload",
-                      url
-                    )
+                    thisdata.attachmentUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload",
+                    url
+                  )
                   : [],
                 fileUrl: thisdata.attachmentUrl
                   ? splitUrl(
-                      thisdata.attachmentUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload",
-                      url
-                    )
+                    thisdata.attachmentUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload",
+                    url
+                  )
                   : [],
                 pictureUrl: thisdata.pictureUrl
                   ? splitUrl(
-                      thisdata.pictureUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload",
-                      url
-                    )
+                    thisdata.pictureUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload",
+                    url
+                  )
                   : [], //图片地址
                 amount: thisdata.amount,
                 companyName: thisdata.companyName,
@@ -1244,7 +1263,7 @@ const IntentionCustomer = Form.create()(
         onOk() {
           fn();
         },
-        onCancel() {},
+        onCancel() { },
       });
     },
     downImg() {
@@ -1415,24 +1434,24 @@ const IntentionCustomer = Form.create()(
                   <Option value="4">40万元以上</Option>
                 </Select>
                 <Select
-                    style={{ width: 150 }}
-                    placeholder="流程状态"
-                    value={this.state.processStatusSearch}
-                    onChange={e => {
-                      this.setState({
-                        processStatusSearch: e
-                      });
-                    }}
-                  >
-                    <Option value="">全部</Option>
-                    <Option value="0">已派营销员</Option>
-                    <Option value="1">已派营销员管理员</Option>
-                    <Option value="2">已派财务管理员</Option>
-                    <Option value="3">已派财务专员</Option>
-                    <Option value="4">已派咨询师管理员</Option>
-                    <Option value="5">已部分派咨询师经理</Option>
-                    <Option value="6">已部全部派咨询师经理</Option>
-                  </Select>
+                  style={{ width: 150 }}
+                  placeholder="流程状态"
+                  value={this.state.processStatusSearch}
+                  onChange={e => {
+                    this.setState({
+                      processStatusSearch: e
+                    });
+                  }}
+                >
+                  <Option value="">全部</Option>
+                  <Option value="0">已派营销员</Option>
+                  <Option value="1">已派营销员管理员</Option>
+                  <Option value="2">已派财务管理员</Option>
+                  <Option value="3">已派财务专员</Option>
+                  <Option value="4">已派咨询师管理员</Option>
+                  <Option value="5">已部分派咨询师经理</Option>
+                  <Option value="6">已部全部派咨询师经理</Option>
+                </Select>
                 <span style={{ marginRight: "10px" }}>下单时间 :</span>
                 <RangePicker
                   value={[
@@ -1460,11 +1479,11 @@ const IntentionCustomer = Form.create()(
             <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>
@@ -1474,8 +1493,8 @@ const IntentionCustomer = Form.create()(
               <Table
                 columns={
                   this.state.changeList
-                      ? this.state.changeList
-                      : this.state.columns
+                    ? this.state.changeList
+                    : this.state.columns
                 }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
@@ -1503,8 +1522,8 @@ const IntentionCustomer = Form.create()(
                   >
                     <Spin spinning={this.state.loading}>
                       <div className="clearfix">
-                        <div style={{position:"absolute",top:'-30px',left:'92px',zIndex:10000}}>
-                          <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                        <div style={{ position: "absolute", top: '-30px', left: '92px', zIndex: 10000 }}>
+                          <OrderItemStatus deleteSign={this.state.deleteSign} />
                         </div>
                         <FormItem
                           className="half-item"
@@ -1527,9 +1546,12 @@ const IntentionCustomer = Form.create()(
                         >
                           <span>{this.state.userName}</span>
                           <EnterpriseNameChange
-                              type='journal'
-                              style={{ marginLeft: 10 }}
-                              enterpriseId={this.state.orderUid}/>
+                            type='journal'
+                            style={{ marginLeft: 10 }}
+                            enterpriseId={this.state.orderUid} />
+                        </FormItem>
+                        <FormItem className="half-item" {...formItemLayout} label="销售类型">
+                          <span>{salesList[this.state.salesType]}</span>
                         </FormItem>
                         <FormItem
                           className="half-item"
@@ -1655,8 +1677,8 @@ const IntentionCustomer = Form.create()(
                               {/*    });*/}
                               {/*  }}*/}
                               {/*/>*/}
-                              <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                              <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                               </div>
                               {this.state.previewVisible ? <Modal
                                 maskClosable={false}
@@ -1710,7 +1732,7 @@ const IntentionCustomer = Form.create()(
                                 >
                                   下一张
                                 </Button>
-                              </Modal> : <div/>}
+                              </Modal> : <div />}
                               <Button
                                 style={{
                                   float: "right",
@@ -1738,8 +1760,8 @@ const IntentionCustomer = Form.create()(
                               {/*    });*/}
                               {/*  }}*/}
                               {/*/>*/}
-                              <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                                {this.state.replenishUrl && this.state.visible ? <ImgList domId={'examine1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                              <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                                {this.state.replenishUrl && this.state.visible ? <ImgList domId={'examine1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
                               </div>
                               {this.state.previewVisibles ? <Modal
                                 maskClosable={false}
@@ -1793,15 +1815,15 @@ const IntentionCustomer = Form.create()(
                                 >
                                   下一张
                                 </Button>
-                              </Modal> : <div/>}
+                              </Modal> : <div />}
                             </FormItem>
                           </div>
                         </div>
                         <ContentUrl
-                        processStatus={1}
-                        domId = {"examineContents"}
-                        contentUrl = {this.state.contentUrl}
-                        imgId = {"examineContentsImg"}
+                          processStatus={1}
+                          domId={"examineContents"}
+                          contentUrl={this.state.contentUrl}
+                          imgId={"examineContentsImg"}
                         />
                         <div className="clearfix">
                           <FormItem
@@ -1872,7 +1894,7 @@ const IntentionCustomer = Form.create()(
                           </FormItem>
                         </div>
                         {/* 协单人员 */}
-                        <OrderCoor orderNo={this.state.orderNos}/>
+                        <OrderCoor orderNo={this.state.orderNos} />
                         <div>
                           <span
                             style={{ marginLeft: "50px", fontSize: "20px" }}
@@ -2163,7 +2185,7 @@ const IntentionCustomer = Form.create()(
                   </Spin>
                 </TabPane> */}
               </Tabs>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             {this.state.noVisible ? <Modal
               maskClosable={false}
               visible={this.state.noVisible}
@@ -2216,7 +2238,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             {this.state.agreeVisible ? <Modal
               maskClosable={false}
               visible={this.state.agreeVisible}
@@ -2287,7 +2309,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
@@ -2315,9 +2337,9 @@ const IntentionCustomer = Form.create()(
             />
           </div>
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       );

+ 105 - 79
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -17,7 +17,7 @@ import {
   Tabs,
   Select,
   Col,
-  Tag
+  Tag,
 } from "antd";
 import NewService from "./addService.jsx";
 import ResolutionDetail from "@/resolutionDetail";
@@ -41,6 +41,7 @@ import {
   getCuikuan,
   getjiedian, getProjectName
 } from "../../../tools.js";
+import { salesList } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../orderNew/chooseList";
 import ReactToPrint from "react-to-print";
@@ -165,6 +166,7 @@ const IntentionCustomer = Form.create()(
               theArr.push({
                 key: thisdata.orderNo,
                 id: thisdata.id,
+                salesType: thisdata.salesType, //销售类型
                 orderNo: thisdata.orderNo, //订单编号
                 totalAmount: thisdata.totalAmount, //签单金额
                 processStatus: thisdata.processStatus, //流程状态
@@ -207,7 +209,7 @@ const IntentionCustomer = Form.create()(
     getInitialState() {
       return {
         rotateDeg: 0,
-        orderNos:'',
+        orderNos: '',
         kaiData: {
           remarks: "",
           type: undefined,
@@ -457,16 +459,16 @@ const IntentionCustomer = Form.create()(
             title: "客户名称",
             dataIndex: "userName",
             key: "userName",
-            render:text=>{
+            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>
               )
             }
           },
@@ -563,16 +565,16 @@ const IntentionCustomer = Form.create()(
             title: "客户名称",
             dataIndex: "userName",
             key: "userName",
-            render:text=>{
+            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>
               )
             }
           },
@@ -666,6 +668,22 @@ const IntentionCustomer = Form.create()(
         ],
         columns: [
           {
+            title: "销售类型",
+            dataIndex: "salesType",
+            key: "salesType",
+            render: (text, record) => {
+              return (
+                <Tooltip
+                  title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? "," + record.other : "")}
+                >
+                  <span>
+                    {salesList[text]}
+                  </span>
+                </Tooltip>
+              );
+            },
+          },
+          {
             title: "合同编号",
             dataIndex: "contractNo",
             key: "contractNo",
@@ -681,16 +699,16 @@ const IntentionCustomer = Form.create()(
             title: "客户名称",
             dataIndex: "userName",
             key: "userName",
-            render:text=>{
+            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>
               )
             }
           },
@@ -1044,10 +1062,10 @@ const IntentionCustomer = Form.create()(
               recipientAddress: thisdata.recipientAddress,
               orgCodeUrl: thisdata.voucherUrl
                 ? splitUrl(
-                    thisdata.voucherUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.voucherUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [],
             });
           }
@@ -1279,10 +1297,10 @@ const IntentionCustomer = Form.create()(
               recipientAddress: thisdata.recipientAddress,
               orgCodeUrl: thisdata.voucherUrl
                 ? splitUrl(
-                    thisdata.voucherUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.voucherUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [],
             });
           }
@@ -1342,10 +1360,10 @@ const IntentionCustomer = Form.create()(
             recipientAddress: thisdata.recipientAddress,
             orgCodeUrl: thisdata.voucherUrl
               ? splitUrl(
-                  thisdata.voucherUrl,
-                  ",",
-                  globalConfig.avatarHost + "/upload"
-                )
+                thisdata.voucherUrl,
+                ",",
+                globalConfig.avatarHost + "/upload"
+              )
               : [],
           });
         }.bind(this),
@@ -1581,7 +1599,7 @@ const IntentionCustomer = Form.create()(
     tableRowClick(record) {
       this.setState({
         visible: true,
-        orderNos:record.orderNo
+        orderNos: record.orderNo
       });
       this.xiangqing(record.orderNo);
       this.xiangmu(record.orderNo);
@@ -1599,7 +1617,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0,
       });
     },
@@ -1633,6 +1651,7 @@ const IntentionCustomer = Form.create()(
             let thisdata = data.data;
             this.setState({
               orderUid: thisdata.uid,
+              salesType: thisdata.salesType, //订单详情
               orderNo: thisdata.orderNo, //订单编号
               contractNo: thisdata.contractNo, //合同编号
               userName: thisdata.userName, //客户名称
@@ -1650,24 +1669,24 @@ const IntentionCustomer = Form.create()(
               orderRemarks: thisdata.orderRemarks, //订单留言
               orgCodeUrl: thisdata.contractPictureUrl
                 ? splitUrl(
-                    thisdata.contractPictureUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               replenishUrl: thisdata.agreementUrl
                 ? splitUrl(
-                    thisdata.agreementUrl,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.agreementUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
-                contentUrl:thisdata.serviceContent
+              contentUrl: thisdata.serviceContent
                 ? splitUrl(
-                    thisdata.serviceContent,
-                    ",",
-                    globalConfig.avatarHost + "/upload"
-                  )
+                  thisdata.serviceContent,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
                 : [], //图片地址
               salesmanName: thisdata.salesmanName, //营销员名称
               salesmanMobile: thisdata.salesmanMobile, //营销员电话
@@ -1679,7 +1698,7 @@ const IntentionCustomer = Form.create()(
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
               depName: thisdata.depName,
               outsource: thisdata.outsource == 0 ? "否" : "是",
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this),
@@ -3629,8 +3648,8 @@ const IntentionCustomer = Form.create()(
                           {this.state.invoiceType === 0
                             ? "增值税专用发票"
                             : this.state.invoiceType === 1
-                            ? "增值税普通发票"
-                            : "其他"}
+                              ? "增值税普通发票"
+                              : "其他"}
                         </span>
                       </FormItem>
                     </div>
@@ -3747,8 +3766,8 @@ const IntentionCustomer = Form.create()(
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'inquiry2'} fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'inquiry2'} fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                         </div>
                         <Modal
                           maskClosable={false}
@@ -4030,8 +4049,8 @@ const IntentionCustomer = Form.create()(
               >
                 <Spin spinning={this.state.loading}>
                   <div className="clearfix">
-                    <div style={{position:"absolute",top:'-52px',left:'81px',zIndex:10000}}>
-                      <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                    <div style={{ position: "absolute", top: '-52px', left: '81px', zIndex: 10000 }}>
+                      <OrderItemStatus deleteSign={this.state.deleteSign} />
                     </div>
                     <FormItem
                       className="half-item"
@@ -4054,9 +4073,16 @@ const IntentionCustomer = Form.create()(
                     >
                       <span>{this.state.userName}</span>
                       <EnterpriseNameChange
-                          type='journal'
-                          style={{ marginLeft: 10 }}
-                          enterpriseId={this.state.orderUid}/>
+                        type='journal'
+                        style={{ marginLeft: 10 }}
+                        enterpriseId={this.state.orderUid} />
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="销售类型"
+                    >
+                      <span>{salesList[this.state.salesType]}</span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -4166,8 +4192,8 @@ const IntentionCustomer = Form.create()(
                         wrapperCol={{ span: 18 }}
                         label={"合同扫描件"}
                       >
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'} /> : <div />}
                         </div>
                         {/*<Upload*/}
                         {/*  className="demandDetailShow-upload"*/}
@@ -4260,8 +4286,8 @@ const IntentionCustomer = Form.create()(
                         {/*    });*/}
                         {/*  }}*/}
                         {/*/>*/}
-                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                          {this.state.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                        <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                          {this.state.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'} /> : <div />}
                         </div>
                         <Modal
                           maskClosable={false}
@@ -4269,7 +4295,7 @@ const IntentionCustomer = Form.create()(
                           width={"50%"}
                           visible={this.state.previewVisibles}
                           onCancel={() => {
-                            this.setState({ previewVisibles: false,rotateDeg: 0 });
+                            this.setState({ previewVisibles: false, rotateDeg: 0 });
                           }}
                         >
                           <img
@@ -4316,10 +4342,10 @@ const IntentionCustomer = Form.create()(
                       </FormItem>
                     </div>
                     <ContentUrl
-                    processStatus={1}
-                    domId = {"inquiryContents"}
-                    contentUrl = {this.state.contentUrl}
-                    imgId = {"inquiryContentsImg"}
+                      processStatus={1}
+                      domId={"inquiryContents"}
+                      contentUrl={this.state.contentUrl}
+                      imgId={"inquiryContentsImg"}
                     />
                     <div className="clearfix">
                       <FormItem
@@ -4451,7 +4477,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             <OrderRiZi
               dataSourcerizhi={this.state.dataSourcerizhi}
               closeOrderLog={this.closeOrderLog}
@@ -4460,9 +4486,9 @@ const IntentionCustomer = Form.create()(
             />
           </div>
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       );

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

@@ -9,11 +9,13 @@ import {
   Tabs,
   Table,
   Modal,
+  Tooltip,
 } from "antd";
 import $ from "jquery/src/ajax";
 import { ChooseList } from "../../../manageCenter/order/orderNew/chooseList";
 import OrderDetail from "../orderNew/changeComponent/orderDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
+import { salesList } from "@/dataDic.js";
 import {
   getProcessStatus,
   getLiquidationStatus,
@@ -77,6 +79,22 @@ class OrderList extends Component {
       ],
       columns: [
         {
+          title: "销售类型",
+          dataIndex: "salesType",
+          key: "salesType",
+          render: (text, record) => {
+            return (
+              <Tooltip
+                title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? "," + record.other : "")}
+              >
+                <span>
+                  {salesList[text]}
+                </span>
+              </Tooltip>
+            );
+          },
+        },
+        {
           title: "合同编号",
           dataIndex: "contractNo",
           key: "contractNo",