mentoswzq лет назад: 4
Родитель
Сommit
8747014af1
26 измененных файлов с 821 добавлено и 687 удалено
  1. 60 26
      js/component/common/imgList/index.js
  2. 48 38
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  3. 47 47
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  4. 33 26
      js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx
  5. 1 1
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  6. 47 37
      js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx
  7. 2 2
      js/component/manageCenter/financialManage/orderDetail/orderDesc.jsx
  8. 29 22
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  9. 16 17
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  10. 15 15
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  11. 50 45
      js/component/manageCenter/order/orderNew/addService.jsx
  12. 14 14
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  13. 14 14
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  14. 15 15
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  15. 40 35
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  16. 62 49
      js/component/manageCenter/order/orderNew/chargeback.jsx
  17. 50 48
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  18. 15 25
      js/component/manageCenter/order/orderNew/contractCwzj.js
  19. 10 10
      js/component/manageCenter/order/orderNew/contractJszj.js
  20. 44 36
      js/component/manageCenter/order/orderNew/contractYxgly.js
  21. 30 30
      js/component/manageCenter/order/orderNew/examine.jsx
  22. 46 39
      js/component/manageCenter/order/orderNew/inquiry.jsx
  23. 51 40
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  24. 47 28
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  25. 31 24
      js/component/manageCenter/project/project/projectQuery.jsx
  26. 4 4
      js/component/manageCenter/project/task/myTask.jsx

+ 60 - 26
js/component/common/imgList/index.js

@@ -1,54 +1,78 @@
 import React,{Component} from 'react';
-import {Upload} from 'antd';
+import {Spin, Upload} from 'antd';
 import './index.less';
 import Viewer from 'viewerjs';
-import 'viewerjs/dist/viewer.css'
+import 'viewerjs/dist/viewer.css';
+import PropTypes from 'prop-types';
 
