hujie123456 5 years ago
parent
commit
e881340d07
22 changed files with 7132 additions and 5150 deletions
  1. 6 34
      js/component/manageCenter/order/orderNew/addorders.js
  2. 4 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  3. 4 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  4. 4 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  5. 5 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  6. 4 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  7. 4 1
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  8. 5 2
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  9. 3 1
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  10. 0 1
      js/component/manageCenter/order/orderNew/changeComponent/rizhi.js
  11. 0 1
      js/component/manageCenter/order/orderNew/contractCwzj.js
  12. 0 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  13. 11 17
      js/component/manageCenter/order/orderNew/contractJsy.js
  14. 0 1
      js/component/manageCenter/order/orderNew/contractJszj.js
  15. 11 17
      js/component/manageCenter/order/orderNew/contractYxgly.js
  16. 3 1
      js/component/manageCenter/order/orderNew/examine.jsx
  17. 3 1
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  18. 1 1
      js/component/manageCenter/order/orderNew/reject.jsx
  19. 800 654
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  20. 2440 1683
      js/component/manageCenter/project/task/myTask.jsx
  21. 3025 2074
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  22. 799 653
      js/component/manageCenter/project/task/taskAssignment.jsx

+ 6 - 34
js/component/manageCenter/order/orderNew/addorders.js

@@ -418,8 +418,7 @@ const Addorders = Form.create()(
     },
 
     //新建订单、编辑订单保存
