mentoswzq 5 years ago
parent
commit
23cca57872

+ 2 - 1
js/component/manageCenter/order/orderNew/addService.jsx

@@ -1455,7 +1455,7 @@ const NewService = Form.create()(
     //删除收款节点
     confirmDeletNew(index) {
       if (index.id) {
-        this.state.contactListNew.splice(index.key, 1);
+        this.state.contactListNew.splice(index.id, 1);
         this.setState({
           contactListNew: this.state.contactListNew,
           cuiFlag: false,
@@ -1479,6 +1479,7 @@ const NewService = Form.create()(
                 cuiFlag: false
               });
               this.jiedianNew(this.state.orderNo);
+
             } else {
               message.warning(data.error[0].message);
             }

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

@@ -30,7 +30,8 @@ import {
   getApproval,
   getTaskStatus,
   getProjectStatus,
-  getNewOrderStatus
+  getNewOrderStatus,
+  getInvoiceStatus
 } from "@/tools.js";
 import './customer.less';
 import { ChooseList } from "../orderNew/chooseList";
@@ -126,7 +127,7 @@ const IntentionCustomer = Form.create()(
           starTime: this.state.releaseDate[0], //开始时间
           endTime: this.state.releaseDate[1], //结束时间
           approval: this.state.approvalSearch ? this.state.approvalSearch : 0, //审批状态
-          liquidationStatus: this.state.liquidationStatus //结算状态
+          liquidationStatus: this.state.liquidationStatusSearch //结算状态
         },
         success: function(data) {
           ShowModal(this);
@@ -1263,7 +1264,7 @@ const IntentionCustomer = Form.create()(
       this.state.orderNoSearch = undefined;
       this.state.contractNoSearch = undefined;
       this.state.nameSearch = undefined;
-      this.state.liquidationStatus = [];
+      this.state.liquidationStatusSearch = [];
       this.state.departmenttList = undefined;
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
@@ -1828,10 +1829,10 @@ const IntentionCustomer = Form.create()(
                 <Select
                   placeholder="结算状态"
                   onChange={e => {
-                    this.setState({ liquidationStatus: e });
+                    this.setState({ liquidationStatusSearch: e });
                   }}
                   style={{ width: 160, marginRight: 5 }}
-                  value={this.state.liquidationStatus}
+                  value={this.state.liquidationStatusSearch}
                 >
                   <Option value="0">首付待付清</Option>
                   <Option value="1">尾款待付清</Option>
@@ -2566,7 +2567,7 @@ const IntentionCustomer = Form.create()(
               className="admin-desc-content"
               width="1400px"
               onCancel={() => {
-                this.loadData();
+                // this.loadData();
                 this.setState({
                   dvisible: false
                 });
@@ -2634,6 +2635,7 @@ const IntentionCustomer = Form.create()(
                     dataSource={this.state.recordData}
                     pagination={false}
                     bordered
+                    size="small"
                   />
                   <div className="clearfix" style={{ marginTop: "20px" }}>
                     <FormItem
@@ -2684,6 +2686,7 @@ const IntentionCustomer = Form.create()(
                     dataSource={this.state.waterData}
                     pagination={false}
                     bordered
+                    size="small"
                   />
                   <div className="clearfix" style={{ marginTop: "20px" }}>
                     <FormItem
@@ -2871,7 +2874,7 @@ const IntentionCustomer = Form.create()(
                   <Table
                     columns={this.state.proColumns}
                     dataSource={this.state.proDataList}
-                    onRowClick={this.tableRowClickPro}
+                    // onRowClick={this.tableRowClickPro}
                     pagination={false}
                     bordered
                     size="small"

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

@@ -389,7 +389,9 @@ class ChangeDetail extends Component {
             <img src={tongguo} style={{ width: "100%" }} />
           </div>
 
-          <h2 style={{ textAlign: "center", marginBottom: 0 }}>合同变更记录</h2>
+          <h2 style={{ textAlign: "center", marginBottom: 10, marginTop: 20 }}>
+            合同变更记录
+          </h2>
           {pageData.map((item, index) => {
             return <Itemlist key={index} pageData={item} />;
           })}

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

@@ -1089,14 +1089,14 @@ const Task = React.createClass({
                         {...formItemLayout}
                         label="用户名"
                       >
-                        <span>{this.state.declareUser ? "*" : ""}</span>
+                        <span>{this.state.declareUser}</span>
                       </FormItem>
                       <FormItem
                         className="half-item"
                         {...formItemLayout}
                         label="密码"
                       >
-                        <span>{this.state.declarePwd ? "*" : ""}</span>
+                        <span>{this.state.declarePwd}</span>
                       </FormItem>
                     </div>
                     <div className="clearfix">

+ 3 - 2
js/component/project.jsx

@@ -425,7 +425,7 @@ const project = React.createClass({
         visible={this.state.visible}
         // onOk={this.visitOk}
         onCancel={e => {
-          this.props.cancel()
+          this.props.cancel();
         }}
       >
         <Form
@@ -466,7 +466,8 @@ const project = React.createClass({
                   {...formItemLayout}
                   label="项目状态"
                 >
-                  <span>{getProcessStatus(this.state.projectStatus)}</span>
+                  {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
+                  <span>{getProjectStatus(this.state.projectStatus)}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"

+ 1 - 1
package.json

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