Browse Source

完成订单变更功能1-18

mentoswzq 5 years ago
parent
commit
ac1cbf0a43

+ 0 - 1
css/changeDetail.less

@@ -1,6 +1,5 @@
 .changeDetail {
 .changeDetail {
     position: relative;
     position: relative;
-    bottom: 15px;
 }
 }
 
 
 .changeDetail .half-item {
 .changeDetail .half-item {

+ 11 - 0
js/component/manageCenter/order/content.less

@@ -88,4 +88,15 @@
 
 
 .ant-upload-list-item{
 .ant-upload-list-item{
 	font-size: 14px;
 	font-size: 14px;
+}
+.ant-modal-close-x {
+    display: block;
+    font-style: normal;
+    text-align: center;
+    text-transform: none;
+    text-rendering: auto;
+    width: 22px;
+    height: 23px;
+    line-height: 28px;
+    font-size: 21px;
 }
 }

+ 233 - 3
js/component/manageCenter/order/orderNew/addService.jsx

@@ -349,6 +349,234 @@ const NewService = Form.create()(
             }
             }
           }
           }
         ],
         ],
+        detailColumns: [
+        {
+          title: "变更状态",
+          dataIndex: "type",
+          key: "type",
+          render: text => {
+            let str = "";
+            let color = "";
+            if (text == 1) {
+              str = "增";
+              color = "#87d068";
+            } else if (text == 2) {
+              str = "改";
+              color = "#108ee9";
+            } else if (text == 3) {
+              str = "删";
+              color = "#f50";
+            }
+            return (
+              <Tag
+                color={color}
+                style={{ display: text == 0 ? "none" : "inline-block" }}
+              >
+                {str}
+              </Tag>
+            );
+          }
+        },
+        {
+          title: "业务项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName"
+          // render: (text, record) => {
+          //   let str = "";
+          //   let color = "";
+          //   if (record.type == 1) {
+          //     str = "增";
+          //     color = "#87d068";
+          //   } else if (record.type == 2) {
+          //     str = "改";
+          //     color = "#108ee9";
+          //   } else if (record.type == 3) {
+          //     str = "删";
+          //     color = "#f50";
+          //   }
+          //   if (record.type == 0) {
+          //     return <span>{text}</span>;
+          //   } else {
+          //     return (
+          //       <span>
+          //         <Tag color={color}>{str}</Tag>
+          //         {text}
+          //       </span>
+          //     );
+          //   }
+          // }
+        },
+        {
+          title: "项目类别",
+          dataIndex: "cname",
+          key: "cname"
+        },
+        {
+          title: "项目数量",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice",
+          render: text => {
+            if (this.props.isZxs) {
+              return <span>***</span>;
+            }else {
+              return <span>{text}</span>
+            }
+          }
+        },
+        {
+          title: "主要项目",
+          dataIndex: "main",
+          key: "main",
+          render: text => {
+            return text ? "是" : "否";
+          }
+        },
+        {
+          title: "项目说明",
+          dataIndex: "taskComment",
+          key: "taskComment",
+          render: text => {
+            return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+          }
+        }
+      ],
+      detailContactsLists: [
+        {
+          title: "变更状态",
+          dataIndex: "type",
+          key: "type",
+          render: text => {
+            let str = "";
+            let color = "";
+            if (text == 1) {
+              str = "增";
+              color = "#87d068";
+            } else if (text == 2) {
+              str = "改";
+              color = "#108ee9";
+            } else if (text == 3) {
+              str = "删";
+              color = "#f50";
+            }
+            return (
+              <Tag
+                color={color}
+                style={{ display: text == 0 ? "none" : "inline-block" }}
+              >
+                {str}
+              </Tag>
+            );
+          }
+        },
+        {
+          title: "项目名称",
+          dataIndex: "commodityName",
+          key: "commodityName"
+          // render: (text, record) => {
+          //   let str = "";
+          //   let color = "";
+          //   if (record.type == 1) {
+          //     str = "增";
+          //     color = "#87d068";
+          //   } else if (record.type == 2) {
+          //     str = "改";
+          //     color = "#108ee9";
+          //   } else if (record.type == 3) {
+          //     str = "删";
+          //     color = "#f50";
+          //   }
+          //   if (record.type == 0) {
+          //     return <span>{text}</span>;
+          //   } else {
+          //     return (
+          //       <span>
+          //         <Tag color={color}>{str}</Tag>
+          //         {text}
+          //       </span>
+          //     );
+          //   }
+          // }
+        },
+        {
+          title: "项目分类",
+          dataIndex: "projectType",
+          key: "projectType",
+          render: text => {
+            let arr = this.state.proDataSource || [];
+            let str = "";
+            for (let i = 0; i < arr.length; i++) {
+              if (this.state.proDataSource[i].cSort == text) {
+                str = this.state.proDataSource[i].cname;
+                return <span>{str}</span>;
+              }
+            }
+          }
+        },
+        {
+          title: "催款科目",
+          dataIndex: "dunTypeName",
+          key: "dunTypeName",
+          render: text => {
+            return <span>{text}</span>;
+          }
+        },
+        {
+          title: "时间",
+          dataIndex: "waitDay",
+          key: "waitDay",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
+            }
+          }
+        },
+        {
+          title: "金额(万元)",
+          dataIndex: "money",
+          key: "money",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              if (record.appropriationRatio && !record.money) {
+                return <span>{record.appropriationRatio}(拨款比例)</span>;
+              } else if (record.appropriationRatio && record.money) {
+                return (
+                  <span>
+                    {text}(比例:{record.appropriationRatio})
+                  </span>
+                );
+              } else {
+                if(this.props.isZxs) {
+                  return <span>***</span>
+                }
+                return <span>{text}</span>;
+              }
+            }
+          }
+        },
+        {
+          title: "服务年限",
+          dataIndex: "startDate",
+          key: "startDate",
+          render: (text, record) => {
+            if (record.dunTypeName) {
+              return <span>{text}</span>;
+            }
+          }
+        },
+        {
+          title: "催款状态",
+          dataIndex: "status",
+          key: "status",
+          render: text => {
+            return <span>{text == 1 ? "已启动" : "未启动"}</span>;
+          }
+        }
+      ],
         columnsrizhi: [
         columnsrizhi: [
           {
           {
             title: "流程",
             title: "流程",
@@ -1938,6 +2166,7 @@ const NewService = Form.create()(
       if (key === "1") {
       if (key === "1") {
         this.jiedian(this.props.datauser.orderNo);
         this.jiedian(this.props.datauser.orderNo);
         this.jiedianNew(this.props.datauser.orderNo);
         this.jiedianNew(this.props.datauser.orderNo);
+        this.loaduser();
         // this.loaduser();
         // this.loaduser();
       }
       }
       if (key === "3") {
       if (key === "3") {
@@ -2042,7 +2271,8 @@ const NewService = Form.create()(
                   tuiKuanFlag: false,
                   tuiKuanFlag: false,
                   displayList: false,
                   displayList: false,
                   // 置空
                   // 置空
-                  changeId: undefined
+                  changeId: undefined,
+                  isCaoGao: false
                 });
                 });
               }
               }
             } else {
             } else {
@@ -4645,7 +4875,7 @@ const NewService = Form.create()(
                               >
                               >
                                 <Spin spinning={this.state.loading}>
                                 <Spin spinning={this.state.loading}>
                                   <Table
                                   <Table
-                                    columns={this.state.proColumns}
+                                    columns={this.state.detailColumns}
                                     dataSource={this.state.proDataSource}
                                     dataSource={this.state.proDataSource}
                                     pagination={this.state.pagination}
                                     pagination={this.state.pagination}
                                     // onRowClick={this.tableRowClick}
                                     // onRowClick={this.tableRowClick}
@@ -4678,7 +4908,7 @@ const NewService = Form.create()(
                                   <Form layout="horizontal">
                                   <Form layout="horizontal">
                                     <Table
                                     <Table
                                       pagination={false}
                                       pagination={false}
-                                      columns={this.state.changeCuiList}
+                                      columns={this.state.detailContactsLists}
                                       dataSource={this.state.cuiDataSource}
                                       dataSource={this.state.cuiDataSource}
                                       scroll={{ x: "max-content", y: 0 }}
                                       scroll={{ x: "max-content", y: 0 }}
                                       bordered
                                       bordered

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -8,6 +8,7 @@ import $ from "jquery/src/ajax";
 import "../../../../../../css/changeDetail.less"
 import "../../../../../../css/changeDetail.less"
 import tongguo from "../../../../../../image/tongguo.png";
 import tongguo from "../../../../../../image/tongguo.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import ProAndCuiList from "./proAndCuiList.jsx";
+import "./xButton.less";
 // import ReactToPrint from "react-to-print";
 // import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
 const FormItem = Form.Item;
 const { TextArea } = Input;
 const { TextArea } = Input;
@@ -594,7 +595,7 @@ class ChangeDetail extends Component {
                 下一张
                 下一张
               </Button>
               </Button>
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
 
 
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -20,6 +20,7 @@ import $ from "jquery/src/ajax";
 import ReactToPrint from "react-to-print";
 import ReactToPrint from "react-to-print";
 import tongguo from "../../../../../../image/tongguo.png";
 import tongguo from "../../../../../../image/tongguo.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import ProAndCuiList from "./proAndCuiList.jsx";
+import "./xButton.less"
 
 
 
 
 const { RangePicker } = DatePicker;
 const { RangePicker } = DatePicker;
@@ -962,7 +963,7 @@ class ChangeDetail extends Component {
                 下一张
                 下一张
               </Button>
               </Button>
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
 
 
           <ul
           <ul

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -7,6 +7,7 @@ import { shenghePeo } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import tongguo from "../../../../../../image/tongguo.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import ProAndCuiList from "./proAndCuiList.jsx";
+import "./xButton.less";
 // import ReactToPrint from "react-to-print";
 // import ReactToPrint from "react-to-print";
 
 
 const formItemLayout = {
 const formItemLayout = {
@@ -435,7 +436,7 @@ class ChangeDetail extends Component {
                 src={this.state.previewImage || ""}
                 src={this.state.previewImage || ""}
               />
               />
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
 
 
           <ul
           <ul

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -7,6 +7,7 @@ import {shenghePeo} from "@/tools.js"
 import $ from "jquery/src/ajax";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import tongguo from "../../../../../../image/tongguo.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import ProAndCuiList from "./proAndCuiList.jsx";
+import "./xButton.less";
 // import ReactToPrint from "react-to-print";
 // import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
 const FormItem = Form.Item;
 const { TextArea } = Input;
 const { TextArea } = Input;
@@ -411,7 +412,7 @@ class ChangeDetail extends Component {
                 src={this.state.previewImage || ""}
                 src={this.state.previewImage || ""}
               />
               />
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
 
 
           {/* <ul>
           {/* <ul>

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -7,6 +7,7 @@ import { shenghePeo } from "@/tools.js";
 import $ from "jquery/src/ajax";
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import tongguo from "../../../../../../image/tongguo.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import ProAndCuiList from "./proAndCuiList.jsx";
+import "./xButton.less";
 // import ReactToPrint from "react-to-print";
 // import ReactToPrint from "react-to-print";
 
 
 const formItemLayout = {
 const formItemLayout = {
@@ -424,7 +425,7 @@ class ChangeDetail extends Component {
                 src={this.state.previewImage || ""}
                 src={this.state.previewImage || ""}
               />
               />
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
 
 
           <ul
           <ul

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

@@ -419,7 +419,7 @@ class ChangeDetail extends Component {
                 src={this.state.previewImage || ""}
                 src={this.state.previewImage || ""}
               />
               />
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
 
 
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}

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

@@ -448,7 +448,7 @@ class ChangeDetail extends Component {
               <Button onClick={this.upImg}>上一张</Button>
               <Button onClick={this.upImg}>上一张</Button>
               <Button onClick={this.downImg}>下一张</Button>
               <Button onClick={this.downImg}>下一张</Button>
             </Modal>
             </Modal>
-            <Rizhi changeId={this.props.data.id} />
+            <Rizhi changeId={this.props.id} />
           </Form.Item>
           </Form.Item>
           {/* {this.props.data.type === 0 && this.props.data.processState >= 2 ? (
           {/* {this.props.data.type === 0 && this.props.data.processState >= 2 ? (
             <div>
             <div>

+ 11 - 0
js/component/manageCenter/order/orderNew/changeComponent/xButton.less

@@ -0,0 +1,11 @@
+.ant-modal-close-x {
+    display: block;
+    font-style: normal;
+    text-align: center;
+    text-transform: none;
+    text-rendering: auto;
+    width: 22px;
+    height: 23px;
+    line-height: 28px;
+    font-size: 21px;
+}

+ 3 - 2
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -846,7 +846,7 @@ const contractChange = Form.create()(
       });
       });
     },
     },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -854,7 +854,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -886,6 +886,7 @@ const contractChange = Form.create()(
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 3 - 2
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -922,7 +922,7 @@ const contractChange = Form.create()(
       });
       });
     },
     },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -930,7 +930,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -963,6 +963,7 @@ const contractChange = Form.create()(
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 3 - 2
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -842,7 +842,7 @@ const contractChange = Form.create()(
       });
       });
     },
     },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -850,7 +850,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -882,6 +882,7 @@ const contractChange = Form.create()(
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 3 - 2
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -806,7 +806,7 @@ const contractChange = Form.create()(
       });
       });
     },
     },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -814,7 +814,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -846,6 +846,7 @@ const contractChange = Form.create()(
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 3 - 2
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -840,7 +840,7 @@ const contractChange = Form.create()(
       });
       });
     },
     },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -848,7 +848,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -880,6 +880,7 @@ const contractChange = Form.create()(
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 3 - 2
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -842,7 +842,7 @@ const contractChange = Form.create()(
     //   },100)
     //   },100)
     // },
     // },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -850,7 +850,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -882,6 +882,7 @@ const contractChange = Form.create()(
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 4 - 2
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -857,7 +857,7 @@ const contractChange = Form.create()(
       });
       });
     },
     },
 
 
-    loadDataChange() {
+    loadDataChange(key) {
       $.ajax({
       $.ajax({
         method: "get",
         method: "get",
         dataType: "json",
         dataType: "json",
@@ -865,7 +865,7 @@ const contractChange = Form.create()(
         crossDomain: false,
         crossDomain: false,
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         url: globalConfig.context + "/api/admin/orderChange/orderChangeLogList",
         data: {
         data: {
-          changeId: this.state.id
+          changeId: key
         },
         },
         success: function(data) {
         success: function(data) {
           if (data.error.length || data.data.list == "") {
           if (data.error.length || data.data.list == "") {
@@ -893,9 +893,11 @@ const contractChange = Form.create()(
             this.loadDataChange(key);
             this.loadDataChange(key);
           } else if (key != "a" && key != "c" && key.length > 10) {
           } else if (key != "a" && key != "c" && key.length > 10) {
             this.primaryOrder(key);
             this.primaryOrder(key);
+            this.ChangeDetail(key);
             this.xiangmu(key);
             this.xiangmu(key);
             this.jiedian(key);
             this.jiedian(key);
             this.jiedianNew(key);
             this.jiedianNew(key);
+            this.loadDataChange(key);
           }
           }
         }
         }
       );
       );

+ 297 - 245
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -52,21 +52,22 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                     for (let i = 0; i < data.data.list.length; i++) {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
                         let thisdata = data.data.list[i];
                         theArr.push({
                         theArr.push({
-                            key: i,
+                          key: i,
-                            id:thisdata.id,//任务ID
+                          id: thisdata.id, //任务ID
-                            orderNo: thisdata.orderNo,//订单编号
+                          orderNo: thisdata.orderNo, //订单编号
-	                         totalAmount:thisdata.totalAmount,//签单金额
+                          totalAmount: thisdata.totalAmount, //签单金额
-	                         processStatus:thisdata.processStatus,//流程状态
+                          processStatus: thisdata.processStatus, //流程状态
-	                         liquidationStatus:thisdata.liquidationStatus,//结算状态
+                          liquidationStatus: thisdata.liquidationStatus, //结算状态
-	                         approval:thisdata.approval,//特批状态
+                          approval: thisdata.approval, //特批状态
-	                         signDate:thisdata.signDate,//签单时间
+                          signDate: thisdata.signDate, //签单时间
-	                         userName:thisdata.userName,//客户名称
+                          userName: thisdata.userName, //客户名称
-	                         salesmanName:thisdata.salesmanName,//营销员名称
+                          salesmanName: thisdata.salesmanName, //营销员名称
-	                         financeName:thisdata.financeName,//财务名称
+                          financeName: thisdata.financeName, //财务名称
-	                         consultantName:thisdata.consultantName,//项目负责人
+                          consultantName: thisdata.consultantName, //项目负责人
-	                         createDate:thisdata.createDate,//下单时间
+                          createDate: thisdata.createDate, //下单时间
-	                         settlementAmount:thisdata.settlementAmount,//已交款项
+                          settlementAmount: thisdata.settlementAmount, //已交款项
-	                         depName:thisdata.depName,//部门名称
+                          depName: thisdata.depName, //部门名称
+                          ischange: thisdata.ischange //是否通过变更生成的
                         });
                         });
                     };
                     };
                 }
                 }
@@ -89,238 +90,289 @@ const zxsglyOutSourcingPaiDan = React.createClass({
     },
     },
     getInitialState() {
     getInitialState() {
         return {
         return {
-			distribution:'0',
+          distribution: "0",
-			customerArr: [],
+          customerArr: [],
-            searchMore: true,
+          searchMore: true,
-            assignVisible:false,
+          assignVisible: false,
-            releaseDate: [],
+          releaseDate: [],
-			attachmentUrl:[],
+          attachmentUrl: [],
-			pictureUrl:[],
+          pictureUrl: [],
-            departmentArr: [],
+          departmentArr: [],
-            boHuivisible:false,
+          boHuivisible: false,
-            selectedRowKeys: [],
+          selectedRowKeys: [],
-            selectedRows: [],
+          selectedRows: [],
-            loading: false,
+          loading: false,
-            paginations:false,
+          paginations: false,
-            pagination: {
+          pagination: {
-                defaultCurrent: 1,
+            defaultCurrent: 1,
-                defaultPageSize: 10,
+            defaultPageSize: 10,
-                showQuickJumper: true,
+            showQuickJumper: true,
-                pageSize: 10,
+            pageSize: 10,
-                onChange: function (page) {
+            onChange: function(page) {
-                    this.loadData(page);
+              this.loadData(page);
-                }.bind(this),
+            }.bind(this),
-                showTotal: function (total) {
+            showTotal: function(total) {
-                    return '共' + total + '条数据';
+              return "共" + total + "条数据";
+            }
+          },
+          columns: [
+            {
+              title: "订单编号",
+              dataIndex: "orderNo",
+              key: "orderNo",
+              render: (text, record) => {
+                if (record.ischange == 1) {
+                  return (
+                    <span>
+                      <Tag color="#f50">变更</Tag>
+                      {text}
+                    </span>
+                  );
+                } else {
+                  return <span>{text}</span>;
                 }
                 }
+              }
             },
             },
-            columns: [
+            {
-                {
+              title: "签单客户",
-                    title: '订单编号',
+              dataIndex: "userName",
-                    dataIndex: 'orderNo',
+              key: "userName"
-                    key: 'orderNo',
+            },
-                },
+            {
-                {
+              title: "下单时间",
-                    title: '签单客户',
+              dataIndex: "createDate",
-                    dataIndex: 'userName',
+              key: "createDate"
-                    key: 'userName',
+            },
-                }, {
+            {
-                    title: '下单时间',
+              title: "签单时间",
-                    dataIndex: 'createDate',
+              dataIndex: "signDate",
-                    key: 'createDate',
+              key: "signDate"
-                },  {
+            },
-                    title: '签单时间',
+            {
-                    dataIndex: 'signDate',
+              title: "订单总金额(万)",
-                    key: 'signDate',
+              dataIndex: "totalAmount",
-                },
+              key: "totalAmount"
-                {
+            },
-                    title: '订单总金额(万)',
+            {
-                    dataIndex: 'totalAmount',
+              title: "是否特批",
-                    key: 'totalAmount'
+              dataIndex: "approval",
-                },
+              key: "approval",
-                {
+              render: text => {
-                    title: '是否特批',
+                return getApproval(text);
-                    dataIndex: 'approval',
+              }
-                    key: 'approval',
+            },
-                    render: text => { return getApproval(text)}
+            {
-                },
+              title: "订单负责人",
-                {
+              dataIndex: "salesmanName",
-                    title: '订单负责人',
+              key: "salesmanName"
-                    dataIndex: 'salesmanName',
+            },
-                    key: 'salesmanName'
+            {
-                },{
+              title: "订单部门",
-                    title: '订单部门',
+              dataIndex: "depName",
-                    dataIndex: 'depName',
+              key: "depName"
-                    key: 'depName'
+            },
-                },
+            {
-                {
+              title: "财务负责人",
-                    title: '财务负责人',
+              dataIndex: "financeName",
-                    dataIndex: 'financeName',
+              key: "financeName"
-                    key: 'financeName'
+            },
-                },
+            {
-                {
+              title: "项目负责人",
-                    title: '项目负责人',
+              dataIndex: "consultantName",
-                    dataIndex: 'consultantName',
+              key: "consultantName"
-                    key: 'consultantName'
+            },
-                },
+            {
-                {
+              title: "分派状态",
-                    title: '分派状态',
+              dataIndex: "processStatus",
-                    dataIndex: 'processStatus',
+              key: "processStatus",
-                    key: 'processStatus',
+              render: text => {
-                    render: text => { return text==5||text==6?getProcessStatus(text):'未分配'}
+                return text == 5 || text == 6
-                },
+                  ? getProcessStatus(text)
-                {
+                  : "未分配";
-                    title:'操作',
+              }
-                    dataIndex: 'caozuo',
+            },
-                    key: 'caouzo',
+            {
-                    render:(text,record)=>{
+              title: "操作",
-                        return <div>
+              dataIndex: "caozuo",
-                        	{record.settlementAmount==0?
+              key: "caouzo",
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.examNo(record)}}>驳回</Button>
+              render: (text, record) => {
-                        	:''}
+                return (
-                        </div>
+                  <div>
-                    }
+                    {record.settlementAmount == 0 ? (
-                }
+                      <Button
-            ],
+                        type="primary"
-			columnsW: [
+                        style={{ margin: "0 10px" }}
-			    {
+                        onClick={e => {
-			        title: '外包名称',
+                          e.stopPropagation(), this.examNo(record);
-			        dataIndex: 'name',
+                        }}
-			        key: 'name',
+                      >
-			    }, {
+                        驳回
-			        title: '联系人',
+                      </Button>
-			        dataIndex: 'contacts',
+                    ) : (
-			        key: 'contacts',
+                      ""
-			    },  {
+                    )}
-			        title: '联系人电话',
+                  </div>
-			        dataIndex: 'contactsMobile',
+                );
-			        key: 'contactsMobile',
+              }
-			    },
+            }
-			    {
+          ],
-			        title: '地址',
+          columnsW: [
-			        dataIndex: 'ProvinceCity',
+            {
-			        key: 'ProvinceCity',
+              title: "外包名称",
-					render:(test)=>{
+              dataIndex: "name",
-						return test[0]===null?'':(getprovince(test[0])+'/'+getprovince(test[1])+'/'+getprovince(test[2]))
+              key: "name"
-					}
+            },
-			    },
+            {
-				{
+              title: "联系人",
-				    title: '地址详情',
+              dataIndex: "contacts",
-				    dataIndex: 'address',
+              key: "contacts"
-				    key: 'address',
+            },
-					render:(text)=>{
+            {
-						return (text&&text.length>8?text.substr(0,8)+'...':text)
+              title: "联系人电话",
-					}
+              dataIndex: "contactsMobile",
-				},
+              key: "contactsMobile"
-				{
+            },
-				    title: '创建时间',
+            {
-				    dataIndex: 'createTimes',
+              title: "地址",
-				    key: 'createTimes',
+              dataIndex: "ProvinceCity",
-				},
+              key: "ProvinceCity",
-			    {
+              render: test => {
-			        title: '任务名称',
+                return test[0] === null
-			        dataIndex: 'tname',
+                  ? ""
-			        key: 'tname'
+                  : getprovince(test[0]) +
-			    },
+                      "/" +
-			    {
+                      getprovince(test[1]) +
-			        title: '合同编号',
+                      "/" +
-			        dataIndex: 'contractNo',
+                      getprovince(test[2]);
-			        key: 'contractNo',
+              }
-			    },
+            },
-			    {
+            {
-			        title: '项目状态',
+              title: "地址详情",
-			        dataIndex: 'projectStatus',
+              dataIndex: "address",
-			        key: 'projectStatus',
+              key: "address",
-					render:(text)=>{
+              render: text => {
-						return getProjectStatus(text);
+                return text && text.length > 8
-					}
+                  ? text.substr(0, 8) + "..."
-			    },
+                  : text;
-			],
+              }
-			columnsrizhi:[
+            },
-				{
+            {
-					title:'流程',
+              title: "创建时间",
-					dataIndex: 'processName',
+              dataIndex: "createTimes",
-					key: 'processName'
+              key: "createTimes"
-				},{
+            },
-					title:'操作人',
+            {
-					dataIndex: 'adminName',
+              title: "任务名称",
-					key: 'adminName'
+              dataIndex: "tname",
-				},{
+              key: "tname"
-					title:'时间',
+            },
-					dataIndex: 'createDate',
+            {
-					key: 'createDate'
+              title: "合同编号",
-				}
+              dataIndex: "contractNo",
-			],
+              key: "contractNo"
-            dataSource: [],
+            },
-            searchTime: [],
+            {
-            columnsX: [
+              title: "项目状态",
-				{
+              dataIndex: "projectStatus",
-                    title: '业务项目名称',
+              key: "projectStatus",
-                    dataIndex: 'commodityName',
+              render: text => {
-                    key: 'commodityName'
+                return getProjectStatus(text);
-                }, {
+              }
-                    title: '项目类别',
+            }
-                    dataIndex: 'cname',
+          ],
-                    key: 'cname'
+          columnsrizhi: [
-                },{
+            {
-                    title: '项目数量',
+              title: "流程",
-                    dataIndex: 'commodityQuantity',
+              dataIndex: "processName",
-                    key: 'commodityQuantity'
+              key: "processName"
-                }, {
+            },
-                    title: '金额(万元)',
+            {
-                    dataIndex: 'commodityPrice',
+              title: "操作人",
-                    key: 'commodityPrice'
+              dataIndex: "adminName",
-                }, {
+              key: "adminName"
-                    title: '负责人',
+            },
-                    dataIndex: 'contacts',
+            {
-                    key: 'contacts'
+              title: "时间",
-                }, {
+              dataIndex: "createDate",
-                    title: '负责人电话',
+              key: "createDate"
-                    dataIndex: 'contactsMobile',
+            }
-                    key: 'contactsMobile'
+          ],
-                }, {
+          dataSource: [],
-                    title: '主要项目',
+          searchTime: [],
-                    dataIndex: 'main',
+          columnsX: [
-                    key: 'main',
+            {
-                    render:(text)=>{
+              title: "业务项目名称",
-                    	return (text?'是':'否')
+              dataIndex: "commodityName",
-                    }
+              key: "commodityName"
-                }, {
+            },
-                    title: '项目说明',
+            {
-                    dataIndex: 'taskComment',
+              title: "项目类别",
-                    key: 'taskComment',
+              dataIndex: "cname",
-					render:(text)=>{
+              key: "cname"
-						return (text&&text.length>8?text.substr(0,8)+'…':text)
+            },
-					}
+            {
-                },
+              title: "项目数量",
-                {
+              dataIndex: "commodityQuantity",
-                    title:'操作',
+              key: "commodityQuantity"
-                    dataIndex: 'caozuo',
+            },
-                    key: 'caouzo',
+            {
-                    render:(text,record)=>{
+              title: "金额(万元)",
-                        return (
+              dataIndex: "commodityPrice",
-                          <div>
+              key: "commodityPrice"
-                            {this.state.processStatus == 4 ||
+            },
-                            record.taskStatus == 0 ? (
+            {
-                              <Button
+              title: "负责人",
-                                type="primary"
+              dataIndex: "contacts",
-                                style={{ margin: "0 10px" }}
+              key: "contacts"
-                                onClick={e => {
+            },
-                                  e.stopPropagation(), this.evaluate(record);
+            {
-                                }}
+              title: "负责人电话",
-                              >
+              dataIndex: "contactsMobile",
-                                分配任务
+              key: "contactsMobile"
-                              </Button>
+            },
-                            ) : (
+            {
-                              ""
+              title: "主要项目",
-                            )}
+              dataIndex: "main",
-                          </div>
+              key: "main",
-                        );
+              render: text => {
-                    }
+                return text ? "是" : "否";
-                }
+              }
-			],
+            },
-			dataSourceX: [],
+            {
-        }
+              title: "项目说明",
+              dataIndex: "taskComment",
+              key: "taskComment",
+              render: text => {
+                return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
+              }
+            },
+            {
+              title: "操作",
+              dataIndex: "caozuo",
+              key: "caouzo",
+              render: (text, record) => {
+                return (
+                  <div>
+                    {this.state.processStatus == 4 || record.taskStatus == 0 ? (
+                      <Button
+                        type="primary"
+                        style={{ margin: "0 10px" }}
+                        onClick={e => {
+                          e.stopPropagation(), this.evaluate(record);
+                        }}
+                      >
+                        分配任务
+                      </Button>
+                    ) : (
+                      ""
+                    )}
+                  </div>
+                );
+              }
+            }
+          ],
+          dataSourceX: []
+        };
     },
     },
     /* 分派 */
     /* 分派 */
     evaluate(record){
     evaluate(record){