Browse Source

修复BUG

mentoswzq 4 years ago
parent
commit
38dc32c23c

+ 3 - 3
js/component/manageCenter/components/checkProject/applyPaymentModal.js

@@ -198,8 +198,8 @@ class ApplyPaymentModal extends Component{
                                         <div>
                                           {
                                               previewPayInfor.costReduction === 1 ?
-                                                  previewPayInfor.reductionAmount :
-                                                  previewPayInfor.officialUnitPrice
+                                                  (isNaN(parseFloat(previewPayInfor.reductionAmount)) ? previewPayInfor.reductionAmount : parseFloat(previewPayInfor.reductionAmount)):
+                                                  (isNaN(parseFloat(previewPayInfor.officialUnitPrice)) ? previewPayInfor.officialUnitPrice : parseFloat(previewPayInfor.officialUnitPrice))
                                           }
                                         </div>
                                     </Form.Item> : <div/>
@@ -266,7 +266,7 @@ class ApplyPaymentModal extends Component{
                                 )}
                             </Form.Item>
                             {/* 0正常 1专利 2软著 3审计 */}
-                            {this.props.projectType !== 2 ? <Form.Item
+                            {this.props.projectType !== 2 && !(this.props.projectType === 1 && this.props.patentType === 0)  ? <Form.Item
                                 {...formItemLayout}
                                 style={{
                                     display:'flex'

+ 5 - 0
js/component/manageCenter/components/checkProject/index.jsx

@@ -79,6 +79,11 @@ class CheckProject extends Component {
           title: '申请支付金额(万元)',
           dataIndex: 'applicationAmount',
           key: 'applicationAmount',
+          render: (text, record) => {
+            return <span>
+              {isNaN(parseFloat(text)) ? text : parseFloat(text)}
+            </span>
+          },
         },
         {
           title: '申请支付数量',

+ 3 - 3
js/component/manageCenter/components/checkProject/payRecord.js

@@ -438,7 +438,7 @@ class PayRecord extends Component{
                                 className='formItemStyle'
                                 label="总价(万元):"
                             >
-                                <div>{paymentDetails.initialTotalAmount}</div>
+                                <div>{isNaN(parseFloat(paymentDetails.initialTotalAmount)) ? paymentDetails.initialTotalAmount : parseFloat(paymentDetails.initialTotalAmount)}</div>
                             </Form.Item>
                             {/*官费不显示已付*/}
                             {paymentDetails.chooseType !== 2 ? <Form.Item
@@ -446,7 +446,7 @@ class PayRecord extends Component{
                                 className='formItemStyle'
                                 label="已付(万元):"
                             >
-                                <div>{paymentDetails.initialPaymentAmount}</div>
+                                <div>{isNaN(parseFloat(paymentDetails.initialPaymentAmount)) ? paymentDetails.initialPaymentAmount : parseFloat(paymentDetails.initialPaymentAmount)}</div>
                             </Form.Item> : <div/>}
                             {/*0第三方 1催款 2官费*/}
                             {/* projectType 0正常 1专利 2软著 3审计*/}
@@ -475,7 +475,7 @@ class PayRecord extends Component{
                                 label="本次申请支付金额(万元):"
                             >
                                 {getFieldDecorator('applicationAmount', {
-                                    initialValue: paymentDetails.applicationAmount,
+                                    initialValue: parseFloat(paymentDetails.applicationAmount),
                                     rules: [
                                         {
                                             required: !(this.props.isAuditPayment ? this.state.paymentDetails.status !== 0 : this.state.paymentDetails.status !== 2),

+ 7 - 12
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/index.js

@@ -25,11 +25,6 @@ class DetailsModal extends Component{
             this.thirdTable(this.props.tid);
             this.payNodeTable(this.props.tid)
         }
-        setTimeout(()=>{
-            this.setState({
-                activeKey:'2'
-            })
-        },500);
     }
 
     visitOk(){
@@ -220,13 +215,13 @@ class DetailsModal extends Component{
                 onCancel={this.visitCancel}
             >
                 <Tabs
-                    defaultActiveKey='2'
+                    defaultActiveKey='1'
                     activeKey={this.state.activeKey}
                     onChange={(e) => {
                         this.setState({
                             activeKey: e
                         })
-                        if(e === '2'){
+                        if(e === '1'){
                             this.waiDetail();
                             this.thirdTable(this.props.tid);
                             this.payNodeTable(this.props.tid);
@@ -245,11 +240,8 @@ class DetailsModal extends Component{
                         </div>
                     }
                 >
-                    <TabPane tab="项目概况" key="1">
-                        <ProjectOverview projectStatus={this.props.projectStatus} tid={this.props.tid}/>
-                    </TabPane>
-                    <TabPane tab="外包/供应商信息" key="2">
-                        {this.state.activeKey === '2' ? <CheckProject
+                    <TabPane tab="外包/供应商信息" key="1">
+                        {this.state.activeKey === '1' ? <CheckProject
                             {...this.props}
                             tid={this.props.tid}
                             isAuditPayment={true}
@@ -272,6 +264,9 @@ class DetailsModal extends Component{
                             }}
                         /> : <div/>}
                     </TabPane>
+                    <TabPane tab="项目概况" key="2">
+                        <ProjectOverview projectStatus={this.props.projectStatus} tid={this.props.tid}/>
+                    </TabPane>
                 </Tabs>
             </Modal>
         )

+ 336 - 336
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -1217,7 +1217,7 @@ const outsourcingPro = Form.create()(
       this.setState({ pictureUrl: e });
     },
     callback(e) {
-      if (e == 2) {
+      if (e == 1) {
         this.waiDetail()
       }
       this.setState({
@@ -1435,286 +1435,393 @@ const outsourcingPro = Form.create()(
                     </div>
                   }
               >
-                <TabPane tab="订单详情" key="1">
+                <TabPane tab="外包审核" key="1">
+                  <Spin spinning={this.state.loading}>
+                    <CheckProject
+                        {...this.props}
+                        tid={this.state.tid}
+                        status={this.state.refundStatus}
+                        thirdInfoList={this.state.thirdInfoList}
+                        dataSource={this.state.payNodeList}
+                        outsourceRemarks={this.state.outsourceRemarks}
+                        fileList={this.state.pictureUrl}
+                        startType={this.state.startType}
+                        projectStatus={this.state.projectStatus}
+                    />
+                    {this.state.refundStatus == 0 ? (
+                      <div>
+                        <hr className="division" />
+                        <div className="clearfix" style={{ marginTop: "20px" }}>
+                          <FormItem
+                            labelCol={{ span: 4 }}
+                            wrapperCol={{ span: 18 }}
+                            label={
+                              <span>
+                                <strong style={{ color: "#f00" }}>*</strong>
+                                审核意见
+                              </span>
+                            }
+                          >
+                            <Input
+                              type="textarea"
+                              placeholder="请输入备注"
+                              rows={4}
+                              value={this.state.remarks}
+                              onChange={(e) => {
+                                this.setState({ remarks: e.target.value });
+                              }}
+                              style={{ width: "440px" }}
+                            />
+                            <span
+                              className="tip"
+                              style={{
+                                width: "160px",
+                                verticalAlign: "top",
+                                display: "inline-block",
+                                marginLeft: "10px",
+                              }}
+                            >
+                              通过或驳回都必须填写审核意见!
+                            </span>
+                          </FormItem>
+                        </div>
+                        <div className="clearfix fa">
+                          <Button
+                            type="danger"
+                            onClick={this.examNo}
+                            loading={this.state.loading}
+                            style={{
+                              color: "#fff",
+                              backgroundColor: "#f04134",
+                            }}
+                          >
+                            驳回
+                          </Button>
+                          <Button
+                            type="primary"
+                            loading={this.state.loading}
+                            onClick={this.examOk}
+                          >
+                            通过
+                          </Button>
+                        </div>
+                      </div>
+                    ) : (
+                      <div className="clearfix">
+                        <hr className="division" />
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="审核意见"
+                          >
+                            <span>{this.state.remarks}</span>
+                          </FormItem>
+                        </div>
+                        {parseInt(this.state.startType) !== 1 ?<div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="审核结果"
+                          >
+                            <span>
+                              {getRefundStatus(this.state.refundStatus)}
+                            </span>
+                          </FormItem>
+                        </div> : <div/>}
+                        <div className="clearfix">
+                          <FormItem
+                            className="half-item"
+                            {...formItemLayout}
+                            label="审核时间"
+                          >
+                            <span>{this.state.auditTimes}</span>
+                          </FormItem>
+                        </div>
+                      </div>
+                    )}
+                  </Spin>
+                </TabPane>
+                <TabPane tab="订单详情" key="2">
                   <Form
-                    layout="horizontal"
-                    onSubmit={this.handleSubmit}
-                    id="demand-form"
-                    style={{ paddingBottom: "40px" }}
+                      layout="horizontal"
+                      onSubmit={this.handleSubmit}
+                      id="demand-form"
+                      style={{ paddingBottom: "40px" }}
                   >
                     <Spin spinning={this.state.loading}>
                       <div className="clearfix">
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="订单编号"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="订单编号"
                         >
                           <span>{this.state.orderNo}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="合同编号"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="合同编号"
                         >
                           <span>{this.state.contractNo}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="客户名称"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="客户名称"
                         >
                           <span>{this.state.userName}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="合同签订时间"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="合同签订时间"
                         >
                           <span>{this.state.signDate}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="流程状态"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="流程状态"
                         >
                           <span>
                             {getProcessStatus(this.state.processStatus)}
                           </span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="结算状态"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="结算状态"
                         >
                           <span>
                             {getLiquidationStatus(this.state.liquidationStatus)}
                           </span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="企业联系人"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="企业联系人"
                         >
                           <span>{this.state.contacts}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="联系人电话"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="联系人电话"
                         >
                           <span>{this.state.contactMobile}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="企业法人"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="企业法人"
                         >
                           <span>{this.state.legalPerson}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="法人电话"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="法人电话"
                         >
                           <span>{this.state.legalPersonTel}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="签单金额(万元)"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="签单金额(万元)"
                         >
                           <span>{this.state.totalAmount}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="首付金额(万元)"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="首付金额(万元)"
                         >
                           <span>{this.state.firstAmount}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="特批立项"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="特批立项"
                         >
                           <span>{getApprovedState(this.state.approval)}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="已收款项(万元)"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="已收款项(万元)"
                         >
                           <span>{this.state.settlementAmount}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="订单部门"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="订单部门"
                         >
                           <span>{this.state.depName}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="是否外包"
+                            className="half-item"
+                            {...formItemLayout}
+                            label="是否外包"
                         >
                           <span>{this.state.outsource}</span>
                         </FormItem>
                         <div className="clearfix">
                           <FormItem
-                            labelCol={{ span: 4 }}
-                            wrapperCol={{ span: 16 }}
-                            label="订单留言"
+                              labelCol={{ span: 4 }}
+                              wrapperCol={{ span: 16 }}
+                              label="订单留言"
                           >
                             <span>{this.state.orderRemarks}</span>
                           </FormItem>
                         </div>
                         <div className="clearfix">
                           <FormItem
-                            labelCol={{ span: 4 }}
-                            wrapperCol={{ span: 18 }}
-                            label="合同扫描件"
+                              labelCol={{ span: 4 }}
+                              wrapperCol={{ span: 18 }}
+                              label="合同扫描件"
                           >
                             <Upload
-                              className="demandDetailShow-upload"
-                              listType="picture-card"
-                              fileList={this.state.orgCodeUrl}
-                              onPreview={(file) => {
-                                this.setState({
-                                  previewImage: file.url || file.thumbUrl,
-                                  previewVisible: true,
-                                });
-                              }}
+                                className="demandDetailShow-upload"
+                                listType="picture-card"
+                                fileList={this.state.orgCodeUrl}
+                                onPreview={(file) => {
+                                  this.setState({
+                                    previewImage: file.url || file.thumbUrl,
+                                    previewVisible: true,
+                                  });
+                                }}
                             ></Upload>
                             <Modal
-                              maskClosable={false}
-                              footer={null}
-                              width={"50%"}
-                              visible={this.state.previewVisible}
-                              onCancel={() => {
-                                this.setState({
-                                  previewVisible: false,
-                                  rotateDeg: 0,
-                                });
-                              }}
+                                maskClosable={false}
+                                footer={null}
+                                width={"50%"}
+                                visible={this.state.previewVisible}
+                                onCancel={() => {
+                                  this.setState({
+                                    previewVisible: false,
+                                    rotateDeg: 0,
+                                  });
+                                }}
                             >
                               <img
-                                alt=""
-                                style={{
-                                  width: "100%",
-                                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                                }}
-                                src={this.state.previewImage || ""}
+                                  alt=""
+                                  style={{
+                                    width: "100%",
+                                    transform: `rotate(${this.state.rotateDeg}deg)`,
+                                  }}
+                                  src={this.state.previewImage || ""}
                               />
                               <Button
-                                onClick={this.rotate}
-                                style={{
-                                  position: "relative",
-                                  left: "50%",
-                                  transform: "translateX(-50%)",
-                                }}
+                                  onClick={this.rotate}
+                                  style={{
+                                    position: "relative",
+                                    left: "50%",
+                                    transform: "translateX(-50%)",
+                                  }}
                               >
                                 旋转
                               </Button>
                               <Button
-                                onClick={this.upImg}
-                                style={{
-                                  position: "absolute",
-                                  left: -81,
-                                  top: "50%",
-                                  transform: "translateY(-50%)",
-                                }}
+                                  onClick={this.upImg}
+                                  style={{
+                                    position: "absolute",
+                                    left: -81,
+                                    top: "50%",
+                                    transform: "translateY(-50%)",
+                                  }}
                               >
                                 上一张
                               </Button>
                               <Button
-                                onClick={this.downImg}
-                                style={{
-                                  position: "absolute",
-                                  right: -81,
-                                  top: "50%",
-                                  transform: "translateY(-50%)",
-                                }}
+                                  onClick={this.downImg}
+                                  style={{
+                                    position: "absolute",
+                                    right: -81,
+                                    top: "50%",
+                                    transform: "translateY(-50%)",
+                                  }}
                               >
                                 下一张
                               </Button>
                             </Modal>
                             <Button
-                              style={{
-                                float: "right",
-                                marginRight: "140px",
-                                marginTop: "20px",
-                              }}
-                              onClick={this.getOrderLog}
+                                style={{
+                                  float: "right",
+                                  marginRight: "140px",
+                                  marginTop: "20px",
+                                }}
+                                onClick={this.getOrderLog}
                             >
                               查看订单日志
                             </Button>
                           </FormItem>
                           <FormItem
-                            labelCol={{ span: 4 }}
-                            wrapperCol={{ span: 18 }}
-                            label="补充协议"
+                              labelCol={{ span: 4 }}
+                              wrapperCol={{ span: 18 }}
+                              label="补充协议"
                           >
                             <Upload
-                              className="demandDetailShow-upload"
-                              listType="picture-card"
-                              fileList={this.state.replenishUrl}
-                              onPreview={(file) => {
-                                this.setState({
-                                  previewImage: file.url || file.thumbUrl,
-                                  previewVisibles: true,
-                                });
-                              }}
+                                className="demandDetailShow-upload"
+                                listType="picture-card"
+                                fileList={this.state.replenishUrl}
+                                onPreview={(file) => {
+                                  this.setState({
+                                    previewImage: file.url || file.thumbUrl,
+                                    previewVisibles: true,
+                                  });
+                                }}
                             ></Upload>
                             <Modal
-                              maskClosable={false}
-                              footer={null}
-                              width={"50%"}
-                              visible={this.state.previewVisibles}
-                              onCancel={() => {
-                                this.setState({
-                                  previewVisibles: false,
-                                  rotateDeg: 0,
-                                });
-                              }}
+                                maskClosable={false}
+                                footer={null}
+                                width={"50%"}
+                                visible={this.state.previewVisibles}
+                                onCancel={() => {
+                                  this.setState({
+                                    previewVisibles: false,
+                                    rotateDeg: 0,
+                                  });
+                                }}
                             >
                               <img
-                                alt=""
-                                style={{
-                                  width: "100%",
-                                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                                }}
-                                src={this.state.previewImage || ""}
+                                  alt=""
+                                  style={{
+                                    width: "100%",
+                                    transform: `rotate(${this.state.rotateDeg}deg)`,
+                                  }}
+                                  src={this.state.previewImage || ""}
                               />
                               <Button
-                                onClick={this.rotate}
-                                style={{
-                                  position: "relative",
-                                  left: "50%",
-                                  transform: "translateX(-50%)",
-                                }}
+                                  onClick={this.rotate}
+                                  style={{
+                                    position: "relative",
+                                    left: "50%",
+                                    transform: "translateX(-50%)",
+                                  }}
                               >
                                 旋转
                               </Button>
                               <Button
-                                onClick={this.upImgs}
-                                style={{
-                                  position: "absolute",
-                                  left: -81,
-                                  top: "50%",
-                                  transform: "translateY(-50%)",
-                                }}
+                                  onClick={this.upImgs}
+                                  style={{
+                                    position: "absolute",
+                                    left: -81,
+                                    top: "50%",
+                                    transform: "translateY(-50%)",
+                                  }}
                               >
                                 上一张
                               </Button>
                               <Button
-                                onClick={this.downImgs}
-                                style={{
-                                  position: "absolute",
-                                  right: -81,
-                                  top: "50%",
-                                  transform: "translateY(-50%)",
-                                }}
+                                  onClick={this.downImgs}
+                                  style={{
+                                    position: "absolute",
+                                    right: -81,
+                                    top: "50%",
+                                    transform: "translateY(-50%)",
+                                  }}
                               >
                                 下一张
                               </Button>
@@ -1723,103 +1830,103 @@ const outsourcingPro = Form.create()(
                         </div>
                         <div className="clearfix">
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="订单负责人"
+                              className="half-item"
+                              {...formItemLayout}
+                              label="订单负责人"
                           >
                             <span>{this.state.salesmanName}</span>
                           </FormItem>
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="订单负责人电话"
+                              className="half-item"
+                              {...formItemLayout}
+                              label="订单负责人电话"
                           >
                             <span>{this.state.salesmanMobile}</span>
                           </FormItem>
                         </div>
                         <div className="clearfix">
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="当前财务负责人"
+                              className="half-item"
+                              {...formItemLayout}
+                              label="当前财务负责人"
                           >
                             <span>{this.state.nowFinance}</span>
                           </FormItem>
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="当前财务负责人电话"
+                              className="half-item"
+                              {...formItemLayout}
+                              label="当前财务负责人电话"
                           >
                             <span>{this.state.nowFinanceMobile}</span>
                           </FormItem>
                         </div>
                         <div className="clearfix">
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            style={{ opacity: ".5" }}
-                            label="原订单负责人"
+                              className="half-item"
+                              {...formItemLayout}
+                              style={{ opacity: ".5" }}
+                              label="原订单负责人"
                           >
                             <span>{this.state.oldSalesmanName}</span>
                           </FormItem>
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            style={{ opacity: ".5" }}
-                            label="原订单负责人电话"
+                              className="half-item"
+                              {...formItemLayout}
+                              style={{ opacity: ".5" }}
+                              label="原订单负责人电话"
                           >
                             <span>{this.state.oldSalesmanMobile}</span>
                           </FormItem>
                         </div>
                         <div className="clearfix">
                           <FormItem
-                            className="half-item"
-                            style={{ opacity: ".5" }}
-                            {...formItemLayout}
-                            label="实际财务操作人"
+                              className="half-item"
+                              style={{ opacity: ".5" }}
+                              {...formItemLayout}
+                              label="实际财务操作人"
                           >
                             <span>{this.state.financeName}</span>
                           </FormItem>
                           <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            style={{ opacity: ".5" }}
-                            label="实际财务操作人电话"
+                              className="half-item"
+                              {...formItemLayout}
+                              style={{ opacity: ".5" }}
+                              label="实际财务操作人电话"
                           >
                             <span>{this.state.financeMobile}</span>
                           </FormItem>
                         </div>
                         <div>
                           <span
-                            style={{ marginLeft: "50px", fontSize: "20px" }}
+                              style={{ marginLeft: "50px", fontSize: "20px" }}
                           >
                             项目业务
                           </span>
                           {this.state.processStatus == 0 ? (
-                            <Button
-                              type="primary"
-                              onClick={this.addDetailed}
-                              style={{
-                                float: "right",
-                                marginRight: "50px",
-                                marginBottom: "15px",
-                              }}
-                            >
-                              添加项目明细
-                            </Button>
+                              <Button
+                                  type="primary"
+                                  onClick={this.addDetailed}
+                                  style={{
+                                    float: "right",
+                                    marginRight: "50px",
+                                    marginBottom: "15px",
+                                  }}
+                              >
+                                添加项目明细
+                              </Button>
                           ) : (
-                            ""
+                              ""
                           )}
                         </div>
                         <div className="patent-table">
                           <Spin spinning={this.state.loading}>
                             <Table
-                              columns={this.state.columnsX}
-                              dataSource={this.state.dataSourceX}
-                              pagination={this.state.paginations}
-                              onRowClick={this.tableRowClickX}
-                              bordered
-                              size="small"
+                                columns={this.state.columnsX}
+                                dataSource={this.state.dataSourceX}
+                                pagination={this.state.paginations}
+                                onRowClick={this.tableRowClickX}
+                                bordered
+                                size="small"
                             />
                           </Spin>
                         </div>
@@ -1828,13 +1935,13 @@ const outsourcingPro = Form.create()(
                             催款节点
                           </span>
                           <span
-                            style={{
-                              display: cuiDataList.length
-                                ? "none"
-                                : "inline-block",
-                              marginLeft: 10,
-                              color: "red",
-                            }}
+                              style={{
+                                display: cuiDataList.length
+                                    ? "none"
+                                    : "inline-block",
+                                marginLeft: 10,
+                                color: "red",
+                              }}
                           >
                             金额总计(万元): {this.state.totalCui}
                           </span>
@@ -1843,24 +1950,24 @@ const outsourcingPro = Form.create()(
                           <Spin spinning={this.state.loading}>
                             <Form layout="horizontal" id="demand-form">
                               <Table
-                                pagination={false}
-                                bordered
-                                size="small"
-                                columns={
-                                  cuiDataList.length
-                                    ? this.state.ContactsLists
-                                    : this.state.ContactsListsNew
-                                }
-                                dataSource={
-                                  cuiDataList.length
-                                    ? this.state.contactList
-                                    : this.state.contactListNew
-                                }
+                                  pagination={false}
+                                  bordered
+                                  size="small"
+                                  columns={
+                                    cuiDataList.length
+                                        ? this.state.ContactsLists
+                                        : this.state.ContactsListsNew
+                                  }
+                                  dataSource={
+                                    cuiDataList.length
+                                        ? this.state.contactList
+                                        : this.state.contactListNew
+                                  }
                               />
                               <Col
-                                span={24}
-                                offset={9}
-                                style={{ marginTop: "15px" }}
+                                  span={24}
+                                  offset={9}
+                                  style={{ marginTop: "15px" }}
                               />
                             </Form>
                           </Spin>
@@ -1869,113 +1976,6 @@ const outsourcingPro = Form.create()(
                     </Spin>
                   </Form>
                 </TabPane>
-                <TabPane tab="外包审核" key="2">
-                  <Spin spinning={this.state.loading}>
-                    <CheckProject
-                        {...this.props}
-                        tid={this.state.tid}
-                        status={this.state.refundStatus}
-                        thirdInfoList={this.state.thirdInfoList}
-                        dataSource={this.state.payNodeList}
-                        outsourceRemarks={this.state.outsourceRemarks}
-                        fileList={this.state.pictureUrl}
-                        startType={this.state.startType}
-                        projectStatus={this.state.projectStatus}
-                    />
-                    {this.state.refundStatus == 0 ? (
-                      <div>
-                        <hr className="division" />
-                        <div className="clearfix" style={{ marginTop: "20px" }}>
-                          <FormItem
-                            labelCol={{ span: 4 }}
-                            wrapperCol={{ span: 18 }}
-                            label={
-                              <span>
-                                <strong style={{ color: "#f00" }}>*</strong>
-                                审核意见
-                              </span>
-                            }
-                          >
-                            <Input
-                              type="textarea"
-                              placeholder="请输入备注"
-                              rows={4}
-                              value={this.state.remarks}
-                              onChange={(e) => {
-                                this.setState({ remarks: e.target.value });
-                              }}
-                              style={{ width: "440px" }}
-                            />
-                            <span
-                              className="tip"
-                              style={{
-                                width: "160px",
-                                verticalAlign: "top",
-                                display: "inline-block",
-                                marginLeft: "10px",
-                              }}
-                            >
-                              通过或驳回都必须填写审核意见!
-                            </span>
-                          </FormItem>
-                        </div>
-                        <div className="clearfix fa">
-                          <Button
-                            type="danger"
-                            onClick={this.examNo}
-                            loading={this.state.loading}
-                            style={{
-                              color: "#fff",
-                              backgroundColor: "#f04134",
-                            }}
-                          >
-                            驳回
-                          </Button>
-                          <Button
-                            type="primary"
-                            loading={this.state.loading}
-                            onClick={this.examOk}
-                          >
-                            通过
-                          </Button>
-                        </div>
-                      </div>
-                    ) : (
-                      <div className="clearfix">
-                        <hr className="division" />
-                        <div className="clearfix">
-                          <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="审核意见"
-                          >
-                            <span>{this.state.remarks}</span>
-                          </FormItem>
-                        </div>
-                        {parseInt(this.state.startType) !== 1 ?<div className="clearfix">
-                          <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="审核结果"
-                          >
-                            <span>
-                              {getRefundStatus(this.state.refundStatus)}
-                            </span>
-                          </FormItem>
-                        </div> : <div/>}
-                        <div className="clearfix">
-                          <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="审核时间"
-                          >
-                            <span>{this.state.auditTimes}</span>
-                          </FormItem>
-                        </div>
-                      </div>
-                    )}
-                  </Spin>
-                </TabPane>
               </Tabs>
             </Modal>
             <Modal

+ 40 - 32
js/component/manageCenter/project/task/myTask.jsx

@@ -160,38 +160,17 @@ const Task = React.createClass({
           }
         } else {
           for (let i = 0; i < data.data.list.length; i++) {
-            let thisdata = data.data.list[i]
-            theArr.push({
-              key: i,
-              orderNo: thisdata.orderNo, //订单编号
-              id: thisdata.id, //项目ID
-              taskName: thisdata.taskName, //名称
-              cname: thisdata.cname, //项目品类
-              receiverName: thisdata.receiverName, //受理人
-              projectStatus: thisdata.projectStatus, //项目状态
-              taskStatus: thisdata.taskStatus, //项目状态
-              taskDate: thisdata.taskDate, //分配时间
-              userName:
-                thisdata.taskName.substring(0, 5) === '软件著作权'
-                  ? thisdata.userName +
-                    '(' +
-                    thisdata.commodityQuantity.toString() +
-                    '/' +
-                    thisdata.alreadyNumber +
-                    ')'
-                  : thisdata.userName, //用户名
-              depName: thisdata.depName, //部门名称
-              projectType: thisdata.projectType, //0正常 1专利 2软著 3审计
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              hours: thisdata.hours,
-              contractNo: thisdata.contractNo,
-              approval: thisdata.approval, //特批状态
-              outsourceStatus: thisdata.outsourceStatus, //外包审核状态
-              outsourceType: thisdata.outsourceType, //外包审核状态
-              splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
-              splitSuper: thisdata.splitSuper,
-              splitId: thisdata.splitId,
-            })
+            let thisdata = data.data.list[i];
+            thisdata.key = i;
+            thisdata.userName = thisdata.taskName.substring(0, 5) === '软件著作权'
+                ? thisdata.userName +
+                '(' +
+                thisdata.commodityQuantity.toString() +
+                '/' +
+                thisdata.alreadyNumber +
+                ')'
+                : thisdata.userName;
+            theArr.push(thisdata)
           }
         }
         this.state.pagination.current = data.data.pageNo
@@ -396,6 +375,35 @@ const Task = React.createClass({
           key: 'hours',
         },
         {
+          title: "项目金额(万元)",
+          dataIndex: "commodityPrice",
+          key: "commodityPrice",
+        },
+        {
+          title: "外包成本(万元)",
+          dataIndex: "costAmount",
+          key: "costAmount",
+          render: (text, record) => {
+            return (<span>
+              {
+                isNaN(parseFloat(text)) ? text : parseFloat(text)
+              }
+            </span>)
+          }
+        },
+        {
+          title: "已付(万元)",
+          dataIndex: "partyAmount",
+          key: "partyAmount",
+          render: (text, record) => {
+            return (<span>
+              {
+                isNaN(parseFloat(text)) ? text : parseFloat(text)
+              }
+            </span>)
+          }
+        },
+        {
           title: '操作',
           dataIndex: 'caozuo',
           key: 'caozuo',

+ 14 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -338,11 +338,25 @@ const MyTaskOutsource = React.createClass({
           title: "外包成本(万元)",
           dataIndex: "costAmount",
           key: "costAmount",
+          render: (text, record) => {
+            return (<span>
+              {
+                isNaN(parseFloat(text)) ? text : parseFloat(text)
+              }
+            </span>)
+          }
         },
         {
           title: "已付(万元)",
           dataIndex: "partyAmount",
           key: "partyAmount",
+          render: (text, record) => {
+            return (<span>
+              {
+                isNaN(parseFloat(text)) ? text : parseFloat(text)
+              }
+            </span>)
+          }
         },
         {
           title: "操作",

+ 2 - 2
js/component/manageCenter/project/task/operationPayNode.js

@@ -125,7 +125,7 @@ class OperationPayNode extends Component{
         })
         if(this.props.projectType !== 2){
             this.props.form.setFieldsValue({
-                totalAmount: currentTotalPrice
+                totalAmount: parseFloat(currentTotalPrice)
             })
             this.setState({
                 thirdUnitPrice: unitPrice
@@ -250,7 +250,7 @@ class OperationPayNode extends Component{
                             {this.props.projectType !== 2 ? <div className="clearfix">
                                 <Form.Item {...formItemLayout} label="总价(万元)">
                                     {getFieldDecorator('totalAmount', {
-                                        initialValue: payNodeInfor.totalAmount,
+                                        initialValue: parseFloat(payNodeInfor.totalAmount),
                                         rules: [{ required: true, message: '请输入总价' }],
                                     })(
                                         <Input