mentoswzq пре 4 година
родитељ
комит
e2f4d980b0

+ 4 - 4
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -2847,7 +2847,7 @@ const approvedOutsourcing = React.createClass({
                 });
               }}
             >
-              打印项目信息
+              打印项目进度
             </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
@@ -2896,7 +2896,7 @@ const approvedOutsourcing = React.createClass({
               style={{ margin: "11px 0px 10px 10px" }}
               onClick={this.exportPro}
             >
-              导出项目详情
+              导出项目进度
             </Button>
           </TabPane>
           <TabPane tab="查看" key="5">
@@ -2963,7 +2963,7 @@ const approvedOutsourcing = React.createClass({
                 });
               }}
             >
-              项目信息
+              项目进度
             </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
@@ -3928,7 +3928,7 @@ const approvedOutsourcing = React.createClass({
         <Modal
           visible={this.state.proVisible}
           footer=""
-          title="项目详情"
+          title="项目进度"
           className="admin-desc-content"
           width="1300px"
           pagination={false}

+ 4 - 4
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -2623,7 +2623,7 @@ const approvedOutsourcing = React.createClass({
                 });
               }}
             >
-              打印项目信息
+              打印项目进度
             </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
@@ -2672,7 +2672,7 @@ const approvedOutsourcing = React.createClass({
               style={{ margin: "11px 0px 10px 10px" }}
               onClick={this.exportPro}
             >
-              导出项目详情
+              导出项目进度
             </Button>
           </TabPane>
           <TabPane tab="查看" key="5">
@@ -2739,7 +2739,7 @@ const approvedOutsourcing = React.createClass({
                 });
               }}
             >
-              项目信息
+              项目进度
             </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
@@ -3669,7 +3669,7 @@ const approvedOutsourcing = React.createClass({
         <Modal
           visible={this.state.proVisible}
           footer=""
-          title="项目详情"
+          title="项目进度"
           className="admin-desc-content"
           width="1300px"
           pagination={false}

+ 4 - 4
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -1915,7 +1915,7 @@ const ShouKuang = React.createClass({
                 });
               }}
             >
-              打印项目信息
+              打印项目进度
             </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
@@ -1964,7 +1964,7 @@ const ShouKuang = React.createClass({
               style={{ margin: "11px 0px 10px 10px" }}
               onClick={this.exportPro}
             >
-              导出项目详情
+              导出项目进度
             </Button>
           </TabPane>
           <TabPane tab="查看" key="5">
@@ -2031,7 +2031,7 @@ const ShouKuang = React.createClass({
                 });
               }}
             >
-              项目信息
+              项目进度
             </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
@@ -2475,7 +2475,7 @@ const ShouKuang = React.createClass({
         <Modal
           visible={this.state.proVisible}
           footer=""
-          title="项目详情"
+          title="项目进度"
           className="admin-desc-content"
           width="1300px"
           pagination={false}

+ 4 - 4
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -2017,7 +2017,7 @@ const ShouKuang = React.createClass({
                 });
               }}
             >
-              打印项目信息
+              打印项目进度
             </Button>
           </TabPane>
           <TabPane tab="导出Excel" key="4">
@@ -2066,7 +2066,7 @@ const ShouKuang = React.createClass({
               style={{ margin: "11px 0px 10px 10px" }}
               onClick={this.exportPro}
             >
-              导出项目详情
+              导出项目进度
             </Button>
           </TabPane>
           <TabPane tab="查看" key="5">
@@ -2133,7 +2133,7 @@ const ShouKuang = React.createClass({
                 });
               }}
             >
