mentoswzq 4 years ago
parent
commit
e915cf3a59
39 changed files with 494 additions and 294 deletions
  1. 12 11
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  2. 14 11
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  3. 0 2
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  4. 5 5
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  5. 5 5
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  6. 13 10
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  7. 105 55
      js/component/manageCenter/order/orderNew/addService.jsx
  8. 5 5
      js/component/manageCenter/order/orderNew/addorders.js
  9. 20 8
      js/component/manageCenter/order/orderNew/approveds.jsx
  10. 1 3
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js
  11. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  12. 1 5
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  13. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  14. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  15. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  16. 116 38
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  17. 34 4
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  18. 11 8
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  19. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js
  20. 11 7
      js/component/manageCenter/order/orderNew/chargeback.jsx
  21. 12 7
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  22. 3 2
      js/component/manageCenter/order/orderNew/contractCwjl.js
  23. 3 2
      js/component/manageCenter/order/orderNew/contractCwzj.js
  24. 3 2
      js/component/manageCenter/order/orderNew/contractCwzy.js
  25. 3 2
      js/component/manageCenter/order/orderNew/contractJsjl.js
  26. 1 0
      js/component/manageCenter/order/orderNew/contractJsy.js
  27. 3 2
      js/component/manageCenter/order/orderNew/contractJszj.js
  28. 3 2
      js/component/manageCenter/order/orderNew/contractYxgly.js
  29. 3 2
      js/component/manageCenter/order/orderNew/contractYxy.js
  30. 13 30
      js/component/manageCenter/order/orderNew/examine.jsx
  31. 11 7
      js/component/manageCenter/order/orderNew/inquiry.jsx
  32. 9 5
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  33. 13 9
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  34. 46 24
      js/component/manageCenter/order/orderNew/reject.jsx
  35. 5 5
      js/component/manageCenter/project/project/projectQuery.jsx
  36. 1 9
      js/component/manageCenter/project/task/myTaskCount.jsx
  37. 2 0
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  38. 1 1
      js/component/manageCenter/statistics/personnel/picModal.jsx
  39. 1 1
      package.json

