hujie123456 5 anos atrás
pai
commit
3d209f7587

+ 3 - 1
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -367,7 +367,9 @@ const outInvoiceQuery = React.createClass({
           dataIndex: "status",
           key: "status",
           render: text => {
-            return getInvoiceStatus(text);
+            return getInvoiceStatus(text, {
+              approval: 0
+            });
           }
         }
       ],

+ 17 - 3
js/component/manageCenter/order/orderNew/billing.jsx

@@ -330,6 +330,10 @@ const MyService=Form.create()(React.createClass({
     },
 	
 	invoiceData(record) {
+		if(this.state.flagA) return
+		this.setState({
+			flagA: true
+		})
 		let theorgCodeUrl = [];
 		if (this.state.orgCodeUrl.length) {
 		    let picArr = [];
@@ -496,7 +500,7 @@ const MyService=Form.create()(React.createClass({
 								invoiceType:thisdata.invoiceType,
 								unitName:thisdata.unitName,
 								taxNumber:thisdata.taxNumber,
-								amount:thisdata.amount,
+								amount:thisdata.amount + "",
 								banks:thisdata.banks,
 								content:thisdata.content,
 								unitAddress:thisdata.unitAddress,
@@ -508,7 +512,7 @@ const MyService=Form.create()(React.createClass({
 								addresseeProvince:thisdata.addresseeProvince,
 								addresseeCity:thisdata.addresseeCity,
 								addresseeArea:thisdata.addresseeArea,
-								alreadyAmount:thisdata.alreadyAmount,
+								alreadyAmount:thisdata.alreadyAmount + "",
 								ProvinceCity: ProvinceCityArr[0]!=null?ProvinceCityArr:undefined,//省市区
 								recipientAddress:thisdata.recipientAddress,
 								orgCodeUrl: thisdata.voucherUrl ? splitUrl(thisdata.voucherUrl, ',', globalConfig.avatarHost + '/upload') : [],
@@ -526,16 +530,26 @@ const MyService=Form.create()(React.createClass({
 					if (this.state.flag) {
 						this.inRecordData()
 					}
+					this.setState({
+						flagA: false
+					})
 				}else if(this.state.status === 0){
 					message.success('保存成功!');
 					this.visitCancels()
+					this.setState({
+						flagA: false
+					})
 				}else if(this.state.status === 3){
 					this.setState({
-						flag:true
+						flag:true,
+						flagA: false
 					})
 				}
 			} else {
 				message.warning(data.error[0].message);
+				this.setState({
+					flagA: false
+				})
 			}
         }.bind(this));
     },

+ 26 - 4
js/component/manageCenter/order/orderNew/examine.jsx

@@ -605,6 +605,10 @@ const IntentionCustomer = Form.create()(
     },
     //审核通过
     examOk() {
+      if(this.state.flag) return
+      this.setState({
+        flag: true
+      })
       $.ajax({
         method: "post",
         dataType: "json",
@@ -618,11 +622,15 @@ const IntentionCustomer = Form.create()(
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
+              this.setState({
+                flag: false
+              })
             }
           } else {
             message.success("该订单已通过审核~");
             this.setState({
-              visible: false
+              visible: false,
+              flag: false
             });
             this.reset();
           }
@@ -637,6 +645,10 @@ const IntentionCustomer = Form.create()(
     },
     //通过发给外包
     outsourcing() {
+      if(this.state.flag) return
+      this.setState({
+        flag: true
+      })
       $.ajax({
         method: "post",
         dataType: "json",
@@ -651,11 +663,15 @@ const IntentionCustomer = Form.create()(
           if (data.error.length || data.data.list == "") {
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
+              this.setState({
+                flag: false
+              })
             }
           } else {
             message.success("该订单已通过审核~");
             this.setState({
-              visible: false
+              visible: false,
+              flag: false
             });
             this.reset();
           }
@@ -670,6 +686,10 @@ const IntentionCustomer = Form.create()(
     },
     //审核不通过
     examOks() {
+      if (this.state.flag) return;
+      this.setState({
+        flag: true
+      });
       this.setState({
         aloading: true
       });
@@ -688,7 +708,8 @@ const IntentionCustomer = Form.create()(
             if (data.error && data.error.length) {
               message.warning(data.error[0].message);
               this.setState({
-                aloading: true
+                aloading: true,
+                flag: false
               });
             }
           } else {
@@ -697,7 +718,8 @@ const IntentionCustomer = Form.create()(
               visible: false,
               aloading: false,
               noVisible: false,
-              reason: ""
+              reason: "",
+              flag: false
             });
             this.reset();
           }

+ 15 - 2
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -286,7 +286,7 @@ const PaiDan = React.createClass({
           render: (text, record) => {
             return (
               <div>
-                {record.taskStatus == 0 ? (
+                {this.state.processStatus == 4 || record.taskStatus == 0 ? (
                   <Button
                     type="primary"
                     style={{ margin: "0 10px" }}
@@ -330,6 +330,10 @@ const PaiDan = React.createClass({
   },
   //审核不通过
   examOks() {
+    if(this.state.flag) return
+    this.setState({
+      flag: true
+    })
     $.ajax({
       method: "post",
       dataType: "json",
@@ -343,13 +347,17 @@ const PaiDan = React.createClass({
         if (data.error.length || data.data == "") {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
+            this.setState({
+              flag: false
+            })
           }
         } else {
           message.success("该订单已被驳回~");
           this.setState({
             visible: false,
             noVisible: false,
-            reason: ""
+            reason: "",
+            flag: false
           });
           this.reset();
         }
@@ -377,6 +385,7 @@ const PaiDan = React.createClass({
     });
   },
   //订单详情
+ 
   xiangqing(orderNos) {
     $.ajax({
       method: "get",
@@ -782,7 +791,9 @@ const PaiDan = React.createClass({
     this.state.assignVisible = e;
     if (s) {
       this.loadData(this.state.page);
+      this.xiangqing(this.state.orderNo);
       this.xiangmu(this.state.orderNo);
+      this.jiedian(this.state.orderNo);
     }
   },
   search() {
@@ -796,6 +807,7 @@ const PaiDan = React.createClass({
     this.state.departmenttSearch = undefined;
     this.state.distribution = undefined;
     this.loadData(this.state.page);
+    
   },
   nextCancel() {
     this.setState({
@@ -1001,6 +1013,7 @@ const PaiDan = React.createClass({
           specially={1}
           roleName={"咨询师经理"}
           requestMethod={"post"}
+          reset={this.reset}
         />
         <Modal
           className="customeDetails"

+ 22 - 5
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -297,11 +297,24 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                     dataIndex: 'caozuo',
                     key: 'caouzo',
                     render:(text,record)=>{
-                        return <div>
-                        	{record.taskStatus==0?
-                            <Button type="primary" style={{margin:'0 10px'}} onClick={(e)=>{e.stopPropagation(),this.evaluate(record)}}>分配任务</Button>
-                        	:''}
-                        </div>
+                        return (
+                          <div>
+                            {this.state.processStatus == 4 ||
+                            record.taskStatus == 0 ? (
+                              <Button
+                                type="primary"
+                                style={{ margin: "0 10px" }}
+                                onClick={e => {
+                                  e.stopPropagation(), this.evaluate(record);
+                                }}
+                              >
+                                分配任务
+                              </Button>
+                            ) : (
+                              ""
+                            )}
+                          </div>
+                        );
                     }
                 }
 			],
@@ -890,7 +903,9 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         this.state.assignVisible = e;
         if (s) {
             this.loadData(this.state.page);
+            this.xiangqing(this.state.orderNo);
             this.xiangmu(this.state.orderNo);
+            this.jiedian(this.state.orderNo);
         };
     },
     search() {
@@ -904,6 +919,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         this.state.departmenttSearch=undefined;
         this.state.distribution=undefined;
         this.loadData(this.state.page);
+        
+        
     },
     nextCancel() {
 		this.setState({

+ 7 - 0
js/component/manageCenter/publicComponent/assign.jsx

@@ -208,6 +208,9 @@ const Assign=React.createClass({
             if (!data.error.length) {
                 message.success('派单成功');
                 this.onShow();
+                if(this.props.reset) {
+                    this.props.reset()
+                }
             } else {
                 message.warning(data.error[0].message);
             };
@@ -249,6 +252,9 @@ const Assign=React.createClass({
             if (!data.error.length) {
               message.success("派单成功");
               this.onShow();
+              if (this.props.reset) {
+                this.props.reset();
+              }
             } else {
               message.warning(data.error[0].message);
             }
@@ -303,6 +309,7 @@ const Assign=React.createClass({
     },
     //初始加载组件,和主页面一起加载
     componentDidMount() {
+        console.log(this.props);
         
         
     },

+ 1 - 1
package.json

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