Explorar el Código

519人事更新

mentoswzq hace 4 años
padre
commit
ce115c4f88
Se han modificado 28 ficheros con 993 adiciones y 359 borrados
  1. 1 1
      css/base.less
  2. 17 2
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  3. 232 44
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  4. 1 1
      js/component/manageCenter/financialManage/distribute/shouKuan.less
  5. 8 1
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  6. 8 1
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  7. 10 2
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  8. 271 150
      js/component/manageCenter/order/orderNew/addService.jsx
  9. 101 62
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  10. 7 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  11. 3 0
      js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx
  12. 8 0
      js/component/manageCenter/order/orderNew/chargeback.jsx
  13. 3 1
      js/component/manageCenter/order/orderNew/contractCwjl.js
  14. 3 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  15. 3 1
      js/component/manageCenter/order/orderNew/contractCwzy.js
  16. 3 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  17. 3 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  18. 3 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  19. 3 1
      js/component/manageCenter/order/orderNew/contractYxgly.js
  20. 3 1
      js/component/manageCenter/order/orderNew/contractYxy.js
  21. 81 24
      js/component/manageCenter/order/orderNew/reject.jsx
  22. 44 9
      js/component/manageCenter/project/task/myTask.jsx
  23. 35 20
      js/component/manageCenter/project/task/myTaskCount.jsx
  24. 53 0
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  25. 34 19
      js/component/manageCenter/project/task/taskCount.jsx
  26. 15 0
      js/component/manageCenter/project/task/taskQuery.jsx
  27. 23 5
      js/component/manageCenter/statistics/personnel/personnelAll.jsx
  28. 17 9
      js/component/project.jsx

+ 1 - 1
css/base.less