-//const url1 = 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1601012352754&di=d33308119328f5ed987bd90031f98cfa&imgtype=0&src=http%3A%2F%2Fa2.att.hudong.com%2F27%2F81%2F01200000194677136358818023076.jpg';
-//const url2 = 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1601001245&di=60b5e1a42beb791524b46d7e3677f1f4&src=http://a2.att.hudong.com/13/86/01300001285722131043860050752.jpg';
+// const url1 = 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1601012352754&di=d33308119328f5ed987bd90031f98cfa&imgtype=0&src=http%3A%2F%2Fa2.att.hudong.com%2F27%2F81%2F01200000194677136358818023076.jpg';
+// const url2 = 'https://ss0.bdstatic.com/94oJfD_bAAcT8t7mm9GUKT-xh_/timg?image&quality=100&size=b4000_4000&sec=1601001245&di=60b5e1a42beb791524b46d7e3677f1f4&src=http://a2.att.hudong.com/13/86/01300001285722131043860050752.jpg';
 class ImgList extends Component{
     constructor(props) {
         super(props);
         this.state={
             seeMore: false,
-            fileList: props.fileList.map((v,i)=>{
-                v.index = i;
-                // v.url = i%2 ? url1 : url2;
-                return v
-            }) || [],
+            gallery: null,
+            loading: true,
+            imgLoadNum: 0,
         }
+        this.imgLoading = this.imgLoading.bind(this);
     }
 
-    componentDidMount() {
-        this.gallery = new Viewer(document.getElementById('images'));
+    imgLoading(){
+        let num = this.state.imgLoadNum + 1;
+        if(num >= this.props.fileList.length){
+            this.setState({
+                gallery: new Viewer(document.getElementById(this.props.domId))
+            },()=>{
+                this.setState({
+                    loading: false
+                })
+            })
+        }
+        this.setState({
+            imgLoadNum: num
+        })
     }
 
     render() {
-        const {fileList} = this.state;
+        const {fileList} = this.props;
+        if(!fileList || !Array.isArray(fileList) || fileList.length <= 0){
+            return null;
+        }
+        const list = fileList.map((v,i)=>{
+            v.index = i;
+            // v.url = i%2 ? url1 : url2;
+            return v
+        });
         return (
             <div className='ImgListComponent'>
                 <div className='ImgList'>
-                    <Upload
-                        className="demandDetailShow-upload"
-                        listType="picture-card"
-                        fileList={
-                            this.state.seeMore?
-                                fileList :
-                                fileList.slice(0,10)
-                        }
-                        onPreview={(file) => {
-                            this.gallery.view(file.index).show();
-                        }}
-                    />
+                    <Spin spinning={fileList.length === 0 ? false : this.state.loading}>
+                        <Upload
+                            className="demandDetailShow-upload"
+                            listType="picture-card"
+                            fileList={
+                                this.state.seeMore?
+                                    list :
+                                    list.slice(0,10)
+                            }
+                            onPreview={(file) => {
+                                this.state.gallery.view(file.index).show();
+                            }}
+                        />
+                    </Spin>
                 </div>
                 {fileList.length > 10 ? <div className='seeMore' onClick={()=>{this.setState({seeMore:!this.state.seeMore})}}>
                     {this.state.seeMore ? '收起' : '查看更多'}
                 </div> : <div/>}
-                <ul id="images" style={{display:'none',zIndex:-1,}}>
+                <ul id={this.props.domId} style={{display:'none',zIndex:-1,}}>
                     {
                         fileList.map((value,index)=>(
                             <li key={index}>
-                                <img src={value.url || value.thumbUrl}/>
+                                <img src={value.url || value.thumbUrl} onLoad={()=>{
+                                    this.imgLoading();
+                                }}/>
                             </li>
                         ))
                     }
@@ -58,4 +82,14 @@ class ImgList extends Component{
     }
 }
 
+ImgList.propTypes = {
+    domId : PropTypes.string,                            //如果一个界面有多个该组件,需要传入自定义id名称,用于图片列表显示
+    fileList: PropTypes.array.isRequired,                //图片文件列表
+}
+
+ImgList.defaultProps = {
+    domId: 'images',
+    fileList: [],
+}
+
 export default ImgList;

+ 48 - 38
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -41,6 +41,7 @@ import {
   getCuikuan,
 } from '@/tools'
 import { ChooseList } from '../../../../component/manageCenter/order/orderNew/chooseList'
+import ImgList from "../../../common/imgList";
 const FormItem = Form.Item
 
 const approvedOutsourcing = React.createClass({
@@ -3186,7 +3187,7 @@ const approvedOutsourcing = React.createClass({
           </p>
         </div>
         <div className="patent-desc">
-          <Modal
+          {this.state.visible ? <Modal
             maskClosable={false}
             visible={this.state.visible}
             onCancel={this.closeModal}
@@ -3200,7 +3201,7 @@ const approvedOutsourcing = React.createClass({
               activeKey={this.state.modKey}
             >
               <TabPane tab="项目概况" key="1">
-                <Form layout="horizontal" id="demand-form">
+                {this.state.modKey === "1" ? <Form layout="horizontal" id="demand-form">
                   <Spin spinning={this.state.loading}>
                     <div className="clearfix">
                       <FormItem
@@ -3285,17 +3286,20 @@ const approvedOutsourcing = React.createClass({
                         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,
-                            })
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    })*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ?  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.orgCodeUrl} domId={'approvedOutsourcing1'}/>
+                        </div>: <div/>}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3365,17 +3369,20 @@ const approvedOutsourcing = React.createClass({
                         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,
-                            })
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.replenishUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisibles: true,*/}
+                        {/*    })*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ?  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.replenishUrl} domId={'approvedOutsourcing2'}/>
+                        </div>: <div/>}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3610,12 +3617,12 @@ const approvedOutsourcing = React.createClass({
                             span={24}
                             offset={9}
                             style={{ marginTop: '15px' }}
-                          ></Col>
+                          />
                         </Form>
                       </Spin>
                     </div>
                   </Spin>
-                </Form>
+                </Form> : <div/>}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -3712,17 +3719,20 @@ const approvedOutsourcing = React.createClass({
                     wrapperCol={{ span: 18 }}
                     label="合同/协议扫描件"
                   >
-                    <Upload
-                      className="demandDetailShow-upload"
-                      listType="picture-card"
-                      fileList={this.state.pictureUrl}
-                      onPreview={(file) => {
-                        this.setState({
-                          previewImage: file.url || file.thumbUrl,
-                          previewVisible: true,
-                        })
-                      }}
-                    ></Upload>
+                    {/*<Upload*/}
+                    {/*  className="demandDetailShow-upload"*/}
+                    {/*  listType="picture-card"*/}
+                    {/*  fileList={this.state.pictureUrl}*/}
+                    {/*  onPreview={(file) => {*/}
+                    {/*    this.setState({*/}
+                    {/*      previewImage: file.url || file.thumbUrl,*/}
+                    {/*      previewVisible: true,*/}
+                    {/*    })*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ?  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      <ImgList fileList={this.state.pictureUrl} domId={'approvedOutsourcing3'}/>
+                    </div>: <div/>}
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -3810,7 +3820,7 @@ const approvedOutsourcing = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal>
+          </Modal> : <div/>}
         </div>
         <div className="patent-desc">
           <Modal

+ 47 - 47
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -3097,7 +3097,7 @@ const approvedOutsourcing = React.createClass({
           </p>
         </div>
         <div className="patent-desc">
-          <Modal
+          {this.state.visible ? <Modal
             maskClosable={false}
             visible={this.state.visible}
             onCancel={this.closeModal}
@@ -3111,7 +3111,7 @@ const approvedOutsourcing = React.createClass({
               activeKey={this.state.modKey}
             >
               <TabPane tab="项目概况" key="1">
-                <Form layout="horizontal" id="demand-form">
+                {this.state.modKey === '1' ? <Form layout="horizontal" id="demand-form">
                   <Spin spinning={this.state.loading}>
                     <div className="clearfix">
                       <FormItem
@@ -3196,20 +3196,20 @@ const approvedOutsourcing = React.createClass({
                         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,
-                            });
-                          }}
-                        />
-                        {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                        {/*  <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-                        {/*</div>*/}
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.orgCodeUrl && this.state.modKey === '1' ? <ImgList domId={'approvedOutsourcingAll1'} fileList={this.state.orgCodeUrl}/> : <div/>}
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3279,20 +3279,20 @@ const approvedOutsourcing = React.createClass({
                         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,
-                            });
-                          }}
-                        />
-                        {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                        {/*  <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>*/}
-                        {/*</div>*/}
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.replenishUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisibles: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.replenishUrl && this.state.modKey === '1' ? <ImgList fileList={this.state.replenishUrl}/> : <div/>}
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3527,12 +3527,12 @@ const approvedOutsourcing = React.createClass({
                             span={24}
                             offset={9}
                             style={{ marginTop: "15px" }}
-                          ></Col>
+                          />
                         </Form>
                       </Spin>
                     </div>
                   </Spin>
-                </Form>
+                </Form> : <div/>}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -3628,20 +3628,20 @@ const approvedOutsourcing = React.createClass({
                     wrapperCol={{ span: 18 }}
                     label="合同/协议扫描件"
                   >
-                    <Upload
-                      className="demandDetailShow-upload"
-                      listType="picture-card"
-                      fileList={this.state.pictureUrl}
-                      onPreview={(file) => {
-                        this.setState({
-                          previewImage: file.url || file.thumbUrl,
-                          previewVisible: true,
-                        });
-                      }}
-                    />
-                    {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                    {/*  <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>*/}
-                    {/*</div>*/}
+                    {/*<Upload*/}
+                    {/*  className="demandDetailShow-upload"*/}
+                    {/*  listType="picture-card"*/}
+                    {/*  fileList={this.state.pictureUrl}*/}
+                    {/*  onPreview={(file) => {*/}
+                    {/*    this.setState({*/}
+                    {/*      previewImage: file.url || file.thumbUrl,*/}
+                    {/*      previewVisible: true,*/}
+                    {/*    });*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      {this.state.pictureUrl && this.state.modKey === '3' ? <ImgList domId={'approvedOutsourcingAll2'} fileList={this.state.pictureUrl}/> : <div/>}
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -3729,7 +3729,7 @@ const approvedOutsourcing = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal>
+          </Modal> : <div/>}
         </div>
         <div className="patent-desc">
           <Modal

+ 33 - 26
js/component/manageCenter/financialManage/distribute/outOutsourcingList.jsx

@@ -28,6 +28,7 @@ import {
   splitUrl,
   getprovince
 } from "@/tools";
+import ImgList from "../../../common/imgList";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -939,7 +940,7 @@ const outsourcingPaiDan = React.createClass({
           </Spin>
         </div>
         <div className="patent-desc">
-          <Modal
+          {this.state.visible ? <Modal
             maskClosable={false}
             visible={this.state.visible}
             onCancel={this.closeModal}
@@ -953,7 +954,7 @@ const outsourcingPaiDan = React.createClass({
               activeKey={this.state.modKey}
             >
               <TabPane tab="项目概况" key="1">
-                <Form layout="horizontal" id="demand-form">
+                {this.state.modKey === "1" ? <Form layout="horizontal" id="demand-form">
                   <Spin spinning={this.state.loading}>
                     <div className="clearfix">
                       <FormItem
@@ -1038,17 +1039,20 @@ const outsourcingPaiDan = React.createClass({
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        {this.state.visible && this.state.orgCodeUrl && this.state.modKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.orgCodeUrl} domId={'outOutsourcingList1'}/>
+                        </div> : <div/>}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1118,17 +1122,20 @@ const outsourcingPaiDan = React.createClass({
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.replenishUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisibles: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        {this.state.visible && this.state.replenishUrl && this.state.modKey === "1" ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.replenishUrl} domId={'outOutsourcingList2'}/>
+                        </div> : <div/>}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1291,7 +1298,7 @@ const outsourcingPaiDan = React.createClass({
                       </div>
                     </div>
                   </Spin>
-                </Form>
+                </Form> : <div/>}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -1314,7 +1321,7 @@ const outsourcingPaiDan = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal>
+          </Modal> : <div/>}
         </div>
         <Assign
           title="订单"

+ 1 - 1
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -653,7 +653,7 @@ const outSpecial = React.createClass({
             onChange={e => {
               this.setState({ reason: e.target.value });
             }}
-          ></Input.TextArea>
+          />
           <div className="clearfix" style={{ marginTop: "20px" }}>
             <Button
               type="primary"

+ 47 - 37
js/component/manageCenter/financialManage/distribute/outsourcingPaiDan.jsx

@@ -29,6 +29,7 @@ import {
   getprovince,
   getRefundStatus
 } from "@/tools";
+import ImgList from "../../../common/imgList";
 const FormItem = Form.Item;
 
 const outsourcingPaiDan = React.createClass({
@@ -1093,7 +1094,7 @@ const outsourcingPaiDan = React.createClass({
           </Spin>
         </div>
         <div className="patent-desc">
-          <Modal
+          {this.state.visible ? <Modal
             maskClosable={false}
             visible={this.state.visible}
             onCancel={this.closeModal}
@@ -1107,7 +1108,7 @@ const outsourcingPaiDan = React.createClass({
               activeKey={this.state.modKey}
             >
               <TabPane tab="项目概况" key="1">
-                <Form layout="horizontal" id="demand-form">
+                {this.state.modKey === "1" ? <Form layout="horizontal" id="demand-form">
                   <Spin spinning={this.state.loading}>
                     <div className="clearfix">
                       <FormItem
@@ -1192,17 +1193,20 @@ const outsourcingPaiDan = React.createClass({
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        {this.state.visible && this.state.modKey === "1" && this.state.orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.orgCodeUrl} domId={'outsourcingPaiDan1'}/>
+                        </div> : <div/>}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1272,17 +1276,20 @@ const outsourcingPaiDan = React.createClass({
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.replenishUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisibles: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        {this.state.visible && this.state.modKey === "1" && this.state.replenishUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.replenishUrl} domId={'outsourcingPaiDan2'}/>
+                        </div> : <div/>}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1447,7 +1454,7 @@ const outsourcingPaiDan = React.createClass({
                       </div>
                     </div>
                   </Spin>
-                </Form>
+                </Form>:<div/>}
               </TabPane>
               <TabPane tab="外包详情" key="2">
                 <div className="clearfix">
@@ -1540,17 +1547,20 @@ const outsourcingPaiDan = React.createClass({
                     wrapperCol={{ span: 18 }}
                     label="合同/协议扫描件"
                   >
-                    <Upload
-                      className="demandDetailShow-upload"
-                      listType="picture-card"
-                      fileList={this.state.pictureUrl}
-                      onPreview={(file) => {
-                        this.setState({
-                          previewImage: file.url || file.thumbUrl,
-                          previewVisible: true,
-                        });
-                      }}
-                    ></Upload>
+                    {/*<Upload*/}
+                    {/*  className="demandDetailShow-upload"*/}
+                    {/*  listType="picture-card"*/}
+                    {/*  fileList={this.state.pictureUrl}*/}
+                    {/*  onPreview={(file) => {*/}
+                    {/*    this.setState({*/}
+                    {/*      previewImage: file.url || file.thumbUrl,*/}
+                    {/*      previewVisible: true,*/}
+                    {/*    });*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    {this.state.visible && this.state.modKey === "3" && this.state.pictureUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      <ImgList fileList={this.state.pictureUrl} domId={'outsourcingPaiDan3'}/>
+                    </div> : <div/>}
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -1599,7 +1609,7 @@ const outsourcingPaiDan = React.createClass({
                 </div>
               </TabPane>
             </Tabs>
-          </Modal>
+          </Modal> : <div/>}
         </div>
         <Assign
           title="订单"

+ 2 - 2
js/component/manageCenter/financialManage/orderDetail/orderDesc.jsx

@@ -28,7 +28,7 @@ class DemandDesc extends React.Component {
 	render() {
 		return (
 			<div className="patent-desc">
-				<Modal
+				{this.state.visible ? <Modal
 					maskClosable={false}
 					visible={this.state.visible}
 					onOk={this.handOk.bind(this)}
@@ -48,7 +48,7 @@ class DemandDesc extends React.Component {
 							/>
 						</div>
 					</div>
-				</Modal>
+				</Modal> : <div/>}
 			</div>
 		);
 	}

+ 29 - 22
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -24,6 +24,7 @@ import {
 } from "@/tools";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ResolutionDetail from "@/resolutionDetail";
+import ImgList from "../../../common/imgList";
 const OrderDetail = Form.create()(
   React.createClass({
     loadXmu(record) {
@@ -827,17 +828,20 @@ const OrderDetail = Form.create()(
                   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,
-                      });
-                    }}
-                  ></Upload>
+                  {/*<Upload*/}
+                  {/*  className="demandDetailShow-upload"*/}
+                  {/*  listType="picture-card"*/}
+                  {/*  fileList={this.state.orgCodeUrl}*/}
+                  {/*  onPreview={(file) => {*/}
+                  {/*    this.setState({*/}
+                  {/*      previewImage: file.url || file.thumbUrl,*/}
+                  {/*      previewVisible: true,*/}
+                  {/*    });*/}
+                  {/*  }}*/}
+                  {/*/>*/}
+                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                    {this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                  </div>
                   <Modal
                     maskClosable={false}
                     footer={null}
@@ -988,17 +992,20 @@ const OrderDetail = Form.create()(
                   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,
-                      });
-                    }}
-                  ></Upload>
+                  {/*<Upload*/}
+                  {/*  className="demandDetailShow-upload"*/}
+                  {/*  listType="picture-card"*/}
+                  {/*  fileList={this.state.replenishUrl}*/}
+                  {/*  onPreview={(file) => {*/}
+                  {/*    this.setState({*/}
+                  {/*      previewImage: file.url || file.thumbUrl,*/}
+                  {/*      previewVisibles: true,*/}
+                  {/*    });*/}
+                  {/*  }}*/}
+                  {/*/>*/}
+                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                    {this.state.replenishUrl ? <ImgList domId={'orderDetail1'} fileList={this.state.replenishUrl}/> : <div/>}
+                  </div>
                   <Modal
                     maskClosable={false}
                     footer={null}

+ 16 - 17
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -647,8 +647,7 @@ const NewService = Form.create()(React.createClass({
                              key: i,
 	                         billNo: thisdata.billNo,
 	                         transactionAmount:thisdata.transactionAmount,
-	                         createTime:thisdata.createTime, 
-	                         transactionAmount:thisdata.transactionAmount,
+	                         createTime:thisdata.createTime,
 	                         payerName:thisdata.payerName,
 	                         payeeName:thisdata.payeeName,
 	                         transactionSubject:thisdata.transactionSubject,
@@ -876,7 +875,7 @@ const NewService = Form.create()(React.createClass({
 		    
 		return(
 			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
+				{this.state.visible ? <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width={!this.props.userDetaile?'600px':'1000px'}  
                         title={!this.props.userDetaile?'创建订单':'编辑订单'}                      
@@ -1021,19 +1020,19 @@ const NewService = Form.create()(React.createClass({
 										                        wrapperCol={{ span: 18 }}
 										                        label="合同扫描件" >
 										                        <div className="clearfix">
-										                            <Upload className="demandDetailShow-upload"
-										                                beforeUpload={beforeUploadFile}
-										                                listType="picture-card"
-										                                fileList={this.state.orgCodeUrl}
-										                                onPreview={(file) => {
-										                                    this.setState({
-										                                        previewImage: file.url || file.thumbUrl,
-										                                        previewVisible: true,
-										                                    });
-										                                }} />
-																	{/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-																	{/*	<ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-																	{/*</div>*/}
+										                            {/*<Upload className="demandDetailShow-upload"*/}
+										                            {/*    beforeUpload={beforeUploadFile}*/}
+										                            {/*    listType="picture-card"*/}
+										                            {/*    fileList={this.state.orgCodeUrl}*/}
+										                            {/*    onPreview={(file) => {*/}
+										                            {/*        this.setState({*/}
+										                            {/*            previewImage: file.url || file.thumbUrl,*/}
+										                            {/*            previewVisible: true,*/}
+										                            {/*        });*/}
+										                            {/*    }} />*/}
+																	{this.state.orgCodeUrl && this.state.visible ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+																		<ImgList fileList={this.state.orgCodeUrl}/>
+																	</div> : <div/>}
 										                            <Modal maskClosable={false} footer={null}
 										                                visible={this.state.previewVisible}
 										                                onCancel={() => { this.setState({ previewVisible: false }) }}>
@@ -1159,7 +1158,7 @@ const NewService = Form.create()(React.createClass({
 				                    </div>
 			                </Spin>
 			            </Form >
-			        </Modal> 
+			        </Modal> : <div/>}
 			        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='800px'

+ 15 - 15
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -1250,7 +1250,7 @@ const NewService = Form.create()(React.createClass({
 		    
 		return(
 			<div>
-            <Modal maskClosable={false} visible={this.state.visible}
+                {this.state.visible ? <Modal maskClosable={false} visible={this.state.visible}
                         onOk={this.handleOk} onCancel={this.handleCancel}
                         width={!this.props.userDetaile?'600px':'1000px'}  
                         title={!this.props.userDetaile?'创建订单':'编辑订单'}                      
@@ -1480,19 +1480,19 @@ const NewService = Form.create()(React.createClass({
 										                        labelCol={{ span: 4 }}
 										                        wrapperCol={{ span: 18 }}
 										                        label="合同扫描件" >
-									                            <Upload className="demandDetailShow-upload"
-									                            	beforeUpload={beforeUploadFile}
-									                                listType="picture-card"
-									                                fileList={this.state.orgCodeUrl}
-									                                onPreview={(file) => {
-									                                    this.setState({
-									                                        previewImage: file.url || file.thumbUrl,
-									                                        previewVisible: true,
-									                                    });
-									                                }} />
-                                                                {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                                                                {/*    <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-                                                                {/*</div>*/}
+									                            {/*<Upload className="demandDetailShow-upload"*/}
+									                            {/*	beforeUpload={beforeUploadFile}*/}
+									                            {/*    listType="picture-card"*/}
+									                            {/*    fileList={this.state.orgCodeUrl}*/}
+									                            {/*    onPreview={(file) => {*/}
+									                            {/*        this.setState({*/}
+									                            {/*            previewImage: file.url || file.thumbUrl,*/}
+									                            {/*            previewVisible: true,*/}
+									                            {/*        });*/}
+									                            {/*    }} />*/}
+                                                                {this.state.orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                                                    <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                                                                </div> : <div/>}
 									                            <Modal maskClosable={false} footer={null}
 									                                visible={this.state.previewVisible}
 									                                onCancel={() => { this.setState({ previewVisible: false }) }}>
@@ -1616,7 +1616,7 @@ const NewService = Form.create()(React.createClass({
 				                    </div>
 			                </Spin>
 			            </Form >
-			        </Modal> 
+			        </Modal> : <div/>}
 			        <Modal maskClosable={false} visible={this.state.addnextVisible}
                         onOk={this.nextCancel} onCancel={this.nextCancel}
                         width='800px'

+ 50 - 45
js/component/manageCenter/order/orderNew/addService.jsx

@@ -659,7 +659,6 @@ const NewService = Form.create()(
         ],
 
         contactList: [],
-        loading: false,
         ContactsLists: [
           {
             title: "催款科目",
@@ -1921,7 +1920,6 @@ const NewService = Form.create()(
             financeMobile: thisData.financeMobile, //财务电话
             nowFinanceMobile: thisData.nowFinanceMobile,
             nowFinance: thisData.nowFinance,
-            contractNo: thisData.contractNo, //合同编号
             approval:
               thisData.approval == 0
                 ? thisData.approval.toString()
@@ -4818,20 +4816,20 @@ const NewService = Form.create()(
                                   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,
-                                      });
-                                    }}
-                                  />
-                                  {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                                  {/*  <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-                                  {/*</div>*/}
+                                  {/*<Upload*/}
+                                  {/*  className="demandDetailShow-upload"*/}
+                                  {/*  listType="picture-card"*/}
+                                  {/*  fileList={this.state.orgCodeUrl}*/}
+                                  {/*  onPreview={(file) => {*/}
+                                  {/*    this.setState({*/}
+                                  {/*      previewImage: file.url || file.thumbUrl,*/}
+                                  {/*      previewVisible: true,*/}
+                                  {/*    });*/}
+                                  {/*  }}*/}
+                                  {/*/>*/}
+                                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                    {this.state.orgCodeUrl && this.state.visible && this.state.activeKey === '1'? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                                  </div>
                                   <Modal
                                     maskClosable={false}
                                     footer={null}
@@ -4901,20 +4899,20 @@ const NewService = Form.create()(
                                   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,
-                                      });
-                                    }}
-                                  />
-                                  {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                                  {/*  <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>*/}
-                                  {/*</div>*/}
+                                  {/*<Upload*/}
+                                  {/*  className="demandDetailShow-upload"*/}
+                                  {/*  listType="picture-card"*/}
+                                  {/*  fileList={this.state.replenishUrl}*/}
+                                  {/*  onPreview={(file) => {*/}
+                                  {/*    this.setState({*/}
+                                  {/*      previewImage: file.url || file.thumbUrl,*/}
+                                  {/*      previewVisibles: true,*/}
+                                  {/*    });*/}
+                                  {/*  }}*/}
+                                  {/*/>*/}
+                                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                    {this.state.visible && this.state.activeKey === '1' && this.state.replenishUrl?  <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                                  </div>
                                   <Modal
                                     maskClosable={false}
                                     footer={null}
@@ -5912,22 +5910,29 @@ const NewService = Form.create()(
                                 label="变更凭证"
                               >
                                 <div>
-                                  <Upload
-                                    className="demandDetailShow-upload"
-                                    listType="picture-card"
-                                    fileList={
-                                      this.state.detailChange.voucherUrl
+                                  {/*<Upload*/}
+                                  {/*  className="demandDetailShow-upload"*/}
+                                  {/*  listType="picture-card"*/}
+                                  {/*  fileList={*/}
+                                  {/*    this.state.detailChange.voucherUrl*/}
+                                  {/*  }*/}
+                                  {/*  onPreview={(file) => {*/}
+                                  {/*    this.setState({*/}
+                                  {/*      previewImage: file.url || file.thumbUrl,*/}
+                                  {/*      previewVisible: true,*/}
+                                  {/*    });*/}
+                                  {/*  }}*/}
+                                  {/*/>*/}
+                                  <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                    {
+                                      this.state.detailChange &&
+                                      this.state.detailChange.voucherUrl &&
+                                      this.state.activeKey === '3' &&
+                                      this.state.visible?
+                                          <ImgList fileList={this.state.detailChange.voucherUrl} ItemWidth={'96px'}/>
+                                          : <div/>
                                     }
-                                    onPreview={(file) => {
-                                      this.setState({
-                                        previewImage: file.url || file.thumbUrl,
-                                        previewVisible: true,
-                                      });
-                                    }}
-                                  />
-                                  {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                                  {/*  <ImgList fileList={this.state.detailChange.voucherUrl} ItemWidth={'96px'}/>*/}
-                                  {/*</div>*/}
+                                  </div>
                                   {/*<Modal*/}
                                   {/*  maskClosable={false}*/}
                                   {/*  footer={null}*/}

+ 14 - 14
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -553,20 +553,20 @@ class ChangeDetail extends Component {
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
-              fileList={orgCodeUrl}
-              onPreview={(file) => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisible: true,
-                });
-              }}
-            />
-            {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-            {/*  <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>*/}
-            {/*</div>*/}
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
+            {/*  fileList={orgCodeUrl}*/}
+            {/*  onPreview={(file) => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisible: true,*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              {orgCodeUrl ? <ImgList domId={'changeDetailCwzj'+this.props.id} fileList={orgCodeUrl}/>: <div/>}
+            </div>
             <Modal
               maskClosable={false}
               footer={null}

+ 14 - 14
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -430,20 +430,20 @@ class ChangeDetail extends Component {
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
-              fileList={orgCodeUrl}
-              onPreview={(file) => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisible: true,
-                });
-              }}
-            />
-            {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-            {/*  <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>*/}
-            {/*</div>*/}
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
+            {/*  fileList={orgCodeUrl}*/}
+            {/*  onPreview={(file) => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisible: true,*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            {orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              <ImgList fileList={orgCodeUrl} domId={'changeDetailJszj1'}/>
+            </div> : <div/>}
             <Modal
               maskClosable={false}
               footer={null}

+ 15 - 15
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -11,7 +11,7 @@ import ProAndCuiList from "./proAndCuiList.jsx";
 import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
 import Refund from "./refund.js"
-// import ImgList from "../../../../common/imgList/index";
+import ImgList from "../../../../common/imgList/index";
 const { TextArea } = Input;
 
 const formItemLayout = {
@@ -451,20 +451,20 @@ class ChangeDetail extends Component {
             labelCol={{ span: 4 }}
             wrapperCol={{ span: 18 }}
           >
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
-              fileList={orgCodeUrl}
-              onPreview={(file) => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisible: true,
-                });
-              }}
-            />
-            {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-            {/*  <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>*/}
-            {/*</div>*/}
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
+            {/*  fileList={orgCodeUrl}*/}
+            {/*  onPreview={(file) => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisible: true,*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>
+            </div>
             <Modal
               maskClosable={false}
               footer={null}

+ 40 - 35
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -12,7 +12,7 @@ import {
 } from "@/tools.js";
 import img from "./img.png"
 import ResolutionDetail from "@/resolutionDetail";
-// import ImgList from "../../../../common/imgList";
+import ImgList from "../../../../common/imgList";
 
 const FormItem = Form.Item;
 class OrderDetail extends Component {
@@ -529,42 +529,34 @@ class OrderDetail extends Component {
             wrapperCol={{ span: 18 }}
             label="合同扫描件"
           >
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
-              fileList={
-                data.contractPictureUrl
-                  ? splitUrl(
-                      data.contractPictureUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload"
-                    )
-                  : []
-              }
-              onPreview={(file) => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisible: true,
-                });
-              }}
-            />
-            {/*{(data.contractPictureUrl*/}
-            {/*    ? splitUrl(*/}
-            {/*        data.contractPictureUrl,*/}
-            {/*        ",",*/}
-            {/*        globalConfig.avatarHost + "/upload"*/}
-            {/*    )*/}
-            {/*    : []).length > 0 ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-            {/*  <ImgList fileList={*/}
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
+            {/*  fileList={*/}
             {/*    data.contractPictureUrl*/}
-            {/*        ? splitUrl(*/}
-            {/*        data.contractPictureUrl,*/}
-            {/*        ",",*/}
-            {/*        globalConfig.avatarHost + "/upload"*/}
+            {/*      ? splitUrl(*/}
+            {/*          data.contractPictureUrl,*/}
+            {/*          ",",*/}
+            {/*          globalConfig.avatarHost + "/upload"*/}
             {/*        )*/}
-            {/*        : []*/}
-            {/*  } ItemWidth={'96px'}/>*/}
-            {/*</div> : <div/>}*/}
+            {/*      : []*/}
+            {/*  }*/}
+            {/*  onPreview={(file) => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisible: true,*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            {this.props.orderData && this.props.orderData.contractPictureUrl ? <ImgList fileList={
+              this.props.orderData.contractPictureUrl
+                  ? splitUrl(
+                  this.props.orderData.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload"
+                  )
+                  : []
+            } domId={'orderDetail1'}/> : <div/> }
             <Modal
               maskClosable={false}
               footer={null}
@@ -656,6 +648,19 @@ class OrderDetail extends Component {
             {/*    });*/}
             {/*  }}*/}
             {/*/>*/}
+            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              <ImgList
+                  domId={'orderDetail2'}
+                  fileList={
+                data.agreementUrl
+                    ? splitUrl(
+                    data.agreementUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload"
+                    )
+                    : []
+              }/>
+            </div>
             <Modal
               maskClosable={false}
               footer={null}

+ 62 - 49
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -18,6 +18,7 @@ import {
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import ImgList from "../../../common/imgList";
 
 const IntentionCustomer = Form.create()(
   React.createClass({
@@ -1049,7 +1050,7 @@ const IntentionCustomer = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               title="订单详情"
@@ -1181,17 +1182,20 @@ const IntentionCustomer = Form.create()(
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1261,17 +1265,20 @@ const IntentionCustomer = Form.create()(
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.replenishUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisibles: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.visible && this.state.replenishUrl ? <ImgList domId={'chargeback1'} fileList={this.state.replenishUrl}/> : <div/>}
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -1446,15 +1453,15 @@ const IntentionCustomer = Form.create()(
                             span={24}
                             offset={9}
                             style={{ marginTop: "15px" }}
-                          ></Col>
+                          />
                         </Form>
                       </Spin>
                     </div>
                   </div>
                 </Spin>
               </Form>
-            </Modal>
-            <Modal
+            </Modal> : <div/>}
+            {this.state.addnextVisible ? <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}
               onOk={this.nextCancel}
@@ -1537,17 +1544,20 @@ const IntentionCustomer = Form.create()(
                           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,
-                              });
-                            }}
-                          ></Upload>
+                          {/*<Upload*/}
+                          {/*  className="demandDetailShow-upload"*/}
+                          {/*  listType="picture-card"*/}
+                          {/*  fileList={this.state.orgCodeUrl}*/}
+                          {/*  onPreview={(file) => {*/}
+                          {/*    this.setState({*/}
+                          {/*      previewImage: file.url || file.thumbUrl,*/}
+                          {/*      previewVisible: true,*/}
+                          {/*    });*/}
+                          {/*  }}*/}
+                          {/*/>*/}
+                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                            {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'chargeback2'} fileList={this.state.orgCodeUrl}/> : <div/>}
+                          </div>
                           <Modal
                             maskClosable={false}
                             footer={null}
@@ -1571,17 +1581,20 @@ const IntentionCustomer = Form.create()(
                         wrapperCol={{ span: 16 }}
                         label="退单申请表"
                       >
-                        <Upload
-                          className="demandDetailShow-upload"
-                          listType="picture-card"
-                          fileList={this.state.orgCodeUrl}
-                          onPreview={(file) => {
-                            this.setState({
-                              previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'chargeback3'} fileList={this.state.orgCodeUrl}/> : <div/>}
+                        </div>
                       </FormItem>
                     </div>
                     <div className="clearfix">
@@ -1631,7 +1644,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal>
+            </Modal> : <div/>}
             {/* <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"

+ 50 - 48
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -1222,7 +1222,7 @@ const checkOutsourcing = Form.create()(
               />
             </Spin>
           </div>
-          <Modal
+          {this.state.visible ? <Modal
             className="customeDetails"
             footer=""
             width="900px"
@@ -1232,7 +1232,7 @@ const checkOutsourcing = Form.create()(
           >
             <Tabs activeKey={this.state.activeKey} onChange={this.callback}>
               <TabPane tab="订单详情" key="1">
-                <Form
+                {this.state.activeKey === '1' ? <Form
                   layout="horizontal"
                   onSubmit={this.handleSubmit}
                   id="demand-form"
@@ -1371,20 +1371,20 @@ const checkOutsourcing = Form.create()(
                           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,
-                              })
-                            }}
-                          />
-                          {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                          {/*  <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-                          {/*</div>*/}
+                          {/*<Upload*/}
+                          {/*  className="demandDetailShow-upload"*/}
+                          {/*  listType="picture-card"*/}
+                          {/*  fileList={this.state.orgCodeUrl}*/}
+                          {/*  onPreview={(file) => {*/}
+                          {/*    this.setState({*/}
+                          {/*      previewImage: file.url || file.thumbUrl,*/}
+                          {/*      previewVisible: true,*/}
+                          {/*    })*/}
+                          {/*  }}*/}
+                          {/*/>*/}
+                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                            {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>: <div/>}
+                          </div>
                           <Modal
                             maskClosable={false}
                             footer={null}
@@ -1454,20 +1454,20 @@ const checkOutsourcing = Form.create()(
                           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,
-                              })
-                            }}
-                          />
-                          {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                          {/*  <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>*/}
-                          {/*</div>*/}
+                          {/*<Upload*/}
+                          {/*  className="demandDetailShow-upload"*/}
+                          {/*  listType="picture-card"*/}
+                          {/*  fileList={this.state.replenishUrl}*/}
+                          {/*  onPreview={(file) => {*/}
+                          {/*    this.setState({*/}
+                          {/*      previewImage: file.url || file.thumbUrl,*/}
+                          {/*      previewVisibles: true,*/}
+                          {/*    })*/}
+                          {/*  }}*/}
+                          {/*/>*/}
+                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                            {this.state.replenishUrl && this.state.visible ? <ImgList domId={'checkOutsourcing1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/>: <div/>}
+                          </div>
                           <Modal
                             maskClosable={false}
                             footer={null}
@@ -1661,16 +1661,17 @@ const checkOutsourcing = Form.create()(
                               span={24}
                               offset={9}
                               style={{ marginTop: '15px' }}
-                            ></Col>
+                            />
                           </Form>
                         </Spin>
                       </div>
                     </div>
                   </Spin>
-                </Form>
+                </Form> : <div/>}
               </TabPane>
               <TabPane tab="外包(不走总部)" key="2">
-                <div className="clearfix">
+                {this.state.activeKey === '2' ? <div>
+                    <div className="clearfix">
                   <FormItem
                     className="half-item"
                     {...formItemLayout}
@@ -1741,20 +1742,20 @@ const checkOutsourcing = Form.create()(
                     wrapperCol={{ span: 18 }}
                     label="合同/协议扫描件"
                   >
-                    <Upload
-                      className="demandDetailShow-upload"
-                      listType="picture-card"
-                      fileList={this.state.pictureUrl}
-                      onPreview={(file) => {
-                        this.setState({
-                          previewImage: file.url || file.thumbUrl,
-                          previewVisible: true,
-                        })
-                      }}
-                    />
-                    {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                    {/*  <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>*/}
-                    {/*</div>*/}
+                    {/*<Upload*/}
+                    {/*  className="demandDetailShow-upload"*/}
+                    {/*  listType="picture-card"*/}
+                    {/*  fileList={this.state.pictureUrl}*/}
+                    {/*  onPreview={(file) => {*/}
+                    {/*    this.setState({*/}
+                    {/*      previewImage: file.url || file.thumbUrl,*/}
+                    {/*      previewVisible: true,*/}
+                    {/*    })*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      {this.state.pictureUrl && this.state.visible ? <ImgList domId={'checkOutsourcing2'} fileList={this.state.pictureUrl} ItemWidth={'96px'}/>: <div/>}
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -1889,9 +1890,10 @@ const checkOutsourcing = Form.create()(
                     </div>
                   </div>
                 )}
+                </div> : <div/>}
               </TabPane>
             </Tabs>
-          </Modal>
+          </Modal> : <div/>}
           <Modal
             maskClosable={false}
             visible={this.state.addnextVisible}

+ 15 - 25
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -1067,14 +1067,9 @@ const contractChange = Form.create()(
     visitCancel() {
       this.setState(
         {
-          activeKey: "a"
-        },
-        () => {
-          this.setState({
-            visible: false
-          });
-        }
-      );
+          activeKey: "a",
+          visible: false
+        });
       this.loadData(this.state.pageNo);
     },
     visitOk() {
@@ -1164,7 +1159,7 @@ const contractChange = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               maskClosable={false}
@@ -1179,14 +1174,9 @@ const contractChange = Form.create()(
                 type="card"
               >
                 <TabPane tab="订单详情" key="a">
-                  <Form
-                    layout="horizontal"
-                    onSubmit={this.handleSubmit}
-                    id="demand-form"
-                    style={{ paddingBottom: "40px" }}
-                  >
+                  <div style={{ paddingBottom: "40px" }}>
                     <Spin spinning={this.state.loading}>
-                      <OrderDetail
+                      {this.state.activeKey === 'a' && this.state.visible? <OrderDetail
                         orderData={this.state.orderData}
                         getOrderLog={this.getOrderLog}
                         dataSourceX={this.state.dataSourceX}
@@ -1195,9 +1185,9 @@ const contractChange = Form.create()(
                         totalCui={this.state.totalCui}
                         contactListNew={this.state.contactListNew}
                         // isCaiWu={true}
-                      />
+                      />: <div/>}
                     </Spin>
-                  </Form>
+                  </div>
                 </TabPane>
                 {/* <TabPane tab="合同变更记录" key="2">
                   <ChangeDetail
@@ -1218,7 +1208,7 @@ const contractChange = Form.create()(
                 {tabList.map((item, index, arr) => {
                   return (
                     <TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
-                      <ChangeDetail
+                      {this.state.activeKey === String(item.id) ? <ChangeDetail
                         id={item.id}
                         money={
                           index == arr.length - 1
@@ -1238,7 +1228,7 @@ const contractChange = Form.create()(
                         invoiceTotal={this.state.invTotal}
                         contactList={this.state.refundInvoice}
                         onCancel={this.visitCancel}
-                      />
+                      /> : <div/>}
                     </TabPane>
                   );
                 })}
@@ -1274,7 +1264,7 @@ const contractChange = Form.create()(
                         tab={"原订单" + (index + 1)}
                         key={item.usedOrder}
                       >
-                        <Form
+                        {this.state.activeKey === String(item.usedOrder)? <Form
                           layout="horizontal"
                           onSubmit={this.handleSubmit}
                           id="demand-form"
@@ -1292,7 +1282,7 @@ const contractChange = Form.create()(
                               contactListNew={this.state.contactListNew}
                             />
                           </Spin>
-                        </Form>
+                        </Form> : <div/>}
                       </TabPane>
                     );
                   } else {
@@ -1302,7 +1292,7 @@ const contractChange = Form.create()(
                 {this.state.status === 4 && this.state.isAddition ? (
                   this.state.type === 4 || this.state.type === 5 ? (
                     <TabPane tab="附加订单" key="c">
-                      <OrderDetail
+                      {this.state.activeKey === "c" ? <OrderDetail
                         orderData={this.state.additionalOrderData}
                         getOrderLog={this.getOrderLog}
                         dataSourceX={this.state.dataSourceX}
@@ -1311,7 +1301,7 @@ const contractChange = Form.create()(
                         isCaiWu={true}
                         totalCui={this.state.totalCui}
                         contactListNew={this.state.contactListNew}
-                      />
+                      /> : <div/>}
                     </TabPane>
                   ) : (
                       ""
@@ -1320,7 +1310,7 @@ const contractChange = Form.create()(
                     ""
                   )}
               </Tabs>
-            </Modal>
+            </Modal> : <div/>}
             <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}

+ 10 - 10
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -1130,7 +1130,7 @@ const contractChange = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               maskClosable={false}
@@ -1145,7 +1145,7 @@ const contractChange = Form.create()(
                 type="card"
               >
                 <TabPane tab="订单详情" key="a">
-                  <Form
+                  {this.state.activeKey === "a" ? <Form
                     layout="horizontal"
                     onSubmit={this.handleSubmit}
                     id="demand-form"
@@ -1162,7 +1162,7 @@ const contractChange = Form.create()(
                         orderNo={this.state.orderNo}
                       />
                     </Spin>
-                  </Form>
+                  </Form> : <div/>}
                 </TabPane>
                 {/* <TabPane tab="合同变更记录" key="2">
                   <ChangeDetail
@@ -1182,7 +1182,7 @@ const contractChange = Form.create()(
                 {tabList.map((item, index, arr) => {
                   return (
                     <TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
-                          <ChangeDetail
+                      {this.state.activeKey === String(item.id) ?<ChangeDetail
                             id={item.id}
                             money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
                             data={this.state.contractData}
@@ -1196,7 +1196,7 @@ const contractChange = Form.create()(
                             invoiceTotal={this.state.invTotal}
                             contactList={this.state.refundInvoice}
                             onCancel={this.visitCancel}
-                          />
+                          /> : <div/>}
                     </TabPane>
                   );
                 })}
@@ -1231,7 +1231,7 @@ const contractChange = Form.create()(
                         tab={"原订单" + (index + 1)}
                         key={item.usedOrder}
                       >
-                        <Form
+                        {this.state.activeKey === String(item.usedOrder) ?<Form
                           layout="horizontal"
                           onSubmit={this.handleSubmit}
                           id="demand-form"
@@ -1248,7 +1248,7 @@ const contractChange = Form.create()(
                               contactListNew={this.state.contactListNew}
                             />
                           </Spin>
-                        </Form>
+                        </Form> : <div/>}
                       </TabPane>
                     );
                   } else {
@@ -1258,7 +1258,7 @@ const contractChange = Form.create()(
                 {this.state.status === 4 && this.state.isAddition ? (
                   this.state.type === 4 || this.state.type === 5 ? (
                     <TabPane tab="附加订单" key="c">
-                      <OrderDetail
+                      {this.state.activeKey === 'c' ? <OrderDetail
                         orderData={this.state.additionalOrderData}
                         getOrderLog={this.getOrderLog}
                         dataSourceX={this.state.dataSourceX}
@@ -1266,7 +1266,7 @@ const contractChange = Form.create()(
                         orderNo={this.state.additionalOrder}
                         totalCui={this.state.totalCui}
                         contactListNew={this.state.contactListNew}
-                      />
+                      /> : <div/>}
                     </TabPane>
                   ) : (
                       ""
@@ -1275,7 +1275,7 @@ const contractChange = Form.create()(
                     ""
                   )}
               </Tabs>
-            </Modal>
+            </Modal>:<div/>}
             <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}

+ 44 - 36
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -1137,7 +1137,7 @@ const contractChange = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               maskClosable={false}
@@ -1159,7 +1159,7 @@ const contractChange = Form.create()(
                     style={{ paddingBottom: "40px" }}
                   >
                     <Spin spinning={this.state.loading}>
-                      <OrderDetail
+                      {this.state.activeKey === 'a' ? <OrderDetail
                         orderData={this.state.orderData}
                         getOrderLog={this.getOrderLog}
                         totalCui={this.state.totalCui}
@@ -1167,7 +1167,7 @@ const contractChange = Form.create()(
                         contactList={this.state.contactList}
                         contactListNew={this.state.contactListNew}
                         orderNo={this.state.orderNo}
-                      />
+                      /> : <div/>}
                     </Spin>
                   </Form>
                 </TabPane>
@@ -1188,20 +1188,22 @@ const contractChange = Form.create()(
                 {tabList.map((item, index, arr) => {
                   return (
                     <TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
-
-                          <ChangeDetail
-                            id={item.id}
-                            money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
-                            data={this.state.contractData}
-                            pictureUrl={this.state.voucherUrl}
-                            processState={this.props.processState}
-                            dataSource={this.state.dataProps}
-                            proceedsData={this.state.proceedsData}
-                            proceedsTotal={this.state.proTotal}
-                            invoiceTotal={this.state.invTotal}
-                            contactList={this.state.refundInvoice}
-                            onCancel={this.visitCancel}
-                          />
+                      {
+                        this.state.activeKey === String(item.id) ?
+                            <ChangeDetail
+                                id={item.id}
+                                money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
+                                data={this.state.contractData}
+                                pictureUrl={this.state.voucherUrl}
+                                processState={this.props.processState}
+                                dataSource={this.state.dataProps}
+                                proceedsData={this.state.proceedsData}
+                                proceedsTotal={this.state.proTotal}
+                                invoiceTotal={this.state.invTotal}
+                                contactList={this.state.refundInvoice}
+                                onCancel={this.visitCancel}
+                            /> : <div/>
+                      }
                     </TabPane>
                   );
                 })}
@@ -1244,15 +1246,18 @@ const contractChange = Form.create()(
                           style={{ paddingBottom: "40px" }}
                         >
                           <Spin spinning={this.state.loading}>
-                            <OrderDetail
-                              orderData={this.state.primaryOrderData}
-                              getOrderLog={this.getOrderLog}
-                              dataSourceX={this.state.dataSourceX}
-                              contactList={this.state.contactList}
-                              orderNo={this.state.primaryOrderNo}
-                              totalCui={this.state.totalCui}
-                              contactListNew={this.state.contactListNew}
-                            />
+                            {
+                              this.state.activeKey === String(item.usedOrder) ?
+                                  <OrderDetail
+                                      orderData={this.state.primaryOrderData}
+                                      getOrderLog={this.getOrderLog}
+                                      dataSourceX={this.state.dataSourceX}
+                                      contactList={this.state.contactList}
+                                      orderNo={this.state.primaryOrderNo}
+                                      totalCui={this.state.totalCui}
+                                      contactListNew={this.state.contactListNew}
+                                  /> : <div/>
+                            }
                           </Spin>
                         </Form>
                       </TabPane>
@@ -1264,15 +1269,18 @@ const contractChange = Form.create()(
                 {this.state.status === 4 && this.state.isAddition ? (
                   this.state.type === 4 || this.state.type === 5 ? (
                     <TabPane tab="附加订单" key="c">
-                      <OrderDetail
-                        orderData={this.state.additionalOrderData}
-                        getOrderLog={this.getOrderLog}
-                        dataSourceX={this.state.dataSourceX}
-                        totalCui={this.state.totalCui}
-                        contactListNew={this.state.contactListNew}
-                        contactList={this.state.contactList}
-                        orderNo={this.state.additionalOrder}
-                      />
+                      {
+                        this.state.activeKey === "c" ?
+                            <OrderDetail
+                                orderData={this.state.additionalOrderData}
+                                getOrderLog={this.getOrderLog}
+                                dataSourceX={this.state.dataSourceX}
+                                totalCui={this.state.totalCui}
+                                contactListNew={this.state.contactListNew}
+                                contactList={this.state.contactList}
+                                orderNo={this.state.additionalOrder}
+                            /> : <div/>
+                      }
                     </TabPane>
                   ) : (
                       ""
@@ -1281,7 +1289,7 @@ const contractChange = Form.create()(
                     ""
                   )}
               </Tabs>
-            </Modal>
+            </Modal> : <div/>}
             <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}

+ 30 - 30
js/component/manageCenter/order/orderNew/examine.jsx

@@ -1423,7 +1423,7 @@ const IntentionCustomer = Form.create()(
                 size="small"
               />
             </Spin>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               width="900px"
@@ -1575,20 +1575,20 @@ const IntentionCustomer = Form.create()(
                               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,
-                                  });
-                                }}
-                              />
-                              {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                              {/*  <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-                              {/*</div>*/}
+                              {/*<Upload*/}
+                              {/*  className="demandDetailShow-upload"*/}
+                              {/*  listType="picture-card"*/}
+                              {/*  fileList={this.state.orgCodeUrl}*/}
+                              {/*  onPreview={(file) => {*/}
+                              {/*    this.setState({*/}
+                              {/*      previewImage: file.url || file.thumbUrl,*/}
+                              {/*      previewVisible: true,*/}
+                              {/*    });*/}
+                              {/*  }}*/}
+                              {/*/>*/}
+                              <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                {this.state.orgCodeUrl && this.state.visible ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                              </div>
                               <Modal
                                 maskClosable={false}
                                 footer={null}
@@ -1658,20 +1658,20 @@ const IntentionCustomer = Form.create()(
                               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,
-                                  });
-                                }}
-                              />
-                              {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                              {/*  <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>*/}
-                              {/*</div>*/}
+                              {/*<Upload*/}
+                              {/*  className="demandDetailShow-upload"*/}
+                              {/*  listType="picture-card"*/}
+                              {/*  fileList={this.state.replenishUrl}*/}
+                              {/*  onPreview={(file) => {*/}
+                              {/*    this.setState({*/}
+                              {/*      previewImage: file.url || file.thumbUrl,*/}
+                              {/*      previewVisibles: true,*/}
+                              {/*    });*/}
+                              {/*  }}*/}
+                              {/*/>*/}
+                              <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                {this.state.replenishUrl && this.state.visible ? <ImgList domId={'examine1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                              </div>
                               <Modal
                                 maskClosable={false}
                                 footer={null}
@@ -2086,7 +2086,7 @@ const IntentionCustomer = Form.create()(
                   </Spin>
                 </TabPane> */}
               </Tabs>
-            </Modal>
+            </Modal> : <div/>}
             <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}

+ 46 - 39
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -94,13 +94,14 @@ const PicturesWall = React.createClass({
             globalConfig.context +
             "/api/admin/orderInvoice/uploadOrderInvoiceFile"
           }
+          multiple={true}
           data={{ sign: "order_invoice_file" }}
           listType="picture-card"
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
         >
-          {fileList.length >= 18 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}
@@ -3707,17 +3708,20 @@ const IntentionCustomer = Form.create()(
                           </span>
                         }
                       >
-                        <Upload
-                          className="demandDetailShow-upload"
-                          listType="picture-card"
-                          fileList={this.state.orgCodeUrl}
-                          onPreview={(file) => {
-                            this.setState({
-                              previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList domId={'inquiry2'} fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -4033,7 +4037,7 @@ const IntentionCustomer = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               title="订单详情"
@@ -4179,20 +4183,20 @@ const IntentionCustomer = Form.create()(
                         wrapperCol={{ span: 18 }}
                         label={"合同扫描件"}
                       >
-                        {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-                        {/*  <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>*/}
-                        {/*</div>*/}
-                        <Upload
-                          className="demandDetailShow-upload"
-                          listType="picture-card"
-                          fileList={this.state.orgCodeUrl}
-                          onPreview={(file) => {
-                            this.setState({
-                              previewImage: file.url || file.thumbUrl,
-                              previewVisible: true,
-                            });
-                          }}
-                        ></Upload>
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.visible && this.state.orgCodeUrl ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                        </div>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.orgCodeUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisible: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -4262,17 +4266,20 @@ const IntentionCustomer = Form.create()(
                         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,
-                            });
-                          }}
-                        ></Upload>
+                        {/*<Upload*/}
+                        {/*  className="demandDetailShow-upload"*/}
+                        {/*  listType="picture-card"*/}
+                        {/*  fileList={this.state.replenishUrl}*/}
+                        {/*  onPreview={(file) => {*/}
+                        {/*    this.setState({*/}
+                        {/*      previewImage: file.url || file.thumbUrl,*/}
+                        {/*      previewVisibles: true,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          {this.state.visible && this.state.replenishUrl ? <ImgList domId={'inquiry1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -4453,7 +4460,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal>
+            </Modal> : <div/>}
             <OrderRiZi
               dataSourcerizhi={this.state.dataSourcerizhi}
               closeOrderLog={this.closeOrderLog}

+ 51 - 40
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -35,6 +35,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 const confirm = Modal.confirm;
 import OrderRiZi from "@/orderRiZi.jsx";
+import ImgList from "../../../common/imgList";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -85,8 +86,9 @@ const PicturesWall = React.createClass({
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
+          multiple={true}
         >
-          {fileList.length >= 10 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}
@@ -1553,7 +1555,7 @@ const outsourcingList = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               width="900px"
@@ -1563,7 +1565,7 @@ const outsourcingList = Form.create()(
             >
               <Tabs activeKey={this.state.activeKey} onChange={this.callback}>
                 <TabPane tab="订单详情" key="1">
-                  <Form
+                  {this.state.activeKey === "1" ? <Form
                     layout="horizontal"
                     onSubmit={this.handleSubmit}
                     id="demand-form"
@@ -1704,17 +1706,20 @@ const outsourcingList = Form.create()(
                             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,
-                                });
-                              }}
-                            ></Upload>
+                            {/*<Upload*/}
+                            {/*  className="demandDetailShow-upload"*/}
+                            {/*  listType="picture-card"*/}
+                            {/*  fileList={this.state.orgCodeUrl}*/}
+                            {/*  onPreview={(file) => {*/}
+                            {/*    this.setState({*/}
+                            {/*      previewImage: file.url || file.thumbUrl,*/}
+                            {/*      previewVisible: true,*/}
+                            {/*    });*/}
+                            {/*  }}*/}
+                            {/*/>*/}
+                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                              {this.state.visible && this.state.activeKey === "1" ? <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> : <div/>}
+                            </div>
                             <Modal
                               maskClosable={false}
                               footer={null}
@@ -1784,17 +1789,20 @@ const outsourcingList = Form.create()(
                             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,
-                                });
-                              }}
-                            ></Upload>
+                            {/*<Upload*/}
+                            {/*  className="demandDetailShow-upload"*/}
+                            {/*  listType="picture-card"*/}
+                            {/*  fileList={this.state.replenishUrl}*/}
+                            {/*  onPreview={(file) => {*/}
+                            {/*    this.setState({*/}
+                            {/*      previewImage: file.url || file.thumbUrl,*/}
+                            {/*      previewVisibles: true,*/}
+                            {/*    });*/}
+                            {/*  }}*/}
+                            {/*/>*/}
+                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                              {this.state.visible && this.state.activeKey === "1" && this.state.replenishUrl ? <ImgList domId={'outsourcingList1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> : <div/>}
+                            </div>
                             <Modal
                               maskClosable={false}
                               footer={null}
@@ -1999,7 +2007,7 @@ const outsourcingList = Form.create()(
                                 span={24}
                                 offset={9}
                                 style={{ marginTop: "15px" }}
-                              ></Col>
+                              />
                             </Form>
                           </Spin>
                         </div>
@@ -2061,7 +2069,7 @@ const outsourcingList = Form.create()(
                                 span={24}
                                 offset={9}
                                 style={{ marginTop: "15px" }}
-                              ></Col>
+                              />
                             </Form>
                           </Spin>
                         </div>
@@ -2107,7 +2115,7 @@ const outsourcingList = Form.create()(
                         )}
                       </div>
                     </Spin>
-                  </Form>
+                  </Form> : <div/>}
                 </TabPane>
                 <TabPane tab="外包(不走总部)" key="2">
                   {this.state.refundStatus === 2 ? (
@@ -2362,17 +2370,20 @@ const outsourcingList = Form.create()(
                           wrapperCol={{ span: 18 }}
                           label="合同/协议扫描件"
                         >
-                          <Upload
-                            className="demandDetailShow-upload"
-                            listType="picture-card"
-                            fileList={this.state.pictureUrl}
-                            onPreview={(file) => {
-                              this.setState({
-                                previewImage: file.url || file.thumbUrl,
-                                previewVisible: true,
-                              });
-                            }}
-                          ></Upload>
+                          {/*<Upload*/}
+                          {/*  className="demandDetailShow-upload"*/}
+                          {/*  listType="picture-card"*/}
+                          {/*  fileList={this.state.pictureUrl}*/}
+                          {/*  onPreview={(file) => {*/}
+                          {/*    this.setState({*/}
+                          {/*      previewImage: file.url || file.thumbUrl,*/}
+                          {/*      previewVisible: true,*/}
+                          {/*    });*/}
+                          {/*  }}*/}
+                          {/*/>*/}
+                          <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                            {this.state.visible && this.state.activeKey === "2" && this.state.pictureUrl ? <ImgList domId={'outsourcingList2'} fileList={this.state.pictureUrl} ItemWidth={'96px'}/> : <div/>}
+                          </div>
                           <Modal
                             maskClosable={false}
                             footer={null}
@@ -2465,7 +2476,7 @@ const outsourcingList = Form.create()(
                   )}
                 </TabPane>
               </Tabs>
-            </Modal>
+            </Modal> : <div/>}
             <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}

+ 47 - 28
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -36,6 +36,7 @@ import ResolutionDetail from "@/resolutionDetail";
 const confirm = Modal.confirm;
 import CheckProject from '../../components/checkProject'
 import OrderRiZi from "@/orderRiZi.jsx";
+import ImgList from "../../../common/imgList";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -1458,7 +1459,7 @@ const outsourcingPro = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               maskClosable={false}
               visible={this.state.visible}
               onCancel={this.cancel}
@@ -1490,7 +1491,7 @@ const outsourcingPro = Form.create()(
                   }
               >
                 <TabPane tab="外包审核" key="1">
-                  <Spin spinning={this.state.loading}>
+                  {this.state.activeKey === '1' ? <Spin spinning={this.state.loading}>
                     <CheckProject
                         {...this.props}
                         tid={this.state.tid}
@@ -1595,10 +1596,10 @@ const outsourcingPro = Form.create()(
                         </div>
                       </div>
                     )}
-                  </Spin>
+                  </Spin> : <div/>}
                 </TabPane>
                 <TabPane tab="订单详情" key="2">
-                  <Form
+                  {this.state.activeKey === '2' ? <Form
                       layout="horizontal"
                       onSubmit={this.handleSubmit}
                       id="demand-form"
@@ -1737,17 +1738,26 @@ const outsourcingPro = Form.create()(
                               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,
-                                  });
-                                }}
-                            ></Upload>
+                            {/*<Upload*/}
+                            {/*    className="demandDetailShow-upload"*/}
+                            {/*    listType="picture-card"*/}
+                            {/*    fileList={this.state.orgCodeUrl}*/}
+                            {/*    onPreview={(file) => {*/}
+                            {/*      this.setState({*/}
+                            {/*        previewImage: file.url || file.thumbUrl,*/}
+                            {/*        previewVisible: true,*/}
+                            {/*      });*/}
+                            {/*    }}*/}
+                            {/*/>*/}
+                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                              {
+                                this.state.orgCodeUrl
+                                && this.state.visible &&
+                                  this.state.activeKey === '2' ?
+                                  <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/> :
+                                <div/>
+                              }
+                            </div>
                             <Modal
                                 maskClosable={false}
                                 footer={null}
@@ -1817,17 +1827,26 @@ const outsourcingPro = Form.create()(
                               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,
-                                  });
-                                }}
-                            ></Upload>
+                            {/*<Upload*/}
+                            {/*    className="demandDetailShow-upload"*/}
+                            {/*    listType="picture-card"*/}
+                            {/*    fileList={this.state.replenishUrl}*/}
+                            {/*    onPreview={(file) => {*/}
+                            {/*      this.setState({*/}
+                            {/*        previewImage: file.url || file.thumbUrl,*/}
+                            {/*        previewVisibles: true,*/}
+                            {/*      });*/}
+                            {/*    }}*/}
+                            {/*/>*/}
+                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                              {
+                                this.state.replenishUrl
+                                && this.state.visible &&
+                                this.state.activeKey === '2' ?
+                                    <ImgList domId={'outsourcingPro1'} fileList={this.state.replenishUrl} ItemWidth={'96px'}/> :
+                                    <div/>
+                              }
+                            </div>
                             <Modal
                                 maskClosable={false}
                                 footer={null}
@@ -2029,10 +2048,10 @@ const outsourcingPro = Form.create()(
                         </div>
                       </div>
                     </Spin>
-                  </Form>
+                  </Form> : <div/>}
                 </TabPane>
               </Tabs>
-            </Modal>
+            </Modal> : <div/>}
             <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"

+ 31 - 24
js/component/manageCenter/project/project/projectQuery.jsx

@@ -19,6 +19,7 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import ImgList from "../../../common/imgList";
 
 const {TabPane} = Tabs
 const PaiDan = React.createClass({
@@ -800,7 +801,7 @@ const PaiDan = React.createClass({
           specially={1}
           roleName={"咨询师经理"}
         />
-        <Modal
+        {this.state.visible ? <Modal
           className="customeDetails"
           footer=""
           title="订单详情"
@@ -939,17 +940,20 @@ const PaiDan = React.createClass({
                     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,
-                        });
-                      }}
-                    ></Upload>
+                    {/*<Upload*/}
+                    {/*  className="demandDetailShow-upload"*/}
+                    {/*  listType="picture-card"*/}
+                    {/*  fileList={this.state.orgCodeUrl}*/}
+                    {/*  onPreview={(file) => {*/}
+                    {/*    this.setState({*/}
+                    {/*      previewImage: file.url || file.thumbUrl,*/}
+                    {/*      previewVisible: true,*/}
+                    {/*    });*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      {this.state.visible && this.state.orgCodeUrl  ? <ImgList fileList={this.state.orgCodeUrl} domId={'projectQuery1'}/> : <div/>}
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -1016,17 +1020,20 @@ const PaiDan = React.createClass({
                     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,
-                        });
-                      }}
-                    ></Upload>
+                    {/*<Upload*/}
+                    {/*  className="demandDetailShow-upload"*/}
+                    {/*  listType="picture-card"*/}
+                    {/*  fileList={this.state.replenishUrl}*/}
+                    {/*  onPreview={(file) => {*/}
+                    {/*    this.setState({*/}
+                    {/*      previewImage: file.url || file.thumbUrl,*/}
+                    {/*      previewVisibles: true,*/}
+                    {/*    });*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      {this.state.visible && this.state.replenishUrl  ? <ImgList fileList={this.state.replenishUrl} domId={'projectQuery2'}/> : <div/>}
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}
@@ -1189,7 +1196,7 @@ const PaiDan = React.createClass({
               </div>
             </Spin>
           </Form>
-        </Modal>
+        </Modal> : <div/>}
         <Modal
           maskClosable={false}
           visible={this.state.addnextVisible}

+ 4 - 4
js/component/manageCenter/project/task/myTask.jsx

@@ -3425,7 +3425,7 @@ const Task = React.createClass({
             }}
           >
             <TabPane tab="项目概况" key="1">
-              <Form
+              {this.state.activeKey === "1" ? <Form
                 layout="horizontal"
                 onSubmit={this.handleSubmit}
                 id="demand-form"
@@ -4228,7 +4228,7 @@ const Task = React.createClass({
                     </div>
                   </div>
                 </Spin>
-              </Form>
+              </Form> : <div/>}
             </TabPane>
             <TabPane tab="外包/供应商信息" key="2">
               {this.state.refundStatus != 0 && this.state.refundStatus != 1 ? (
@@ -4753,7 +4753,7 @@ const Task = React.createClass({
             {!this.props.isZxs || (this.state.isHuiyuan && this.props.isZxs) ? (
               <TabPane tab="订单详情" key="3">
                 <Spin spinning={this.state.loading}>
-                  <OrderDetail
+                  {this.state.activeKey === "3" ? <OrderDetail
                     orderData={this.state.orderData}
                     getOrderLog={this.getOrderLog}
                     dataSourceX={this.state.dataSourceX}
@@ -4762,7 +4762,7 @@ const Task = React.createClass({
                     totalCui={this.state.totalCui}
                     contactListNew={this.state.jiedianNew}
                     pictureUrl={this.state.contractPictureUrl}
-                  />
+                  /> : <div/>}
                 </Spin>
               </TabPane>
             ) : (