Bläddra i källkod

人事管理上线

mentoswzq 4 år sedan
förälder
incheckning
a4adf503f0
25 ändrade filer med 483 tillägg och 135 borttagningar
  1. 2 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  2. 2 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  3. 1 0
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  4. 3 3
      js/component/manageCenter/order/orderNew/addService.jsx
  5. 133 64
      js/component/manageCenter/order/orderNew/addorders.js
  6. 10 2
      js/component/manageCenter/order/orderNew/approveds.jsx
  7. 18 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  8. 42 30
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  9. 1 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  10. 48 3
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  11. 17 2
      js/component/manageCenter/order/orderNew/examine.jsx
  12. 9 1
      js/component/manageCenter/order/orderNew/inquiry.jsx
  13. 54 8
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  14. 48 3
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  15. 2 0
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  16. 3 1
      js/component/manageCenter/project/task/myTask.jsx
  17. 4 2
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  18. 2 0
      js/component/manageCenter/project/task/taskAssignment.jsx
  19. 2 0
      js/component/manageCenter/project/task/taskQuery.jsx
  20. 2 1
      js/component/manageCenter/set/business/businessProject.jsx
  21. 71 8
      js/component/manageCenter/statistics/personnel/personnelAll.jsx
  22. 5 1
      js/component/manageCenter/statistics/personnel/personnelList.less
  23. 1 0
      js/component/manageCenter/statistics/personnel/picModal.jsx
  24. 2 1
      js/component/project.jsx
  25. 1 1
      package.json

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

@@ -747,7 +747,7 @@ const approvedOutsourcing = React.createClass({
           key: "dunTypeName",
           render: (text, record) => {
             if (record.customizeName) {
-              return record.customizeName;
+              return text + record.customizeName;
             }
             return <span>{text}</span>;
           },
@@ -2501,6 +2501,7 @@ const approvedOutsourcing = React.createClass({
               outsourceName: thisdata.outsourceName,
               outsourcePrice: thisdata.outsourcePrice,
               splitStatus: thisdata.splitStatus,
+              sort: thisdata.cSort,
             });
           }
         }

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

@@ -462,7 +462,7 @@ const approvedOutsourcing = React.createClass({
           key: "dunTypeName",
           render: (text, record) => {
             if (record.customizeName) {
-              return record.customizeName;
+              return text + record.customizeName;
             }
             return <span>{text}</span>;
           },
@@ -2420,6 +2420,7 @@ const approvedOutsourcing = React.createClass({
               outsourceName: thisdata.outsourceName,
               outsourcePrice: thisdata.outsourcePrice,
               splitStatus: thisdata.splitStatus,
+              sort: thisdata.cSort,
             });
           }
         }

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

@@ -610,6 +610,7 @@ const outsourcingPaiDan = React.createClass({
               certificateNumber: thisdata.certificateNumber,
               projectStatus: thisdata.projectStatus,
               splitStatus: thisdata.splitStatus,
+              sort: thisdata.cSort,
             });
           }
         }

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

@@ -278,6 +278,9 @@ const NewService = Form.create()(
                       onClick={(e) => {
                         e.stopPropagation();
                         this.showConfirm(this.delectRow, record);
+                        this.setState({
+                          addFlag: false,
+                        });
                       }}
                     >
                       删除
@@ -4732,9 +4735,6 @@ const NewService = Form.create()(
                                   wrapperCol={{ span: 18 }}
                                   label={
                                     <span>
-                                      <strong style={{ color: "#f00" }}>
-                                        *
-                                      </strong>
                                       补充协议
                                     </span>
                                   }

+ 133 - 64
js/component/manageCenter/order/orderNew/addorders.js

@@ -143,6 +143,7 @@ const Addorders = Form.create()(
         visible: false,
         resVisible: false,
         orgCodeUrl: [],
+        replenishUrl: [],
         voucherUrl: [],
         customerArr: [],
         mark: false,
@@ -482,54 +483,82 @@ const Addorders = 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 (
@@ -544,11 +573,14 @@ const Addorders = 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) {
@@ -559,24 +591,42 @@ const Addorders = Form.create()(
                 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 }}
+                      disabledDate={(e) => {
+                        let time = moment(e).valueOf();
+                        let today = Date.parse(new Date());
+                        if (time <= today) {
+                          return true;
+                        }
+                      }}
+                      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>
               );
             },
           },