@@ -523,7 +523,7 @@ body {
 //   transition: all .5s !important;
 // }
 .ant-tabs-tabpane.ant-tabs-tabpane-active .ant-calendar-picker-input.ant-input {
-  width: 170px !important;
+  // width: 170px !important;
 }
 .up-btn:hover {
     opacity: 1 !important;

+ 17 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -177,6 +177,7 @@ const approvedOutsourcing = React.createClass({
   },
   getInitialState() {
     return {
+      cuiTabKey: "1",
       rotateDeg: 0,
       searchMore: true,
       loadingA: false,
@@ -744,7 +745,10 @@ const approvedOutsourcing = React.createClass({
           title: "催款科目",
           dataIndex: "dunTypeName",
           key: "dunTypeName",
-          render: (text) => {
+          render: (text, record) => {
+            if (record.customizeName) {
+              return record.customizeName;
+            }
             return <span>{text}</span>;
           },
         },
@@ -754,6 +758,9 @@ const approvedOutsourcing = React.createClass({
           key: "waitDay",
           render: (text, record) => {
             if (record.dunTypeName) {
+              if (record.customizeTimes) {
+                return record.customizeTimes;
+              }
               return <span>{text}</span>;
             }
           },
@@ -2332,6 +2339,9 @@ const approvedOutsourcing = React.createClass({
   },
 
   cuiTabChange(index) {
+    this.setState({
+      cuiTabKey: index
+    })
     if (index == 2) {
       this.setState({
         loading: true,
@@ -2636,6 +2646,8 @@ const approvedOutsourcing = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {
@@ -2783,6 +2795,7 @@ const approvedOutsourcing = React.createClass({
               </Select>
               <span style={{ marginRight: 0 }}>下单日期:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.releaseDate[0]
                     ? moment(this.state.releaseDate[0])
@@ -2797,6 +2810,7 @@ const approvedOutsourcing = React.createClass({
               />
               <span style={{}}>最近收款:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.shouKuanDate[0]
                     ? moment(this.state.shouKuanDate[0])
@@ -3962,10 +3976,11 @@ const approvedOutsourcing = React.createClass({
             this.loadData();
             this.setState({
               cuiVisible: false,
+              cuiTabKey: "1",
             });
           }}
         >
-          <Tabs defaultActiveKey="1" onChange={this.cuiTabChange}>
+          <Tabs activeKey={this.state.cuiTabKey} onChange={this.cuiTabChange}>
             <TabPane tab="催款节点" key="1">
               <Spin spinning={this.state.loading}>
                 <div

+ 232 - 44
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -177,6 +177,7 @@ const approvedOutsourcing = React.createClass({
   },
   getInitialState() {
     return {
+      cuiTabKey: "1",
       rotateDeg: 0,
       searchMore: true,
       assignVisibleX: false,
@@ -459,7 +460,10 @@ const approvedOutsourcing = React.createClass({
           title: "催款科目",
           dataIndex: "dunTypeName",
           key: "dunTypeName",
-          render: (text) => {
+          render: (text, record) => {
+            if (record.customizeName) {
+              return record.customizeName;
+            }
             return <span>{text}</span>;
           },
         },
@@ -469,6 +473,9 @@ const approvedOutsourcing = React.createClass({
           key: "waitDay",
           render: (text, record) => {
             if (record.dunTypeName) {
+              if (record.customizeTimes) {
+                return record.customizeTimes;
+              }
               return <span>{text}</span>;
             }
           },
@@ -1309,6 +1316,106 @@ const approvedOutsourcing = React.createClass({
         },
       ],
       waterData: [],
+      qianColumns: [
+        {
+          title: "序号",
+          dataIndex: "key",
+          key: "key",
+        },
+        {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo",
+        },
+        {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo",
+        },
+        {
+          title: "客户名称",
+          dataIndex: "userName",
+          key: "userName",
+        },
+        {
+          title: "订单负责人",
+          dataIndex: "salesmanName",
+          key: "salesmanName",
+        },
+        {
+          title: "订单部门",
+          dataIndex: "depName",
+          key: "depName",
+        },
+        {
+          title: "订单状态",
+          dataIndex: "orderStatus",
+          key: "orderStatus",
+          render: (text) => {
+            return getNewOrderStatus(text);
+          },
+        },
+        {
+          title: "项目状态",
+          dataIndex: "projectStatus",
+          key: "projectStatus",
+          render: (text) => {
+            return getProjectStatus(text);
+          },
+        },
+        {
+          title: "签单金额",
+          dataIndex: "totalAmount",
+          key: "totalAmount",
+        },
+        {
+          title: "结算状态",
+          dataIndex: "liquidationStatus",
+          key: "liquidationStatus",
+          render: (text) => {
+            return getLiquidationStatus(text);
+          },
+        },
+        {
+          title: "已收款",
+          dataIndex: "settlementAmount",
+          key: "settlementAmount",
+        },
+        {
+          title: "欠款",
+          dataIndex: "orderArrears",
+          key: "orderArrears",
+        },
+        {
+          title: "催收科目",
+          dataIndex: "type",
+          key: "type",
+          render: (text) => {
+            return "按时触发应收欠款";
+          },
+        },
+        {
+          title: "催款状态",
+          dataIndex: "dunStatus",
+          key: "dunStatus",
+          render: (text) => {
+            if (text == 0) {
+              return "未启动";
+            } else if (text == 1) {
+              return "催款中";
+            } else if (text == 2) {
+              return "已完成";
+            } else if (text == 3) {
+              return "已停止";
+            }
+          },
+        },
+        {
+          title: "催收启动时间",
+          dataIndex: "startDate",
+          key: "startDate",
+        },
+      ],
     };
   },
   // 特批通过
@@ -2412,6 +2519,8 @@ const approvedOutsourcing = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {
@@ -2432,6 +2541,50 @@ const approvedOutsourcing = React.createClass({
       }.bind(this)
     );
   },
+  cuiTabChange(index) {
+    this.setState({
+      cuiTabKey: index,
+    });
+    if (index == 2) {
+      this.setState({
+        loading: true,
+      });
+      $.ajax({
+        method: "get",
+        dataType: "json",
+        crossDomain: false,
+        url: globalConfig.context + "/api/admin/newOrder/arrearsDunList",
+        data: {
+          orderNo: this.state.selectedRowKeys[0],
+          pageSize: 9999,
+        },
+        success: function (data) {
+          let theArr = [];
+          if (data.error.length || data.data.list == "") {
+            if (data.error && data.error.length) {
+              message.warning(data.error[0].message);
+            }
+          } else {
+            for (let i = 0; i < data.data.list.length; i++) {
+              let thisdata = data.data.list[i];
+              let obj = thisdata;
+              obj.key = i;
+              theArr.push(obj);
+            }
+          }
+          this.setState({
+            qianDataList: theArr,
+          });
+        }.bind(this),
+      }).always(
+        function () {
+          this.setState({
+            loading: false,
+          });
+        }.bind(this)
+      );
+    }
+  },
   render() {
     const { TextArea } = Input;
     const { RangePicker } = DatePicker;
@@ -2559,6 +2712,7 @@ const approvedOutsourcing = React.createClass({
               </Select>
               <span style={{ marginRight: 0 }}>下单日期:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.releaseDate[0]
                     ? moment(this.state.releaseDate[0])
@@ -2573,6 +2727,7 @@ const approvedOutsourcing = React.createClass({
               />
               <span style={{}}>最近收款:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.shouKuanDate[0]
                     ? moment(this.state.shouKuanDate[0])
@@ -3735,53 +3890,86 @@ const approvedOutsourcing = React.createClass({
             this.loadData();
             this.setState({
               cuiVisible: false,
+              cuiTabKey: "1",
             });
           }}
         >
-          <Spin spinning={this.state.loading}>
-            <div
-              className="patent-table"
-              style={
-                {
-                  // width: 900,
-                  // position: "relative",
-                  // left: "50%",
-                  // transform: "translate(-50%)",
-                  // padding: "25px 0 30px 30px"
-                }
-              }
-              ref={(e) => {
-                this.refs.all = e;
-              }}
-            >
-              <Table
-                columns={this.state.cuiColumns}
-                dataSource={this.state.cuiDataList}
-                scroll={{ x: "max-content", y: 0 }}
-                pagination={false}
-                bordered
-                size="small"
-              />
-            </div>
-          </Spin>
+          <Tabs activeKey={this.state.cuiTabKey} onChange={this.cuiTabChange}>
+            <TabPane tab="催款节点" key="1">
+              <Spin spinning={this.state.loading}>
+                <div
+                  className="patent-table"
+                  ref={(e) => {
+                    this.refs.all = e;
+                  }}
+                >
+                  <Table
+                    columns={this.state.cuiColumns}
+                    dataSource={this.state.cuiDataList}
+                    scroll={{ x: "max-content", y: 0 }}
+                    pagination={false}
+                    bordered
+                    size="small"
+                  />
+                </div>
 
-          <ReactToPrint
-            trigger={() => (
-              <Button
-                type="primary"
-                style={{
-                  float: "right",
-                  marginTop: 10,
-                  position: "absolute",
-                  top: 0,
-                  right: 30,
-                }}
-              >
-                打印
-              </Button>
-            )}
-            content={() => this.refs.all}
-          />
+                <ReactToPrint
+                  trigger={() => (
+                    <Button
+                      type="primary"
+                      style={{
+                        float: "right",
+                        marginTop: 10,
+                        position: "absolute",
+                        top: "-60px",
+                        right: 30,
+                      }}
+                    >
+                      打印
+                    </Button>
+                  )}
+                  content={() => this.refs.all}
+                />
+              </Spin>
+            </TabPane>
+            <TabPane tab="欠款催收记录" key="2">
+              <Spin spinning={this.state.loading}>
+                <div
+                  className="patent-table"
+                  ref={(e) => {
+                    this.refs.all = e;
+                  }}
+                >
+                  <Table
+                    columns={this.state.qianColumns}
+                    dataSource={this.state.qianDataList}
+                    scroll={{ x: "max-content", y: 0 }}
+                    pagination={false}
+                    bordered
+                    size="small"
+                  />
+                </div>
+
+                <ReactToPrint
+                  trigger={() => (
+                    <Button
+                      type="primary"
+                      style={{
+                        float: "right",
+                        marginTop: 10,
+                        position: "absolute",
+                        top: "-60px",
+                        right: 30,
+                      }}
+                    >
+                      打印
+                    </Button>
+                  )}
+                  content={() => this.refs.all}
+                />
+              </Spin>
+            </TabPane>
+          </Tabs>
         </Modal>
         <Modal
           visible={this.state.proVisible}

+ 1 - 1
js/component/manageCenter/financialManage/distribute/shouKuan.less

@@ -2,5 +2,5 @@
 //     width: 200px !important;
 // }
 .half-item .ant-calendar-picker-input.ant-input {
-    width: 155px !important;
+    // width: 155px !important;
 }

+ 8 - 1
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -174,6 +174,7 @@ const ShouKuang = React.createClass({
   },
   getInitialState() {
     return {
+      cuiTabKey: "1",
       searchMore: true,
       dvisible: false,
       assignVisibleX: false,
@@ -1563,6 +1564,9 @@ const ShouKuang = React.createClass({
     );
   },
   cuiTabChange(index) {
+    this.setState({
+      cuiTabKey: index
+    });
     if (index == 2) {
       this.setState({
         loading: true,
@@ -1806,6 +1810,7 @@ const ShouKuang = React.createClass({
               </Select>
               <span style={{}}>下单日期:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.releaseDate[0]
                     ? moment(this.state.releaseDate[0])
@@ -1820,6 +1825,7 @@ const ShouKuang = React.createClass({
               />
               <span style={{}}>最近收款:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.shouKuanDate[0]
                     ? moment(this.state.shouKuanDate[0])
@@ -2392,10 +2398,11 @@ const ShouKuang = React.createClass({
             this.loadData();
             this.setState({
               cuiVisible: false,
+              cuiTabKey: "1",
             });
           }}
         >
-          <Tabs defaultActiveKey="1" onChange={this.cuiTabChange}>
+          <Tabs activeKey={this.state.cuiTabKey} onChange={this.cuiTabChange}>
             <TabPane tab="催款节点" key="1">
               <Spin spinning={this.state.loading}>
                 <div

+ 8 - 1
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -179,6 +179,7 @@ const ShouKuang = React.createClass({
   },
   getInitialState() {
     return {
+      cuiTabKey: "1",
       //默认搜索无流程状态
       processStatusSearch: [],
       searchMore: true,
@@ -1618,6 +1619,9 @@ const ShouKuang = React.createClass({
     );
   },
   cuiTabChange(index) {
+    this.setState({
+      cuiTabKey: index
+    });
     if(index == 2) {
       this.setState({
         loading: true
@@ -1908,6 +1912,7 @@ const ShouKuang = React.createClass({
               </Select>
               <span style={{}}>下单日期:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.releaseDate[0]
                     ? moment(this.state.releaseDate[0])
@@ -1922,6 +1927,7 @@ const ShouKuang = React.createClass({
               />
               <span style={{}}>最近收款:</span>
               <RangePicker
+                style={{ width: 170 }}
                 value={[
                   this.state.shouKuanDate[0]
                     ? moment(this.state.shouKuanDate[0])
@@ -2494,10 +2500,11 @@ const ShouKuang = React.createClass({
             this.loadData();
             this.setState({
               cuiVisible: false,
+              cuiTabKey: "1",
             });
           }}
         >
-          <Tabs defaultActiveKey="1" onChange={this.cuiTabChange}>
+          <Tabs activeKey={this.state.cuiTabKey} onChange={this.cuiTabChange}>
             <TabPane tab="催款节点" key="1">
               <Spin spinning={this.state.loading}>
                 <div

+ 10 - 2
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -219,7 +219,10 @@ const OrderDetail = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: text => {
+            render: (text, record) => {
+              if(record.customizeName) {
+                return text + record.customizeName;
+              }
               return <span>{text}</span>;
             }
           },
@@ -229,6 +232,9 @@ const OrderDetail = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
             }
@@ -642,7 +648,9 @@ const OrderDetail = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

+ 271 - 150
js/component/manageCenter/order/orderNew/addService.jsx

@@ -566,7 +566,7 @@ const NewService = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text) => {
+            render: (text,record) => {
               return <span>{text}</span>;
             },
           },
@@ -576,6 +576,9 @@ const NewService = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if(record.customizeTimes) {
+                  return record.customizeTimes
+                }
                 return <span>{text}</span>;
               }
             },
@@ -837,54 +840,82 @@ const NewService = Form.create()(
             key: "dunTypeName",
             render: (text, record) => {
               if (text) {
+                if(record.customizeName) {
+                  return text + record.customizeName;
+                }
                 return <span>{text}</span>;
               }
               if (this.state.getLoad) {
                 let arr = record.arr || [];
                 return (
-                  <Select
-                    style={{ width: "150px" }}
-                    placeholder="请选择分类"
-                    onChange={(e) => {
-                      record.dunType = e;
-                      if (e != 1) {
-                        this.setState({
-                          timeFlag: true,
-                        });
-                      } else {
-                        this.setState({
-                          timeFlag: false,
-                        });
-                      }
-                      if (e == 1 && record.sort == 6) {
-                        this.setState({
-                          yearFlag: true,
-                        });
-                      } else if (e != 1 && record.sort == 6) {
-                        this.setState({
-                          yearFlag: false,
-                        });
-                      }
-                      if (record.sort == 3 && e == 3) {
-                        this.setState({
-                          boFlag: true,
-                        });
-                      } else {
-                        this.setState({
-                          boFlag: false,
-                        });
-                      }
-                    }}
-                  >
-                    {arr.map((item) => {
-                      record;
-                      return (
-                        <Select.Option key={item.value} value={item.value}>
-                          {item.key}
-                        </Select.Option>
-                      );
-                    })}
-                  </Select>
+                  <div>
+                    <Select
+                      style={{ width: "150px", marginRight: 5 }}
+                      placeholder="请选择分类"
+                      onChange={(e) => {
+                        record.dunType = e;
+                        if(record.dunType == 0) {
+                          record.customizeTimes = ""
+                          record.customizeName = ""
+                        }
+                        if (e != 1) {
+                          this.setState({
+                            timeFlag: true,
+                          });
+                        } else {
+                          this.setState({
+                            timeFlag: false,
+                          });
+                        }
+                        if (e == 1 && record.sort == 6) {
+                          this.setState({
+                            yearFlag: true,
+                          });
+                        } else if (e != 1 && record.sort == 6) {
+                          this.setState({
+                            yearFlag: false,
+                          });
+                        }
+                        if (record.sort == 3 && e == 3) {
+                          this.setState({
+                            boFlag: true,
+                          });
+                        } else {
+                          this.setState({
+                            boFlag: false,
+                          });
+                        }
+                      }}
+                    >
+                      {arr.map((item) => {
+                        record;
+                        return (
+                          <Select.Option key={item.value} value={item.value}>
+                            {item.key}
+                          </Select.Option>
+                        );
+                      })}
+                      <Select.Option key={0} value={0}>
+                        自定义
+                      </Select.Option>
+                    </Select>
+                    {record.dunType == 0 ? (
+                      <Input
+                        value={record.customizeName}
+                        placeholder="请输入自定义名称"
+                        required="required"
+                        onChange={(e) => {
+                          record.customizeName = e.target.value;
+                          this.setState({
+                            contactList: this.state.contactList,
+                          });
+                        }}
+                        style={{ width: "120px" }}
+                      />
+                    ) : (
+                      ""
+                    )}
+                  </div>
                 );
               } else {
                 return (
@@ -899,40 +930,54 @@ const NewService = Form.create()(
             },
           },
           {
-            title: "首付时间(特批需选择时间)",
+            title: "收款时间(特批需选择时间)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {
-              if (record.dunTypeName) {
-                if (text == 0) {
-                  var str = "当天";
-                } else if (!text) {
-                  var str = "";
-                } else {
-                  var str = text + "天";
-                }
-                return <span>{str}</span>;
-              }
-              return (
-                <Select
-                  placeholder="请选择时间"
-                  style={{ width: "150px" }}
-                  disabled={
-                    this.state.approval != 0 && !this.state.timeFlag
-                      ? false
-                      : true
+                if (record.dunTypeName) {
+                  if (record.customizeTimes) {
+                    return record.customizeTimes;
                   }
-                  onChange={(e) => {
-                    record.waitDay = e;
-                  }}
-                >
-                  <Select.Option key={0}>当天</Select.Option>
-                  <Select.Option key={3}>3天</Select.Option>
-                  <Select.Option key={5}>5天</Select.Option>
-                  <Select.Option key={7}>7天</Select.Option>
-                  <Select.Option key={15}>15天</Select.Option>
-                </Select>
-              );
+                  if (text == 0) {
+                    var str = "当天";
+                  } else if (!text) {
+                    var str = "";
+                  } else {
+                    var str = text + "天";
+                  }
+                  return <span>{str}</span>;
+                }
+                return (
+                  <div>
+                    {record.dunType == 0 ? (
+                      <DatePicker
+                        style={{ width: 150 }}
+                        onChange={(e, t) => {
+                          record.customizeTimes = t;
+                        }}
+                      />
+                    ) : (
+                      <Select
+                        placeholder="请选择时间"
+                        style={{ width: "160px" }}
+                        disabled={
+                          this.state.approval != 0 && !this.state.timeFlag
+                            ? false
+                            : true
+                        }
+                        onChange={(e) => {
+                          record.waitDay = e;
+                        }}
+                      >
+                        <Select.Option key={0}>当天</Select.Option>
+                        <Select.Option key={3}>3天</Select.Option>
+                        <Select.Option key={5}>5天</Select.Option>
+                        <Select.Option key={7}>7天</Select.Option>
+                        <Select.Option key={15}>15天</Select.Option>
+                      </Select>
+                    )}
+                  </div>
+                );
             },
           },
           {
@@ -1247,49 +1292,74 @@ const NewService = Form.create()(
               if (this.state.getLoad) {
                 let arr = record.arr || [];
                 return (
-                  <Select
-                    style={{ width: "150px" }}
-                    placeholder="请选择分类"
-                    onChange={(e) => {
-                      record.dunType = e;
-                      if (e != 1) {
-                        this.setState({
-                          timeFlag: true,
-                        });
-                      } else {
-                        this.setState({
-                          timeFlag: false,
-                        });
-                      }
-                      if (e == 1 && record.sort == 6) {
-                        this.setState({
-                          yearFlag: true,
-                        });
-                      } else if (e != 1 && record.sort == 6) {
-                        this.setState({
-                          yearFlag: false,
-                        });
-                      }
-                      if (record.sort == 3 && e == 3) {
-                        this.setState({
-                          boFlag: true,
-                        });
-                      } else {
-                        this.setState({
-                          boFlag: false,
-                        });
-                      }
-                    }}
-                  >
-                    {arr.map((item) => {
-                      record;
-                      return (
-                        <Select.Option key={item.value} value={item.value}>
-                          {item.key}
-                        </Select.Option>
-                      );
-                    })}
-                  </Select>
+                  <div>
+                    <Select
+                      style={{ width: "150px",marginRight: 5 }}
+                      placeholder="请选择分类"
+                      onChange={(e) => {
+                        record.dunType = e;
+                        if (record.dunType != 0) {
+                          record.customizeTimes = "";
+                          record.customizeName = "";
+                        }
+                        if (e != 1) {
+                          this.setState({
+                            timeFlag: true,
+                          });
+                        } else {
+                          this.setState({
+                            timeFlag: false,
+                          });
+                        }
+                        if (e == 1 && record.sort == 6) {
+                          this.setState({
+                            yearFlag: true,
+                          });
+                        } else if (e != 1 && record.sort == 6) {
+                          this.setState({
+                            yearFlag: false,
+                          });
+                        }
+                        if (record.sort == 3 && e == 3) {
+                          this.setState({
+                            boFlag: true,
+                          });
+                        } else {
+                          this.setState({
+                            boFlag: false,
+                          });
+                        }
+                      }}
+                    >
+                      {arr.map((item) => {
+                        record;
+                        return (
+                          <Select.Option key={item.value} value={item.value}>
+                            {item.key}
+                          </Select.Option>
+                        );
+                      })}
+                      <Select.Option key={0} value={0}>
+                        自定义
+                      </Select.Option>
+                    </Select>
+                    {record.dunType == 0 ? (
+                      <Input
+                        value={record.customizeName}
+                        placeholder="请输入自定义名称"
+                        required="required"
+                        onChange={(e) => {
+                          record.customizeName = e.target.value;
+                          this.setState({
+                            contactList: this.state.contactList,
+                          });
+                        }}
+                        style={{ width: "120px" }}
+                      />
+                    ) : (
+                      ""
+                    )}
+                  </div>
                 );
               } else {
                 return (
@@ -1304,40 +1374,54 @@ const NewService = Form.create()(
             },
           },
           {
-            title: "首付时间(特批需选择时间)",
+            title: "收款时间(特批需选择时间)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {
-              if (record.dunTypeName) {
-                if (text == 0) {
-                  var str = "当天";
-                } else if (!text) {
-                  var str = "";
-                } else {
-                  var str = text + "天";
-                }
-                return <span>{str}</span>;
-              }
-              return (
-                <Select
-                  placeholder="请选择时间"
-                  style={{ width: "150px" }}
-                  disabled={
-                    this.state.approval != 0 && !this.state.timeFlag
-                      ? false
-                      : true
+                if (record.dunTypeName) {
+                  if (record.customizeTimes) {
+                    return record.customizeTimes;
                   }
-                  onChange={(e) => {
-                    record.waitDay = e;
-                  }}
-                >
-                  <Select.Option key={0}>当天</Select.Option>
-                  <Select.Option key={3}>3天</Select.Option>
-                  <Select.Option key={5}>5天</Select.Option>
-                  <Select.Option key={7}>7天</Select.Option>
-                  <Select.Option key={15}>15天</Select.Option>
-                </Select>
-              );
+                  if (text == 0) {
+                    var str = "当天";
+                  } else if (!text) {
+                    var str = "";
+                  } else {
+                    var str = text + "天";
+                  }
+                  return <span>{str}</span>;
+                }
+                return (
+                  <div>
+                    {record.dunType == 0 ? (
+                      <DatePicker
+                        style={{ width: 150 }}
+                        onChange={(e, t) => {
+                          record.customizeTimes = t;
+                        }}
+                      />
+                    ) : (
+                      <Select
+                        placeholder="请选择时间"
+                        style={{ width: "160px" }}
+                        disabled={
+                          this.state.approval != 0 && !this.state.timeFlag
+                            ? false
+                            : true
+                        }
+                        onChange={(e) => {
+                          record.waitDay = e;
+                        }}
+                      >
+                        <Select.Option key={0}>当天</Select.Option>
+                        <Select.Option key={3}>3天</Select.Option>
+                        <Select.Option key={5}>5天</Select.Option>
+                        <Select.Option key={7}>7天</Select.Option>
+                        <Select.Option key={15}>15天</Select.Option>
+                      </Select>
+                    )}
+                  </div>
+                );
             },
           },
           {
@@ -1902,6 +1986,8 @@ const NewService = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -1955,6 +2041,15 @@ const NewService = Form.create()(
     },
     //催款节点保存
     contactSaveNew(record) {
+      if(record.dunType == 0) {
+        if(!record.customizeTimes) {
+          message.warning("请输入自定义时间")
+          return
+        }else if(!record.customizeName) {
+          message.warning("请输入自定义科目")
+          return
+        }
+      }
       if (record.boStatus == "false") {
         record.boStatus = false;
       } else if (record.boStatus == "true") {
@@ -1984,7 +2079,7 @@ const NewService = Form.create()(
           return;
         }
       }
-      if (!record.dunType) {
+      if (!record.dunType && record.dunType != 0) {
         message.warning("请选择对应科目");
         return;
       }
@@ -2006,6 +2101,10 @@ const NewService = Form.create()(
             appropriationRatio: record.appropriationRatio,
             waitDay: record.waitDay,
             effectiveCount: record.effectiveCount,
+            customizeTimes:
+              record.dunType == 0 ? record.customizeTimes : undefined,
+            customizeName:
+              record.dunType == 0 ? record.customizeName : undefined,
           },
         }).done(
           function (data) {
@@ -2037,6 +2136,10 @@ const NewService = Form.create()(
             money: record.money,
             waitDay: record.waitDay,
             effectiveCount: record.effectiveCount,
+            customizeTimes:
+              record.dunType == 0 ? record.customizeTimes : undefined,
+            customizeName:
+              record.dunType == 0 ? record.customizeName : undefined,
           },
         }).done(
           function (data) {
@@ -3365,6 +3468,15 @@ const NewService = Form.create()(
       }
     },
     changeSaveCui(record) {
+      if (record.dunType == 0) {
+        if (!record.customizeTimes) {
+          message.warning("请输入自定义时间");
+          return;
+        } else if (!record.customizeName) {
+          message.warning("请输入自定义科目");
+          return;
+        }
+      }
       if (record.boStatus == "false") {
         record.boStatus = false;
       } else if (record.boStatus == "true") {
@@ -3394,7 +3506,7 @@ const NewService = Form.create()(
           return;
         }
       }
-      if (!record.dunType) {
+      if (!record.dunType && record.dunType != 0) {
         message.warning("请选择对应科目");
         return;
       }
@@ -3417,6 +3529,10 @@ const NewService = Form.create()(
             waitDay: record.waitDay,
             effectiveCount: record.effectiveCount,
             cid: this.state.changeId, //变更ID
+            customizeTimes:
+              record.dunType == 0 ? record.customizeTimes : undefined,
+            customizeName:
+              record.dunType == 0 ? record.customizeName : undefined,
           },
         }).done(
           function (data) {
@@ -3449,6 +3565,10 @@ const NewService = Form.create()(
             waitDay: record.waitDay,
             effectiveCount: record.effectiveCount,
             cid: this.state.changeId, //变更ID
+            customizeTimes:
+              record.dunType == 0 ? record.customizeTimes : undefined,
+            customizeName:
+              record.dunType == 0 ? record.customizeName : undefined,
           },
         }).done(
           function (data) {
@@ -3561,6 +3681,7 @@ const NewService = Form.create()(
         editCuiVisible: true,
         editCuiMoney: record.money,
         editCuiTid: record.tid,
+        editCuiDid: record.did,
         editCuiId: record.id,
       });
     },
@@ -3583,7 +3704,7 @@ const NewService = Form.create()(
         method: "post",
         data: {
           id: this.state.editCuiId,
-          type: this.state.editCuiTid ? 2 : 1,
+          type: this.state.editCuiDid ? 2 : 1,
           money: this.state.editCuiMoney,
           tid: this.state.editCuiTid,
         },

+ 101 - 62
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -200,49 +200,74 @@ class ChangeApply extends Component {
             if (this.state.getLoad) {
               let arr = record.arr || [];
               return (
-                <Select
-                  style={{ width: "150px" }}
-                  placeholder="请选择分类"
-                  onChange={(e) => {
-                    record.dunType = e;
-                    if (e != 1) {
-                      this.setState({
-                        timeFlag: true,
-                      });
-                    } else {
-                      this.setState({
-                        timeFlag: false,
-                      });
-                    }
-                    if (e == 1 && record.sort == 6) {
-                      this.setState({
-                        yearFlag: true,
-                      });
-                    } else if (e != 1 && record.sort == 6) {
-                      this.setState({
-                        yearFlag: false,
-                      });
-                    }
-                    if (record.sort == 3 && e == 3) {
-                      this.setState({
-                        boFlag: true,
-                      });
-                    } else {
-                      this.setState({
-                        boFlag: false,
-                      });
-                    }
-                  }}
-                >
-                  {arr.map((item) => {
-                    record;
-                    return (
-                      <Select.Option key={item.value} value={item.value}>
-                        {item.key}
-                      </Select.Option>
-                    );
-                  })}
-                </Select>
+                <div>
+                  <Select
+                    style={{ width: "150px", marginRight: 5 }}
+                    placeholder="请选择分类"
+                    onChange={(e) => {
+                      record.dunType = e;
+                      if (record.dunType != 0) {
+                        record.customizeTimes = "";
+                        record.customizeName = "";
+                      }
+                      if (e != 1) {
+                        this.setState({
+                          timeFlag: true,
+                        });
+                      } else {
+                        this.setState({
+                          timeFlag: false,
+                        });
+                      }
+                      if (e == 1 && record.sort == 6) {
+                        this.setState({
+                          yearFlag: true,
+                        });
+                      } else if (e != 1 && record.sort == 6) {
+                        this.setState({
+                          yearFlag: false,
+                        });
+                      }
+                      if (record.sort == 3 && e == 3) {
+                        this.setState({
+                          boFlag: true,
+                        });
+                      } else {
+                        this.setState({
+                          boFlag: false,
+                        });
+                      }
+                    }}
+                  >
+                    {arr.map((item) => {
+                      record;
+                      return (
+                        <Select.Option key={item.value} value={item.value}>
+                          {item.key}
+                        </Select.Option>
+                      );
+                    })}
+                    <Select.Option key={0} value={0}>
+                      自定义
+                    </Select.Option>
+                  </Select>
+                  {record.dunType == 0 ? (
+                    <Input
+                      value={record.customizeName}
+                      placeholder="请输入自定义名称"
+                      required="required"
+                      onChange={(e) => {
+                        record.customizeName = e.target.value;
+                        this.setState({
+                          contactList: this.state.contactList,
+                        });
+                      }}
+                      style={{ width: "120px" }}
+                    />
+                  ) : (
+                    ""
+                  )}
+                </div>
               );
             } else {
               return (
@@ -254,11 +279,14 @@ class ChangeApply extends Component {
           },
         },
         {
-          title: "首付时间(特批需选择时间)",
+          title: "收款时间(特批需选择时间)",
           dataIndex: "waitDay",
           key: "waitDay",
           render: (text, record) => {
             if (record.dunTypeName) {
+              if (record.customizeTimes) {
+                return record.customizeTimes;
+              }
               if (text == 0) {
                 var str = "当天";
               } else if (!text) {
@@ -269,24 +297,35 @@ class ChangeApply extends Component {
               return <span>{str}</span>;
             }
             return (
-              <Select
-                placeholder="请选择时间"
-                style={{ width: "150px" }}
-                disabled={
-                  this.state.approval != 0 && !this.state.timeFlag
-                    ? false
-                    : true
-                }
-                onChange={(e) => {
-                  record.waitDay = e;
-                }}
-              >
-                <Select.Option key={0}>当天</Select.Option>
-                <Select.Option key={3}>3天</Select.Option>
-                <Select.Option key={5}>5天</Select.Option>
-                <Select.Option key={7}>7天</Select.Option>
-                <Select.Option key={15}>15天</Select.Option>
-              </Select>
+              <div>
+                {record.dunType == 0 ? (
+                  <DatePicker
+                    style={{ width: 150 }}
+                    onChange={(e, t) => {
+                      record.customizeTimes = t;
+                    }}
+                  />
+                ) : (
+                  <Select
+                    placeholder="请选择时间"
+                    style={{ width: "160px" }}
+                    disabled={
+                      this.state.approval != 0 && !this.state.timeFlag
+                        ? false
+                        : true
+                    }
+                    onChange={(e) => {
+                      record.waitDay = e;
+                    }}
+                  >
+                    <Select.Option key={0}>当天</Select.Option>
+                    <Select.Option key={3}>3天</Select.Option>
+                    <Select.Option key={5}>5天</Select.Option>
+                    <Select.Option key={7}>7天</Select.Option>
+                    <Select.Option key={15}>15天</Select.Option>
+                  </Select>
+                )}
+              </div>
             );
           },
         },

+ 7 - 1
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -46,7 +46,10 @@ class OrderDetail extends Component {
           title: "催款科目",
           dataIndex: "dunTypeName",
           key: "dunTypeName",
-          render: text => {
+          render: (text, record) => {
+            if(record.customizeName) {
+              return text + record.customizeName;
+            }
             return <span>{text}</span>;
           }
         },
@@ -56,6 +59,9 @@ class OrderDetail extends Component {
           key: "waitDay",
           render: (text, record) => {
             if (record.dunTypeName) {
+              if (record.customizeTimes) {
+                return record.customizeTimes;
+              }
               return <span>{text}</span>;
             }
           }

+ 3 - 0
js/component/manageCenter/order/orderNew/changeComponent/proAndCuiList.jsx

@@ -192,6 +192,9 @@ const ProAndCuiList = React.createClass({
           key: "waitDay",
           render: (text, record) => {
             if (record.dunTypeName) {
+              if (record.customizeTimes) {
+                return record.customizeTimes;
+              }
               return <span>{text}</span>;
             }
           },

+ 8 - 0
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -303,6 +303,9 @@ const IntentionCustomer = Form.create()(
             dataIndex: "dunTypeName",
             key: "dunTypeName",
             render: (text) => {
+              if(record.customizeName) {
+                return record.customizeName;
+              }
               return <span>{text}</span>;
             },
           },
@@ -312,6 +315,9 @@ const IntentionCustomer = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
             },
@@ -791,6 +797,8 @@ const IntentionCustomer = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeTimes: thisData.customizeTimes,
+                customizeName: thisData.customizeName,
               });
             }
             if (!totalCui) {

+ 3 - 1
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -792,7 +792,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

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

@@ -712,7 +712,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

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

@@ -785,7 +785,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

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

@@ -709,7 +709,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

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

@@ -673,7 +673,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

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

@@ -707,7 +707,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

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

@@ -702,7 +702,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

+ 3 - 1
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -724,7 +724,9 @@ const contractChange = Form.create()(
                 effectiveCount: thisData.effectiveCount,
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
-                appropriationRatio: thisData.appropriationRatio
+                appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

+ 81 - 24
js/component/manageCenter/order/orderNew/reject.jsx

@@ -437,18 +437,24 @@ const IntentionCustomer = Form.create()(
             key: "dunTypeName",
             render: (text, record) => {
               if (text) {
+                if (record.customizeName) {
+                  return record.customizeName;
+                }
                 return <span>{text}</span>;
               }
               if (this.state.getLoad) {
                 let arr = record.arr || [];
-                console.log("arrrr", arr);
-
                 return (
+                  <div>
                   <Select
                     style={{ width: "150px" }}
                     placeholder="请选择分类"
                     onChange={(e) => {
                       record.dunType = e;
+                      if (record.dunType == 0) {
+                        record.customizeTimes = "";
+                        record.customizeName = "";
+                      }
                       if (e != 1) {
                         this.setState({
                           timeFlag: true,
@@ -487,7 +493,27 @@ const IntentionCustomer = Form.create()(
                         </Select.Option>
                       );
                     })}
+                    <Select.Option key={0} value={0}>
+                      自定义
+                    </Select.Option>
                   </Select>
+                  {record.dunType == 0 ? (
+                      <Input
+                        value={record.customizeName}
+                        placeholder="请输入自定义名称"
+                        required="required"
+                        onChange={(e) => {
+                          record.customizeName = e.target.value;
+                          this.setState({
+                            contactList: this.state.contactList,
+                          });
+                        }}
+                        style={{ width: "120px" }}
+                      />
+                    ) : (
+                      ""
+                    )}
+                    </div>
                 );
               } else {
                 return (
@@ -502,11 +528,14 @@ const IntentionCustomer = Form.create()(
             },
           },
           {
-            title: "首付时间(特批需选择时间)",
+            title: "收款时间(特批需选择时间)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 if (text == 0) {
                   var str = "当天";
                 } else if (!text) {
@@ -517,26 +546,35 @@ const IntentionCustomer = Form.create()(
                 return <span>{str}</span>;
               }
               return (
-                <Select
-                  placeholder="请选择时间"
-                  style={{ width: "150px" }}
-                  disabled={
-                    this.state.approval != 0 && !this.state.timeFlag
-                      ? false
-                      : true
-                  }
-                  onChange={(e) => {
-                    console.log("ee", e);
-                    record.waitDay = e;
-                    console.log("time", record);
-                  }}
-                >
-                  <Select.Option key={0}>当天</Select.Option>
-                  <Select.Option key={3}>3天</Select.Option>
-                  <Select.Option key={5}>5天</Select.Option>
-                  <Select.Option key={7}>7天</Select.Option>
-                  <Select.Option key={15}>15天</Select.Option>
-                </Select>
+                <div>
+                  {record.dunType == 0 ? (
+                    <DatePicker
+                      style={{ width: 150 }}
+                      onChange={(e, t) => {
+                        record.customizeTimes = t;
+                      }}
+                    />
+                  ) : (
+                    <Select
+                      placeholder="请选择时间"
+                      style={{ width: "160px" }}
+                      disabled={
+                        this.state.approval != 0 && !this.state.timeFlag
+                          ? false
+                          : true
+                      }
+                      onChange={(e) => {
+                        record.waitDay = e;
+                      }}
+                    >
+                      <Select.Option key={0}>当天</Select.Option>
+                      <Select.Option key={3}>3天</Select.Option>
+                      <Select.Option key={5}>5天</Select.Option>
+                      <Select.Option key={7}>7天</Select.Option>
+                      <Select.Option key={15}>15天</Select.Option>
+                    </Select>
+                  )}
+                </div>
               );
             },
           },
@@ -1083,6 +1121,8 @@ const IntentionCustomer = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -1136,6 +1176,15 @@ const IntentionCustomer = Form.create()(
     },
     //催款节点保存
     contactSaveNew(record) {
+      if (record.dunType == 0) {
+        if (!record.customizeTimes) {
+          message.warning("请输入自定义时间");
+          return;
+        } else if (!record.customizeName) {
+          message.warning("请输入自定义科目");
+          return;
+        }
+      }
       if (record.boStatus == "false") {
         record.boStatus = false;
       } else if (record.boStatus == "true") {
@@ -1165,7 +1214,7 @@ const IntentionCustomer = Form.create()(
           return;
         }
       }
-      if (!record.dunType) {
+      if (!record.dunType && record.dunType != 0) {
         message.warning("请选择对应科目");
         return;
       }
@@ -1187,6 +1236,10 @@ const IntentionCustomer = Form.create()(
             appropriationRatio: record.appropriationRatio,
             waitDay: record.waitDay,
             effectiveCount: record.effectiveCount,
+            customizeTimes:
+              record.dunType == 0 ? record.customizeTimes : undefined,
+            customizeName:
+              record.dunType == 0 ? record.customizeName : undefined,
           },
         }).done(
           function (data) {
@@ -1217,6 +1270,10 @@ const IntentionCustomer = Form.create()(
             money: record.money,
             waitDay: record.waitDay,
             effectiveCount: record.effectiveCount,
+            customizeTimes:
+              record.dunType == 0 ? record.customizeTimes : undefined,
+            customizeName:
+              record.dunType == 0 ? record.customizeName : undefined,
           },
         }).done(
           function (data) {

+ 44 - 9
js/component/manageCenter/project/task/myTask.jsx

@@ -47,6 +47,7 @@ const confirm = Modal.confirm;
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 const { TextArea } = Input;
+const { Option } = Select;
 const { MonthPicker, RangePicker } = DatePicker;
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -727,6 +728,7 @@ const Task = React.createClass({
         declarePwd: this.state.declarePwd, //密码
         outsourceName: this.state.outsourceName, //外包公司
         outsourcePrice: this.state.outsourcePrice, //外包价格
+        declarationBatch: this.state.declarationBatch,
       },
     }).done(
       function (data) {
@@ -837,6 +839,7 @@ const Task = React.createClass({
             declarePwd: thisdata.declarePwd, //密码
             outsourceName: thisdata.outsourceName, //外包公司
             outsourcePrice: thisdata.outsourcePrice, //外包价格
+            declarationBatch: thisdata.declarationBatch,
           });
         }
       }.bind(this),
@@ -2510,6 +2513,31 @@ const Task = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
+                        label="申报批次"
+                      >
+                        <Select
+                          style={{ width: 200 }}
+                          placeholder="请选择批次"
+                          value={
+                            this.state.declarationBatch
+                              ? this.state.declarationBatch
+                              : undefined
+                          }
+                          onChange={(e) => {
+                            this.setState({
+                              declarationBatch: e,
+                            });
+                          }}
+                        >
+                          <Option value={1}>第一批</Option>
+                          <Option value={2}>第二批</Option>
+                          <Option value={3}>第三批</Option>
+                          <Option value={4}>第四批</Option>
+                        </Select>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
                         label="启动时间"
                       >
                         <DatePicker
@@ -3737,18 +3765,25 @@ const Task = React.createClass({
                   {...formItemLayout}
                   label="启动时间"
                 >
-                  <DatePicker
-                    style={{ marginTop: "5px" }}
-                    showTime
-                    format="YYYY-MM-DD"
-                    onOk={() => {}}
+                  <Select
                     value={
-                      this.state.startDate ? moment(this.state.startDate) : null
+                      this.state.declarationBatch
+                        ? this.state.declarationBatch
+                        : undefined
                     }
-                    onChange={(data, dataString) => {
-                      this.setState({ startDate: dataString });
+                    placeholder="请选择批次"
+                    style={{ width: 200 }}
+                    onChange={(e) => {
+                      this.setState({
+                        declarationBatch: e,
+                      });
                     }}
-                  />
+                  >
+                    <Option value={1}>第一批</Option>
+                    <Option value={2}>第二批</Option>
+                    <Option value={3}>第三批</Option>
+                    <Option value={4}>第四批</Option>
+                  </Select>
                 </FormItem>
                 <FormItem
                   className="half-item"

+ 35 - 20
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -575,7 +575,8 @@ const MyTaskCount = Form.create()(
               declarePwd: thisdata.declarePwd, //密码
               depName: thisdata.depName, //订单部门
               outsourceName: thisdata.outsourceName, //外包公司名称
-              outsourcePrice: thisdata.outsourcePrice //外包价格
+              outsourcePrice: thisdata.outsourcePrice, //外包价格
+              declarationBatch: thisdata.declarationBatch,
             });
           }
         }.bind(this)
@@ -1068,10 +1069,10 @@ const MyTaskCount = Form.create()(
                     width: "150px",
                     marginBottom: "10px",
                     marginLeft: 10,
-                    marginRight: 10
+                    marginRight: 10,
                   }}
                   value={this.state.customerName}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ customerName: e.target.value });
                   }}
                 />
@@ -1079,7 +1080,7 @@ const MyTaskCount = Form.create()(
                   placeholder="任务编号"
                   style={{ width: "150px", marginRight: 10 }}
                   value={this.state.idSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ idSearch: e.target.value });
                   }}
                 />
@@ -1087,9 +1088,9 @@ const MyTaskCount = Form.create()(
                   placeholder="订单编号"
                   style={{ width: "150px", marginRight: 10 }}
                   value={this.state.orderNoSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({
-                      orderNoSearch: e.target.value
+                      orderNoSearch: e.target.value,
                     });
                   }}
                 />
@@ -1097,9 +1098,9 @@ const MyTaskCount = Form.create()(
                   placeholder="合同编号"
                   style={{ width: "150px", marginRight: 10 }}
                   value={this.state.contractNoSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({
-                      contractNoSearch: e.target.value
+                      contractNoSearch: e.target.value,
                     });
                   }}
                 />
@@ -1107,11 +1108,11 @@ const MyTaskCount = Form.create()(
                   placeholder="订单部门"
                   style={{ width: 150, marginRight: 10 }}
                   value={this.state.departmenttList}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ departmenttList: e });
                   }}
                 >
-                  {departmentArr.map(function(item) {
+                  {departmentArr.map(function (item) {
                     return (
                       <Select.Option key={item.id}>{item.name}</Select.Option>
                     );
@@ -1121,7 +1122,7 @@ const MyTaskCount = Form.create()(
                   placeholder="项目类别"
                   style={{ width: "150", marginRight: "10px" }}
                   value={this.state.cid}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ cid: e });
                   }}
                   notFoundContent="未获取到上级品类列表"
@@ -1132,11 +1133,11 @@ const MyTaskCount = Form.create()(
                   placeholder="是否外包"
                   style={{ width: "150", marginRight: "10px" }}
                   value={this.state.outsourceSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ outsourceSearch: e });
                   }}
                 >
-                  {isWai.map(function(item) {
+                  {isWai.map(function (item) {
                     return (
                       <Select.Option key={item.id}>{item.name}</Select.Option>
                     );
@@ -1150,7 +1151,7 @@ const MyTaskCount = Form.create()(
                       : null,
                     this.state.releaseDate[1]
                       ? moment(this.state.releaseDate[1])
-                      : null
+                      : null,
                   ]}
                   onChange={(data, dataString) => {
                     this.setState({ releaseDate: dataString });
@@ -1162,7 +1163,7 @@ const MyTaskCount = Form.create()(
                   style={{
                     marginLeft: "10px",
                     marginRight: 10,
-                    marginBottom: 10
+                    marginBottom: 10,
                   }}
                 >
                   搜索
@@ -1494,6 +1495,13 @@ const MyTaskCount = Form.create()(
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
+                      label="申报批次"
+                    >
+                      <span>{this.state.declarationBatch}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
                       label="启动时间"
                     >
                       <span>{this.state.startDate}</span>
@@ -1560,10 +1568,10 @@ const MyTaskCount = Form.create()(
                         className="demandDetailShow-upload"
                         listType="picture-card"
                         fileList={this.state.attachmentUrl}
-                        onPreview={file => {
+                        onPreview={(file) => {
                           this.setState({
                             previewImage: file.url || file.thumbUrl,
-                            previewVisible: true
+                            previewVisible: true,
                           });
                         }}
                       ></Upload>
@@ -1601,7 +1609,7 @@ const MyTaskCount = Form.create()(
                         style={{
                           float: "right",
                           marginRight: "50px",
-                          marginBottom: "15px"
+                          marginBottom: "15px",
                         }}
                       >
                         添加项目明细
@@ -1947,10 +1955,10 @@ const MyTaskCount = Form.create()(
                   className="demandDetailShow-upload"
                   listType="picture-card"
                   fileList={this.state.attachmentUrl}
-                  onPreview={file => {
+                  onPreview={(file) => {
                     this.setState({
                       previewImage: file.url || file.thumbUrl,
-                      previewVisible: true
+                      previewVisible: true,
                     });
                   }}
                 ></Upload>
@@ -1984,6 +1992,13 @@ const MyTaskCount = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
+                label="申报批次"
+              >
+                <span>{this.state.declarationBatch}</span>
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
                 label="启动时间"
               >
                 <span>{this.state.startDate}</span>

+ 53 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -44,6 +44,7 @@ import { taskStatus, projectStatus } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
+const { Option } = Select;
 const { MonthPicker, RangePicker } = DatePicker;
 const MyTaskOutsource = React.createClass({
   loadData(pageNo) {
@@ -739,6 +740,7 @@ const MyTaskOutsource = React.createClass({
         declarePwd: this.state.declarePwd, //密码
         outsourceName: this.state.outsourceName, //外包公司名称
         outsourcePrice: this.state.outsourcePrice, //外包价格
+        declarationBatch: this.state.declarationBatch,
       },
     }).done(
       function (data) {
@@ -849,6 +851,7 @@ const MyTaskOutsource = React.createClass({
             declarePwd: thisdata.declarePwd, //密码
             outsourceName: thisdata.outsourceName, //外包公司名称
             outsourcePrice: thisdata.outsourcePrice, //外包价格
+            declarationBatch: thisdata.declarationBatch,
           });
         }
       }.bind(this),
@@ -2446,6 +2449,31 @@ const MyTaskOutsource = React.createClass({
                         {...formItemLayout}
                         label="启动时间"
                       >
+                        <Select
+                          value={
+                            this.state.declarationBatch
+                              ? this.state.declarationBatch
+                              : undefined
+                          }
+                          placeholder="请选择批次"
+                          style={{ width: 200 }}
+                          onChange={(e) => {
+                            this.setState({
+                              declarationBatch: e,
+                            });
+                          }}
+                        >
+                          <Option value={1}>第一批</Option>
+                          <Option value={2}>第二批</Option>
+                          <Option value={3}>第三批</Option>
+                          <Option value={4}>第四批</Option>
+                        </Select>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="启动时间"
+                      >
                         <DatePicker
                           style={{
                             marginTop: "2px",
@@ -3417,6 +3445,31 @@ const MyTaskOutsource = React.createClass({
                   {...formItemLayout}
                   label="启动时间"
                 >
+                  <Select
+                    value={
+                      this.state.declarationBatch
+                        ? this.state.declarationBatch
+                        : undefined
+                    }
+                    placeholder="请选择批次"
+                    style={{ width: 200 }}
+                    onChange={(e) => {
+                      this.setState({
+                        declarationBatch: e,
+                      });
+                    }}
+                  >
+                    <Option value={1}>第一批</Option>
+                    <Option value={2}>第二批</Option>
+                    <Option value={3}>第三批</Option>
+                    <Option value={4}>第四批</Option>
+                  </Select>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="启动时间"
+                >
                   <DatePicker
                     style={{ marginTop: "5px" }}
                     showTime

+ 34 - 19
js/component/manageCenter/project/task/taskCount.jsx

@@ -565,7 +565,8 @@ const IntentionCustomer = Form.create()(
               outsourcePrice: thisdata.outsourcePrice, //外包价格
               splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
               splitSuper: thisdata.splitSuper,
-              splitId: thisdata.splitId
+              splitId: thisdata.splitId,
+              declarationBatch: thisdata.declarationBatch,
             });
           }
         }.bind(this)
@@ -1087,10 +1088,10 @@ const IntentionCustomer = Form.create()(
                     marginBottom: "10px",
                     marginTop: 10,
                     marginLeft: 10,
-                    marginRight: 10
+                    marginRight: 10,
                   }}
                   value={this.state.customerName}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ customerName: e.target.value });
                   }}
                 />
@@ -1098,7 +1099,7 @@ const IntentionCustomer = Form.create()(
                   placeholder="任务编号"
                   style={{ width: "150px", marginRight: 10 }}
                   value={this.state.idSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ idSearch: e.target.value });
                   }}
                 />
@@ -1106,9 +1107,9 @@ const IntentionCustomer = Form.create()(
                   placeholder="订单编号"
                   style={{ width: "150px", marginRight: 10 }}
                   value={this.state.orderNoSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({
-                      orderNoSearch: e.target.value
+                      orderNoSearch: e.target.value,
                     });
                   }}
                 />
@@ -1116,9 +1117,9 @@ const IntentionCustomer = Form.create()(
                   placeholder="合同编号"
                   style={{ width: "150px", marginRight: 10 }}
                   value={this.state.contractNoSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({
-                      contractNoSearch: e.target.value
+                      contractNoSearch: e.target.value,
                     });
                   }}
                 />
@@ -1126,11 +1127,11 @@ const IntentionCustomer = Form.create()(
                   placeholder="订单部门"
                   style={{ width: 150, marginRight: 10 }}
                   value={this.state.departmenttList}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ departmenttList: e });
                   }}
                 >
-                  {departmentArr.map(function(item) {
+                  {departmentArr.map(function (item) {
                     return (
                       <Select.Option key={item.id}>{item.name}</Select.Option>
                     );
@@ -1140,7 +1141,7 @@ const IntentionCustomer = Form.create()(
                   placeholder="项目类别"
                   style={{ width: "150", marginRight: "10px" }}
                   value={this.state.cid}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ cid: e });
                   }}
                   notFoundContent="未获取到上级品类列表"
@@ -1151,11 +1152,11 @@ const IntentionCustomer = Form.create()(
                   placeholder="是否外包"
                   style={{ width: "150", marginRight: "10px" }}
                   value={this.state.outsourceSearch}
-                  onChange={e => {
+                  onChange={(e) => {
                     this.setState({ outsourceSearch: e });
                   }}
                 >
-                  {isWai.map(function(item) {
+                  {isWai.map(function (item) {
                     return (
                       <Select.Option key={item.id}>{item.name}</Select.Option>
                     );
@@ -1169,7 +1170,7 @@ const IntentionCustomer = Form.create()(
                       : null,
                     this.state.releaseDate[1]
                       ? moment(this.state.releaseDate[1])
-                      : null
+                      : null,
                   ]}
                   onChange={(data, dataString) => {
                     this.setState({ releaseDate: dataString });
@@ -1563,6 +1564,13 @@ const IntentionCustomer = Form.create()(
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
+                      label="申报批次"
+                    >
+                      <span>{this.state.declarationBatch}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
                       label="启动时间"
                     >
                       <span>{this.state.startDate}</span>
@@ -1629,10 +1637,10 @@ const IntentionCustomer = Form.create()(
                         className="demandDetailShow-upload"
                         listType="picture-card"
                         fileList={this.state.attachmentUrl}
-                        onPreview={file => {
+                        onPreview={(file) => {
                           this.setState({
                             previewImage: file.url || file.thumbUrl,
-                            previewVisible: true
+                            previewVisible: true,
                           });
                         }}
                       ></Upload>
@@ -1670,7 +1678,7 @@ const IntentionCustomer = Form.create()(
                         style={{
                           float: "right",
                           marginRight: "50px",
-                          marginBottom: "15px"
+                          marginBottom: "15px",
                         }}
                       >
                         添加项目明细
@@ -2032,10 +2040,10 @@ const IntentionCustomer = Form.create()(
                   className="demandDetailShow-upload"
                   listType="picture-card"
                   fileList={this.state.attachmentUrl}
-                  onPreview={file => {
+                  onPreview={(file) => {
                     this.setState({
                       previewImage: file.url || file.thumbUrl,
-                      previewVisible: true
+                      previewVisible: true,
                     });
                   }}
                 ></Upload>
@@ -2069,6 +2077,13 @@ const IntentionCustomer = Form.create()(
               <FormItem
                 className="half-item"
                 {...formItemLayout}
+                label="申报批次"
+              >
+                <span>{this.state.declarationBatch}</span>
+              </FormItem>
+              <FormItem
+                className="half-item"
+                {...formItemLayout}
                 label="启动时间"
               >
                 <span>{this.state.startDate}</span>

+ 15 - 0
js/component/manageCenter/project/task/taskQuery.jsx

@@ -455,6 +455,7 @@ const Task = React.createClass({
             depName: thisdata.depName, //订单部门
             outsourceName: thisdata.outsourceName, //外包公司名称
             outsourcePrice: thisdata.outsourcePrice, //外包价格
+            declarationBatch: thisdata.declarationBatch,
           });
         }
       }.bind(this),
@@ -1459,6 +1460,13 @@ const Task = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
+                        label="申报批次"
+                      >
+                        <span>{this.state.declarationBatch}</span>
+                      </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
                         label="启动时间"
                       >
                         <span>{this.state.startDate}</span>
@@ -2000,6 +2008,13 @@ const Task = React.createClass({
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
+                  label="申报批次"
+                >
+                  <span>{this.state.declarationBatch}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
                   label="启动时间"
                 >
                   <span>{this.state.startDate}</span>

+ 23 - 5
js/component/manageCenter/statistics/personnel/personnelAll.jsx

@@ -197,6 +197,14 @@ const PersonnelAll = React.createClass({
           title: "转正时间",
           dataIndex: "promotionTimes",
           key: "promotionTimes",
+          render: text => {
+            let time = moment(text).valueOf();
+            let today = Date.parse(new Date());
+            if(today > time) {
+              return <span style={{ color: "red", fontWeight: 900 }}>{text}</span>
+            }
+            return text
+          }
         },
         {
           title: "生日日期",
@@ -268,7 +276,12 @@ const PersonnelAll = React.createClass({
           dataIndex: "contractStart",
           key: "contractStart",
           render: (text, record) => {
+            let end = moment(record.contractEnd).valueOf()
+            let today = Date.parse(new Date())
             if (text) {
+              if(today > end) {
+                return <span style={{color: "red", fontWeight: 900}}>{text + "~" + record.contractEnd}</span>;
+              }
               return text + "~" + record.contractEnd;
             }
           },
@@ -2150,7 +2163,7 @@ const PersonnelAll = React.createClass({
               <br />
               <span style={{}}>转正日期:</span>
               <RangePicker
-                style={{ marginRight: 10 }}
+                style={{ marginRight: 10, width: 170 }}
                 value={[
                   this.state.promotionTime[0]
                     ? moment(this.state.promotionTime[0])
@@ -2165,7 +2178,7 @@ const PersonnelAll = React.createClass({
               />
               <span style={{}}>入职时间:</span>
               <RangePicker
-                style={{ marginRight: 10 }}
+                style={{ marginRight: 10, width: 170 }}
                 value={[
                   this.state.entryTime[0]
                     ? moment(this.state.entryTime[0])
@@ -2180,7 +2193,7 @@ const PersonnelAll = React.createClass({
               />
               <span style={{}}>离职时间:</span>
               <RangePicker
-                style={{ marginRight: 21 }}
+                style={{ marginRight: 10, width: 170 }}
                 value={[
                   this.state.quitTime[0]
                     ? moment(this.state.quitTime[0])
@@ -2195,7 +2208,7 @@ const PersonnelAll = React.createClass({
               />
               <span style={{}}>合同时间:</span>
               <RangePicker
-                style={{ marginRight: 10 }}
+                style={{ marginRight: 10, width: 170 }}
                 value={[
                   this.state.contractTime[0]
                     ? moment(this.state.contractTime[0])
@@ -2983,7 +2996,12 @@ const PersonnelAll = React.createClass({
                 </div>
               </div>
             ) : (
-              <Tabs activeKey={this.state.active} onChange={e => {this.setState({active: e})}}>
+              <Tabs
+                activeKey={this.state.active}
+                onChange={(e) => {
+                  this.setState({ active: e });
+                }}
+              >
                 <TabPane tab="任职信息" key={1}>
                   <div className="title-peo">
                     <span>任职信息</span>

+ 17 - 9
js/component/project.jsx

@@ -250,7 +250,8 @@ const project = React.createClass({
             declarePwd: thisdata.declarePwd, //密码
             depName: thisdata.depName, //订单部门
             outsourceName: thisdata.outsourceName, //外包公司名称
-            outsourcePrice: thisdata.outsourcePrice //外包价格
+            outsourcePrice: thisdata.outsourcePrice, //外包价格
+            declarationBatch: thisdata.declarationBatch, //外包价格
           });
         }
       }.bind(this)
@@ -628,7 +629,7 @@ const project = React.createClass({
         width="900px"
         visible={this.state.visible}
         // onOk={this.visitOk}
-        onCancel={e => {
+        onCancel={(e) => {
           this.props.cancel();
         }}
       >
@@ -972,6 +973,13 @@ const project = React.createClass({
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
+                      label="申报批次"
+                    >
+                      <span>{this.state.declarationBatch}</span>
+                    </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
                       label="启动时间"
                     >
                       <span>{this.state.startDate}</span>
@@ -1038,10 +1046,10 @@ const project = React.createClass({
                         className="demandDetailShow-upload"
                         listType="picture-card"
                         fileList={this.state.attachmentUrl}
-                        onPreview={file => {
+                        onPreview={(file) => {
                           this.setState({
                             previewImage: file.url || file.thumbUrl,
-                            previewVisible: true
+                            previewVisible: true,
                           });
                         }}
                       ></Upload>
@@ -1163,10 +1171,10 @@ const project = React.createClass({
                         className="demandDetailShow-upload"
                         listType="picture-card"
                         fileList={this.state.pictureUrl}
-                        onPreview={file => {
+                        onPreview={(file) => {
                           this.setState({
                             previewImage: file.url || file.thumbUrl,
-                            previewVisible: true
+                            previewVisible: true,
                           });
                         }}
                       ></Upload>
@@ -1193,7 +1201,7 @@ const project = React.createClass({
                   <div
                     className="clearfix"
                     style={{
-                      display: this.state.refundStatus == 0 ? "none" : "block"
+                      display: this.state.refundStatus == 0 ? "none" : "block",
                     }}
                   >
                     <FormItem
@@ -1216,7 +1224,7 @@ const project = React.createClass({
                   <div
                     className="clearfix"
                     style={{
-                      display: this.state.refundStatus == 0 ? "none" : "block"
+                      display: this.state.refundStatus == 0 ? "none" : "block",
                     }}
                   >
                     <FormItem
@@ -1243,7 +1251,7 @@ const project = React.createClass({
                     scroll={{ x: 300, y: 0 }}
                     bordered
                     size="small"
-                    expandedRowRender={record => {
+                    expandedRowRender={(record) => {
                       return <p>{record.remarks}</p>;
                     }}
                     pagination={false}