mentoswzq 5 anni fa
parent
commit
2c2644a1e3

+ 16 - 7
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -717,7 +717,18 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
-
+        {
+          title: "项目编号",
+          dataIndex: "id",
+          key: "id",
+          render: (text, record) => {
+            if (record.splitStatus == 2) {
+              return <span>{record.splitSuper + "-" + record.splitId}</span>;
+            } else {
+              return text;
+            }
+          }
+        },
         {
           title: "客户名称",
           dataIndex: "userName",
@@ -743,11 +754,6 @@ const approvedOutsourcing = React.createClass({
           key: "cname"
         },
         {
-          title: "项目编号",
-          dataIndex: "id",
-          key: "id"
-        },
-        {
           title: "项目名称",
           dataIndex: "taskName",
           key: "taskName"
@@ -2113,7 +2119,10 @@ const approvedOutsourcing = React.createClass({
               salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime,
-              outsource: thisdata.outsource
+              outsource: thisdata.outsource,
+              splitStatus: thisdata.splitStatus,
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }

+ 16 - 7
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -724,7 +724,18 @@ const approvedOutsourcing = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
-
+        {
+          title: "项目编号",
+          dataIndex: "id",
+          key: "id",
+          render: (text, record) => {
+            if (record.splitStatus == 2) {
+              return <span>{record.splitSuper + "-" + record.splitId}</span>;
+            } else {
+              return text;
+            }
+          }
+        },
         {
           title: "客户名称",
           dataIndex: "userName",
@@ -750,11 +761,6 @@ const approvedOutsourcing = React.createClass({
           key: "cname"
         },
         {
-          title: "项目编号",
-          dataIndex: "id",
-          key: "id"
-        },
-        {
           title: "项目名称",
           dataIndex: "taskName",
           key: "taskName"
@@ -2078,7 +2084,10 @@ const approvedOutsourcing = React.createClass({
               salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime,
-              outsource: thisdata.outsource
+              outsource: thisdata.outsource,
+              splitStatus: thisdata.splitStatus,
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }

+ 1 - 2
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -126,8 +126,7 @@ const outsourcingPaiDan = React.createClass({
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo",
-          fixed: "left"
+          key: "orderNo"
         },
         {
           title: "合同编号",

+ 1 - 2
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -175,8 +175,7 @@ const outsourcingPaiDan = React.createClass({
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo",
-          fixed: "left"
+          key: "orderNo"
         },
         {
           title: "合同编号",

+ 1 - 2
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -157,8 +157,7 @@ const PaiDan = React.createClass({
         {
           title: "订单编号",
           dataIndex: "orderNo",
-          key: "orderNo",
-          fixed: "left"
+          key: "orderNo"
         },
         {
           title: "合同编号",

+ 105 - 50
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -19,6 +19,7 @@ import {
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import Receivable from "./receivable";
+import ResolutionDetail from "@/resolutionDetail";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ReactToPrint from "react-to-print";
 import {
@@ -48,7 +49,7 @@ const ShouKuang = React.createClass({
       crossDomain: false,
       url: globalConfig.context + "/api/admin/organization/selectSuperId",
       data: {},
-      success: function (data) {
+      success: function(data) {
         let thedata = data.data;
         let theArr = [];
         if (!thedata) {
@@ -56,7 +57,7 @@ const ShouKuang = React.createClass({
             message.warning(data.error[0].message);
           }
         } else {
-          thedata.map(function (item, index) {
+          thedata.map(function(item, index) {
             theArr.push({
               key: index,
               name: item.name,
@@ -69,7 +70,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -104,9 +105,9 @@ const ShouKuang = React.createClass({
         processStatus: this.state.processStatusSearch,
         contractNo: this.state.contractNoSearch,
         liquidationStatus: this.state.liquidationStatus,
-        amountStatus: this.state.amountStatus,
+        amountStatus: this.state.amountStatus
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data || !data.data.pagination.list) {
           if (data.error && data.error.length) {
@@ -162,7 +163,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loadingA: false
         });
@@ -191,10 +192,10 @@ const ShouKuang = React.createClass({
         defaultPageSize: 10,
         showQuickJumper: true,
         pageSize: 10,
-        onChange: function (page) {
+        onChange: function(page) {
           this.loadData(page);
         }.bind(this),
-        showTotal: function (total) {
+        showTotal: function(total) {
           return "共" + total + "条数据";
         }
       },
@@ -247,7 +248,27 @@ const ShouKuang = React.createClass({
         {
           title: "项目数量",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
+          render: (text, record) => {
+            if (record.splitStatus == 1) {
+              return (
+                <span>
+                  {text}{" "}
+                  <Tag
+                    color="#108ee9"
+                    onClick={e => {
+                      e.stopPropagation();
+                      this.showRes(record);
+                    }}
+                  >
+                    已拆
+                  </Tag>
+                </span>
+              );
+            } else {
+              return text;
+            }
+          }
         },
         {
           title: "服务市价",
@@ -278,9 +299,9 @@ const ShouKuang = React.createClass({
           key: "outsource",
           render: text => {
             if (text == 0) {
-              return "否"
+              return "否";
             } else if (text == 1) {
-              return "是"
+              return "是";
             }
           }
         },
@@ -396,7 +417,18 @@ const ShouKuang = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
-
+        {
+          title: "项目编号",
+          dataIndex: "id",
+          key: "id",
+          render: (text, record) => {
+            if (record.splitStatus == 2) {
+              return <span>{record.splitSuper + "-" + record.splitId}</span>;
+            } else {
+              return text;
+            }
+          }
+        },
         {
           title: "客户名称",
           dataIndex: "userName",
@@ -422,11 +454,6 @@ const ShouKuang = React.createClass({
           key: "cname"
         },
         {
-          title: "项目编号",
-          dataIndex: "id",
-          key: "id"
-        },
-        {
           title: "项目名称",
           dataIndex: "taskName",
           key: "taskName"
@@ -473,9 +500,9 @@ const ShouKuang = React.createClass({
           key: "outsource",
           render: text => {
             if (text == 0) {
-              return "否"
+              return "否";
             } else if (text == 1) {
-              return "是"
+              return "是";
             }
           }
         },
@@ -593,14 +620,14 @@ const ShouKuang = React.createClass({
           dataIndex: "contractNo",
           key: "contractNo",
           className: "title-table",
-          fixed: 'left',
+          fixed: "left"
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
           className: "title-table",
-          fixed: 'left',
+          fixed: "left"
         },
         {
           title: "订单编号",
@@ -707,9 +734,9 @@ const ShouKuang = React.createClass({
           className: "title-table",
           render: text => {
             if (text == 3) {
-              return (<Tag>已驳回</Tag>)
+              return <Tag>已驳回</Tag>;
             } else {
-              return ("")
+              return "";
             }
           }
         }
@@ -906,13 +933,9 @@ const ShouKuang = React.createClass({
           key: "deleteSign",
           render: (text, record) => {
             if (!text) {
-              return (
-                ""
-              )
+              return "";
             } else {
-              return (
-                <Tag>已删除</Tag>
-              )
+              return <Tag>已删除</Tag>;
             }
           }
         }
@@ -931,7 +954,7 @@ const ShouKuang = React.createClass({
         orderNo: record.orderNo
       }
     }).done(
-      function (data) {
+      function(data) {
         if (!data.error.length) {
           message.success("通过成功!");
           this.setState({
@@ -1018,6 +1041,20 @@ const ShouKuang = React.createClass({
   search() {
     this.loadData();
   },
+
+  // 拆分详细
+  showRes(record) {
+    this.setState({
+      resVisible: true,
+      resRecord: record
+    });
+  },
+  resCancel() {
+    this.setState({
+      resVisible: false
+    });
+  },
+
   reset() {
     this.state.nameSearch = "";
     this.state.releaseDate = [];
@@ -1052,7 +1089,7 @@ const ShouKuang = React.createClass({
         reason: this.state.content
       }
     }).done(
-      function (data) {
+      function(data) {
         if (!data.error.length) {
           message.success("驳回成功!");
           this.setState({
@@ -1118,7 +1155,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         let sum = 0;
         if (!data.data) {
@@ -1145,7 +1182,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).done(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1167,7 +1204,7 @@ const ShouKuang = React.createClass({
         pageSize: 9999,
         whoType: 1
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         let waterSum = 0;
         if (!data.data || !data.data.list) {
@@ -1194,11 +1231,16 @@ const ShouKuang = React.createClass({
               createrName: thisdata.createrName,
               saleName: thisdata.saleName,
               createTimes: thisdata.createTimes,
-              type: thisdata.type == 0 ? "手工" : thisdata.type == 1 ? "批量" : "合同变更退款",
+              type:
+                thisdata.type == 0
+                  ? "手工"
+                  : thisdata.type == 1
+                  ? "批量"
+                  : "合同变更退款",
               deleteSign: thisdata.deleteSign,
               deleteTimes: thisdata.deleteTimes,
               refundTimes: thisdata.refundTimes,
-              remarks: thisdata.remarks,
+              remarks: thisdata.remarks
             });
           }
         }
@@ -1208,7 +1250,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1231,13 +1273,13 @@ const ShouKuang = React.createClass({
       globalConfig.context +
       "/api/admin/receivables/exportReceivables?" +
       `orderNo=${
-      this.state.orderNoSearch ? this.state.orderNoSearch : ""
+        this.state.orderNoSearch ? this.state.orderNoSearch : ""
       }&buyerName=${
-      this.state.nameSearch ? this.state.nameSearch : ""
+        this.state.nameSearch ? this.state.nameSearch : ""
       }&departmentId=${
-      this.state.departmenttList ? this.state.departmenttList : ""
+        this.state.departmenttList ? this.state.departmenttList : ""
       }&contractNo=${
-      this.state.contractNoSearch ? this.state.contractNoSearch : ""
+        this.state.contractNoSearch ? this.state.contractNoSearch : ""
       }&processStatus=${this.state.processStatusSearch}`;
   },
   exportWater() {
@@ -1265,7 +1307,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -1294,7 +1336,10 @@ const ShouKuang = React.createClass({
               salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime,
-              outsource: thisdata.outsource
+              outsource: thisdata.outsource,
+              splitStatus: thisdata.splitStatus,
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }
@@ -1303,7 +1348,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1355,7 +1400,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -1397,7 +1442,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1417,7 +1462,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         let totalWaibao = 0;
         if (!data.data) {
@@ -1471,7 +1516,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1500,6 +1545,16 @@ const ShouKuang = React.createClass({
     };
     return (
       <div className="user-content">
+        {this.state.resVisible ? (
+          <ResolutionDetail
+            cancel={this.resCancel}
+            detail={this.state.resRecord}
+            visible={this.state.resVisible}
+            id={this.state.resRecord.orderNo}
+          />
+        ) : (
+          ""
+        )}
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>收款结算</span>
         </div>
@@ -1540,7 +1595,7 @@ const ShouKuang = React.createClass({
                   this.setState({ departmenttList: e });
                 }}
               >
-                {departmentArr.map(function (item) {
+                {departmentArr.map(function(item) {
                   return (
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
@@ -1869,7 +1924,7 @@ const ShouKuang = React.createClass({
               <span>
                 {`合同额总计(万元):${
                   this.state.totalHui ? this.state.totalHui : "0"
-                  }`}
+                }`}
               </span>
             }
           </p>

+ 130 - 71
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -19,6 +19,7 @@ import {
   Popconfirm
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
+import ResolutionDetail from "@/resolutionDetail";
 import Receivable from "./receivable";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ReactToPrint from "react-to-print";
@@ -51,7 +52,7 @@ const ShouKuang = React.createClass({
       crossDomain: false,
       url: globalConfig.context + "/api/admin/organization/selectSuperId",
       data: {},
-      success: function (data) {
+      success: function(data) {
         let thedata = data.data;
         let theArr = [];
         if (!thedata) {
@@ -59,7 +60,7 @@ const ShouKuang = React.createClass({
             message.warning(data.error[0].message);
           }
         } else {
-          thedata.map(function (item, index) {
+          thedata.map(function(item, index) {
             theArr.push({
               key: index,
               name: item.name,
@@ -72,7 +73,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         // this.setState({
         //   loading: false
         // });
@@ -109,12 +110,11 @@ const ShouKuang = React.createClass({
         liquidationStatus: this.state.liquidationStatus,
         amountStatus: this.state.amountStatus
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data || !data.data.pagination.list) {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
-
           }
         } else {
           for (let i = 0; i < data.data.pagination.list.length; i++) {
@@ -164,10 +164,9 @@ const ShouKuang = React.createClass({
           totalHui: data.data.count ? data.data.count.signTotalAmount : 0,
           hui: data.data.count ? data.data.count.actuallyTotalAmount : 0
         });
-
       }.bind(this)
     }).always(
-      function () {
+      function() {
         // window.setTimeout(() => {
         this.setState({
           loadingA: false
@@ -201,15 +200,15 @@ const ShouKuang = React.createClass({
         defaultPageSize: 10,
         showQuickJumper: true,
         pageSize: 10,
-        onChange: function (page) {
-          console.log(page);
+        onChange: function(page) {
+          // console.log(page);
 
           this.setState({
             pageNo: page
-          })
+          });
           this.loadData(page);
         }.bind(this),
-        showTotal: function (total) {
+        showTotal: function(total) {
           return "共" + total + "条数据";
         }
       },
@@ -267,7 +266,27 @@ const ShouKuang = React.createClass({
         {
           title: "项目数量",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
+          render: (text, record) => {
+            if (record.splitStatus == 1) {
+              return (
+                <span>
+                  {text}{" "}
+                  <Tag
+                    color="#108ee9"
+                    onClick={e => {
+                      e.stopPropagation();
+                      this.showRes(record);
+                    }}
+                  >
+                    已拆
+                  </Tag>
+                </span>
+              );
+            } else {
+              return text;
+            }
+          }
         },
         {
           title: "服务市价",
@@ -298,9 +317,9 @@ const ShouKuang = React.createClass({
           key: "outsource",
           render: text => {
             if (text == 0) {
-              return "否"
+              return "否";
             } else if (text == 1) {
-              return "是"
+              return "是";
             }
           }
         },
@@ -416,6 +435,18 @@ const ShouKuang = React.createClass({
           dataIndex: "orderNo",
           key: "orderNo"
         },
+        {
+          title: "项目编号",
+          dataIndex: "id",
+          key: "id",
+          render: (text, record) => {
+            if (record.splitStatus == 2) {
+              return <span>{record.splitSuper + "-" + record.splitId}</span>;
+            } else {
+              return text;
+            }
+          }
+        },
 
         {
           title: "客户名称",
@@ -441,11 +472,7 @@ const ShouKuang = React.createClass({
           dataIndex: "cname",
           key: "cname"
         },
-        {
-          title: "项目编号",
-          dataIndex: "id",
-          key: "id"
-        },
+
         {
           title: "项目名称",
           dataIndex: "taskName",
@@ -493,9 +520,9 @@ const ShouKuang = React.createClass({
           key: "outsource",
           render: text => {
             if (text == 0) {
-              return "否"
+              return "否";
             } else if (text == 1) {
-              return "是"
+              return "是";
             }
           }
         },
@@ -613,14 +640,14 @@ const ShouKuang = React.createClass({
           dataIndex: "contractNo",
           key: "contractNo",
           className: "title-table",
-          fixed: 'left',
+          fixed: "left"
         },
         {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
           className: "title-table",
-          fixed: 'left',
+          fixed: "left"
         },
         {
           title: "订单编号",
@@ -756,7 +783,7 @@ const ShouKuang = React.createClass({
                     收款
                   </Button>
                 )} */}
-                {recard.backStatus == 3 ? (<Tag>已驳回</Tag>) : ("")}
+                {recard.backStatus == 3 ? <Tag>已驳回</Tag> : ""}
                 {recard.processStatus == 3 ? (
                   <Button
                     type="primary"
@@ -769,22 +796,26 @@ const ShouKuang = React.createClass({
                     通过
                   </Button>
                 ) : (
-                    ""
-                  )}
+                  ""
+                )}
                 {!(
                   recard.actuallyTotalAmount &&
                   Number(recard.actuallyTotalAmount) > 0
                 ) && (
-                    <Button
-                      type="danger"
-                      style={{ marginLeft: "5px", display: recard.processStatus == 3 ? "inline-block" : "none" }}
-                      onClick={e => {
-                        e.stopPropagation(), this.reject(recard);
-                      }}
-                    >
-                      驳回
-                    </Button>
-                  )}
+                  <Button
+                    type="danger"
+                    style={{
+                      marginLeft: "5px",
+                      display:
+                        recard.processStatus == 3 ? "inline-block" : "none"
+                    }}
+                    onClick={e => {
+                      e.stopPropagation(), this.reject(recard);
+                    }}
+                  >
+                    驳回
+                  </Button>
+                )}
                 {
                   // <Button
                   //   type="primary"
@@ -924,15 +955,11 @@ const ShouKuang = React.createClass({
                   okText="删除"
                   cancelText="不删除"
                 >
-                  <Button>
-                    删除
-                  </Button>
+                  <Button>删除</Button>
                 </Popconfirm>
-              )
+              );
             } else {
-              return (
-                <Tag>已删除</Tag>
-              )
+              return <Tag>已删除</Tag>;
             }
           }
         }
@@ -953,18 +980,18 @@ const ShouKuang = React.createClass({
       data: {
         billNo
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (data.error && data.error.length) {
           message.warning(data.error[0].message);
         } else {
-          message.warning("删除流水成功!")
-          this.waterData()
-          this.loadData()
+          message.warning("删除流水成功!");
+          this.waterData();
+          this.loadData();
         }
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -982,7 +1009,7 @@ const ShouKuang = React.createClass({
         orderNo: record.orderNo
       }
     }).done(
-      function (data) {
+      function(data) {
         if (!data.error.length) {
           message.success("通过成功!");
           this.setState({
@@ -1069,6 +1096,20 @@ const ShouKuang = React.createClass({
   search() {
     this.loadData();
   },
+
+  // 拆分详细
+  showRes(record) {
+    this.setState({
+      resVisible: true,
+      resRecord: record
+    });
+  },
+  resCancel() {
+    this.setState({
+      resVisible: false
+    });
+  },
+
   reset() {
     this.state.nameSearch = "";
     this.state.releaseDate = [];
@@ -1103,7 +1144,7 @@ const ShouKuang = React.createClass({
         reason: this.state.content
       }
     }).done(
-      function (data) {
+      function(data) {
         if (!data.error.length) {
           message.success("驳回成功!");
           this.setState({
@@ -1135,7 +1176,7 @@ const ShouKuang = React.createClass({
     });
   },
   callback(key) {
-    console.log(key);
+    // console.log(key);
   },
   onSelectChange(selectedRowKeys) {
     // for(var i=0; i<selectedRowKeys.length; i++){
@@ -1169,7 +1210,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         let sum = 0;
         if (!data.data) {
@@ -1196,7 +1237,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).done(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1218,7 +1259,7 @@ const ShouKuang = React.createClass({
         pageSize: 9999,
         whoType: 1
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         let waterSum = 0;
         if (!data.data || !data.data.list) {
@@ -1245,7 +1286,12 @@ const ShouKuang = React.createClass({
               createrName: thisdata.createrName,
               saleName: thisdata.saleName,
               createTimes: thisdata.createTimes,
-              type: thisdata.type == 0 ? "手工" : thisdata.type == 1 ? "批量" : "合同变更退款",
+              type:
+                thisdata.type == 0
+                  ? "手工"
+                  : thisdata.type == 1
+                  ? "批量"
+                  : "合同变更退款",
               deleteSign: thisdata.deleteSign,
               deleteTimes: thisdata.deleteTimes,
               refundTimes: thisdata.refundTimes,
@@ -1259,7 +1305,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1282,13 +1328,13 @@ const ShouKuang = React.createClass({
       globalConfig.context +
       "/api/admin/receivables/exportReceivables?" +
       `orderNo=${
-      this.state.orderNoSearch ? this.state.orderNoSearch : ""
+        this.state.orderNoSearch ? this.state.orderNoSearch : ""
       }&buyerName=${
-      this.state.nameSearch ? this.state.nameSearch : ""
+        this.state.nameSearch ? this.state.nameSearch : ""
       }&departmentId=${
-      this.state.departmenttList ? this.state.departmenttList : ""
+        this.state.departmenttList ? this.state.departmenttList : ""
       }&contractNo=${
-      this.state.contractNoSearch ? this.state.contractNoSearch : ""
+        this.state.contractNoSearch ? this.state.contractNoSearch : ""
       }&processStatus=${this.state.processStatusSearch}`;
   },
   exportWater() {
@@ -1316,7 +1362,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -1345,7 +1391,10 @@ const ShouKuang = React.createClass({
               salesmanName: thisdata.salesmanName, //订单负责人
               taskDistributionTime: thisdata.taskDistributionTime,
               taskEndTime: thisdata.taskEndTime,
-              outsource: thisdata.outsource
+              outsource: thisdata.outsource,
+              splitStatus: thisdata.splitStatus,
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }
@@ -1354,7 +1403,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1406,7 +1455,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data || !data.data.list) {
           if (data.error && data.error.length) {
@@ -1448,7 +1497,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1468,7 +1517,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.selectedRowKeys[0],
         pageSize: 9999
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         let totalWaibao = 0;
         if (!data.data) {
@@ -1523,7 +1572,7 @@ const ShouKuang = React.createClass({
         });
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1553,7 +1602,7 @@ const ShouKuang = React.createClass({
         orderNo: this.state.checkOrderNo,
         remarks: this.state.checkData
       },
-      success: function (data) {
+      success: function(data) {
         let theArr = [];
         if (!data.data) {
           if (data.error && data.error.length) {
@@ -1569,7 +1618,7 @@ const ShouKuang = React.createClass({
         }
       }.bind(this)
     }).always(
-      function () {
+      function() {
         this.setState({
           loading: false
         });
@@ -1598,6 +1647,16 @@ const ShouKuang = React.createClass({
     };
     return (
       <div className="user-content">
+        {this.state.resVisible ? (
+          <ResolutionDetail
+            cancel={this.resCancel}
+            detail={this.state.resRecord}
+            visible={this.state.resVisible}
+            id={this.state.resRecord.orderNo}
+          />
+        ) : (
+          ""
+        )}
         <div className="content-title" style={{ marginBottom: 10 }}>
           <span style={{ fontWeight: 900, fontSize: 16 }}>收款结算</span>
         </div>
@@ -1638,7 +1697,7 @@ const ShouKuang = React.createClass({
                   this.setState({ departmenttList: e });
                 }}
               >
-                {departmentArr.map(function (item) {
+                {departmentArr.map(function(item) {
                   return (
                     <Select.Option key={item.id}>{item.name}</Select.Option>
                   );
@@ -1967,7 +2026,7 @@ const ShouKuang = React.createClass({
               <span>
                 {`合同额总计(万元):${
                   this.state.totalHui ? this.state.totalHui : "0"
-                  }`}
+                }`}
               </span>
             }
           </p>

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

@@ -750,8 +750,8 @@ class ChangeDetail extends Component {
         id: this.props.data.id
       },
       success: data => {
-        if (data.data && data.data.length) {
-          message.success("保存成功!");
+        if (data.data) {
+          message.success("提交成功!");
           // window.location.reload();
           this.setState({
             loading: false

+ 1 - 0
js/component/manageCenter/order/orderNew/changeComponent/rizhi.js

@@ -125,6 +125,7 @@ class Rizhi extends Component {
         }}
       >
         <Button
+          style={{ position: "relative", zIndex: 999 }}
           onClick={() => {
             this.loadData();
             this.changeModal();

+ 21 - 2
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -159,7 +159,21 @@ const OutsourceTaskAssignment = React.createClass({
         {
           title: "任务数量",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
+          render: (text, record) => {
+            if (record.splitStatus == 1) {
+              return (
+                <span>
+                  {text}{" "}
+                  <Tag color="#108ee9" style={{ float: "right" }}>
+                    已拆
+                  </Tag>
+                </span>
+              );
+            } else {
+              return text;
+            }
+          }
         },
         {
           title: "订单部门",
@@ -610,7 +624,12 @@ const OutsourceTaskAssignment = React.createClass({
             key: "splitAname"
           },
           {
-            title: "拆分时间人",
+            title: "项目负责人",
+            dataIndex: "receiverName",
+            key: "receiverName"
+          },
+          {
+            title: "拆分时间",
             dataIndex: "splitTimes",
             key: "splitTimes"
           },

+ 40 - 7
js/component/manageCenter/project/task/myTask.jsx

@@ -174,7 +174,10 @@ const Task = React.createClass({
               hours: thisdata.hours,
               contractNo: thisdata.contractNo,
               approval: thisdata.approval, //特批状态
-              outsourceStatus: thisdata.outsourceStatus //外包审核状态
+              outsourceStatus: thisdata.outsourceStatus, //外包审核状态
+              splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }
@@ -258,7 +261,18 @@ const Task = React.createClass({
         {
           title: "项目编号",
           dataIndex: "id",
-          key: "id"
+          key: "id",
+          render: (text, record) => {
+            if(record.splitStatus == 2) {
+              return (
+                <span>{record.splitSuper + "-" + record.splitId}</span>
+              )
+            }else {
+              return (
+                text
+              )
+            }
+          }
         },
         {
           title: "项目名称",
@@ -269,6 +283,11 @@ const Task = React.createClass({
           }
         },
         {
+          title: "项目数量",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo"
@@ -616,16 +635,23 @@ const Task = React.createClass({
   },
   tableRowClick(record) {
     this.state.RowData = record;
+    
     if (record.taskName.substring(0, 5) === "软件著作权") {
       this.setState({
         speVisible: true,
         id: record.id,
+        splitStatus: record.splitStatus,
+        splitSuper: record.splitSuper,
+        splitId: record.splitId,
         dataArr: record,
         commodityQuantity: record.commodityQuantity
       });
     } else {
       this.setState({
-        visible: true
+        visible: true,
+        splitStatus: record.splitStatus,
+        splitSuper: record.splitSuper,
+        splitId: record.splitId
       });
     }
     this.xiangqing(record.id, record.taskName);
@@ -796,7 +822,7 @@ const Task = React.createClass({
             declareUser: thisdata.declareUser, //账号
             declarePwd: thisdata.declarePwd, //密码
             outsourceName: thisdata.outsourceName, //外包公司
-            outsourcePrice: thisdata.outsourcePrice //外包价格
+            outsourcePrice: thisdata.outsourcePrice, //外包价格
           });
         }
       }.bind(this)
@@ -848,7 +874,6 @@ const Task = React.createClass({
             postalAddress: thisdata.postalAddress //详细地址
           });
         }
-        console.log(this.state.ProvinceCity);
       }.bind(this)
     }).always(
       function() {
@@ -2140,7 +2165,11 @@ const Task = React.createClass({
                         {...formItemLayout}
                         label="项目编号"
                       >
-                        <span>{this.state.id}</span>
+                        <span>
+                          {this.state.splitStatus == 2
+                            ? this.state.splitSuper + "-" + this.state.splitId
+                            : this.state.id}
+                        </span>
                       </FormItem>
                       <FormItem
                         className="half-item"
@@ -3310,7 +3339,11 @@ const Task = React.createClass({
               {...formItemLayout}
               label="项目编号"
             >
-              <span>{this.state.id}</span>
+              <span>
+                {this.state.splitStatus == 2
+                  ? this.state.splitSuper + "-" + this.state.splitId
+                  : this.state.id}
+              </span>
             </FormItem>
             <FormItem
               className="half-item"

+ 41 - 13
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -128,7 +128,10 @@ const MyTaskCount = Form.create()(
                   salesmanName: thisdata.salesmanName, //订单负责人
                   taskDistributionTime: thisdata.taskDistributionTime,
                   taskEndTime: thisdata.taskEndTime,
-                  outsource: thisdata.outsource
+                  outsource: thisdata.outsource,
+                  splitStatus: thisdata.splitStatus,
+                  splitSuper: thisdata.splitSuper,
+                  splitId: thisdata.splitId
                 });
               }
               this.state.pagination.total = data.data.totalCount;
@@ -197,7 +200,10 @@ const MyTaskCount = Form.create()(
                   salesmanName: thisdata.salesmanName, //订单负责人
                   taskDistributionTime: thisdata.taskDistributionTime,
                   taskEndTime: thisdata.taskEndTime,
-                  outsource: thisdata.outsource
+                  outsource: thisdata.outsource,
+                  splitStatus: thisdata.splitStatus,
+                  splitSuper: thisdata.splitSuper,
+                  splitId: thisdata.splitId
                 });
               }
               this.state.pagination.total = data.data.totalCount;
@@ -252,7 +258,18 @@ const MyTaskCount = Form.create()(
             dataIndex: "orderNo",
             key: "orderNo"
           },
-
+          {
+            title: "项目编号",
+            dataIndex: "id",
+            key: "id",
+            render: (text, record) => {
+              if (record.splitStatus == 2) {
+                return <span>{record.splitSuper + "-" + record.splitId}</span>;
+              } else {
+                return text;
+              }
+            }
+          },
           {
             title: "客户名称",
             dataIndex: "userName",
@@ -278,11 +295,6 @@ const MyTaskCount = Form.create()(
             key: "cname"
           },
           {
-            title: "项目编号",
-            dataIndex: "id",
-            key: "id"
-          },
-          {
             title: "项目名称",
             dataIndex: "taskName",
             key: "taskName"
@@ -486,12 +498,18 @@ const MyTaskCount = Form.create()(
         this.setState({
           speVisible: true,
           id: record.id,
+          splitStatus: record.splitStatus,
+          splitSuper: record.splitSuper,
+          splitId: record.splitId,
           dataArr: record,
           commodityQuantity: record.commodityQuantity
         });
       } else {
         this.setState({
-          visible: true
+          visible: true,
+          splitStatus: record.splitStatus,
+          splitSuper: record.splitSuper,
+          splitId: record.splitId
         });
       }
       this.xiangqing(record.id, record.taskName);
@@ -620,7 +638,7 @@ const MyTaskCount = Form.create()(
               locationArea: thisdata.locationArea,
               ProvinceCity: ProvinceCityArr,
               postalAddress: thisdata.postalAddress, //详细地址
-              outsource: thisdata.outsource
+              outsource: thisdata.outsource,
             });
           }
         }.bind(this)
@@ -763,7 +781,9 @@ const MyTaskCount = Form.create()(
                 contacts: thisdata.contacts, //联系人
                 contactsMobile: thisdata.contactsMobile, //联系人电话
                 taskStatus: thisdata.taskStatus, //是否分配
-                splitStatus: thisdata.splitStatus
+                splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
+                splitSuper: thisdata.splitSuper,
+                splitId: thisdata.splitId
               });
             }
           }
@@ -1298,7 +1318,11 @@ const MyTaskCount = Form.create()(
                       {...formItemLayout}
                       label="任务编号"
                     >
-                      <span>{this.state.id}</span>
+                      <span>
+                        {this.state.splitStatus == 2
+                          ? this.state.splitSuper + "-" + this.state.splitId
+                          : this.state.id}
+                      </span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1784,7 +1808,11 @@ const MyTaskCount = Form.create()(
                 {...formItemLayout}
                 label="任务编号"
               >
-                <span>{this.state.id}</span>
+                <span>
+                  {this.state.splitStatus == 2
+                    ? this.state.splitSuper + "-" + this.state.splitId
+                    : this.state.id}
+                </span>
               </FormItem>
               <FormItem
                 className="half-item"

+ 34 - 6
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -105,7 +105,11 @@ const MyTaskOutsource = React.createClass({
               outsourceName: thisdata.outsourceName,
               hours: thisdata.hours,
               contractNo: thisdata.contractNo,
-              approval: thisdata.approval //特批状态
+              approval: thisdata.approval, //特批状态
+              outsourceStatus: thisdata.outsourceStatus, //外包审核状态
+              splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }
@@ -192,7 +196,14 @@ const MyTaskOutsource = React.createClass({
         {
           title: "项目编号",
           dataIndex: "id",
-          key: "id"
+          key: "id",
+          render: (text, record) => {
+            if (record.splitStatus == 2) {
+              return <span>{record.splitSuper + "-" + record.splitId}</span>;
+            } else {
+              return text;
+            }
+          }
         },
         {
           title: "项目名称",
@@ -203,6 +214,11 @@ const MyTaskOutsource = React.createClass({
           }
         },
         {
+          title: "项目数量",
+          dataIndex: "commodityQuantity",
+          key: "commodityQuantity"
+        },
+        {
           title: "订单编号",
           dataIndex: "orderNo",
           key: "orderNo"
@@ -632,12 +648,18 @@ const MyTaskOutsource = React.createClass({
       this.setState({
         speVisible: true,
         id: record.id,
+        splitStatus: record.splitStatus,
+        splitSuper: record.splitSuper,
+        splitId: record.splitId,
         dataArr: record,
         commodityQuantity: record.commodityQuantity
       });
     } else {
       this.setState({
-        visible: true
+        visible: true,
+        splitStatus: record.splitStatus,
+        splitSuper: record.splitSuper,
+        splitId: record.splitId
       });
     }
     this.xiangqing(record.id, record.taskName);
@@ -808,7 +830,7 @@ const MyTaskOutsource = React.createClass({
             declareUser: thisdata.declareUser, //账号
             declarePwd: thisdata.declarePwd, //密码
             outsourceName: thisdata.outsourceName, //外包公司名称
-            outsourcePrice: thisdata.outsourcePrice //外包价格
+            outsourcePrice: thisdata.outsourcePrice, //外包价格
           });
         }
       }.bind(this)
@@ -905,7 +927,9 @@ const MyTaskOutsource = React.createClass({
               taskStatus: thisdata.taskStatus, //是否分配
               contractNo: thisdata.contractNo, //合同编号
               certificateNumber: thisdata.certificateNumber,
-              splitStatus: thisdata.splitStatus
+              splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }
@@ -2078,7 +2102,11 @@ const MyTaskOutsource = React.createClass({
                         {...formItemLayout}
                         label="项目编号"
                       >
-                        <span>{this.state.id}</span>
+                        <span>
+                          {this.state.splitStatus == 2
+                            ? this.state.splitSuper + "-" + this.state.splitId
+                            : this.state.id}
+                        </span>
                       </FormItem>
                       <FormItem
                         className="half-item"

+ 27 - 10
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -158,7 +158,18 @@ const Task = React.createClass({
         {
           title: "任务数量",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
+          render: (text, record) => {
+            if (record.splitStatus == 1) {
+              return (
+                <span>
+                  {text} <Tag color="#108ee9" style={{ float: "right" }}>已拆</Tag>
+                </span>
+              );
+            } else {
+              return text;
+            }
+          }
         },
         {
           title: "订单部门",
@@ -239,10 +250,13 @@ const Task = React.createClass({
               return (
                 <span>
                   {text}{" "}
-                  <Tag color="#108ee9" onClick={e => {
-                    e.stopPropagation()
-                    this.showRes(record)
-                  }}>
+                  <Tag
+                    color="#108ee9"
+                    onClick={e => {
+                      e.stopPropagation();
+                      this.showRes(record);
+                    }}
+                  >
                     已拆
                   </Tag>
                 </span>
@@ -555,9 +569,7 @@ const Task = React.createClass({
           dataIndex: "splitSuper",
           key: "splitSuper",
           render: (text, record) => {
-            return (
-              text + "-" + record.splitId
-            )
+            return text + "-" + record.splitId;
           }
         },
         {
@@ -596,7 +608,7 @@ const Task = React.createClass({
         {
           title: "任务数量",
           dataIndex: "commodityQuantity",
-          key: "commodityQuantity"
+          key: "commodityQuantity",
         },
         {
           title: "订单部门",
@@ -609,7 +621,12 @@ const Task = React.createClass({
           key: "splitAname"
         },
         {
-          title: "拆分时间人",
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "拆分时间",
           dataIndex: "splitTimes",
           key: "splitTimes"
         },

+ 37 - 12
js/component/manageCenter/project/task/taskCount.jsx

@@ -80,7 +80,10 @@ const IntentionCustomer = Form.create()(
                   salesmanName: thisdata.salesmanName, //订单负责人
                   taskDistributionTime: thisdata.taskDistributionTime,
                   taskEndTime: thisdata.taskEndTime,
-                  outsource: thisdata.outsource
+                  outsource: thisdata.outsource,
+                  splitStatus: thisdata.splitStatus,
+                  splitSuper: thisdata.splitSuper,
+                  splitId: thisdata.splitId
                 });
               }
               this.state.pagination.total = data.data.totalCount;
@@ -149,7 +152,10 @@ const IntentionCustomer = Form.create()(
                   salesmanName: thisdata.salesmanName, //订单负责人
                   taskDistributionTime: thisdata.taskDistributionTime,
                   taskEndTime: thisdata.taskEndTime,
-                  outsource: thisdata.outsource
+                  outsource: thisdata.outsource,
+                  splitStatus: thisdata.splitStatus,
+                  splitSuper: thisdata.splitSuper,
+                  splitId: thisdata.splitId
                 });
               }
               this.state.pagination.total = data.data.totalCount;
@@ -205,7 +211,18 @@ const IntentionCustomer = Form.create()(
             dataIndex: "orderNo",
             key: "orderNo"
           },
-
+          {
+            title: "项目编号",
+            dataIndex: "id",
+            key: "id",
+            render: (text, record) => {
+              if (record.splitStatus == 2) {
+                return <span>{record.splitSuper + "-" + record.splitId}</span>;
+              } else {
+                return text;
+              }
+            }
+          },
           {
             title: "客户名称",
             dataIndex: "userName",
@@ -231,11 +248,6 @@ const IntentionCustomer = Form.create()(
             key: "cname"
           },
           {
-            title: "项目编号",
-            dataIndex: "id",
-            key: "id"
-          },
-          {
             title: "项目名称",
             dataIndex: "taskName",
             key: "taskName"
@@ -549,7 +561,10 @@ const IntentionCustomer = Form.create()(
               declarePwd: thisdata.declarePwd, //密码
               depName: thisdata.depName, //订单部门
               outsourceName: thisdata.outsourceName, //外包公司名称
-              outsourcePrice: thisdata.outsourcePrice //外包价格
+              outsourcePrice: thisdata.outsourcePrice, //外包价格
+              splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
+              splitSuper: thisdata.splitSuper,
+              splitId: thisdata.splitId
             });
           }
         }.bind(this)
@@ -747,7 +762,9 @@ const IntentionCustomer = Form.create()(
                 contacts: thisdata.contacts, //联系人
                 contactsMobile: thisdata.contactsMobile, //联系人电话
                 taskStatus: thisdata.taskStatus, //是否分配
-                splitStatus: thisdata.splitStatus
+                splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
+                splitSuper: thisdata.splitSuper,
+                splitId: thisdata.splitId
               });
             }
           }
@@ -1261,7 +1278,11 @@ const IntentionCustomer = Form.create()(
                       {...formItemLayout}
                       label="任务编号"
                     >
-                      <span>{this.state.id}</span>
+                      <span>
+                        {this.state.splitStatus == 2
+                          ? this.state.splitSuper + "-" + this.state.splitId
+                          : this.state.id}
+                      </span>
                     </FormItem>
                     <FormItem
                       className="half-item"
@@ -1781,7 +1802,11 @@ const IntentionCustomer = Form.create()(
                 {...formItemLayout}
                 label="任务编号"
               >
-                <span>{this.state.id}</span>
+                <span>
+                  {this.state.splitStatus == 2
+                    ? this.state.splitSuper + "-" + this.state.splitId
+                    : this.state.id}
+                </span>
               </FormItem>
               <FormItem
                 className="half-item"

File diff suppressed because it is too large
+ 1617 - 1531
js/component/manageCenter/project/task/taskQuery.jsx


+ 0 - 2
js/component/project.jsx

@@ -153,8 +153,6 @@ const project = React.createClass({
     };
   },
   componentWillReceiveProps(nextProps) {
-    console.log(nextProps.visible);
-    console.log(nextProps.record, "ss");
 
     this.setState({
       visible: nextProps.visible,

+ 6 - 1
js/component/resolutionDetail.jsx

@@ -23,7 +23,12 @@ const ResolutionDetail = React.createClass({
           key: "splitAname"
         },
         {
-          title: "拆分时间人",
+          title: "项目负责人",
+          dataIndex: "receiverName",
+          key: "receiverName"
+        },
+        {
+          title: "拆分时间",
           dataIndex: "splitTimes",
           key: "splitTimes"
         }

+ 1 - 1
package.json

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