@@ -1103,6 +1153,8 @@ const Addorders = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -1156,6 +1208,15 @@ const Addorders = 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") {
@@ -1185,7 +1246,7 @@ const Addorders = Form.create()(
           return;
         }
       }
-      if (!record.dunType) {
+      if (!record.dunType && record.dunType != 0) {
         message.warning("请选择对应科目");
         return;
       }
@@ -1207,6 +1268,10 @@ const Addorders = 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) {
@@ -1238,6 +1303,10 @@ const Addorders = 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) {
@@ -2453,7 +2522,7 @@ const Addorders = Form.create()(
                     wrapperCol={{ span: 18 }}
                     label={
                       <span>
-                        <strong style={{ color: "#f00" }}>*</strong>补充协议
+                        补充协议
                       </span>
                     }
                   >

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

@@ -455,7 +455,10 @@ const IntentionCustomer = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text) => {
+            render: (text,record) => {
+              if (record.customizeName) {
+                return text +  record.customizeName;
+              }
               return <span>{text}</span>;
             },
           },
@@ -465,6 +468,9 @@ const IntentionCustomer = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
             },
@@ -1196,6 +1202,8 @@ const IntentionCustomer = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -2419,7 +2427,7 @@ const IntentionCustomer = Form.create()(
                         wrapperCol={{ span: 18 }}
                         label={
                           <span>
-                            <strong style={{ color: "#f00" }}>*</strong>补充协议
+                            补充协议
                           </span>
                         }
                       >

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

@@ -8,7 +8,7 @@ import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
-// import ReactToPrint from "react-to-print";
+import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
 import Refund from "./refund.js"
 const { TextArea } = Input;
@@ -671,6 +671,23 @@ class ChangeDetail extends Component {
           )}
           content={() => this.refs}
         /> */}
+        <ReactToPrint
+          trigger={() => (
+            <Button
+              type="primary"
+              style={{
+                float: "right",
+                marginTop: 10,
+                position: "absolute",
+                top: 0,
+                right: 30,
+              }}
+            >
+              打印
+            </Button>
+          )}
+          content={() => this.refs}
+        />
       </div>
     );
   }

