dev01 3 years ago
parent
commit
da80e71136

+ 254 - 244
js/component/dataDic.js

@@ -1419,7 +1419,7 @@ module.exports = {
     // },
   ],
   //销售类型
-  ssalesType:[
+  ssalesType: [
     {
       value: "0",
       key: "电话新开发",
@@ -1445,7 +1445,7 @@ module.exports = {
       key: "其他",
     },
   ],
-  qsalesType:[
+  qsalesType: [
     {
       value: "6",
       key: "高新复购",
@@ -1455,6 +1455,16 @@ module.exports = {
       key: "其他复购",
     },
   ],
+  salesList: [
+    "电话新开发",
+    "电话自带资源",
+    "网络",
+    "渠道",
+    "转介绍",
+    "其他",
+    "高新复购",
+    "其他复购",
+  ],
   //性别
   sex: [
     {
@@ -1568,76 +1578,76 @@ module.exports = {
   ],
   //外联分配状态
   //0未分配  1已分配经理 2已分配营销员 3已存在私有 4已存在公共 5已存在签单 6回退 7已签单 8已释放 9非法名称
-  channelAllocationStatus:[
+  channelAllocationStatus: [
     {
       value: "0",
       key: "未分配",
-      color:'#ff5500'
+      color: '#ff5500'
     },
     {
       value: "1",
       key: "已分配经理",
-      color:'#87d068'
+      color: '#87d068'
     },
     {
       value: "2",
       key: "已分配营销员",
-      color:'#385a2f'
+      color: '#385a2f'
     },
     {
       value: "3",
       key: "已存在自己私有客户库",
-      color:'#ef7f7f'
+      color: '#ef7f7f'
     },
     {
       value: "12",
       key: "已存在他人私有客户库",
-      color:'#ef7f7f'
+      color: '#ef7f7f'
     },
     {
       value: "4",
       key: "已存在公共",
-      color:'#63aade'
+      color: '#63aade'
     },
     {
       value: "5",
       key: "已存在自己签单库",
-      color:'#316388'
+      color: '#316388'
     },
     {
       value: "13",
       key: "已存在他人签单库",
-      color:'#316388'
+      color: '#316388'
     },
     {
       value: "6",
       key: "回退",
-      color:'#f00'
+      color: '#f00'
     },
     {
       value: "7",
       key: "已签单",
-      color:'#fa0e84'
+      color: '#fa0e84'
     },
     {
       value: "10",
       key: "已存在自己外联库",
-      color:'#775dd9'
+      color: '#775dd9'
     },
     {
       value: "11",
       key: "已存在他人外联库",
-      color:'#775dd9'
+      color: '#775dd9'
     },
     {
       value: "8",
       key: "已释放",
-      color:'#0c0c0c'
+      color: '#0c0c0c'
     },
     {
       value: "9",
       key: "客户名称含过滤关键词",
-      color:'#66277b'
+      color: '#66277b'
     },
   ],
   //账户状态
@@ -3051,186 +3061,186 @@ module.exports = {
     },
   ],
   //项目状态层级选择
-  projectStatusCascader:[
+  projectStatusCascader: [
     {
-      value:0,
-      label:'未启动',
+      value: 0,
+      label: '未启动',
     },
     {
-      value:1,
-      label:'进行中',
+      value: 1,
+      label: '进行中',
     },
     {
-      value:2,
-      label:'暂停(客户通知暂停)',
+      value: 2,
+      label: '暂停(客户通知暂停)',
     },
     {
-      value:3,
-      label:'暂停(业务线通知暂停)',
+      value: 3,
+      label: '暂停(业务线通知暂停)',
     },
     {
-      value:4,
-      label:'已提交',
+      value: 4,
+      label: '已提交',
     },
     {
       value: '高新',
       label: '高新',
-      children:[
+      children: [
         {
-          value:5,
-          label:'未推荐',
+          value: 5,
+          label: '未推荐',
         },
         {
-          value:6,
-          label:'已推荐',
+          value: 6,
+          label: '已推荐',
         },
         {
-          value:7,
-          label:'未公示',
+          value: 7,
+          label: '未公示',
         },
         {
-          value:8,
-          label:'已公示',
+          value: 8,
+          label: '已公示',
         },
         {
-          value:9,
-          label:'已备案',
+          value: 9,
+          label: '已备案',
         },
         {
-          value:10,
-          label:'已下注',
+          value: 10,
+          label: '已下注',
         },
         {
-          value:11,
-          label:'退单(已申报)',
+          value: 11,
+          label: '退单(已申报)',
         },
         {
-          value:12,
-          label:'退单(未申报)',
+          value: 12,
+          label: '退单(未申报)',
         }
       ]
     },
     {
       value: '科技',
       label: '科技',
-      children:[
+      children: [
         {
-          value:5,
-          label:'未推荐',
+          value: 5,
+          label: '未推荐',
         },
         {
-          value:6,
-          label:'已推荐',
+          value: 6,
+          label: '已推荐',
         },
         {
-          value:13,
-          label:'已答辩',
+          value: 13,
+          label: '已答辩',
         },
         {
-          value:14,
-          label:'未立项',
+          value: 14,
+          label: '未立项',
         },
         {
-          value:15,
-          label:'已立项',
+          value: 15,
+          label: '已立项',
         },
         {
-          value:16,
-          label:'前补助',
+          value: 16,
+          label: '前补助',
         },
         {
-          value:17,
-          label:'后补助',
+          value: 17,
+          label: '后补助',
         },
         {
-          value:18,
-          label:'已拨款',
+          value: 18,
+          label: '已拨款',
         },
         {
-          value:11,
-          label:'退单(已申报)',
+          value: 11,
+          label: '退单(已申报)',
         },
         {
-          value:12,
-          label:'退单(未申报)',
+          value: 12,
+          label: '退单(未申报)',
         }
       ]
     },
     {
       value: '专利',
       label: '专利',
-      children:[
+      children: [
         {
-          value:19,
-          label:'已完成/下证',
+          value: 19,
+          label: '已完成/下证',
         },
         {
-          value:20,
-          label:'已驳回',
+          value: 20,
+          label: '已驳回',
         },
         {
-          value:11,
-          label:'退单(已申报)',
+          value: 11,
+          label: '退单(已申报)',
         },
         {
-          value:12,
-          label:'退单(未申报)',
+          value: 12,
+          label: '退单(未申报)',
         }
       ]
     },
     {
       value: '通用',
       label: '通用',
-      children:[
+      children: [
         {
-          value:19,
-          label:'已完成/下证',
+          value: 19,
+          label: '已完成/下证',
         },
         {
-          value:20,
-          label:'已驳回',
+          value: 20,
+          label: '已驳回',
         },
       ]
     },
     {
       value: '会员',
       label: '会员',
-      children:[
+      children: [
         {
-          value:21,
-          label:'第1年进行中',
+          value: 21,
+          label: '第1年进行中',
         },
         {
-          value:22,
-          label:'第1年服务完成',
+          value: 22,
+          label: '第1年服务完成',
         },
         {
-          value:23,
-          label:'第2年进行中',
+          value: 23,
+          label: '第2年进行中',
         },
         {
-          value:24,
-          label:'第2年服务完成',
+          value: 24,
+          label: '第2年服务完成',
         },
         {
-          value:25,
-          label:'第3年进行中',
+          value: 25,
+          label: '第3年进行中',
         },
         {
-          value:26,
-          label:'第3年服务完成',
+          value: 26,
+          label: '第3年服务完成',
         },
         {
-          value:27,
-          label:'所有会员服务全部完成',
+          value: 27,
+          label: '所有会员服务全部完成',
         },
         {
-          value:11,
-          label:'退单(已申报)',
+          value: 11,
+          label: '退单(已申报)',
         },
         {
-          value:12,
-          label:'退单(未申报)',
+          value: 12,
+          label: '退单(未申报)',
         }
       ]
     },
@@ -3796,260 +3806,260 @@ module.exports = {
       ],
     },
   ],
-//  项目状态列表
-  projectStatusList:[
+  //  项目状态列表
+  projectStatusList: [
     {
-      value:0,
-      label:'未启动',
+      value: 0,
+      label: '未启动',
     },
     {
-      value:1,
-      label:'进行中',
+      value: 1,
+      label: '进行中',
     },
     {
-      value:2,
-      label:'暂停(客户通知暂停)',
+      value: 2,
+      label: '暂停(客户通知暂停)',
     },
     {
-      value:3,
-      label:'暂停(业务线、总经理通知暂停)',
+      value: 3,
+      label: '暂停(业务线、总经理通知暂停)',
     },
     {
-      value:4,
-      label:'已提交',
+      value: 4,
+      label: '已提交',
     },
     {
-      value:5,
-      label:'未推荐',
+      value: 5,
+      label: '未推荐',
     },
     {
-      value:6,
-      label:'已推荐',
+      value: 6,
+      label: '已推荐',
     },
     {
-      value:7,
-      label:'未公示',
+      value: 7,
+      label: '未公示',
     },
     {
-      value:8,
-      label:'已公示',
+      value: 8,
+      label: '已公示',
     },
     {
-      value:9,
-      label:'已备案',
+      value: 9,
+      label: '已备案',
     },
     {
-      value:10,
-      label:'已下证',
+      value: 10,
+      label: '已下证',
     },
     {
-      value:11,
-      label:'退单(已申报/已下证)',
+      value: 11,
+      label: '退单(已申报/已下证)',
     },
     {
-      value:12,
-      label:'退单(未申报/未下证)',
+      value: 12,
+      label: '退单(未申报/未下证)',
     },
     {
-      value:13,
-      label:'已答辩',
+      value: 13,
+      label: '已答辩',
     },
     {
-      value:14,
-      label:'未立项',
+      value: 14,
+      label: '未立项',
     },
     {
-      value:15,
-      label:'已立项',
+      value: 15,
+      label: '已立项',
     },
     {
-      value:16,
-      label:'前补助',
+      value: 16,
+      label: '前补助',
     },
     {
-      value:17,
-      label:'后补助',
+      value: 17,
+      label: '后补助',
     },
     {
-      value:18,
-      label:'立项已拨款',
+      value: 18,
+      label: '立项已拨款',
     },
     {
-      value:19,
-      label:'已完成/下证',
+      value: 19,
+      label: '已完成/下证',
     },
     {
-      value:20,
-      label:'已驳回',
+      value: 20,
+      label: '已驳回',
     },
     {
-      value:21,
-      label:'第1年进行中',
+      value: 21,
+      label: '第1年进行中',
     },
     {
-      value:22,
-      label:'第1年服务完成',
+      value: 22,
+      label: '第1年服务完成',
     },
     {
-      value:23,
-      label:'第2年进行中',
+      value: 23,
+      label: '第2年进行中',
     },
     {
-      value:24,
-      label:'第2年服务完成',
+      value: 24,
+      label: '第2年服务完成',
     },
     {
-      value:25,
-      label:'第3年进行中',
+      value: 25,
+      label: '第3年进行中',
     },
     {
-      value:26,
-      label:'第3年服务完成',
+      value: 26,
+      label: '第3年服务完成',
     },
     {
-      value:27,
-      label:'所有会员服务全部完成',
+      value: 27,
+      label: '所有会员服务全部完成',
     },
     {
-      value:28,
-      label:'抽查未备案',
+      value: 28,
+      label: '抽查未备案',
     },
   ],
   //转交类型
-  transferType:[
-    {
-      value:0,
-      label:'录入',
-    },{
-      value:1,
-      label:'领取',
-    },{
-      value:2,
-      label:'转交私有客户',
-    },{
-      value:3,
-      label:'转交业务',
-    },{
-      value:4,
-      label:'未跟进丢失(30)',
-    },{
-      value:5,
-      label:'未签单丢失(270天)',
-    },{
-      value:6,
-      label:'移除',
-    },{
-      value:7,
-      label:'转交签单客户',
-    },{
-      value:8,
-      label:'外联录入',
-    },{
-      value:9,
-      label:'外联客户总监分配',
-    },{
-      value:10,
-      label:'外联客户经理分配',
-    },{
-      value:11,
-      label:'外联释放',
-    },{
-      value:12,
-      label:'回收',
-    },{
-      value:13,
-      label:'离职客户转交',
-    },{
-      value:14,
-      label:'离职签单业务转交',
-    },{
-      value:15,
-      label:'领取为私有渠道',
+  transferType: [
+    {
+      value: 0,
+      label: '录入',
+    }, {
+      value: 1,
+      label: '领取',
+    }, {
+      value: 2,
+      label: '转交私有客户',
+    }, {
+      value: 3,
+      label: '转交业务',
+    }, {
+      value: 4,
+      label: '未跟进丢失(30)',
+    }, {
+      value: 5,
+      label: '未签单丢失(270天)',
+    }, {
+      value: 6,
+      label: '移除',
+    }, {
+      value: 7,
+      label: '转交签单客户',
+    }, {
+      value: 8,
+      label: '外联录入',
+    }, {
+      value: 9,
+      label: '外联客户总监分配',
+    }, {
+      value: 10,
+      label: '外联客户经理分配',
+    }, {
+      value: 11,
+      label: '外联释放',
+    }, {
+      value: 12,
+      label: '回收',
+    }, {
+      value: 13,
+      label: '离职客户转交',
+    }, {
+      value: 14,
+      label: '离职签单业务转交',
+    }, {
+      value: 15,
+      label: '领取为私有渠道',
     }
   ],
   //消息提醒状态
   //状态 0 未提醒 1 剩余90天 2剩余30天 3剩余20天 4剩余10天 5剩余3天 6剩余2天 7剩余1天
-  messageReminderStart:[
+  messageReminderStart: [
     {
       value: "0",
       key: "未提醒",
-      color:'#f5bc12'
+      color: '#f5bc12'
     },
     {
       value: "1",
       key: "已触发剩余90天提醒",
-      color:'#186f07'
+      color: '#186f07'
     },
     {
       value: "2",
       key: "已触发剩余60天提醒",
-      color:'#5084d2'
+      color: '#5084d2'
     },
     {
       value: "3",
       key: "已触发剩余30天提醒",
-      color:'#665107'
+      color: '#665107'
     },
     {
       value: "4",
       key: "已触发剩余15天提醒",
-      color:'#2d7d59'
+      color: '#2d7d59'
     },
     {
       value: "5",
       key: "已触发剩余7天提醒",
-      color:'#b300ff'
+      color: '#b300ff'
     },
   ],
   //详情申请状态
-  clockState : [
+  clockState: [
     {
-      title:'驳回',
-      id:0,
-      color:'#f31212'
+      title: '驳回',
+      id: 0,
+      color: '#f31212'
     },
     {
-      title:'审核中',
-      id:1,
-      color:'#1d4fea'
+      title: '审核中',
+      id: 1,
+      color: '#1d4fea'
     },
     {
-      title:'通过',
-      id:2,
-      color:'#34de38'
+      title: '通过',
+      id: 2,
+      color: '#34de38'
     },
     {
-      title:'已撤销',
-      id:3,
-      color:'#242424'
+      title: '已撤销',
+      id: 3,
+      color: '#242424'
     },
   ],
   //申请日志状态
-  clockJournalState : [
+  clockJournalState: [
     {
-      title:'驳回',
-      id:0,
-      color:'#f31212'
+      title: '驳回',
+      id: 0,
+      color: '#f31212'
     },
     {
-      title:'发起',
-      id:1,
-      color:'#1d4fea'
+      title: '发起',
+      id: 1,
+      color: '#1d4fea'
     },
     {
-      title:'通过',
-      id:2,
-      color:'#34de38'
+      title: '通过',
+      id: 2,
+      color: '#34de38'
     },
     {
-      title:'已打卡',
-      id:3,
-      color:'#b934de'
+      title: '已打卡',
+      id: 3,
+      color: '#b934de'
     },
     {
-      title:'已撤销',
-      id:4,
-      color:'#242424'
+      title: '已撤销',
+      id: 4,
+      color: '#242424'
     },
   ],
 };

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

@@ -28,6 +28,7 @@ import ResolutionDetail from "@/resolutionDetail";
 import quxiao from "../../../../../image/quxiao.png";
 import tongguo from "../../../../../image/tongguo.png";
 import $ from "jquery";
+import { salesList } from "@/dataDic.js";
 
 import OrderRiZi from "@/orderRiZi.jsx";
 import {
@@ -5010,16 +5011,7 @@ const NewService = Form.create()(
                               label="销售类型"
                             >
                               <span>{(["私有客户", "签单客户"][this.state.userType] || " ") + "-" +
-                                ([
-                                  "电话新开发",
-                                  "电话自带资源",
-                                  "网络",
-                                  "渠道",
-                                  "转介绍",
-                                  "其他",
-                                  "高新复购",
-                                  "其他复购",
-                                ][this.state.salesType] || "")}</span>
+                                (salesList[this.state.salesType] || "")}</span>
                               {
                                 this.state.processStatus === 0 &&
                                 <UpdateSales

+ 26 - 63
js/component/manageCenter/order/orderNew/billing.jsx

@@ -19,6 +19,7 @@ import {
   Tooltip,
   Row,
   Col,
+  Tag,
 } from "antd";
 import NewService from "./addService.jsx";
 import moment from "moment";
@@ -38,6 +39,7 @@ import {
   getProjectStatus,
   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";
@@ -467,32 +469,14 @@ const MyService = Form.create()(
             title: "销售类型",
             dataIndex: "salesType",
             key: "salesType",
-            width: 70,
+            // width: 70,
             render: (text, record) => {
               return (
                 <Tooltip
-                  title={[
-                    "电话新开发",
-                    "电话自带资源",
-                    "网络",
-                    "渠道",
-                    "转介绍",
-                    "其他",
-                    "高新复购",
-                    "其他复购",
-                  ][text] + ((text == 3 || text == 4 || text == 5) ? "," + record.other : "")}
+                  title={salesList[text] + ((text == 3 || text == 4 || text == 5) ? "," + record.other : "")}
                 >
                   <span>
-                    {[
-                      "电话新开发",
-                      "电话自带资源",
-                      "网络",
-                      "渠道",
-                      "转介绍",
-                      "其他",
-                      "高新复购",
-                      "其他复购",
-                    ][text]}
+                    {salesList[text]}
                   </span>
                 </Tooltip>
               );
@@ -502,8 +486,8 @@ const MyService = Form.create()(
             title: "合同编号",
             dataIndex: "contractNo",
             key: "contractNo",
-            width: 110,
-            render: (text) => {
+            width: 112,
+            render: (text, record) => {
               return (
                 <Tooltip
                   title={
@@ -522,7 +506,12 @@ const MyService = Form.create()(
                     </Button>
                   }
                 >
-                  {text}
+                  <div>
+                    {text}
+                    <div style={{ height: 22 }}>
+                      <OrderItemStatus deleteSign={record.deleteSign} />
+                    </div>
+                  </div>
                 </Tooltip>
               );
             },
@@ -553,36 +542,10 @@ const MyService = Form.create()(
                 >
                   <div>
                     {text}
-                    {record.totalAmount >= 10 ? (
-                      <div
-                        style={{
-                          background: "#ef7207",
-                          color: "#FFF",
-                          padding: "1px 7px",
-                          borderRadius: "5px",
-                          fontSize: "12px",
-                          display: "inline-block",
-                          marginRight: "10px",
-                        }}
-                      >
-                        大客户
-                      </div>
-                    ) : null}
-                    {record.projectType == 1 ? (
-                      <div
-                        style={{
-                          background: "rgb(22, 155, 213)",
-                          color: "#FFF",
-                          padding: "1px 7px",
-                          borderRadius: "5px",
-                          fontSize: "12px",
-                          display: "inline-block",
-                          marginRight: "10px",
-                        }}
-                      >
-                        会员
-                      </div>
-                    ) : null}
+                    <div style={{ height: 22 }}>
+                      {record.totalAmount >= 10 && <Tag color="#ef7207">大客户</Tag>}
+                      {record.totalAmount == 1 && <Tag color="rgb(22, 155, 213)">会员</Tag>}
+                    </div>
                   </div>
                 </Tooltip>
               );
@@ -623,15 +586,15 @@ const MyService = Form.create()(
               );
             },
           },
-          {
-            title: "状态",
-            dataIndex: "deleteSign",
-            key: "deleteSign",
-            width: 80,
-            render: (text) => {
-              return <OrderItemStatus deleteSign={text} />;
-            },
-          },
+          // {
+          //   title: "状态",
+          //   dataIndex: "deleteSign",
+          //   key: "deleteSign",
+          //   width: 80,
+          //   render: (text) => {
+          //     return <OrderItemStatus deleteSign={text} />;
+          //   },
+          // },
           {
             title: "订单部门",
             dataIndex: "depName",

+ 3 - 13
js/component/manageCenter/order/orderNew/reject.jsx

@@ -20,7 +20,7 @@ import {
 } from 'antd';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { boutique, tepi, jiedian } from '@/dataDic.js';
+import { boutique, tepi, jiedian, salesList,cuiJieDian } from '@/dataDic.js';
 import {
   getLiquidationStatus,
   getProcessStatus,
@@ -32,7 +32,6 @@ import {
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx"
 import OrderRiZi from "@/orderRiZi.jsx";
-import { cuiJieDian } from "@/dataDic.js";
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
 import { ChooseList } from "./chooseList";
@@ -41,7 +40,7 @@ import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from './changeComponent/orderCoor';
 import ProjectOperation from "../../../common/projectOperation";
 import ContentUrl from './contentUrl';
-import UpdateSales from './updatesales';
+import UpdateSales from './updatesales';//修改销售类型
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -2085,16 +2084,7 @@ const IntentionCustomer = Form.create()(
                       label="销售类型"
                     >
                       <span>{(["私有客户", "签单客户"][this.state.userType] || " ") + "-" +
-                        ([
-                          "电话新开发",
-                          "电话自带资源",
-                          "网络",
-                          "渠道",
-                          "转介绍",
-                          "其他",
-                          "高新复购",
-                          "其他复购",
-                        ][this.state.salesType] || "")}</span>
+                        (salesList[this.state.salesType] || "")}</span>
                       <UpdateSales
                         orderNo={this.state.orderNo}
                         updatas={this.state.updatas}

+ 13 - 6
js/component/manageCenter/order/source/index.jsx

@@ -15,10 +15,11 @@ import {
 } from "antd";
 import $ from "jquery/src/ajax";
 import { ShowModal, getPercentage } from "@/tools";
+import { salesList } from "@/dataDic.js";
 import moment from "moment";
 import { provinceSelect, getProvince } from "../../../NewDicProvinceList";
 import { ChooseList } from "../../../manageCenter/order/orderNew/chooseList";
-import OrderList from "./order"
+import OrderList from "./order"; //客户订单列表
 
 const { TabPane } = Tabs;
 const FormItem = Form.Item;
@@ -348,7 +349,7 @@ class Source extends Component {
       }.bind(this)
     );
   }
-  //获取上级组织
+  // 获取上级组织
   selectSuperId() {
     this.setState({
       departmentLoading: true,
@@ -384,7 +385,7 @@ class Source extends Component {
       }.bind(this)
     );
   }
-  //导出excel
+  // 导出excel
   exportExec() {
     message.config({
       duration: 20,
@@ -418,7 +419,7 @@ class Source extends Component {
       }.bind(this)
     );
   }
-
+  // 下载
   download(fileName) {
     window.location.href =
       globalConfig.context + "/open/download?fileName=" + fileName;
@@ -430,7 +431,7 @@ class Source extends Component {
   }
 
   render() {
-    const { searchValues, onelist, columns, changeList, contactsOption, visible } = this.state;
+    const { searchValues, onelist, columns, changeList, contactsOption, visible, datas } = this.state;
     return (
       <div className="user-content signatureStatistics">
         <div className="content-title">
@@ -581,7 +582,13 @@ class Source extends Component {
           visible &&
           <Modal
             visible={visible}
-            title="客户订单列表"
+            // title="客户订单列表"
+            title={
+              <div>
+                <span style={{ marginRight: 20 }}>客户订单列表</span>
+                {!!datas["salesType"] && <span style={{ color: "red", marginRight: 20 }}>销售类型:{salesList[datas["salesType"]]}</span>}
+                <span style={{ color: "red" }}>省份:{getProvince(datas["province"])}</span>
+              </div>}
             width="90%"
             footer={null}
             onCancel={() => {

+ 15 - 13
js/component/manageCenter/order/source/order.jsx

@@ -268,7 +268,7 @@ class OrderList extends Component {
       }.bind(this)
     );
   }
-  //订单详情
+  // 订单详情
   xiangqing(orderNos) {
     this.setState({
       loading: true
@@ -318,6 +318,7 @@ class OrderList extends Component {
       }.bind(this)
     );
   }
+  // 
   createTabs(orderNos) {
     $.ajax({
       url: globalConfig.context + "/api/admin/orderChange/getOrderChange",
@@ -336,7 +337,7 @@ class OrderList extends Component {
       }
     });
   }
-  //整行点击
+  // 整行点击
   tableRowClick(record) {
     this.setState(
       {
@@ -349,6 +350,7 @@ class OrderList extends Component {
       }
     );
   }
+  //
   jiedianNew(orderNos) {
     $.ajax({
       method: "get",
@@ -409,11 +411,12 @@ class OrderList extends Component {
       }.bind(this)
     );
   }
-  closeDesc(e, s) {
-    this.state.details = e;
-    if (s) {
-      this.loadData(this.state.pageNo);
-    }
+  // 
+  closeDesc() {
+    this.setState({
+      details: false
+    })
+    this.loadData(this.state.pageNo);
   }
   //查看订单日志
   getOrderLog() {
@@ -422,11 +425,13 @@ class OrderList extends Component {
     });
     this.rizhi();
   }
+  // 
   closeOrderLog() {
     this.setState({
       rizhivisible: false
     });
   }
+  // 日志
   rizhi() {
     $.ajax({
       method: "get",
@@ -461,7 +466,7 @@ class OrderList extends Component {
       }.bind(this)
     });
   }
-  //项目列表
+  // 项目列表
   xiangmu(orderNos) {
     $.ajax({
       method: "get",
@@ -492,6 +497,7 @@ class OrderList extends Component {
       }.bind(this)
     });
   }
+
   componentWillMount() {
     this.loadData();
   }
@@ -644,11 +650,7 @@ class OrderList extends Component {
             width="900px"
             title="订单详情"
             visible={details}
-            onCancel={() => {
-              this.setState({
-                details: false
-              })
-            }}
+            onCancel={this.closeDesc.bind(this)}
           >
             <Spin spinning={this.state.loading}>
               <OrderDetail