hujie123456 5 years ago
parent
commit
1c465d5886

+ 10 - 1
js/component/dataDic.js

@@ -2432,7 +2432,10 @@ module.exports = {
 	    },{
 	        value: "7",
 	        key: "已派特批审核"
-	    },{
+        },{
+            value: "8",
+            key: "已派外包审核"
+        },{
 			value: "99",
 			key: "未知"
 		}
@@ -2663,6 +2666,12 @@ module.exports = {
         }, {
             value: "1",
             key: "特批"
+        }, {
+            value: "2",
+            key: "特批通过"
+        }, {
+            value: "3",
+            key: "特批驳回"
         }
     ],
 	//省内外

+ 25 - 9
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -175,14 +175,24 @@ const OrderDetail = Form.create()(React.createClass({
                     thisData = {};
                 };
                 this.setState({
-					id:thisData.id,
-					orderList:thisData,
-					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
-					orderRemarks:thisData.orderRemarks,
-                    orgCodeUrl: thisData.contractPictureUrl ? splitUrl(thisData.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-               		orderNo:thisData.orderNo,//订单编号
-               		buyerId:thisData.buyerId,
-               		depName:thisData.depName,
+                  id: thisData.id,
+                  orderList: thisData,
+                  approval:
+                    thisData.approval == 0
+                      ? thisData.approval.toString()
+                      : thisData.approval,
+                  orderRemarks: thisData.orderRemarks,
+                  orgCodeUrl: thisData.contractPictureUrl
+                    ? splitUrl(
+                        thisData.contractPictureUrl,
+                        ",",
+                        globalConfig.avatarHost + "/upload"
+                      )
+                    : [],
+                  orderNo: thisData.orderNo, //订单编号
+                  buyerId: thisData.buyerId,
+                  depName: thisData.depName,
+                  outsource: thisData.outsource == 0 ? "否" : "是"
                 });
             }.bind(this),
        }).always(function () {
@@ -426,6 +436,13 @@ const OrderDetail = Form.create()(React.createClass({
                   >
                     <span>{getApproval(theData.approval)}</span>
                   </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="是否外包"
+                  >
+                    <span>{this.state.outsource}</span>
+                  </FormItem>
                   {this.props.data.orderStatus == "6" && (
                     <FormItem
                       className="half-item"
@@ -553,7 +570,6 @@ const OrderDetail = Form.create()(React.createClass({
                         }}
                         src={this.state.previewImage || ""}
                       />
-                      
                     </Modal>
                     <Button
                       style={{

+ 35 - 21
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -350,27 +350,34 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					let thisdata=data.data;
 					this.setState({
-						 orderNo: thisdata.orderNo,//订单编号
-						 contractNo: thisdata.contractNo,//合同编号
-						 userName:thisdata.userName,//客户名称
-						 signDate:thisdata.signDate,//签单时间
-						 processStatus:thisdata.processStatus,//流程状态
-	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
-	                     contacts:thisdata.contacts,//企业联系人
-	                     contactMobile:thisdata.contactMobile,//联系人电话
-	                     legalPerson:thisdata.legalPerson,//法人
-	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
-	                     firstAmount:thisdata.firstAmount,//签单金额
-	                     totalAmount:thisdata.totalAmount,//首付金额
-	                     approval:thisdata.approval,//特批状态
-	                     settlementAmount:thisdata.settlementAmount,//已收款项
-	                     orderRemarks:thisdata.orderRemarks,//订单留言
-	                     orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
-	                     salesmanName:thisdata.salesmanName,//营销员名称
-	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
-	                     financeName:thisdata.financeName,//财务名称
-	                     financeMobile:thisdata.financeMobile,//财务电话
-					})
+            orderNo: thisdata.orderNo, //订单编号
+            contractNo: thisdata.contractNo, //合同编号
+            userName: thisdata.userName, //客户名称
+            signDate: thisdata.signDate, //签单时间
+            processStatus: thisdata.processStatus, //流程状态
+            liquidationStatus: thisdata.liquidationStatus, //结算状态
+            contacts: thisdata.contacts, //企业联系人
+            contactMobile: thisdata.contactMobile, //联系人电话
+            legalPerson: thisdata.legalPerson, //法人
+            legalPersonTel: thisdata.legalPersonTel, //法人电话
+            firstAmount: thisdata.firstAmount, //签单金额
+            totalAmount: thisdata.totalAmount, //首付金额
+            approval: thisdata.approval, //特批状态
+            settlementAmount: thisdata.settlementAmount, //已收款项
+            orderRemarks: thisdata.orderRemarks, //订单留言
+            orgCodeUrl: thisdata.contractPictureUrl
+              ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
+              : [], //图片地址
+            salesmanName: thisdata.salesmanName, //营销员名称
+            salesmanMobile: thisdata.salesmanMobile, //营销员电话
+            financeName: thisdata.financeName, //财务名称
+            financeMobile: thisdata.financeMobile, //财务电话
+            outsource: thisdata.outsource == 0 ? "否" : "是"
+          });
 				};
 				
 			}.bind(this),
@@ -891,6 +898,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                   >
                     <span>{this.state.settlementAmount}</span>
                   </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="是否外包"
+                  >
+                    <span>{this.state.outsource}</span>
+                  </FormItem>
                   <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 4 }}

+ 9 - 8
js/component/manageCenter/order/orderNew/billing.jsx

@@ -318,7 +318,7 @@ const MyService=Form.create()(React.createClass({
 					render:(text,record)=>{
 						return <div>
 									{record.status === 3?<Button type="danger" onClick={(e) =>{ e.stopPropagation(),this.reject(record)}}>被拒,查看原因</Button>
-										:getInvoiceStatus(text)}
+										:getInvoiceStatus(text,record)}
 									{record.status === 3?<Button type="primary" onClick={(e) =>{ e.stopPropagation(),this.recompose(record)}} style={{marginLeft:"10px"}}>修改开票</Button>
 										:''}	
 								</div>
@@ -719,13 +719,14 @@ const MyService=Form.create()(React.createClass({
 			            let thisdata = data.data.list[i];
 						sum += parseFloat(thisdata.amount);
 			            theArr.push({
-			                 id: thisdata.id,
-			                 orderno: thisdata.orderno,//订单编号
-			                 amount:thisdata.amount,//签单金额
-			                 createTime:thisdata.createTime,//流程状态
-			                 status:thisdata.status,//结算状态
-							 rejectReason:thisdata.rejectReason
-			            });
+                    id: thisdata.id,
+                    orderno: thisdata.orderno, //订单编号
+                    amount: thisdata.amount, //签单金额
+                    createTime: thisdata.createTime, //流程状态
+                    status: thisdata.status, //结算状态
+                    rejectReason: thisdata.rejectReason,
+                    approval: thisdata.approval
+                  });
 			        };
 			    };
 				this.setState({

+ 11 - 10
js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js

@@ -57,21 +57,21 @@ class ReasonInput extends Component {
         if (data.error.length || data.data.list == "") {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
-            if (!this.state.flag) return;
+            // if (!this.state.flag) return;
             this.setState({
               flagS: !this.state.flagS
             });
             return
           }
         } else {
-          this.setState({
-            flagS: !this.state.flagS
-          })
           message.success("操作成功!");
           this.props.visible();
-          this.changeModal();
+          // this.changeModal();
           this.props.onCancel();
           // window.location.reload()
+           this.setState({
+            flagS: !this.state.flagS
+          })
         }
       }.bind(this)
     }).done(
@@ -99,7 +99,7 @@ class ReasonInput extends Component {
         if (data.error.length || data.data.list == "") {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
-            if (!this.state.flag) return;
+            // if (!this.state.flag) return;
             this.setState({
               flag: !this.state.flag
             });
@@ -181,7 +181,7 @@ class ReasonInput extends Component {
       } else {
         this.inputAjax(data, backData);
       }
-    data.onChange(this.state.reason);
+    // data.onChange(this.state.reason);
   }
 
   render() {
@@ -198,6 +198,7 @@ class ReasonInput extends Component {
           onClick={() => {
             this.changeModal();
           }}
+
         >
           {data.name}
         </Button>
@@ -208,9 +209,9 @@ class ReasonInput extends Component {
           onCancel={() => {
             this.changeModal();
           }}
-          onOk={_e => {
-            this.onOk(data, backData);
-          }}
+          // onOk={_e => {
+          //   this.onOk(data, backData);
+          // }}
         >
           <Form.Item>
             <Input.TextArea

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

@@ -258,15 +258,18 @@ class OrderDetail extends Component {
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="企业联系人">
           <span>{data.contacts}</span>
+          <span>{this.props.isCaiWu ? "***" : data.contacts}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="联系人电话">
-          <span>{data.contactMobile}</span>
+          {/* <span>{data.contactMobile}</span> */}
+          <span>{this.props.isCaiWu ? "***" : data.contactMobile}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="企业法人">
-          <span>{data.legalPerson}</span>
+          <span>{this.props.isCaiWu ? "***" : data.legalPerson}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="法人电话">
           <span>{data.legalPersonTel}</span>
+          <span>{this.props.isCaiWu ? "***" : data.legalPersonTel}</span>
         </FormItem>
         <FormItem
           className="half-item"
@@ -301,6 +304,9 @@ class OrderDetail extends Component {
         <FormItem className="half-item" {...formItemLayout} label="订单部门">
           <span>{data.depName}</span>
         </FormItem>
+        <FormItem className="half-item" {...formItemLayout} label="是否外包">
+          {data.outsource == 0 ? "否" : "是"}
+        </FormItem>
         <div className="clearfix">
           <FormItem
             labelCol={{ span: 4 }}

+ 7 - 1
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -301,7 +301,8 @@ const checkOutsourcing = Form.create()(React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
-						 depName:thisdata.depName
+						 depName:thisdata.depName,
+						 outsource: thisdata.outsource == 0 ? "否" : "是"
 					})
 				};
 				
@@ -869,6 +870,11 @@ const checkOutsourcing = Form.create()(React.createClass({
 											    label="订单部门" >  
 											    <span>{this.state.depName}</span>
 											</FormItem>
+											<FormItem className="half-item"
+											    {...formItemLayout}
+											    label="是否外包" >  
+											    <span>{this.state.outsource}</span>
+											</FormItem>
 								            <div className='clearfix'>
 									        	<FormItem
 										            labelCol={{ span: 4 }}

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

@@ -1054,6 +1054,7 @@ const contractChange = Form.create()(
                         dataSourceX={this.state.dataSourceX}
                         contactList={this.state.contactList}
                         orderNo={this.state.orderNo}
+                        isCaiWu={true}
                       />
                     </Spin>
                   </Form>
@@ -1089,6 +1090,7 @@ const contractChange = Form.create()(
                           dataSourceX={this.state.dataSourceX}
                           contactList={this.state.contactList}
                           orderNo={this.state.primaryOrderNo}
+                          isCaiWu={true}
                         />
                       </Spin>
                     </Form>
@@ -1105,6 +1107,7 @@ const contractChange = Form.create()(
                         dataSourceX={this.state.dataSourceX}
                         contactList={this.state.contactList}
                         orderNo={this.state.additionalOrder}
+                        isCaiWu={true}
                       />
                     </TabPane>
                   ) : (

+ 3 - 0
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -1091,6 +1091,7 @@ const contractChange = Form.create()(
                         contactList={this.state.contactList}
                         orderNo={this.state.orderNo}
                         pictureUrl={this.state.contractPictureUrl}
+                        isCaiWu={true}
                       />
                     </Spin>
                   </Form>
@@ -1126,6 +1127,7 @@ const contractChange = Form.create()(
                           dataSourceX={this.state.dataSourceX}
                           contactList={this.state.contactList}
                           orderNo={this.state.primaryOrderNo}
+                          isCaiWu={true}
                         />
                       </Spin>
                     </Form>
@@ -1142,6 +1144,7 @@ const contractChange = Form.create()(
                         dataSourceX={this.state.dataSourceX}
                         contactList={this.state.contactList}
                         orderNo={this.state.additionalOrder}
+                        isCaiWu={true}
                       />
                     </TabPane>
                   ) : (

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

@@ -442,7 +442,8 @@ const IntentionCustomer = Form.create()(
               financeMobile: thisdata.financeMobile, //财务电话
               nowFinance: thisdata.nowFinance, //财务名称
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
-              depName: thisdata.depName
+              depName: thisdata.depName,
+              outsource: thisdata.outsource == 0 ? "否" : "是"
             });
           }
         }.bind(this)
@@ -1142,6 +1143,13 @@ const IntentionCustomer = Form.create()(
                         >
                           <span>{this.state.depName}</span>
                         </FormItem>
+                        <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="是否外包"
+                        >
+                          {this.state.outsource}
+                        </FormItem>
                         <div className="clearfix">
                           <FormItem
                             labelCol={{ span: 4 }}

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

@@ -316,7 +316,8 @@ const IntentionCustomer = Form.create()(React.createClass({
             financeMobile: thisdata.financeMobile, //财务电话
             nowFinance: thisdata.nowFinance, //财务名称
             nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
-            depName: thisdata.depName
+            depName: thisdata.depName,
+            outsource: thisdata.outsource == 0 ? "否" : "是"
           });
 				};
 				
@@ -789,6 +790,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                   >
                     <span>{this.state.depName}</span>
                   </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="是否外包"
+                  >
+                    {this.state.outsource}
+                  </FormItem>
                   <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 4 }}

+ 15 - 2
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -439,7 +439,8 @@ const outsourcingList = Form.create()(
               financeMobile: thisdata.financeMobile, //财务电话
               nowFinance: thisdata.nowFinance, //财务名称
               nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
-              depName: thisdata.depName
+              depName: thisdata.depName,
+              outsource: thisdata.outsource == 0 ? "否" : "是"
             });
           }
         }.bind(this)
@@ -632,6 +633,10 @@ const outsourcingList = Form.create()(
     },
     //通过发给外包
     outsourcing() {
+      if(this.state.flag) return
+      this.setState({
+        flag: true
+      })
       $.ajax({
         method: "post",
         dataType: "json",
@@ -650,7 +655,8 @@ const outsourcingList = Form.create()(
           } else {
             message.success("该订单已通过审核~");
             this.setState({
-              visible: false
+              visible: false,
+              flag: false
             });
             this.reset();
           }
@@ -1142,6 +1148,13 @@ const outsourcingList = Form.create()(
                         >
                           <span>{this.state.depName}</span>
                         </FormItem>
+                        <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="是否外包"
+                        >
+                          {this.state.outsource}
+                        </FormItem>
                         <div className="clearfix">
                           <FormItem
                             labelCol={{ span: 4 }}

+ 25 - 8
js/component/manageCenter/order/orderNew/reject.jsx

@@ -113,7 +113,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							 key: i,
 							 id: thisdata.id,//用户ID
 							 orderNo: thisdata.orderNo,//订单编号
-	                         totalAmount:thisdata.totalAmount,//签单金额
+	                         totalAmount:thisdata.totalAmount + "",//签单金额
 	                         processStatus:thisdata.processStatus,//流程状态
 	                         liquidationStatus:thisdata.liquidationStatus,//结算状态
 	                         approval:thisdata.approval,//特批状态
@@ -412,8 +412,8 @@ const IntentionCustomer = Form.create()(React.createClass({
             contactMobile: thisdata.contactMobile, //联系人电话
             legalPerson: thisdata.legalPerson, //法人
             legalPersonTel: thisdata.legalPersonTel, //法人电话
-            firstAmount: thisdata.firstAmount, //签单金额
-            totalAmount: thisdata.totalAmount, //首付金额
+            firstAmount: thisdata.firstAmount + "", //签单金额
+            totalAmount: thisdata.totalAmount + "", //首付金额
             settlementAmount: thisdata.settlementAmount, //已收款项
             orderRemarks: thisdata.orderRemarks, //订单留言
             orgCodeUrl: thisdata.contractPictureUrl
@@ -435,8 +435,9 @@ const IntentionCustomer = Form.create()(React.createClass({
             backDate: thisdata.backDate, //驳回时间
             reason: thisdata.reason, //驳回原因
             approval: thisdata.approval.toString(), //特批状态
-            organizationSearch: thisdata.orderDep
+            organizationSearch: thisdata.orderDep,
             //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
+            outsource: thisdata.outsource == 0  ?  "否" : "是"
           });
 				};
 				
@@ -587,6 +588,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 	},
 	//重新提交
 	examOk(){
+    if(this.state.flag) return
+    this.setState({
+      flag: true
+    })
 		let theorgCodeUrl = [];
         if (this.state.orgCodeUrl.length) {
             let picArr = [];
@@ -647,8 +652,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					message.success("该订单已重新提交~");
 					this.setState({
-						visible:false,
-					});
+            visible:false,
+            flag: false
+          });
 					this.resets();
 					this.loadData();
 				};
@@ -662,7 +668,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 	},
 	//重新提交
 	examOks(){
-		
+    if(this.state.flag) return
+    this.setState({
+      flag: true
+    })
 		$.ajax({
 			method: "post",
 			dataType: "json",
@@ -679,7 +688,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				} else {
 					message.success("该订单已作废~");
 					this.setState({
-						visible:false,
+            visible:false,
+            flag: false
 					});
 					this.resets();
 					this.loadData();
@@ -1326,6 +1336,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                       })}
                     </Select>
                   </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="是否外包"
+                  >
+                    {this.state.outsource}
+                  </FormItem>
                   <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 4 }}

+ 40 - 26
js/component/manageCenter/project/project/projectQuery.jsx

@@ -267,32 +267,39 @@ const PaiDan = React.createClass({
 				} else {
 					let thisdata=data.data;
 					this.setState({
-						 orderNo: thisdata.orderNo,//订单编号
-						 contractNo: thisdata.contractNo,//合同编号
-						 userName:thisdata.userName,//客户名称
-						 signDate:thisdata.signDate,//签单时间
-						 processStatus:thisdata.processStatus,//流程状态
-	                     liquidationStatus:thisdata.liquidationStatus,//结算状态
-	                     contacts:thisdata.contacts,//企业联系人
-	                     contactMobile:thisdata.contactMobile,//联系人电话
-	                     legalPerson:thisdata.legalPerson,//法人
-	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
-	                     firstAmount:thisdata.firstAmount,//签单金额
-	                     totalAmount:thisdata.totalAmount,//首付金额
-	                     approval:thisdata.approval,//特批状态
-	                     settlementAmount:thisdata.settlementAmount,//已收款项
-	                     orderRemarks:thisdata.orderRemarks,//订单留言
-	                     orgCodeUrl: thisdata.contractPictureUrl ? splitUrl(thisdata.contractPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],//图片地址
-	                     salesmanName:thisdata.salesmanName,//营销员名称
-	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
-	                     financeName:thisdata.financeName,//财务名称
-						 financeMobile:thisdata.financeMobile,//财务电话
-						 oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
-						 oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
-						 nowFinance: thisdata.nowFinance, //财务名称
-						 nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
-	                     depName:thisdata.depName,//订单部门
-					})
+            orderNo: thisdata.orderNo, //订单编号
+            contractNo: thisdata.contractNo, //合同编号
+            userName: thisdata.userName, //客户名称
+            signDate: thisdata.signDate, //签单时间
+            processStatus: thisdata.processStatus, //流程状态
+            liquidationStatus: thisdata.liquidationStatus, //结算状态
+            contacts: thisdata.contacts, //企业联系人
+            contactMobile: thisdata.contactMobile, //联系人电话
+            legalPerson: thisdata.legalPerson, //法人
+            legalPersonTel: thisdata.legalPersonTel, //法人电话
+            firstAmount: thisdata.firstAmount, //签单金额
+            totalAmount: thisdata.totalAmount, //首付金额
+            approval: thisdata.approval, //特批状态
+            settlementAmount: thisdata.settlementAmount, //已收款项
+            orderRemarks: thisdata.orderRemarks, //订单留言
+            orgCodeUrl: thisdata.contractPictureUrl
+              ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                )
+              : [], //图片地址
+            salesmanName: thisdata.salesmanName, //营销员名称
+            salesmanMobile: thisdata.salesmanMobile, //营销员电话
+            financeName: thisdata.financeName, //财务名称
+            financeMobile: thisdata.financeMobile, //财务电话
+            oldSalesmanName: thisdata.oldSalesmanName, //营销员名称
+            oldSalesmanMobile: thisdata.oldSalesmanMobile, //营销员电话
+            nowFinance: thisdata.nowFinance, //财务名称
+            nowFinanceMobile: thisdata.nowFinanceMobile, //财务电话
+            depName: thisdata.depName, //订单部门
+            outsource: thisdata.outsource == 0 ? "否" : "是"
+          });
 				};
 				
 			}.bind(this),
@@ -749,6 +756,13 @@ const PaiDan = React.createClass({
                     >
                       <span>{this.state.settlementAmount}</span>
                     </FormItem>
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="是否外包"
+                    >
+                      <span>{this.state.outsource}</span>
+                    </FormItem>
                     <div className="clearfix">
                       <FormItem
                         labelCol={{ span: 4 }}

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

@@ -953,8 +953,8 @@ const IntentionCustomer = Form.create()(React.createClass({
                     {...formItemLayout}
                     label=""
                   ></FormItem>
-                  <FormItem className="half-item" {...formItemLayout}>
-                    <span style={{ paddingLeft: "12em" }}>
+                  <FormItem className="half-item" {...formItemLayout} label="详细地址">
+                    <span>
                       {this.state.postalAddress}
                     </span>
                   </FormItem>

+ 8 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -341,7 +341,7 @@ const Task = React.createClass({
 						 declarePwd:thisdata.declarePwd,//密码
 						 depName:thisdata.depName,//订单部门
 						 outsourceName:thisdata.outsourceName,//外包公司名称
-						 outsourcePrice:thisdata.outsourcePrice,//外包价格
+             outsourcePrice:thisdata.outsourcePrice,//外包价格
 					})
 				};
 				
@@ -834,6 +834,13 @@ const Task = React.createClass({
                       >
                         <span>{this.state.orderNo}</span>
                       </FormItem>
+                      <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="是否外包"
+                      >
+                        <span>{this.state.outsource == 0 ? "否" : "是"}</span>
+                      </FormItem>
                     </div>
                     <div className="clearfix">
                       <FormItem

+ 15 - 10
js/component/tools.js

@@ -1784,17 +1784,22 @@ module.exports = {
     }
   },
   //开票状态
-  getInvoiceStatus: function(e) {
-    if (e || e == 0) {
-      let str = e.toString();
-      let theType = "";
-      invoiceStatus.map(function(item) {
-        if (item.value == str) {
-          theType = item.key;
-        }
-      });
-      return theType;
+  getInvoiceStatus: function(e,record) {
+    if(record.approval == 1) {
+       return "特批待审核"
+    }else {
+      if (e || e == 0) {
+        let str = e.toString();
+        let theType = "";
+        invoiceStatus.map(function(item) {
+          if (item.value == str) {
+            theType = item.key;
+          }
+        });
+        return theType;
+      }
     }
+    
   },
   getApprovalA: function(e) {
     if (e || e == 0) {