+ 42 - 30
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -9,7 +9,7 @@ import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
-// import ReactToPrint from "react-to-print";
+import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -371,7 +371,7 @@ class ChangeDetail extends Component {
         <div
           className="clearfix"
           style={{ marginTop: 0 }}
-          ref={e => {
+          ref={(e) => {
             this.refs = e;
           }}
         >
@@ -388,9 +388,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4
+                this.props.data.status == 4
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             {/* <span
@@ -417,10 +417,7 @@ class ChangeDetail extends Component {
               left: 586,
               transform: "rotate(-5deg)",
               zIndex: 1,
-              display:
-                this.props.data.status == 5
-                  ? "block"
-                  : "none"
+              display: this.props.data.status == 5 ? "block" : "none",
             }}
           >
             {/* <span
@@ -453,10 +450,10 @@ class ChangeDetail extends Component {
               className="demandDetailShow-upload"
               listType="picture-card"
               fileList={orgCodeUrl}
-              onPreview={file => {
+              onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
+                  previewVisible: true,
                 });
               }}
             />
@@ -472,7 +469,7 @@ class ChangeDetail extends Component {
                 alt=""
                 style={{
                   width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`
+                  transform: `rotate(${this.state.rotateDeg}deg)`,
                 }}
                 src={this.state.previewImage || ""}
               />
@@ -501,7 +498,7 @@ class ChangeDetail extends Component {
               overflow: "hidden",
               paddingLeft: "90px",
               position: "relative",
-              bottom: "20px"
+              bottom: "20px",
             }}
           >
             {/* <span>操作人:</span> */}
@@ -524,7 +521,7 @@ class ChangeDetail extends Component {
                     width: "100%",
                     height: "auto",
                     wordBreak: "break-all",
-                    marginBottom: "10px"
+                    marginBottom: "10px",
                   }}
                 >
                   {item.aname + ":" + "(" + item.status + ")" + item.remarks}
@@ -596,9 +593,9 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                  (this.props.data.status == 2 || this.props.data.status == 4)
+                (this.props.data.status == 2 || this.props.data.status == 4)
                   ? "block"
-                  : "none"
+                  : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -611,12 +608,11 @@ class ChangeDetail extends Component {
               columns={this.state.ContactsLists}
               dataSource={this.state.contactList}
             />
-
           </div>
 
           <div
             style={{
-              display: this.props.data.processState > 5 ? "block" : "none"
+              display: this.props.data.processState > 5 ? "block" : "none",
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
@@ -666,14 +662,17 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                  this.props.data.status == 4 && this.props.data.refundStatus
+                this.props.data.status == 4 &&
+                this.props.data.refundStatus
                   ? "block"
-                  : "none"
-            }}>
+                  : "none",
+            }}
+          >
             <Refund data={this.props.data} id={this.props.id} />
           </div>
         </div>
-        {this.props.processState === this.props.data.processState && this.props.data.status != 5 ? (
+        {this.props.processState === this.props.data.processState &&
+        this.props.data.status != 5 ? (
           <div
             className="clearfix"
             style={{ display: "flex", justifyContent: "space-around" }}
@@ -691,18 +690,31 @@ class ChangeDetail extends Component {
             })}
           </div>
         ) : (
-            ""
-          )}
-        {/* <ReactToPrint
+          ""
+        )}
+        <ReactToPrint
           trigger={() => (
-            <div className="clearfix">
-              <Button type="primary" style={{ float: "right", marginTop: 10 }}>
-                打印
-              </Button>
-            </div>
+            <Button
+              type="primary"
+              style={{
+                float: "right",
+                marginTop: 10,
+                position: "absolute",
+                top: 0,
+                right: 30,
+                display:
+                  (this.props.data.processState == 7 ||
+                    this.props.data.processState == 8) &&
+                  this.props.data.status == 4
+                    ? "block"
+                    : "block",
+              }}
+            >
+              打印
+            </Button>
           )}
           content={() => this.refs}
-        /> */}
+        />
       </div>
     );
   }

+ 1 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -304,7 +304,7 @@ const IntentionCustomer = Form.create()(
             key: "dunTypeName",
             render: (text) => {
               if(record.customizeName) {
-                return record.customizeName;
+                return text + record.customizeName;
               }
               return <span>{text}</span>;
             },

+ 48 - 3
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -299,7 +299,10 @@ const checkOutsourcing = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text) => {
+            render: (text,record) => {
+              if (record.customizeName) {
+                return text + record.customizeName;
+              }
               return <span>{text}</span>;
             },
           },
@@ -309,6 +312,9 @@ const checkOutsourcing = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
             },
@@ -530,6 +536,7 @@ const checkOutsourcing = Form.create()(
                 contactsMobile: thisdata.contactsMobile, //联系人电话
                 projectStatus: thisdata.projectStatus, //项目状态
                 splitStatus: thisdata.splitStatus,
+                sort: thisdata.cSort,
               });
             }
           }