+ 12 - 11
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -722,8 +722,8 @@ const approvedOutsourcing = React.createClass({
           title: "项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: (text) => {
-            return <span>{text}</span>;
+          render: (text, record) => {
+            return <span>{text + "-" + record.tid}</span>;
           },
         },
         {
@@ -1041,11 +1041,11 @@ const approvedOutsourcing = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: (text) => {
+          render: (text, record) => {
             return text && text.length > 6 ? (
-              <span title={text}>{text.substr(0, 8)}...</span>
+              <span title={text}>{text.substr(0, 8) + "-" + record.id}...</span>
             ) : (
-              text
+              text + "-" + record.id
             );
           },
         },
@@ -2649,6 +2649,7 @@ const approvedOutsourcing = React.createClass({
               appropriationRatio: thisData.appropriationRatio,
               customizeName: thisData.customizeName,
               customizeTimes: thisData.customizeTimes,
+              tid: thisData.tid,
             });
           }
           if (!totalCui) {
@@ -3190,7 +3191,7 @@ const approvedOutsourcing = React.createClass({
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({
@@ -3263,18 +3264,18 @@ const approvedOutsourcing = React.createClass({
                           onPreview={(file) => {
                             this.setState({
                               previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
+                              previewVisibles: true,
                             });
                           }}
                         ></Upload>
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
-                          visible={this.state.previewVisible}
+                          width={"50%"}
+                          visible={this.state.previewVisibles}
                           onCancel={() => {
                             this.setState({
-                              previewVisible: false,
+                              previewVisibles: false,
                               rotateDeg: 0,
                             });
                           }}
@@ -3617,7 +3618,7 @@ const approvedOutsourcing = React.createClass({
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
+                      width={"50%"}
                       visible={this.state.previewVisible}
                       onCancel={() => {
                         this.setState({ previewVisible: false });

+ 14 - 11
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -437,8 +437,8 @@ const approvedOutsourcing = React.createClass({
           title: "项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: (text) => {
-            return <span>{text}</span>;
+          render: (text, record) => {
+            return <span>{text + "-" + record.tid}</span>;
           },
         },
         {
@@ -947,11 +947,11 @@ const approvedOutsourcing = React.createClass({
           title: "业务项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: (text) => {
+          render: (text, record) => {
             return text && text.length > 6 ? (
-              <span title={text}>{text.substr(0, 8)}...</span>
+              <span title={text}>{text.substr(0, 8) + "-" + record.id}...</span>
             ) : (
-              text
+              text + "-" + record.id
             );
           },
         },
@@ -2522,6 +2522,7 @@ const approvedOutsourcing = React.createClass({
               appropriationRatio: thisData.appropriationRatio,
               customizeName: thisData.customizeName,
               customizeTimes: thisData.customizeTimes,
+              tid: thisData.tid,
             });
           }
           if (!totalCui) {
@@ -3107,7 +3108,7 @@ const approvedOutsourcing = React.createClass({
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({
@@ -3180,18 +3181,18 @@ const approvedOutsourcing = React.createClass({
                           onPreview={(file) => {
                             this.setState({
                               previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
+                              previewVisibles: true,
                             });
                           }}
                         ></Upload>
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
-                          visible={this.state.previewVisible}
+                          width={"50%"}
+                          visible={this.state.previewVisibles}
                           onCancel={() => {
                             this.setState({
-                              previewVisible: false,
+                              previewVisibles: false,
                               rotateDeg: 0,
                             });
                           }}
@@ -3376,6 +3377,8 @@ const approvedOutsourcing = React.createClass({
                             columns={this.state.columnsX}
                             dataSource={this.state.dataSourceX}
                             pagination={false}
+                            size="small"
+                            bordered
                           />
                         </Spin>
                       </div>
@@ -3531,7 +3534,7 @@ const approvedOutsourcing = React.createClass({
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
+                      width={"50%"}
                       visible={this.state.previewVisible}
                       onCancel={() => {
                         this.setState({ previewVisible: false });

+ 0 - 2
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -591,8 +591,6 @@ const inSpecial = React.createClass({
     });
   },
   tableRowClick(record) {
-    console.log(record);
-    
     this.state.RowData = record;
     this.setState({
       showDesc: true

+ 5 - 5
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -1052,7 +1052,7 @@ const outsourcingPaiDan = React.createClass({
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({
@@ -1125,18 +1125,18 @@ const outsourcingPaiDan = React.createClass({
                           onPreview={(file) => {
                             this.setState({
                               previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
+                              previewVisibles: true,
                             });
                           }}
                         ></Upload>
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
-                          visible={this.state.previewVisible}
+                          width={"50%"}
+                          visible={this.state.previewVisibles}
                           onCancel={() => {
                             this.setState({
-                              previewVisible: false,
+                              previewVisibles: false,
                               rotateDeg: 0,
                             });
                           }}

+ 5 - 5
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -1206,7 +1206,7 @@ const outsourcingPaiDan = React.createClass({
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({
@@ -1279,18 +1279,18 @@ const outsourcingPaiDan = React.createClass({
                           onPreview={(file) => {
                             this.setState({
                               previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
+                              previewVisibles: true,
                             });
                           }}
                         ></Upload>
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
-                          visible={this.state.previewVisible}
+                          width={"50%"}
+                          visible={this.state.previewVisibles}
                           onCancel={() => {
                             this.setState({
-                              previewVisible: false,
+                              previewVisibles: false,
                               rotateDeg: 0,
                             });
                           }}

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

@@ -87,9 +87,11 @@ const OrderDetail = Form.create()(
         avisible: false,
         loading: false,
         jsDate: [],
+        replenishUrl: [],
         auditStatus: 0,
         textFileList: [],
         videoFileList: [],
+        previewVisibles: false,
         pictureUrl: [],
         pictureUrlMin: [],
         columns: [
@@ -97,11 +99,11 @@ const OrderDetail = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: text => {
+            render: (text, record) => {
               return text && text.length > 6 ? (
-                <span title={text}>{text.substr(0, 8)}...</span>
+                <span title={text}>{text.substr(0, 8) + "-" + record.id}...</span>
               ) : (
-                text
+                text + "-" + record.id
               );
             }
           },
@@ -196,8 +198,8 @@ const OrderDetail = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: text => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             }
           },
           {
@@ -651,6 +653,7 @@ const OrderDetail = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -802,7 +805,7 @@ const OrderDetail = Form.create()(
                   <Modal
                     maskClosable={false}
                     footer={null}
-                    width={"70%"}
+                    width={"50%"}
                     visible={this.state.previewVisible}
                     onCancel={() => {
                       this.setState({ previewVisible: false, rotateDeg: 0 });
@@ -956,17 +959,17 @@ const OrderDetail = Form.create()(
                     onPreview={file => {
                       this.setState({
                         previewImage: file.url || file.thumbUrl,
-                        previewVisible: true
+                        previewVisibles: true
                       });
                     }}
                   ></Upload>
                   <Modal
                     maskClosable={false}
                     footer={null}
-                    width={"70%"}
-                    visible={this.state.previewVisible}
+                    width={"50%"}
+                    visible={this.state.previewVisibles}
                     onCancel={() => {
-                      this.setState({ previewVisible: false, rotateDeg: 0 });
+                      this.setState({ previewVisibles: false, rotateDeg: 0 });
                     }}
                   >
                     {/* <div

+ 105 - 55
js/component/manageCenter/order/orderNew/addService.jsx

@@ -196,6 +196,11 @@ const NewService = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return (
+                text + "-" + record.id
+              )
+            }
           },
           {
             title: "项目类别",
@@ -754,7 +759,7 @@ const NewService = Form.create()(
             render: (text, record, index) => {
               let dataArr = this.state.dataSource || [];
               if (text) {
-                return <span>{text}</span>;
+                return <span>{text + "-" + record.tid}</span>;
               }
               return (
                 <Select
@@ -764,25 +769,48 @@ const NewService = Form.create()(
                     this.state.getLoad && record.sortName ? true : false
                   }
                   onChange={(e) => {
-                    record.sortName = e;
-                    dataArr.forEach((item) => {
-                      if (item.commodityName == record.sortName) {
-                        record.cname = item.cname;
-                        record.tid = item.id;
-                        record.isSave = true;
-                        record.sort = item.sort;
-                        cuiJieDian.forEach((item) => {
-                          if (item.value == record.sort) {
-                            record.arr = item.children;
-                            let yearFlag = true;
-                            if (record.sort == 6) {
-                              yearFlag = false;
-                            }
-                            this.setState({
-                              getLoad: true,
-                              yearFlag,
-                            });
-                          }
+                    // let num = e.lastIndexOf("-");
+                    // let ctid = e.substr(num + 1);
+                    // record.sortName = e.substring(0, num);
+                    // dataArr.forEach((item) => {
+                    //   if (
+                    //     item.commodityName == record.sortName &&
+                    //     ctid == item.id
+                    //   ) {
+                    //     record.cname = item.cname;
+                    //     record.tid = item.id;
+                    //     record.isSave = true;
+                    //     record.sort = item.sort;
+                    //     cuiJieDian.forEach((item) => {
+                    //       if (item.value == record.sort) {
+                    //         record.arr = item.children;
+                    //         let yearFlag = true;
+                    //         if (record.sort == 6) {
+                    //           yearFlag = false;
+                    //         }
+                    //         this.setState({
+                    //           getLoad: true,
+                    //           yearFlag,
+                    //         });
+                    //       }
+                    //     });
+                    //   }
+                    // });
+                    let proData = dataArr[e];
+                    record.cname = proData.cname;
+                    record.tid = proData.id;
+                    record.isSave = true;
+                    record.sort = proData.sort;
+                    cuiJieDian.forEach((item) => {
+                      if (item.value == record.sort) {
+                        record.arr = item.children;
+                        let yearFlag = true;
+                        if (record.sort == 6) {
+                          yearFlag = false;
+                        }
+                        this.setState({
+                          getLoad: true,
+                          yearFlag,
                         });
                       }
                     });
@@ -790,8 +818,11 @@ const NewService = Form.create()(
                 >
                   {dataArr.map((item) => {
                     return (
-                      <Select.Option key={item.id} value={item.commodityName}>
-                        {item.commodityName}
+                      <Select.Option
+                        key={item.id}
+                        value={item.key}
+                      >
+                        {item.commodityName + "-" + item.id}
                       </Select.Option>
                     );
                   })}
@@ -1198,30 +1229,48 @@ const NewService = Form.create()(
                     this.state.getLoad && record.sortName ? true : false
                   }
                   onChange={(e) => {
-                    let num = e.lastIndexOf("-");
-                    let ctid = e.substr(num + 1);
-                    record.sortName = e.substring(0, num);
-                    dataArr.forEach((item) => {
-                      if (
-                        item.commodityName == record.sortName &&
-                        ctid == item.id
-                      ) {
-                        record.cname = item.cname;
-                        record.ctid = item.id;
-                        record.isSave = true;
-                        record.sort = item.cSort;
-                        cuiJieDian.forEach((item) => {
-                          if (item.value == record.sort) {
-                            record.arr = item.children;
-                            let yearFlag = true;
-                            if (record.sort == 6) {
-                              yearFlag = false;
-                            }
-                            this.setState({
-                              getLoad: true,
-                              yearFlag,
-                            });
-                          }
+                    // let num = e.lastIndexOf("-");
+                    // let ctid = e.substr(num + 1);
+                    // record.sortName = e.substring(0, num);
+                    // dataArr.forEach((item) => {
+                    //   if (
+                    //     item.commodityName == record.sortName &&
+                    //     ctid == item.id
+                    //   ) {
+                    //     record.cname = item.cname;
+                    //     record.ctid = item.id;
+                    //     record.isSave = true;
+                    //     record.sort = item.cSort;
+                    //     cuiJieDian.forEach((item) => {
+                    //       if (item.value == record.sort) {
+                    //         record.arr = item.children;
+                    //         let yearFlag = true;
+                    //         if (record.sort == 6) {
+                    //           yearFlag = false;
+                    //         }
+                    //         this.setState({
+                    //           getLoad: true,
+                    //           yearFlag,
+                    //         });
+                    //       }
+                    //     });
+                    //   }
+                    // });
+                    let proData = dataArr[e];
+                    record.cname = proData.cname;
+                    record.ctid = proData.id;
+                    record.isSave = true;
+                    record.sort = proData.cSort;
+                    cuiJieDian.forEach((item) => {
+                      if (item.value == record.sort) {
+                        record.arr = item.children;
+                        let yearFlag = true;
+                        if (record.sort == 6) {
+                          yearFlag = false;
+                        }
+                        this.setState({
+                          getLoad: true,
+                          yearFlag,
                         });
                       }
                     });
@@ -1232,7 +1281,7 @@ const NewService = Form.create()(
                       return (
                         <Select.Option
                           key={item.id}
-                          value={item.commodityName + "-" + item.id}
+                          value={item.key}
                           disabled
                         >
                           {item.commodityName + "-" + item.id}
@@ -1242,7 +1291,7 @@ const NewService = Form.create()(
                       return (
                         <Select.Option
                           key={item.id}
-                          value={item.commodityName + "-" + item.id}
+                          value={item.key}
                         >
                           {item.commodityName + "-" + item.id}
                         </Select.Option>
@@ -2005,6 +2054,7 @@ const NewService = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid
               });
             }
             if (!totalCui) {
@@ -2586,8 +2636,8 @@ const NewService = Form.create()(
                 listFlag: true,
               });
             }
-            data.data.forEach((item) => {
-              item.key = item.id;
+            data.data.forEach((item,index) => {
+              item.key = index;
             });
             this.setState({
               proDataSource: data.data,
@@ -4769,7 +4819,7 @@ const NewService = Form.create()(
                                   <Modal
                                     maskClosable={false}
                                     footer={null}
-                                    width={"70%"}
+                                    width={"50%"}
                                     visible={this.state.previewVisible}
                                     onCancel={() => {
                                       this.setState({
@@ -4842,18 +4892,18 @@ const NewService = Form.create()(
                                     onPreview={(file) => {
                                       this.setState({
                                         previewImage: file.url || file.thumbUrl,
-                                        previewVisible: true,
+                                        previewVisibles: true,
                                       });
                                     }}
                                   ></Upload>
                                   <Modal
                                     maskClosable={false}
                                     footer={null}
-                                    width={"70%"}
-                                    visible={this.state.previewVisible}
+                                    width={"50%"}
+                                    visible={this.state.previewVisibles}
                                     onCancel={() => {
                                       this.setState({
-                                        previewVisible: false,
+                                        previewVisibles: false,
                                         rotateDeg: 0,
                                       });
                                     }}

+ 5 - 5
js/component/manageCenter/order/orderNew/addorders.js

@@ -2556,7 +2556,7 @@ const Addorders = Form.create()(
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
+                      width={"50%"}
                       visible={this.state.previewVisible}
                       onCancel={() => {
                         this.setState({ previewVisible: false, rotateDeg: 0 });
@@ -2626,17 +2626,17 @@ const Addorders = Form.create()(
                       onPreview={(file) => {
                         this.setState({
                           previewImage: file.url || file.thumbUrl,
-                          previewVisible: true,
+                          previewVisibles: true,
                         });
                       }}
                     ></Upload>
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
-                      visible={this.state.previewVisible}
+                      width={"50%"}
+                      visible={this.state.previewVisibles}
                       onCancel={() => {
-                        this.setState({ previewVisible: false, rotateDeg: 0 });
+                        this.setState({ previewVisibles: false, rotateDeg: 0 });
                       }}
                     >
                       <img

+ 20 - 8
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -86,16 +86,24 @@ const PicturesWall = React.createClass({
     return (
       <div style={{ display: "inline-block" }}>
         <Upload
-          action={globalConfig.context + "/api/admin/customer/uploadCustomerImg"}
-          data={{ 'sign': '' }}
+          action={
+            globalConfig.context + "/api/admin/customer/uploadCustomerImg"
+          }
+          data={{ sign: "" }}
           listType="picture-card"
           fileList={fileList}
           onPreview={this.handlePreview}
-          onChange={this.handleChange} >
-          {fileList.length >= 1 ? null : uploadButton}
+          onChange={this.handleChange}
+        >
+          {fileList && fileList.length >= 1 ? null : uploadButton}
         </Upload>
-        <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-          <img alt="example" style={{ width: '100%' }} src={previewImage} />
+        <Modal
+          maskClosable={false}
+          visible={previewVisible}
+          footer={null}
+          onCancel={this.handleCancel}
+        >
+          <img alt="example" style={{ width: "100%" }} src={previewImage} />
         </Modal>
       </div>
     );
@@ -341,6 +349,9 @@ const IntentionCustomer = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -432,8 +443,8 @@ const IntentionCustomer = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: (text) => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             },
           },
           {
@@ -1204,6 +1215,7 @@ const IntentionCustomer = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

+ 1 - 3
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -796,7 +796,6 @@ class ChangeDetail extends Component {
             refundInvoice: num
           });
           this.reLoad();
-          console.log("bug", this.state);
         } else {
           message.warning(data.error[0].message);
         }
@@ -1151,7 +1150,7 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
@@ -1785,7 +1784,6 @@ class ChangeDetail extends Component {
                         : null
                     }
                     onChange={(date, dateString) => {
-                      console.log(date, dateString);
                       this.setState({
                         refundDate: dateString,
                       });

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

@@ -566,7 +566,7 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.setState({ previewVisible: false }, () => {});

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

@@ -551,8 +551,6 @@ class ChangeDetail extends Component {
       });
     }, 0);
     this.refundGetList()
-    console.log(this.props,"222");
-    
   }
 
   addRefund() {
@@ -808,7 +806,6 @@ class ChangeDetail extends Component {
             refundInvoice: num
           });
           this.reLoad();
-          console.log("bug", this.state);
         } else {
           message.warning(data.error[0].message);
         }
@@ -1163,7 +1160,7 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
@@ -1866,7 +1863,6 @@ class ChangeDetail extends Component {
                         : null
                     }
                     onChange={(date, dateString) => {
-                      console.log(date, dateString);
                       this.setState({
                         refundDate: dateString,
                       });

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

@@ -452,7 +452,7 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.state.rotateDeg = 0;

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

@@ -437,7 +437,7 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.state.rotateDeg = 0;

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

@@ -443,7 +443,7 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.state.rotateDeg = 0;

+ 116 - 38
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -90,6 +90,7 @@ class ChangeDetail extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      rotateDeg: 0,
       previewVisible: false,
       buttonStatus: true,
       dataSource: [],
@@ -125,7 +126,7 @@ class ChangeDetail extends Component {
                   disabled={record.load}
                   key={record.id}
                   required="required"
-                  onChange={e => {
+                  onChange={(e) => {
                     record.amount = e.target.value;
                     this.setState({ contactList: this.state.contactList });
                   }}
@@ -133,7 +134,7 @@ class ChangeDetail extends Component {
                 />
               </div>
             );
-          }
+          },
         },
         {
           title: "时间",
@@ -141,13 +142,16 @@ class ChangeDetail extends Component {
           key: "createTimes",
           render: (text, record) => {
             return <div>{record.createTimes}</div>;
-          }
-        }
-      ]
+          },
+        },
+      ],
     };
     this.getOrgCodeUrl = this.getOrgCodeUrl.bind(this);
     this.changeButtonStatus = this.changeButtonStatus.bind(this);
     this.moneyOld = this.moneyOld.bind(this);
+    this.downImg = this.downImg.bind(this);
+    this.upImg = this.upImg.bind(this);
+    this.rotate = this.rotate.bind(this);
   }
   // componentWillUpdate() {
   //   this.loadDataChange();
@@ -182,6 +186,44 @@ class ChangeDetail extends Component {
   //     }.bind(this)
   //   });
   // }
+  downImg() {
+    let num = 0;
+    for (let i = 0; i < this.props.pictureUrl.length; i++) {
+      if (this.props.pictureUrl[i].url == this.state.previewImage) {
+        num = i;
+      }
+    }
+    if (num == this.props.pictureUrl.length - 1) {
+      return message.warning("已经是最后一张了哦");
+    }
+    this.state.previewImage = this.props.pictureUrl[num + 1].url;
+    this.setState({
+      previewImage: this.state.previewImage,
+      rotateDeg: 0,
+    });
+  }
+  upImg() {
+    let num = 0;
+    for (let i = 0; i < this.props.pictureUrl.length; i++) {
+      if (this.props.pictureUrl[i].url == this.state.previewImage) {
+        num = i;
+      }
+    }
+    if (num == 0) {
+      return message.warning("已经是第一张了哦");
+    }
+    this.state.previewImage = this.props.pictureUrl[num - 1].url;
+    this.setState({
+      previewImage: this.state.previewImage,
+      rotateDeg: 0,
+    });
+  }
+  rotate() {
+    let rotateDeg = this.state.rotateDeg + 90;
+    this.setState({
+      rotateDeg,
+    });
+  }
 
   moneyOld(str, money) {
     if (money) {
@@ -209,24 +251,24 @@ class ChangeDetail extends Component {
       refundableAmount: nextProps.data.refundableAmount,
       cwRemarks: nextProps.data.cwRemarks,
       contactList: nextProps.contactList,
-      refundInvoice: nextProps.data.refundInvoice
+      refundInvoice: nextProps.data.refundInvoice,
     });
   }
 
   getOrgCodeUrl(e) {
     this.setState({
-      orgCodeUrl: e
+      orgCodeUrl: e,
     });
   }
 
   //同意拒绝按钮的有无
   changeButtonStatus() {
     this.setState({
-      buttonStatus: !this.state.buttonStatus
+      buttonStatus: !this.state.buttonStatus,
     });
     window.setTimeout(() => {
       this.setState({
-        reason: ""
+        reason: "",
       });
     }, 100);
   }
@@ -239,7 +281,7 @@ class ChangeDetail extends Component {
         dataA: this.props.data.userName,
         labelB: "合同编号",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.contractNo
+        dataB: this.props.data.contractNo,
       },
       {
         labelA: "时间",
@@ -247,7 +289,7 @@ class ChangeDetail extends Component {
         dataA: this.props.data.createTimes,
         labelB: "发起人",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.applicant
+        dataB: this.props.data.applicant,
       },
       {
         labelA: "当前进度",
@@ -256,18 +298,18 @@ class ChangeDetail extends Component {
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
             ? shenghePeo(
-              this.props.data.processState == 2
-                ? this.props.data.consultantExamine
-                : this.props.data.managerExamine,
-              this.props.data.processState
-            )
+                this.props.data.processState == 2
+                  ? this.props.data.consultantExamine
+                  : this.props.data.managerExamine,
+                this.props.data.processState
+              )
             : getProcessStatusNew(
-              this.props.data.processState,
-              this.props.data.status
-            ),
+                this.props.data.processState,
+                this.props.data.status
+              ),
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
-        dataB: getChangeType(this.props.data.type)
+        dataB: getChangeType(this.props.data.type),
       },
       {
         labelA: "合同额(万元)",
@@ -275,7 +317,7 @@ class ChangeDetail extends Component {
         dataA: this.moneyOld(this.props.data.totalAmount, this.props.money),
         labelB: "已收款(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: changeColor(this.props.data.settlementAmount)
+        dataB: changeColor(this.props.data.settlementAmount),
       },
       {
         labelA: "欠款(万元)",
@@ -283,13 +325,13 @@ class ChangeDetail extends Component {
         dataA: changeColor(this.props.data.arrears),
         labelB: "申请退款(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: changeColor(this.props.data.changeAmount)
+        dataB: changeColor(this.props.data.changeAmount),
       },
       {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.remarks
-      }
+        dataA: this.props.data.remarks,
+      },
     ];
     const planData = [
       {
@@ -298,13 +340,13 @@ class ChangeDetail extends Component {
         dataA: this.props.data.projectState,
         labelB: "发生成本费用(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.zxsCost
+        dataB: this.props.data.zxsCost,
       },
       {
         labelA: "变更原因",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.zxsRemarks
-      }
+        dataA: this.props.data.zxsRemarks,
+      },
     ];
     const financeData = [
       {
@@ -313,8 +355,8 @@ class ChangeDetail extends Component {
         dataA: this.props.data.cwCost,
         labelB: "应退金额(万元)",
         formItemLayoutB: formItemLayout,
-        dataB: this.props.data.refundableAmount
-      }
+        dataB: this.props.data.refundableAmount,
+      },
     ];
     const buttonData = [
       {
@@ -323,11 +365,11 @@ class ChangeDetail extends Component {
         placeholder: "请输入理由",
         type: "primary",
         status: 2,
-        onChange: value => {
+        onChange: (value) => {
           this.setState({
-            remarks: value
+            remarks: value,
           });
-        }
+        },
       },
       {
         name: "拒绝",
@@ -335,12 +377,12 @@ class ChangeDetail extends Component {
         placeholder: "请输入理由",
         type: "danger",
         status: 3,
-        onChange: value => {
+        onChange: (value) => {
           this.setState({
-            remarks: value
+            remarks: value,
           });
-        }
-      }
+        },
+      },
     ];
     const orgCodeUrl = this.props.pictureUrl;
 
@@ -425,16 +467,52 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
+              width={"50%"}
               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>
             <Rizhi changeId={this.props.id} />
           </Form.Item>

+ 34 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -460,9 +460,10 @@ class ChangeDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
+              width={"70%"}
               visible={this.state.previewVisible}
               onCancel={() => {
-                this.setState({ previewVisible: false });
+                this.setState({ previewVisible: false, rotateDeg: 0 });
               }}
             >
               <img
@@ -473,9 +474,38 @@ class ChangeDetail extends Component {
                 }}
                 src={this.state.previewImage || ""}
               />
-              <Button onClick={this.rotate}>旋转</Button>
-              <Button onClick={this.upImg}>上一张</Button>
-              <Button onClick={this.downImg}>下一张</Button>
+              <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>
             <Rizhi changeId={this.props.id} />
           </Form.Item>

+ 11 - 8
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -23,8 +23,8 @@ class OrderDetail extends Component {
           title: "项目名称",
           dataIndex: "commodityName",
           key: "commodityName",
-          render: text => {
-            return <span>{text}</span>;
+          render: (text, record) => {
+            return <span>{text + "-" + record.tid}</span>;
           }
         },
         {
@@ -133,7 +133,10 @@ class OrderDetail extends Component {
         {
           title: "业务项目名称",
           dataIndex: "commodityName",
-          key: "commodityName"
+          key: "commodityName",
+          render: (text, record) => {
+            return text + "-" + record.id
+          }
         },
         {
           title: "项目类别",
@@ -548,7 +551,7 @@ class OrderDetail extends Component {
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
+              width={"50%"}
               visible={this.state.previewVisible}
               onCancel={() => {
                 this.state.rotateDeg = 0;
@@ -632,19 +635,19 @@ class OrderDetail extends Component {
               onPreview={(file) => {
                 this.setState({
                   previewImage: file.url || file.thumbUrl,
-                  previewVisible: true,
+                  previewVisibles: true,
                 });
               }}
             />
             <Modal
               maskClosable={false}
               footer={null}
-              width={"70%"}
-              visible={this.state.previewVisible}
+              width={"50%"}
+              visible={this.state.previewVisibles}
               onCancel={() => {
                 this.state.rotateDeg = 0;
                 this.setState({
-                  previewVisible: false,
+                  previewVisibles: false,
                   rotateDeg: this.state.rotateDeg,
                 });
               }}

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

@@ -65,7 +65,7 @@ class PicturesWall extends Component {
           maskClosable={false}
           visible={previewVisible}
           footer={null}
-          width={"70%"}
+          width={"50%"}
           onCancel={this.handleCancel}
         >
           <img alt="example" style={{ width: "100%" }} src={previewImage} />

+ 11 - 7
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -193,6 +193,9 @@ const IntentionCustomer = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -279,8 +282,8 @@ const IntentionCustomer = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: (text) => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             },
           },
           {
@@ -799,6 +802,7 @@ const IntentionCustomer = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeTimes: thisData.customizeTimes,
                 customizeName: thisData.customizeName,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -1191,7 +1195,7 @@ const IntentionCustomer = Form.create()(
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({
@@ -1264,17 +1268,17 @@ const IntentionCustomer = Form.create()(
                           onPreview={(file) => {
                             this.setState({
                               previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
+                              previewVisibles: true,
                             });
                           }}
                         ></Upload>
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
-                          visible={this.state.previewVisible}
+                          width={"50%"}
+                          visible={this.state.previewVisibles}
                           onCancel={() => {
-                            this.setState({ previewVisible: false, rotateDeg: 0, });
+                            this.setState({ previewVisibles: false, rotateDeg: 0, });
                           }}
                         >
                           <img

+ 12 - 7
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -177,6 +177,9 @@ const checkOutsourcing = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -276,8 +279,8 @@ const checkOutsourcing = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: (text) => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             },
           },
           {
@@ -691,6 +694,7 @@ const checkOutsourcing = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -1369,6 +1373,7 @@ const checkOutsourcing = Form.create()(
                           <Modal
                             maskClosable={false}
                             footer={null}
+                            width={"50%"}
                             visible={this.state.previewVisible}
                             onCancel={() => {
                               this.setState({
@@ -1441,18 +1446,18 @@ const checkOutsourcing = Form.create()(
                             onPreview={(file) => {
                               this.setState({
                                 previewImage: file.url || file.thumbUrl,
-                                previewVisible: true,
+                                previewVisibles: true,
                               });
                             }}
                           ></Upload>
                           <Modal
                             maskClosable={false}
                             footer={null}
-                            width={"70%"}
-                            visible={this.state.previewVisible}
+                            width={"50%"}
+                            visible={this.state.previewVisibles}
                             onCancel={() => {
                               this.setState({
-                                previewVisible: false,
+                                previewVisibles: false,
                                 rotateDeg: 0,
                               });
                             }}
@@ -1732,7 +1737,7 @@ const checkOutsourcing = Form.create()(
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
+                      width={"50%"}
                       visible={this.state.previewVisible}
                       onCancel={() => {
                         this.setState({ previewVisible: false,rotateDeg: 0 });

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

@@ -467,8 +467,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -795,6 +795,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -426,8 +426,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -715,6 +715,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -467,8 +467,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -788,6 +788,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -423,8 +423,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -712,6 +712,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -676,6 +676,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -421,8 +421,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -710,6 +710,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -416,8 +416,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -705,6 +705,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

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

@@ -428,8 +428,8 @@ const contractChange = Form.create()(
           });
           this.setState({
             proceedsData: data.data,
-            proTotal,
-            invTotal
+            proTotal: (Math.round(proTotal * 10000) / 10000).toFixed(4),
+            invTotal: (Math.round(invTotal * 10000) / 10000).toFixed(4),
           });
         }.bind(this)
       });
@@ -727,6 +727,7 @@ const contractChange = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

+ 13 - 30
js/component/manageCenter/order/orderNew/examine.jsx

@@ -278,6 +278,9 @@ const IntentionCustomer = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -372,8 +375,8 @@ const IntentionCustomer = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: (text) => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             },
           },
           {
@@ -794,6 +797,7 @@ const IntentionCustomer = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -1570,7 +1574,7 @@ const IntentionCustomer = Form.create()(
                               <Modal
                                 maskClosable={false}
                                 footer={null}
-                                width={"70%"}
+                                width={"50%"}
                                 visible={this.state.previewVisible}
                                 onCancel={() => {
                                   this.setState({ previewVisible: false,rotateDeg: 0, });
@@ -1640,17 +1644,17 @@ const IntentionCustomer = Form.create()(
                                 onPreview={(file) => {
                                   this.setState({
                                     previewImage: file.url || file.thumbUrl,
-                                    previewVisible: true,
+                                    previewVisibles: true,
                                   });
                                 }}
                               ></Upload>
                               <Modal
                                 maskClosable={false}
                                 footer={null}
-                                width={"70%"}
-                                visible={this.state.previewVisible}
+                                width={"50%"}
+                                visible={this.state.previewVisibles}
                                 onCancel={() => {
-                                  this.setState({ previewVisible: false,rotateDeg: 0 });
+                                  this.setState({ previewVisibles: false,rotateDeg: 0 });
                                 }}
                               >
                                 <img
@@ -1900,7 +1904,7 @@ const IntentionCustomer = Form.create()(
                     </Spin>
                   </Form>
                 </TabPane>
-                <TabPane tab="外包(不走总部)" key="2">
+                {/* <TabPane tab="外包(不走总部)" key="2">
                   <Spin spinning={this.state.loading}>
                     <div className="clearfix" style={{ marginTop: 10 }}>
                       <FormItem
@@ -1989,27 +1993,6 @@ const IntentionCustomer = Form.create()(
                         />
                       </FormItem>
                     </div>
-                    {/*<div className="clearfix">
-									<FormItem className="half-item"
-									    {...formItemLayout}
-									    label="上传协议文件" style={{height:"auto"}}>  
-									   <Upload header={{authorization: 'authorization-text'}} action={globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"}
-												data={(e)=>{
-														return {
-															'sign': e.name.substring(0,e.name.lastIndexOf("."))
-														}
-													}}
-												fileList={this.state.attachmentUrl}
-												onChange={(e)=>{
-													this.setState({attachmentUrl:e.fileList})
-												}}>
-											{this.state.attachmentUrl.length>1?null:<Button>
-											<Icon type="upload" /> 点击上传
-											</Button>}
-										</Upload>
-										<span className="tip" style={{display:"inline-block"}}>支持文件格式: doc,excel,ppt</span>
-									</FormItem>
-								</div>*/}
                     <div className="clearfix">
                       <FormItem
                         className="half-item"
@@ -2074,7 +2057,7 @@ const IntentionCustomer = Form.create()(
                       </div>
                     </div>
                   </Spin>
-                </TabPane>
+                </TabPane> */}
               </Tabs>
             </Modal>
             <Modal

+ 11 - 7
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -254,6 +254,9 @@ const IntentionCustomer = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -322,8 +325,8 @@ const IntentionCustomer = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: (text) => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             },
           },
           {
@@ -1773,6 +1776,7 @@ const IntentionCustomer = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -4189,7 +4193,7 @@ const IntentionCustomer = Form.create()(
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({
@@ -4262,17 +4266,17 @@ const IntentionCustomer = Form.create()(
                           onPreview={(file) => {
                             this.setState({
                               previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
+                              previewVisibles: true,
                             });
                           }}
                         ></Upload>
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
-                          visible={this.state.previewVisible}
+                          width={"50%"}
+                          visible={this.state.previewVisibles}
                           onCancel={() => {
-                            this.setState({ previewVisible: false,rotateDeg: 0 });
+                            this.setState({ previewVisibles: false,rotateDeg: 0 });
                           }}
                         >
                           <img

+ 9 - 5
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -208,7 +208,7 @@ const outsourcingList = Form.create()(
             render: (text, record, index) => {
               let dataArr = this.state.dataSourceX || [];
               if (text) {
-                return <span>{text}</span>;
+                return <span>{text + "-" + record.tid}</span>;
               }
               return (
                 <Select
@@ -567,6 +567,9 @@ const outsourcingList = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -987,6 +990,7 @@ const outsourcingList = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -1714,7 +1718,7 @@ const outsourcingList = Form.create()(
                             <Modal
                               maskClosable={false}
                               footer={null}
-                              width={"70%"}
+                              width={"50%"}
                               visible={this.state.previewVisible}
                               onCancel={() => {
                                 this.setState({
@@ -1787,14 +1791,14 @@ const outsourcingList = Form.create()(
                               onPreview={(file) => {
                                 this.setState({
                                   previewImage: file.url || file.thumbUrl,
-                                  previewVisible: true,
+                                  previewVisibles: true,
                                 });
                               }}
                             ></Upload>
                             <Modal
                               maskClosable={false}
                               footer={null}
-                              width={"70%"}
+                              width={"50%"}
                               visible={this.state.previewVisibles}
                               onCancel={() => {
                                 this.setState({
@@ -2372,7 +2376,7 @@ const outsourcingList = Form.create()(
                           <Modal
                             maskClosable={false}
                             footer={null}
-                            width={"70%"}
+                            width={"50%"}
                             visible={this.state.previewVisibless}
                             onCancel={() => {
                               this.setState({ previewVisibless: false });

+ 13 - 9
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -299,6 +299,9 @@ const outsourcingPro = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -400,8 +403,8 @@ const outsourcingPro = Form.create()(
             title: "项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
-            render: (text) => {
-              return <span>{text}</span>;
+            render: (text, record) => {
+              return <span>{text + "-" + record.tid}</span>;
             },
           },
           {
@@ -790,6 +793,7 @@ const outsourcingPro = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {
@@ -1396,7 +1400,7 @@ const outsourcingPro = Form.create()(
                             <Modal
                               maskClosable={false}
                               footer={null}
-                              width={"70%"}
+                              width={"50%"}
                               visible={this.state.previewVisible}
                               onCancel={() => {
                                 this.setState({
@@ -1469,18 +1473,18 @@ const outsourcingPro = Form.create()(
                               onPreview={(file) => {
                                 this.setState({
                                   previewImage: file.url || file.thumbUrl,
-                                  previewVisible: true,
+                                  previewVisibles: true,
                                 });
                               }}
                             ></Upload>
                             <Modal
                               maskClosable={false}
                               footer={null}
-                              width={"70%"}
-                              visible={this.state.previewVisible}
+                              width={"50%"}
+                              visible={this.state.previewVisibles}
                               onCancel={() => {
                                 this.setState({
-                                  previewVisible: false,
+                                  previewVisibles: false,
                                   rotateDeg: 0,
                                 });
                               }}
@@ -1631,7 +1635,7 @@ const outsourcingPro = Form.create()(
                           </Spin>
                         </div>
                         <div>
-                          <span style={{ marginLeft: 20, fontSize: "18px" }}>
+                          <span style={{ marginLeft: 50, fontSize: "20px" }}>
                             催款节点
                           </span>
                           <span
@@ -1743,7 +1747,7 @@ const outsourcingPro = Form.create()(
                         <Modal
                           maskClosable={false}
                           footer={null}
-                          width={"70%"}
+                          width={"50%"}
                           visible={this.state.previewVisible}
                           onCancel={() => {
                             this.setState({ previewVisible: false,rotateDeg: 0 });

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

@@ -241,6 +241,9 @@ const IntentionCustomer = Form.create()(
             title: "业务项目名称",
             dataIndex: "commodityName",
             key: "commodityName",
+            render: (text, record) => {
+              return text + "-" + record.id
+            }
           },
           {
             title: "项目类别",
@@ -345,7 +348,7 @@ const IntentionCustomer = Form.create()(
             render: (text, record, index) => {
               let dataArr = this.state.dataSourceX || [];
               if (text) {
-                return <span>{text}</span>;
+                return <span>{text + "-" + record.tid}</span>;
               }
               return (
                 <Select
@@ -355,37 +358,55 @@ const IntentionCustomer = Form.create()(
                     this.state.getLoad && record.sortName ? true : false
                   }
                   onChange={(e) => {
-                    record.sortName = e;
-                    dataArr.forEach((item) => {
-                      if (item.commodityName == record.sortName) {
-                        record.cname = item.cname;
-                        record.tid = item.id;
-                        record.isSave = true;
-                        record.sort = item.sort;
-                        console.log(record);
+                    // record.sortName = e;
+                    // dataArr.forEach((item) => {
+                    //   if (item.commodityName == record.sortName) {
+                    //     record.cname = item.cname;
+                    //     record.tid = item.id;
+                    //     record.isSave = true;
+                    //     record.sort = item.sort;
+                    //     console.log(record);
 
-                        cuiJieDian.forEach((item) => {
-                          if (item.value == record.sort) {
-                            record.arr = item.children;
-                            let yearFlag = true;
-                            if (record.sort == 6) {
-                              yearFlag = false;
-                            }
-                            this.setState({
-                              getLoad: true,
-                              yearFlag,
-                            });
-                          }
+                    //     cuiJieDian.forEach((item) => {
+                    //       if (item.value == record.sort) {
+                    //         record.arr = item.children;
+                    //         let yearFlag = true;
+                    //         if (record.sort == 6) {
+                    //           yearFlag = false;
+                    //         }
+                    //         this.setState({
+                    //           getLoad: true,
+                    //           yearFlag,
+                    //         });
+                    //       }
+                    //     });
+                    //   }
+                    // });
+                    // console.log(e);
+                    let proData = dataArr[e];
+                    record.cname = proData.cname;
+                    record.tid = proData.id;
+                    record.isSave = true;
+                    record.sort = proData.sort;
+                    cuiJieDian.forEach((item) => {
+                      if (item.value == record.sort) {
+                        record.arr = item.children;
+                        let yearFlag = true;
+                        if (record.sort == 6) {
+                          yearFlag = false;
+                        }
+                        this.setState({
+                          getLoad: true,
+                          yearFlag,
                         });
                       }
                     });
-                    console.log(e);
                   }}
                 >
                   {dataArr.map((item) => {
                     return (
-                      <Select.Option key={item.id} value={item.commodityName}>
-                        {item.commodityName}
+                      <Select.Option key={item.id} value={item.key}>
+                        {item.commodityName + "-" + item.id}
                       </Select.Option>
                     );
                   })}
@@ -1123,6 +1144,7 @@ const IntentionCustomer = Form.create()(
                 appropriationRatio: thisData.appropriationRatio,
                 customizeName: thisData.customizeName,
                 customizeTimes: thisData.customizeTimes,
+                tid: thisData.tid,
               });
             }
             if (!totalCui) {

+ 5 - 5
js/component/manageCenter/project/project/projectQuery.jsx

@@ -953,7 +953,7 @@ const PaiDan = React.createClass({
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
+                      width={"50%"}
                       visible={this.state.previewVisible}
                       onCancel={() => {
                         this.setState({ previewVisible: false,rotateDeg: 0 });
@@ -1023,17 +1023,17 @@ const PaiDan = React.createClass({
                       onPreview={(file) => {
                         this.setState({
                           previewImage: file.url || file.thumbUrl,
-                          previewVisible: true,
+                          previewVisibles: true,
                         });
                       }}
                     ></Upload>
                     <Modal
                       maskClosable={false}
                       footer={null}
-                      width={"70%"}
-                      visible={this.state.previewVisible}
+                      width={"50%"}
+                      visible={this.state.previewVisibles}
                       onCancel={() => {
-                        this.setState({ previewVisible: false,rotateDeg: 0 });
+                        this.setState({ previewVisibles: false,rotateDeg: 0 });
                       }}
                     >
                       <img

+ 1 - 9
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -31,9 +31,6 @@ const { TabPane } = Tabs
 const MyTaskCount = Form.create()(
   React.createClass({
     departmentList() {
-      this.setState({
-        loading: true
-      });
       $.ajax({
         method: "get",
         dataType: "json",
@@ -62,9 +59,6 @@ const MyTaskCount = Form.create()(
         }.bind(this)
       }).always(
         function() {
-          this.setState({
-            loading: false
-          });
         }.bind(this)
       );
     },
@@ -230,6 +224,7 @@ const MyTaskCount = Form.create()(
 
     getInitialState() {
       return {
+        loading: false,
         page: 1,
         releaseDate: [],
         selectedRowKeys: [],
@@ -995,9 +990,6 @@ const MyTaskCount = Form.create()(
       }).always(
         function() {
           this.loadData(this.state.ispage);
-          this.setState({
-            loading: false
-          });
         }.bind(this)
       );
     },

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

@@ -115,6 +115,8 @@ const MyTaskOutsource = React.createClass({
             });
           }
         }
+        this.state.pagination.current = data.data.pageNo;
+        this.state.pagination.total = data.data.totalCount;
         if (data.data && data.data.list && !data.data.list.length) {
           this.state.pagination.current = 0;
           this.state.pagination.total = 0;

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

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

+ 1 - 1
package.json

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