hujie123456 5 years ago
parent
commit
a3863f143c

+ 79 - 18
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -27,7 +27,8 @@ import {
   getProjectStatus,
   splitUrl,
   getprovince,
-  getRefundStatus
+  getRefundStatus,
+  getTransactionProject
 } from "@/tools";
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 const FormItem = Form.Item;
@@ -141,7 +142,9 @@ const approvedOutsourcing = React.createClass({
         this.setState({
           totalPage: data.data.pagination.totalPage,
           dataSource: theArr,
-          pagination: this.state.pagination
+          pagination: this.state.pagination,
+          totalHui: data.data.count ? data.data.count.signTotalAmount : 0,
+          hui: data.data.count ? data.data.count.actuallyTotalAmount : 0
         });
       }.bind(this)
     }).always(
@@ -191,6 +194,11 @@ const approvedOutsourcing = React.createClass({
           // fixed: "left"
         },
         {
+          title: "合同编号",
+          dataIndex: "contractNo",
+          key: "contractNo"
+        },
+        {
           title: "签单日期",
           dataIndex: "signTime",
           key: "signTime"
@@ -236,11 +244,6 @@ const approvedOutsourcing = React.createClass({
             return getApproval(text);
           }
         },
-        {
-          title: "合同编号",
-          dataIndex: "contractNo",
-          key: "contractNo"
-        },
         //                 {
         //                     title: '订单状态',
         //                     dataIndex: 'orderStatus',
@@ -573,6 +576,11 @@ const approvedOutsourcing = React.createClass({
       ],
       waterlistDate: [
         {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
           title: "平台流水号",
           dataIndex: "billNo",
           key: "billNo"
@@ -617,11 +625,6 @@ const approvedOutsourcing = React.createClass({
           key: "financialPayNo"
         },
         {
-          title: "订单编号",
-          dataIndex: "orderNo",
-          key: "orderNo"
-        },
-        {
           title: "订单负责人",
           dataIndex: "saleName",
           key: "saleName"
@@ -1327,8 +1330,8 @@ const approvedOutsourcing = React.createClass({
     const jsDate = this.state.jsDate || [];
     return (
       <div className="user-content">
-        <div className="content-title">
-          <span>外包结算管理</span>
+        <div className="content-title" style={{ marginBottom: 10 }}>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>外包结算管理</span>
         </div>
         <Tabs defaultActiveKey="2" onChange={this.callback}>
           <TabPane tab="更改表格显示数据" key="1">
@@ -1420,6 +1423,7 @@ const approvedOutsourcing = React.createClass({
               type="primary"
               style={{ margin: "0px 0px 10px 10px" }}
               onClick={this.printAll}
+              disabled={!this.state.dataSource.length}
             >
               打印所有列表信息
             </Button>
@@ -1496,6 +1500,16 @@ const approvedOutsourcing = React.createClass({
               rowSelection={rowSelection}
             />
           </Spin>
+          <p
+            style={{ display: "inline-block", fontSize: "14px", color: "red" }}
+          >
+            {`收款金额总计(万元):${this.state.hui ? this.state.hui : "0"}` +
+              " " +
+              " " +
+              `合同额总计(万元):${
+                this.state.totalHui ? this.state.totalHui : "0"
+              }`}
+          </p>
         </div>
         <div className="patent-desc">
           <Modal
@@ -1953,7 +1967,12 @@ const approvedOutsourcing = React.createClass({
           onCancel={this.inRecordCanl}
         >
           <Spin spinning={this.state.loading}>
-            <div className="patent-table">
+            <div
+              className="patent-table"
+              ref={e => {
+                this.refs.kaiPiao = e;
+              }}
+            >
               <Table
                 columns={this.state.columnsDate}
                 dataSource={this.state.recordData}
@@ -1969,6 +1988,23 @@ const approvedOutsourcing = React.createClass({
                   <span>{this.state.sum + "(万元)"}</span>
                 </FormItem>
               </div>
+              <ReactToPrint
+                trigger={() => (
+                  <Button
+                    type="primary"
+                    style={{
+                      float: "right",
+                      // marginTop: 10,
+                      position: "absolute",
+                      top: -54,
+                      right: 30
+                    }}
+                  >
+                    打印
+                  </Button>
+                )}
+                content={() => this.refs.kaiPiao}
+              />
             </div>
           </Spin>
         </Modal>
@@ -1981,7 +2017,12 @@ const approvedOutsourcing = React.createClass({
           onCancel={this.waterCanl}
         >
           <Spin spinning={this.state.loading}>
-            <div className="patent-table">
+            <div
+              className="patent-table"
+              ref={e => {
+                this.refs.shouKuan = e;
+              }}
+            >
               <Table
                 columns={this.state.waterlistDate}
                 dataSource={this.state.waterData}
@@ -1997,6 +2038,22 @@ const approvedOutsourcing = React.createClass({
                   <span>{this.state.waterSum + "(万元)"}</span>
                 </FormItem>
               </div>
+              <ReactToPrint
+                trigger={() => (
+                  <Button
+                    type="primary"
+                    style={{
+                      float: "right",
+                      position: "absolute",
+                      top: -54,
+                      right: 30
+                    }}
+                  >
+                    打印
+                  </Button>
+                )}
+                content={() => this.refs.shouKuan}
+              />
             </div>
           </Spin>
         </Modal>
@@ -2007,6 +2064,10 @@ const approvedOutsourcing = React.createClass({
           className="admin-desc-content"
           width="1300px"
           onCancel={() => {
+            this.state.pagination.pageSize = 10;
+            this.setState({
+              pagination: this.state.pagination
+            });
             this.loadData();
             this.setState({
               dvisible: false
@@ -2024,7 +2085,7 @@ const approvedOutsourcing = React.createClass({
                 padding: "25px 0 30px 30px"
               }}
               ref={e => {
-                this.refs = e;
+                this.refs.all = e;
               }}
             >
               <Table
@@ -2052,7 +2113,7 @@ const approvedOutsourcing = React.createClass({
                 打印
               </Button>
             )}
-            content={() => this.refs}
+            content={() => this.refs.all}
           />
         </Modal>
       </div>

+ 5 - 3
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -569,7 +569,7 @@ const HuiKuan = React.createClass({
     return (
       <div className="user-content" style={{ position: "relative" }}>
         <div className="content-title" style={{ marginBottom: 10 }}>
-          <span style={{ fontWeight: 900, fontSize: 16 }}>回款</span>
+          <span style={{ fontWeight: 900, fontSize: 16 }}>批量回款</span>
         </div>
 
         <Tabs defaultActiveKey="1" onChange={this.callback}>
@@ -806,11 +806,13 @@ const HuiKuan = React.createClass({
             style={{ display: "inline-block", fontSize: "14px", color: "red" }}
           >
             {`回款金额总计(万元):${
-              this.state.totalHui ? this.state.totalHui : "0"
+              this.state.hui ? this.state.hui : "0"
             }` +
               " " +
               " " +
-              `合同额总计(万元):${this.state.hui ? this.state.hui : "0"}`}
+              `合同额总计(万元):${
+                this.state.totalHui ? this.state.totalHui : "0"
+              }`}
           </p>
         </div>
 

+ 64 - 11
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -23,7 +23,7 @@ import {
   getProcessStatus,
   getApproval,
   getInvoiceStatus,
-  getTransactionProject
+  getTransactionProject,
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList"
 const FormItem = Form.Item;
@@ -425,6 +425,11 @@ const ShouKuang = React.createClass({
       ],
       waterlistDate: [
         {
+          title: "订单编号",
+          dataIndex: "orderNo",
+          key: "orderNo"
+        },
+        {
           title: "平台流水号",
           dataIndex: "billNo",
           key: "billNo"
@@ -469,11 +474,6 @@ const ShouKuang = React.createClass({
           key: "financialPayNo"
         },
         {
-          title: "订单编号",
-          dataIndex: "orderNo",
-          key: "orderNo"
-        },
-        {
           title: "订单负责人",
           dataIndex: "saleName",
           key: "saleName"
@@ -926,6 +926,7 @@ const ShouKuang = React.createClass({
               type="primary"
               style={{ margin: "0px 0px 10px 10px" }}
               onClick={this.printAll}
+              disabled={!this.state.dataSource.length}
             >
               打印所有列表信息
             </Button>
@@ -1001,7 +1002,16 @@ const ShouKuang = React.createClass({
               onRowClick={this.tableRowClick.bind(this)}
             />
           </Spin>
-          <p style={{ display: "inline-block", fontSize: "14px", color: "red" }}>{`回款金额总计(万元):${this.state.totalHui ? this.state.totalHui : "0"}` + " " + " " + `合同额总计(万元):${this.state.hui ? this.state.hui : "0"}`}</p>
+          <p
+            style={{ display: "inline-block", fontSize: "14px", color: "red" }}
+          >
+            {`收款金额总计(万元):${this.state.hui ? this.state.hui : "0"}` +
+              " " +
+              " " +
+              `合同额总计(万元):${
+                this.state.totalHui ? this.state.totalHui : "0"
+              }`}
+          </p>
         </div>
         <Assign
           title="任务"
@@ -1085,7 +1095,12 @@ const ShouKuang = React.createClass({
           onCancel={this.inRecordCanl}
         >
           <Spin spinning={this.state.loading}>
-            <div className="patent-table">
+            <div
+              className="patent-table"
+              ref={e => {
+                this.refs.kaiPiao = e;
+              }}
+            >
               <Table
                 columns={this.state.columnsDate}
                 dataSource={this.state.recordData}
@@ -1101,6 +1116,23 @@ const ShouKuang = React.createClass({
                   <span>{this.state.sum + "(万元)"}</span>
                 </FormItem>
               </div>
+              <ReactToPrint
+                trigger={() => (
+                  <Button
+                    type="primary"
+                    style={{
+                      float: "right",
+                      // marginTop: 10,
+                      position: "absolute",
+                      top: -54,
+                      right: 30
+                    }}
+                  >
+                    打印
+                  </Button>
+                )}
+                content={() => this.refs.kaiPiao}
+              />
             </div>
           </Spin>
         </Modal>
@@ -1113,7 +1145,12 @@ const ShouKuang = React.createClass({
           onCancel={this.waterCanl}
         >
           <Spin spinning={this.state.loading}>
-            <div className="patent-table">
+            <div
+              className="patent-table"
+              ref={e => {
+                this.refs.shouKuan = e;
+              }}
+            >
               <Table
                 columns={this.state.waterlistDate}
                 dataSource={this.state.waterData}
@@ -1129,6 +1166,22 @@ const ShouKuang = React.createClass({
                   <span>{this.state.waterSum + "(万元)"}</span>
                 </FormItem>
               </div>
+              <ReactToPrint
+                trigger={() => (
+                  <Button
+                    type="primary"
+                    style={{
+                      float: "right",
+                      position: "absolute",
+                      top: -54,
+                      right: 30
+                    }}
+                  >
+                    打印
+                  </Button>
+                )}
+                content={() => this.refs.shouKuan}
+              />
             </div>
           </Spin>
         </Modal>
@@ -1157,7 +1210,7 @@ const ShouKuang = React.createClass({
                 padding: "25px 0 30px 30px"
               }}
               ref={e => {
-                this.refs = e;
+                this.refs.all = e;
               }}
             >
               <Table
@@ -1185,7 +1238,7 @@ const ShouKuang = React.createClass({
                 打印
               </Button>
             )}
-            content={() => this.refs}
+            content={() => this.refs.all}
           />
         </Modal>
       </div>

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

@@ -626,7 +626,7 @@ class ChangeDetail extends Component {
             ""
           )} */}
         </div>
-        {this.props.processState === this.props.data.processState ? (
+        {this.props.processState == this.props.data.processState ? (
           1 ? (
             <div
               style={{

BIN
js/component/manageCenter/order/orderNew/changeComponent/img.png


+ 15 - 2
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -10,6 +10,7 @@ import {
   getApprovedState,
   getProjectStatus
 } from "@/tools.js";
+import img from "./img.png"
 
 const FormItem = Form.Item;
 class OrderDetail extends Component {
@@ -100,10 +101,19 @@ class OrderDetail extends Component {
             return text && text.length > 8 ? text.substr(0, 8) + "…" : text;
           }
         }
-      ]
+      ],
+      rotateDeg: 0
     };
     this.tableRowClickX = this.tableRowClickX.bind(this);
     this.nextCancel = this.nextCancel.bind(this);
+    this.rotate = this.rotate.bind(this)
+  }
+
+  rotate() {
+    let rotateDeg = this.state.rotateDeg + 90 
+    this.setState({
+      rotateDeg
+    })
   }
 
   //项目详情关闭
@@ -254,9 +264,12 @@ class OrderDetail extends Component {
             >
               <img
                 alt=""
-                style={{ width: "100%" }}
+                style={{ width: "100%", transform: `rotate(${this.state.rotateDeg}deg)` }}
+                className="rotate"
                 src={this.state.previewImage || ""}
+                // src={img}
               />
+              <Button onClick={this.rotate}>旋转</Button>
             </Modal>
             <Button
               style={{

+ 1 - 3
js/component/tools.js

@@ -1818,9 +1818,6 @@ module.exports = {
     //     });
     //     return theType;
     // }
-    if (status == 3) {
-      return "订单变更已驳回";
-    }
     let str = "";
     if (pro == 0) {
       str = "营销员";
@@ -1850,6 +1847,7 @@ module.exports = {
       num = "通过";
     } else if (status == 3) {
       num = "驳回";
+      return num + "到" + str
     } else if (status == 4) {
       num = "完成";
     }

+ 1 - 1
package.json

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