@@ -682,6 +689,8 @@ const checkOutsourcing = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -1723,16 +1732,52 @@ const checkOutsourcing = Form.create()(
                     <Modal
                       maskClosable={false}
                       footer={null}
+                      width={"70%"}
                       visible={this.state.previewVisible}
                       onCancel={() => {
-                        this.setState({ previewVisible: false });
+                        this.setState({ previewVisible: false,rotateDeg: 0 });
                       }}
                     >
                       <img
                         alt=""
-                        style={{ width: "100%" }}
+                        style={{
+                          width: "100%",
+                          transform: `rotate(${this.state.rotateDeg}deg)`,
+                        }}
                         src={this.state.previewImage || ""}
                       />
+                      <Button
+                        onClick={this.rotate}
+                        style={{
+                          position: "relative",
+                          left: "50%",
+                          transform: "translateX(-50%)",
+                        }}
+                      >
+                        旋转
+                      </Button>
+                      <Button
+                        onClick={this.upImg}
+                        style={{
+                          position: "absolute",
+                          left: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)",
+                        }}
+                      >
+                        上一张
+                      </Button>
+                      <Button
+                        onClick={this.downImg}
+                        style={{
+                          position: "absolute",
+                          right: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)",
+                        }}
+                      >
+                        下一张
+                      </Button>
                     </Modal>
                   </FormItem>
                 </div>

+ 17 - 2
js/component/manageCenter/order/orderNew/examine.jsx

@@ -395,7 +395,10 @@ const IntentionCustomer = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text) => {
+            render: (text,record) => {
+              if (record.customizeName) {
+                return text + record.customizeName;
+              }
               return <span>{text}</span>;
             },
           },
@@ -405,7 +408,17 @@ const IntentionCustomer = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
-                return <span>{text}</span>;
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
+                if (text == 0) {
+                  var str = "当天";
+                } else if (!text) {
+                  var str = "";
+                } else {
+                  var str = text + "天";
+                }
+                return <span>{str}</span>;
               }
             },
           },
@@ -779,6 +792,8 @@ const IntentionCustomer = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

+ 9 - 1
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -345,7 +345,10 @@ const IntentionCustomer = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text) => {
+            render: (text, record) => {
+              if (record.customizeName) {
+                return text + record.customizeName;
+              }
               return <span>{text}</span>;
             },
           },
@@ -355,6 +358,9 @@ const IntentionCustomer = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
             },