-              项目信息
+              项目进度
             </Button>
           </TabPane>
           {/* <TabPane tab="批量操作" key="6">
@@ -2577,7 +2577,7 @@ const ShouKuang = React.createClass({
         <Modal
           visible={this.state.proVisible}
           footer=""
-          title="项目详情"
+          title="项目进度"
           className="admin-desc-content"
           width="1300px"
           pagination={false}

+ 20 - 4
js/component/manageCenter/order/orderNew/addService.jsx

@@ -2927,6 +2927,12 @@ const NewService = Form.create()(
         message.warning("请选择变更类型")
         return false
       }
+      if(this.state.typeChange == 0 || this.state.typeChange == 1 || this.state.typeChange == 3) {
+        if(this.state.settlementAmount < this.state.changeAmount) {
+          message.warning("退款金额大于已收款金额")
+          return
+        }
+      }
       if (this.state.processStatus != 5 && this.state.processStatus != 6) {
         message.warning("当前订单流程不能发起变更!");
         return false;
@@ -2936,11 +2942,11 @@ const NewService = Form.create()(
         // console.log(this.state.changeAmount);
         return false;
       }
-      if (this.state.remarksC.trim() == "") {
+      if (this.state.remarksC == "") {
         message.warning("请正确填写变更原因");
         return false;
       }
-      if (this.state.startRemarks.trim() == "") {
+      if (this.state.startRemarks == "") {
         message.warning("请正确填写备注信息");
         return false;
       }
@@ -3433,6 +3439,16 @@ const NewService = Form.create()(
         message.warning("请选择变更类型");
         return false;
       }
+      if (
+        this.state.typeChange == 0 ||
+        this.state.typeChange == 1 ||
+        this.state.typeChange == 3
+      ) {
+        if (this.state.settlementAmount < this.state.changeAmount) {
+          message.warning("退款金额大于已收款金额");
+          return;
+        }
+      }
       if (this.state.processStatus != 5 && this.state.processStatus != 6) {
         message.warning("当前订单流程不能发起变更!");
         return false;
@@ -3441,11 +3457,11 @@ const NewService = Form.create()(
         message.warning("申请退款金额不能为空!");
         return false;
       }
-      if (this.state.remarksC.trim() == "") {
+      if (this.state.remarksC == "") {
         message.warning("请正确填写变更原因");
         return false;
       }
-      if (this.state.startRemarks.trim() == "") {
+      if (this.state.startRemarks == "") {
         message.warning("请正确填写备注信息");
         return false;
       }

+ 2 - 2
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1879,7 +1879,7 @@ const MyService = Form.create()(
                   }}
                   disabled={this.state.selectedRowKeys.length != 1}
                 >
-                  查看项目详情
+                  查看项目进度
                 </Button>
               </TabPane>
             </Tabs>
@@ -3393,7 +3393,7 @@ const MyService = Form.create()(
             <Modal
               visible={this.state.proVisible}
               footer=""
-              title="项目详情"
+              title="项目进度"
               className="admin-desc-content"
               width="1300px"
               pagination={false}

+ 25 - 1
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -725,6 +725,16 @@ class ChangeApply extends Component {
     if (moneyVerify(this.state.data.changeAmount)) {
       return false;
     }
+    if (
+      this.state.data.type == 0 ||
+      this.state.data.type == 1 ||
+      this.state.data.type == 3
+    ) {
+      if (this.state.data.settlementAmount < this.state.data.changeAmount) {
+        message.warning("退款金额大于已收款金额");
+        return;
+      }
+    }
     this.setState({
       loading: true
     })
@@ -827,7 +837,8 @@ class ChangeApply extends Component {
       },
       success: function (data) {
         this.setState({
-          cuiDataSource: data.data
+          cuiDataSource: data.data,
+          loading: false,
         });
         if (data.data && data.data.length) {
           if (id) {
@@ -863,6 +874,9 @@ class ChangeApply extends Component {
         id: id || this.state.data.id
       },
       success: function (data) {
+        this.setState({
+          loading:false
+        })
         if (data.data && data.data.length) {
           if (id) {
             this.setState({
@@ -1209,6 +1223,16 @@ class ChangeApply extends Component {
       message.warning("请选择变更类型");
       return false;
     }
+     if (
+       this.state.typeChange == 0 ||
+       this.state.typeChange == 1 ||
+       this.state.typeChange == 3
+     ) {
+       if (this.state.settlementAmount < this.state.changeAmount) {
+         message.warning("退款金额大于已收款金额");
+         return;
+       }
+     }
     if (this.state.processStatus != 5 || this.state.processStatus != 6) {
       message.warning("当前订单流程不能发起变更!");
       return false;

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

@@ -2312,7 +2312,7 @@ const IntentionCustomer = Form.create()(
                   }}
                   disabled={this.state.selectedRowKeys.length != 1}
                 >
-                  查看项目详情
+                  查看项目进度
                 </Button>
               </TabPane>
             </Tabs>

+ 27 - 0
js/component/manageCenter/project/content.jsx

@@ -79,6 +79,14 @@ class Content extends Component {
               });
             });
             break;
+          case "taskQueryZxs":
+            require.ensure([], () => {
+              const TaskQuery = require("./task/taskQueryZxs").default;
+              this.setState({
+                component: <TaskQuery ApiUrl={""} />
+              });
+            });
+            break;
           //任务派单
           case "taskAssignment":
             require.ensure([], () => {
@@ -98,6 +106,15 @@ class Content extends Component {
               });
             });
             break;
+          //我的任务
+          case "myTaskZxs":
+            require.ensure([], () => {
+              const MyTask = require("./task/myTaskZxs").default;
+              this.setState({
+                component: <MyTask ApiUrl={""} />
+              });
+            });
+            break;
           //我的外包任务
           case "myTaskOutsource":
             require.ensure([], () => {
@@ -108,6 +125,16 @@ class Content extends Component {
               });
             });
             break;
+          //我的外包任务
+          case "myTaskOutsourceZxs":
+            require.ensure([], () => {
+              const MyTaskOutsource = require("./task/myTaskOutsourceZxs")
+                .default;
+              this.setState({
+                component: <MyTaskOutsource ApiUrl={""} />
+              });
+            });
+            break;
           //合同变更审核列表
           case "contractChangeJsy":
             require.ensure([], () => {

Разлика између датотеке није приказан због своје велике величине
+ 533 - 356
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx


Разлика између датотеке није приказан због своје велике величине
+ 985 - 766
js/component/manageCenter/project/task/myTask.jsx


Разлика између датотеке није приказан због своје велике величине
+ 497 - 299
js/component/manageCenter/project/task/myTaskOutsource.jsx


+ 17 - 0
js/component/manageCenter/project/task/myTaskOutsourceZxs.jsx

@@ -0,0 +1,17 @@
+import React, { Component } from "react";
+import MyTaskOutsource from "./myTaskOutsource";
+
+class myTaskOutsourceZxs extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isZxs: true,
+    };
+  }
+
+  render() {
+    return <MyTaskOutsource isZxs={this.state.isZxs} />;
+  }
+}
+
+export default myTaskOutsourceZxs;

+ 17 - 0
js/component/manageCenter/project/task/myTaskZxs.jsx

@@ -0,0 +1,17 @@
+import React, { Component } from "react";
+import MyTask from "./myTask";
+
+class myTaskZxs extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isZxs: true,
+    };
+  }
+
+  render() {
+    return <MyTask isZxs={this.state.isZxs} />;
+  }
+}
+
+export default myTaskZxs;

Разлика између датотеке није приказан због своје велике величине
+ 535 - 355
js/component/manageCenter/project/task/taskAssignment.jsx


Разлика између датотеке није приказан због своје велике величине
+ 1206 - 963
js/component/manageCenter/project/task/taskQuery.jsx


+ 17 - 0
js/component/manageCenter/project/task/taskQueryZxs.jsx

@@ -0,0 +1,17 @@
+import React, { Component } from "react";
+import TaskQuery from "./taskQuery";
+
+class TaskQueryZxs extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      isZxs: true,
+    };
+  }
+
+  render() {
+    return <TaskQuery isZxs={this.state.isZxs} />;
+  }
+}
+
+export default TaskQueryZxs;

+ 1 - 1
package.json

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