-    handleSubmit(e) {
-      e.preventDefault();
+    handleSubmit() {
       let theorgCodeUrl = [];
       if (this.state.orgCodeUrl.length) {
         let picArr = [];
@@ -434,30 +433,17 @@ const Addorders = Form.create()(
         });
         theorgCodeUrl = picArr.join(",");
       }
-      if (this.props.userDetaile) {
-        if (!this.state.totalAmount) {
-          message.warning("签单金额不能为空");
-          this.refs.signFirstPayment.focus();
-          return false;
-        }
-        if (!this.state.firstAmount) {
-          message.warning("首付金额不能为空");
-          this.refs.signFirstPayment.focus();
-          return false;
-        }
+      if (this.props.data) {
         if (!theorgCodeUrl) {
           message.warning("图片过大,上传失败");
-          this.refs.signFirstPayment.focus();
           return false;
         }
         if (!this.state.signDate) {
           message.warning("签单日期不能为空");
-          this.refs.signFirstPayment.focus();
           return false;
         }
         if (!this.state.orderRemarks) {
           message.warning("订单留言不能为空");
-          this.refs.signFirstPayment.focus();
           return false;
         }
       } else {
@@ -465,9 +451,6 @@ const Addorders = Form.create()(
       this.setState({
         loading: true
       });
-      // let api = this.props.userDetaile
-      //   ? "/api/admin/newOrder/updateServiceOrderNew"
-      //   : "/api/admin/newOrder/createOrder";
       let api = "/api/admin/newOrder/updateServiceOrderNew";
       $.ajax({
         method: "POST",
@@ -475,12 +458,6 @@ const Addorders = Form.create()(
         crossDomain: false,
         url: globalConfig.context + api,
         data:
-          // !this.props.userDetaile
-          //   ? {
-          //       uid: this.state.autoId,
-          //       orderType: this.state.orderType
-          //     }
-          //   :
           {
             orderNo: this.state.orderNo, //订单编号
             totalAmount: this.state.totalAmount, //总金额
@@ -1408,12 +1385,6 @@ const Addorders = Form.create()(
 
       return (
         <div>
-          <Form
-            layout="horizontal"
-            onSubmit={this.handleSubmit}
-            id="demand-form"
-            style={{ paddingBottom: "40px" }}
-          >
             <Spin spinning={this.state.loading}>
               <div className="clearfix">
                 <FormItem
@@ -1838,7 +1809,9 @@ const Addorders = Form.create()(
                     wrapperCol={{ span: 16 }}
                     label="订单留言"
                   >
-                    <span>{this.state.orderRemarks}</span>
+                    <p style={{ width: 500, wordWrap: "break-word" }}>
+                      {this.state.orderRemarks}
+                    </p>
                   </FormItem>
                 )}
               </div>
@@ -1967,7 +1940,7 @@ const Addorders = Form.create()(
                   <Button
                     className="cancel"
                     type="primary"
-                    onClick={this.handleCancels}
+                    onClick={this.handleCancelq}
                     style={{ marginRight: 40 }}
                     htmlType="submit"
                   >
@@ -1978,7 +1951,6 @@ const Addorders = Form.create()(
                 ""
               )}
             </Spin>
-          </Form>
           <Modal
             maskClosable={false}
             visible={this.state.addnextVisible}

+ 4 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -181,7 +181,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -296,7 +299,6 @@ class ChangeDetail extends Component {
       }
     ];
     const orgCodeUrl = this.props.pictureUrl;
-    console.log(this.props.processState === this.props.data.processState);
 
     return (
       <div>

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

@@ -221,7 +221,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)

+ 4 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -81,7 +81,6 @@ class Itemlist extends Component {
 class ChangeDetail extends Component {
   constructor(props) {
     super(props);
-    console.log(props);
     this.state = {
       previewVisible: false,
       buttonStatus: true,
@@ -133,7 +132,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)

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

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Form, Upload, Modal } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
+import { getProcessStatusNew } from "@/tools.js";
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -112,7 +113,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)

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

@@ -166,7 +166,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)

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

@@ -122,7 +122,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)

+ 5 - 2
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -113,7 +113,10 @@ class ChangeDetail extends Component {
       {
         labelA: "当前进度",
         formItemLayoutA: formItemLayout,
-        dataA: this.props.data.processStateText,
+        dataA:
+          this.props.data.status !== 4
+            ? getProcessStatusNew(this.props.data.processState) + "审核中"
+            : getProcessStatusNew(this.props.data.processState) + "已完成",
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type)
@@ -251,7 +254,7 @@ class ChangeDetail extends Component {
           </Modal>
           <Rizhi changeId={this.props.data.id} />
         </Form.Item>
-        {(this.props.data.type === 0 && this.props.data.processState >= 2) ? (
+        {this.props.data.type === 0 && this.props.data.processState >= 2 ? (
           <div>
             <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
               当前项目进度(咨询师经理填写)

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

@@ -209,7 +209,9 @@ class OrderDetail extends Component {
             wrapperCol={{ span: 16 }}
             label="订单留言"
           >
-            <span>{data.orderRemarks}</span>
+            <p style={{ width: 500, wordWrap: "break-word" }}>
+              {data.orderRemarks}
+            </p>
           </FormItem>
         </div>
         <div className="clearfix">

+ 0 - 1
js/component/manageCenter/order/orderNew/changeComponent/rizhi.js

@@ -77,7 +77,6 @@ class Rizhi extends Component {
   }
 
   loadData() {
-    console.log(this.props.changeId);
     this.setState({
       loading: true
     });

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

@@ -348,7 +348,6 @@ const contractChange = Form.create()(
         success: function(data) {
           if (data.data) {
             let thisdata = data.data;
-            console.log(this.state.userName);
             Object.assign(thisdata, {
               processStateText: this.state.processStateText,
               userName: this.state.userName,

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

@@ -348,7 +348,6 @@ const contractChange = Form.create()(
         success: function(data) {
           if (data.data) {
             let thisdata = data.data;
-            console.log(this.state.userName);
             Object.assign(thisdata, {
               processStateText: this.state.processStateText,
               userName: this.state.userName,

+ 11 - 17
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -355,28 +355,22 @@ const contractChange = Form.create()(
         success: function(data) {
           if (data.data) {
             let thisdata = data.data;
-            console.log(this.state.userName);
             Object.assign(thisdata, {
               processStateText: this.state.processStateText,
               userName: this.state.userName,
               contractNo: this.state.contractNo
             });
-            this.setState(
-              {
-                contractData: thisdata,
-                voucherUrl: thisdata.voucherUrl
-                  ? splitUrl(
-                      thisdata.voucherUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload",
-                      url
-                    )
-                  : []
-              },
-              () => {
-                console.log(this.state.contractData);
-              }
-            );
+            this.setState({
+              contractData: thisdata,
+              voucherUrl: thisdata.voucherUrl
+                ? splitUrl(
+                    thisdata.voucherUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload",
+                    url
+                  )
+                : []
+            });
           }
         }.bind(this)
       });

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

@@ -348,7 +348,6 @@ const contractChange = Form.create()(
         success: function(data) {
           if (data.data) {
             let thisdata = data.data;
-            console.log(this.state.userName);
             Object.assign(thisdata, {
               processStateText: this.state.processStateText,
               userName: this.state.userName,

+ 11 - 17
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -346,28 +346,22 @@ const contractChange = Form.create()(
         success: function(data) {
           if (data.data) {
             let thisdata = data.data;
-            console.log(this.state.userName);
             Object.assign(thisdata, {
               processStateText: this.state.processStateText,
               userName: this.state.userName,
               contractNo: this.state.contractNo
             });
-            this.setState(
-              {
-                contractData: thisdata,
-                voucherUrl: thisdata.voucherUrl
-                  ? splitUrl(
-                      thisdata.voucherUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload",
-                      url
-                    )
-                  : []
-              },
-              () => {
-                console.log(this.state.contractData);
-              }
-            );
+            this.setState({
+              contractData: thisdata,
+              voucherUrl: thisdata.voucherUrl
+                ? splitUrl(
+                    thisdata.voucherUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload",
+                    url
+                  )
+                : []
+            });
           }
         }.bind(this)
       });

+ 3 - 1
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1133,7 +1133,9 @@ const IntentionCustomer = Form.create()(
                             wrapperCol={{ span: 16 }}
                             label="订单留言"
                           >
-                            <span>{this.state.orderRemarks}</span>
+                            <p style={{ width: 500, wordWrap: "break-word" }}>
+                              {this.state.orderRemarks}
+                            </p>
                           </FormItem>
                         </div>
                         <div className="clearfix">

+ 3 - 1
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -1140,7 +1140,9 @@ const outsourcingList = Form.create()(
                             wrapperCol={{ span: 16 }}
                             label="订单留言"
                           >
-                            <span>{this.state.orderRemarks}</span>
+                            <p style={{ width: 500, wordWrap: "break-word" }}>
+                              {this.state.orderRemarks}
+                            </p>
                           </FormItem>
                         </div>
                         <div className="clearfix">

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

@@ -57,7 +57,7 @@ const PicturesWall = React.createClass({
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 8 ? null : uploadButton}
+                    {fileList.length >= 18 ? null : uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />

File diff suppressed because it is too large
+ 800 - 654
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx


File diff suppressed because it is too large
+ 2440 - 1683
js/component/manageCenter/project/task/myTask.jsx


File diff suppressed because it is too large
+ 3025 - 2074
js/component/manageCenter/project/task/myTaskOutsource.jsx


File diff suppressed because it is too large
+ 799 - 653
js/component/manageCenter/project/task/taskAssignment.jsx