@@ -1765,6 +1771,8 @@ const IntentionCustomer = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {

+ 54 - 8
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -302,6 +302,9 @@ const outsourcingList = Form.create()(
             key: "dunTypeName",
             render: (text, record) => {
               if (text) {
+                if (record.customizeName) {
+                  return text + record.customizeName;
+                }
                 return <span>{text}</span>;
               }
               if (this.state.getLoad) {
@@ -345,6 +348,9 @@ const outsourcingList = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
               return (
@@ -979,6 +985,8 @@ const outsourcingList = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -1706,6 +1714,7 @@ const outsourcingList = Form.create()(
                             <Modal
                               maskClosable={false}
                               footer={null}
+                              width={"70%"}
                               visible={this.state.previewVisible}
                               onCancel={() => {
                                 this.setState({
@@ -1785,10 +1794,11 @@ const outsourcingList = Form.create()(
                             <Modal
                               maskClosable={false}
                               footer={null}
-                              visible={this.state.previewVisible}
+                              width={"70%"}
+                              visible={this.state.previewVisibles}
                               onCancel={() => {
                                 this.setState({
-                                  previewVisible: false,
+                                  previewVisibles: false,
                                   rotateDeg: 0,
                                 });
                               }}
@@ -2362,16 +2372,52 @@ const outsourcingList = Form.create()(
                           <Modal
                             maskClosable={false}
                             footer={null}
-                            visible={this.state.previewVisible}
+                            width={"70%"}
+                            visible={this.state.previewVisibless}
                             onCancel={() => {
-                              this.setState({ previewVisible: false });
+                              this.setState({ previewVisibless: false });
                             }}
                           >
                             <img
-                              alt=""
-                              style={{ width: "100%" }}
-                              src={this.state.previewImage || ""}
-                            />
+                                alt=""
+                                style={{
+                                  width: "100%",
+                                  transform: `rotate(${this.state.rotateDeg}deg)`,
+                                }}
+                                src={this.state.previewImage || ""}
+                              />
+                              <Button
+                                onClick={this.rotate}
+                                style={{
+                                  position: "relative",
+                                  left: "50%",
+                                  transform: "translateX(-50%)",
+                                }}
+                              >
+                                旋转
+                              </Button>
+                              <Button
+                                onClick={this.upImg}
+                                style={{
+                                  position: "absolute",
+                                  left: -81,
+                                  top: "50%",
+                                  transform: "translateY(-50%)",
+                                }}
+                              >
+                                上一张
+                              </Button>
+                              <Button
+                                onClick={this.downImg}
+                                style={{
+                                  position: "absolute",
+                                  right: -81,
+                                  top: "50%",
+                                  transform: "translateY(-50%)",
+                                }}
+                              >
+                                下一张
+                              </Button>
                           </Modal>
                         </FormItem>
                       </div>

+ 48 - 3
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -423,7 +423,10 @@ const outsourcingPro = Form.create()(
             title: "催款科目",
             dataIndex: "dunTypeName",
             key: "dunTypeName",
-            render: (text) => {
+            render: (text,record) => {
+              if (record.customizeName) {
+                return text + record.customizeName;
+              }
               return <span>{text}</span>;
             },
           },
@@ -433,6 +436,9 @@ const outsourcingPro = Form.create()(
             key: "waitDay",
             render: (text, record) => {
               if (record.dunTypeName) {
+                if (record.customizeTimes) {
+                  return record.customizeTimes;
+                }
                 return <span>{text}</span>;
               }
             },
@@ -616,6 +622,7 @@ const outsourcingPro = Form.create()(
                 contactsMobile: thisdata.contactsMobile, //联系人电话
                 projectStatus: thisdata.projectStatus, //项目状态
                 splitStatus: thisdata.splitStatus,
+                sort: thisdata.cSort,
               });
             }
           }
@@ -781,6 +788,8 @@ const outsourcingPro = Form.create()(
                 startDate: thisData.startDate,
                 dunType: thisData.dunType,
                 appropriationRatio: thisData.appropriationRatio,
+                customizeName: thisData.customizeName,
+                customizeTimes: thisData.customizeTimes,
               });
             }
             if (!totalCui) {
@@ -1734,16 +1743,52 @@ const outsourcingPro = Form.create()(
                         <Modal
                           maskClosable={false}
                           footer={null}
+                          width={"70%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
-                            this.setState({ previewVisible: false });
+                            this.setState({ previewVisible: false,rotateDeg: 0 });
                           }}
                         >
                           <img
                             alt=""
-                            style={{ width: "100%" }}
+                            style={{
+                              width: "100%",
+                              transform: `rotate(${this.state.rotateDeg}deg)`,
+                            }}
                             src={this.state.previewImage || ""}
                           />
+                          <Button
+                            onClick={this.rotate}
+                            style={{
+                              position: "relative",
+                              left: "50%",
+                              transform: "translateX(-50%)",
+                            }}
+                          >
+                            旋转
+                          </Button>
+                          <Button
+                            onClick={this.upImg}
+                            style={{
+                              position: "absolute",
+                              left: -81,
+                              top: "50%",
+                              transform: "translateY(-50%)",
+                            }}
+                          >
+                            上一张
+                          </Button>
+                          <Button
+                            onClick={this.downImg}
+                            style={{
+                              position: "absolute",
+                              right: -81,
+                              top: "50%",
+                              transform: "translateY(-50%)",
+                            }}
+                          >
+                            下一张
+                          </Button>
                         </Modal>
                       </FormItem>
                     </div>

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

@@ -709,6 +709,8 @@ const OutsourceTaskAssignment = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {

+ 3 - 1
js/component/manageCenter/project/task/myTask.jsx

@@ -1682,6 +1682,8 @@ const Task = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {
@@ -3763,7 +3765,7 @@ const Task = React.createClass({
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
-                  label="启动时间"
+                  label="申报批次"
                 >
                   <Select
                     value={

+ 4 - 2
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -1732,6 +1732,8 @@ const MyTaskOutsource = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {
@@ -2447,7 +2449,7 @@ const MyTaskOutsource = React.createClass({
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
-                        label="启动时间"
+                        label="申报批次"
                       >
                         <Select
                           value={
@@ -3443,7 +3445,7 @@ const MyTaskOutsource = React.createClass({
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
-                  label="启动时间"
+                  label="申报批次"
                 >
                   <Select
                     value={

+ 2 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -709,6 +709,8 @@ const Task = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {

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

@@ -810,6 +810,8 @@ const Task = React.createClass({
               startDate: thisData.startDate,
               dunType: thisData.dunType,
               appropriationRatio: thisData.appropriationRatio,
+              customizeName: thisData.customizeName,
+              customizeTimes: thisData.customizeTimes,
             });
           }
           if (!totalCui) {

+ 2 - 1
js/component/manageCenter/set/business/businessProject.jsx

@@ -409,7 +409,8 @@ const BusinessProject=Form.create()(React.createClass({
 					loading: true
 				});
 				let nameText=this.state.SuperArr
-				let superText=(this.state.editCname.length==1)?nameText[parseInt(this.state.editCname)].id:this.state.editCid;
+				// let superText=(this.state.editCname.length==1)?nameText[parseInt(this.state.editCname)].id:this.state.editCid;
+				let superText=nameText[parseInt(this.state.editCname)].id
 				let isCountry=0;
 		    	let pro='';
 		        let city='';

+ 71 - 8
js/component/manageCenter/statistics/personnel/personnelAll.jsx

@@ -4,6 +4,7 @@ import moment from "moment";
 import "@/manageCenter/financialManage/distribute/public.less";
 import { ChooseList } from "../../order/orderNew/chooseList";
 import { citySelect, provinceList, areaSelect, Birthplace } from "@/areaList";
+import ReactToPrint from "react-to-print";
 import "./personnelList.less"
 import {
   Button,
@@ -189,6 +190,11 @@ const PersonnelAll = React.createClass({
           key: "starName",
         },
         {
+          title: "级别",
+          dataIndex: "lvlName",
+          key: "lvlName",
+        },
+        {
           title: "入职时间",
           dataIndex: "entryTimes",
           key: "entryTimes",
@@ -330,6 +336,16 @@ const PersonnelAll = React.createClass({
           key: "nowName",
         },
         {
+          title: "紧急联系人",
+          dataIndex: "emergencyContact",
+          key: "emergencyContact",
+        },
+        {
+          title: "紧急联系人电话",
+          dataIndex: "emergencyMobile",
+          key: "emergencyMobile",
+        },
+        {
           title: "离职时间",
           dataIndex: "quitTime",
           key: "quitTime",
@@ -2319,7 +2335,31 @@ const PersonnelAll = React.createClass({
             this.cancel();
           }}
         >
-          <Spin spinning={this.state.loading}>
+          <ReactToPrint
+            trigger={() => (
+              <Button
+                type="primary"
+                style={{
+                  float: "right",
+                  marginTop: 10,
+                  position: "absolute",
+                  top: 30,
+                  right: 15,
+                  zIndex: 1,
+                  display: this.state.detailFlag ? "block" : "none"
+                }}
+              >
+                打印
+              </Button>
+            )}
+            content={() => this.refs}
+          />
+          <Spin
+            spinning={this.state.loading}
+            ref={(e) => {
+              this.refs = e;
+            }}
+          >
             <h2
               style={{
                 textAlign: "center",
@@ -2336,7 +2376,7 @@ const PersonnelAll = React.createClass({
                 this.setState({ detailFlag: !this.state.detailFlag });
               }}
             >
-              更换显示模式
+              {this.state.detailFlag ? "切换编辑模式" : "切换查看模式"}
             </Button>
             <ul onClick={this.editPeo} className="peo-table">
               {this.state.table.map((item) => {
@@ -2990,7 +3030,7 @@ const PersonnelAll = React.createClass({
                       lineHeight: "60px",
                     }}
                   >
-                    暂无奖惩情况
+                    暂无离职信息
                   </div>
                 )}
                 <div className="title-peo" style={{ marginBottom: 10 }}>
@@ -3664,7 +3704,7 @@ const PersonnelAll = React.createClass({
                         lineHeight: "60px",
                       }}
                     >
-                      暂无奖惩情况
+                      暂无离职信息
                     </div>
                   )}
                 </TabPane>
@@ -3756,7 +3796,11 @@ const PersonnelAll = React.createClass({
                     }}
                   />
                   <Button
-                    disabled={this.state.employeeId || this.state.employeeId == 0 ? false : true}
+                    disabled={
+                      this.state.employeeId || this.state.employeeId == 0
+                        ? false
+                        : true
+                    }
                     style={{ position: "absolute" }}
                     type={"primary"}
                     onClick={this.verifyId}
@@ -3780,7 +3824,9 @@ const PersonnelAll = React.createClass({
                     }}
                   />
                   <Button
-                    disabled={this.state.doorId || this.state.doorId == 0 ? false : true}
+                    disabled={
+                      this.state.doorId || this.state.doorId == 0 ? false : true
+                    }
                     style={{ position: "absolute" }}
                     type={"primary"}
                     onClick={this.verifyDoor}
@@ -4101,7 +4147,11 @@ const PersonnelAll = React.createClass({
                   }}
                 />
                 <Button
-                  disabled={this.state.employeeId || this.state.employeeId == 0 ? false : true}
+                  disabled={
+                    this.state.employeeId || this.state.employeeId == 0
+                      ? false
+                      : true
+                  }
                   style={{ position: "absolute" }}
                   type={"primary"}
                   onClick={this.verifyId}
@@ -4125,7 +4175,9 @@ const PersonnelAll = React.createClass({
                   }}
                 />
                 <Button
-                  disabled={this.state.doorId || this.state.doorId == 0 ? false : true}
+                  disabled={
+                    this.state.doorId || this.state.doorId == 0 ? false : true
+                  }
                   style={{ position: "absolute" }}
                   type={"primary"}
                   onClick={this.verifyDoor}
@@ -5263,6 +5315,17 @@ const PersonnelAll = React.createClass({
                   label="到期时间"
                 >
                   <DatePicker
+                    disabledDate={(e) => {
+                      let time = moment(e).valueOf();
+                      let today = moment(
+                        this.state.contractList.startTimes
+                      ).valueOf();
+                      if (time <= today) {
+                        return true;
+                      } else if (!this.state.contractList.startTimes) {
+                        return true;
+                      }
+                    }}
                     value={
                       this.state.contractList.endTimes
                         ? moment(this.state.contractList.endTimes)

+ 5 - 1
js/component/manageCenter/statistics/personnel/personnelList.less

@@ -7,7 +7,11 @@
 .ant-tabs-bar {
     margin-bottom: 0;
 }
-
+.ant-modal-close-x {
+    position: absolute;
+    top: -10px;
+    right: -10px;
+}
 .peo-table {
     width: 100%;
     height: 200px;

+ 1 - 0
js/component/manageCenter/statistics/personnel/picModal.jsx

@@ -105,6 +105,7 @@ const PicModal = React.createClass({
         <Modal
           maskClosable={false}
           footer={null}
+          width={"70%"}
           visible={this.state.previewVisible}
           onCancel={() => {
             this.setState({ previewVisible: false, rotateDeg: 0 }, () => {

+ 2 - 1
js/component/project.jsx

@@ -403,7 +403,8 @@ const project = React.createClass({
               contacts: thisdata.contacts, //联系人
               contactsMobile: thisdata.contactsMobile, //联系人电话
               taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus
+              splitStatus: thisdata.splitStatus,
+              sort: thisdata.cSort,
             });
           }
         }

+ 1 - 1
package.json

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