Преглед на файлове

图片显示与取消上传图片限制

mentoswzq преди 4 години
родител
ревизия
3842bf771c
променени са 38 файла, в които са добавени 738 реда и са изтрити 479 реда
  1. 2 1
      js/component/account/achievement/techAchievementDesc.jsx
  2. 15 11
      js/component/account/demand/techDemandDesc.jsx
  3. 2 1
      js/component/account/set/company.jsx
  4. 2 1
      js/component/account/set/person.jsx
  5. 76 13
      js/component/common/imgList/index.js
  6. 32 2
      js/component/common/imgList/index.less
  7. 14 13
      js/component/manageCenter/components/checkProject/index.jsx
  8. 27 21
      js/component/manageCenter/demand/demandAudit/demandAuditDesc.jsx
  9. 27 21
      js/component/manageCenter/demand/techDemandDesc.jsx
  10. 43 33
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  11. 25 20
      js/component/manageCenter/financialManage/distribute/examine.jsx
  12. 15 11
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  13. 15 11
      js/component/manageCenter/financialManage/distribute/kaiPiaoModal.jsx
  14. 2 1
      js/component/manageCenter/idea/activity/activity.jsx
  15. 14 11
      js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx
  16. 16 12
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  17. 45 35
      js/component/manageCenter/order/orderNew/addService.jsx
  18. 2 1
      js/component/manageCenter/order/orderNew/approveds.jsx
  19. 17 12
      js/component/manageCenter/order/orderNew/billing.jsx
  20. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js
  21. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  22. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  23. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  24. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  25. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  26. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  27. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  28. 50 27
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  29. 2 1
      js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js
  30. 15 11
      js/component/manageCenter/order/orderNew/changeComponent/refund.js
  31. 43 33
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  32. 31 23
      js/component/manageCenter/order/orderNew/examine.jsx
  33. 2 1
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  34. 2 1
      js/component/manageCenter/order/orderNew/reject.jsx
  35. 15 11
      js/component/manageCenter/project/task/myTask.jsx
  36. 25 20
      js/component/portal/search/achievementDesc.jsx
  37. 13 10
      js/component/portal/search/demandDesc.jsx
  38. 29 22
      js/component/project.jsx

+ 2 - 1
js/component/account/achievement/techAchievementDesc.jsx

@@ -118,10 +118,11 @@ const PicturesWall = React.createClass({
                     action={globalConfig.context + "/api/user/achievement/uploadPicture"}
                     data={{ 'sign': this.props.pictureSign }}
                     listType="picture-card"
+                    multiple
                     fileList={fileList}
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />

+ 15 - 11
js/component/account/demand/techDemandDesc.jsx

@@ -7,6 +7,7 @@ import $ from 'jquery/src/ajax';
 import { getTechField } from '../../DicTechFieldList.js';
 import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { beforeUploadFile, splitUrl, companySearch, getDemandType, getAchievementCategory } from '../../tools.js';
+import ImgList from "../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -119,9 +120,10 @@ const PicturesWall = React.createClass({
                     data={{ 'sign': 'demand_picture', 'uid': this.props.uid }}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -376,16 +378,18 @@ const DemandDetailShow = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="需求文件(图片)" >
                         <div className="clearfix">
-                            <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'}}>
+                                    <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                                </div>
                             <Modal maskClosable={false} footer={null}
                                 visible={this.state.previewVisible}
                                 onCancel={() => { this.setState({ previewVisible: false }) }}>

+ 2 - 1
js/component/account/set/company.jsx

@@ -96,10 +96,11 @@ class PicturesWall extends React.Component {
                     action={globalConfig.context + "/api/user/avatar/upload"}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview.bind(this)}
                     onChange={this.handleChange.bind(this)}
                 >
-                    {fileList.length >= 9 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel.bind(this)}>
                     <img alt="" style={{ width: '100%' }} src={previewImage} />

+ 2 - 1
js/component/account/set/person.jsx

@@ -98,10 +98,11 @@ class PicturesWall extends React.Component {
                     action={globalConfig.context + "/api/user/avatar/upload"}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview.bind(this)}
                     onChange={this.handleChange.bind(this)}
                 >
-                    {fileList.length >= 9 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel.bind(this)}>
                     <img alt="" style={{ width: '100%' }} src={previewImage} />

+ 76 - 13
js/component/common/imgList/index.js

@@ -1,26 +1,89 @@
 import React,{Component} from 'react';
+import {Icon,Modal} from 'antd';
 import './index.less';
+import $ from "jquery";
 
 class ImgList extends Component{
     constructor(props) {
         super(props);
-        this.state={}
+        this.state={
+            seeMore: false,
+            previewVisible: false,
+            previewImage: ''
+        }
+        this.handleCancel = this.handleCancel.bind(this);
+    }
+
+    componentDidMount() {
+        $(".fileItem").bind("mouseover",function (){
+            $(this).children().first().css({
+                "background": "rgba(0,0,0,.6)",
+                "display":"flex"
+            });
+
+        });
+        $(".fileItem").bind("mouseout",function (){
+            $(this).children().first().css("display","none");
+
+        });
+    }
+
+    handleCancel() {
+        this.setState({
+            previewVisible:false,
+            previewImage: '',
+        })
     }
 
     render() {
         return (
-            <div className='ImgList'>
-                {
-                    this.props.fileList.map((value,index)=>(
-                        <div key={index} className='fileItem' style={{
-                            width: this.props.width ? this.props.width : '100px',
-                            height: this.props.height ? this.props.height : '100px',
-                        }}>
-                            <img src={value.url} className='imgFile'/>
-                        </div>
-                    ))
-                }
-                {console.log(this.props.fileList,'图片')}
+            <div>
+                <div className='ImgList'>
+                    {
+                        this.props.fileList && this.props.fileList.slice(0,10).map((value,index)=>(
+                            <div key={index} className='fileItem' style={{
+                                width: this.props.ItemWidth ? this.props.ItemWidth : '100px',
+                                height: this.props.ItemWidth ? this.props.ItemWidth : '100px',
+                            }}>
+                                <div className='coveringLayer'>
+                                    <Icon type="eye-o" onClick={()=>{
+                                        this.setState({
+                                            previewVisible: true,
+                                            previewImage: value.url
+                                        })
+                                    }}/>
+                                </div>
+                                <img src={value.url} className='imgFile'/>
+                            </div>
+                        ))
+                    }
+                    {
+                        this.props.fileList && this.props.fileList.slice(10).map((value,index)=>(
+                            <div key={index} className='fileItem' style={{
+                                width: this.props.ItemWidth ? this.props.ItemWidth : '100px',
+                                height: this.props.ItemWidth ? this.props.ItemWidth : '100px',
+                                display: this.state.seeMore ? 'block' : 'none',
+                            }}>
+                                <div className='coveringLayer'>
+                                    <Icon type="eye-o" onClick={()=>{
+                                        this.setState({
+                                            previewVisible: true,
+                                            previewImage: value.url || value.thumbUrl
+                                        })
+                                    }}/>
+                                </div>
+                                <img src={value.url} className='imgFile'/>
+                            </div>
+                        ))
+                    }
+                    {console.log(this.props.fileList,'图片')}
+                </div>
+                {this.props.fileList.length > 10 ? <div className='seeMore' onClick={()=>{this.setState({seeMore:!this.state.seeMore})}}>
+                    {this.state.seeMore ? '收起' : '查看更多'}
+                </div> : <div/>}
+                <Modal visible={this.state.previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={this.state.previewImage} />
+                </Modal>
             </div>
         )
     }

+ 32 - 2
js/component/common/imgList/index.less

@@ -3,11 +3,41 @@
   display: flex;
   flex-flow: row wrap;
   .fileItem{
-    margin-right: 2%;
+    margin: 0 12px 12px 0;
+    padding: 8px;
+    border-radius: 4px;
+    border: 1px solid #d9d9d9;
+    position: relative;
     .imgFile{
-      padding: 10px;
       width: 100%;
       height: 100%;
+      overflow: hidden;
+      border-radius: 4px;
     }
   }
+  .flexRowWrap{
+    display: flex;
+    flex-flow: row wrap;
+  }
+  .coveringLayer{
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    border-radius: 4px;
+    flex-flow: row nowrap;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+.seeMore{
+  padding-right: 20px;
+  color: #58a3ff;
+}
+.seeMore:hover{
+  color: #0e77ca;
+  cursor: pointer;
 }

+ 14 - 13
js/component/manageCenter/components/checkProject/index.jsx

@@ -5,7 +5,6 @@ import {
   Table,
   Modal,
   Col,
-  Upload,
   Input,
   Button, message,
   Row, Popconfirm, Radio,
@@ -936,18 +935,20 @@ class CheckProject extends Component {
           </div>
           <div style={{paddingTop:'20px'}}>
             <div className="title">合同/协议扫描件</div>
-            {/*<ImgList fileList={this.props.fileList}/>*/}
-            <Upload
-                className="demandDetailShow-upload"
-                listType="picture-card"
-                fileList={this.props.fileList}
-                onPreview={(file) => {
-                  this.setState({
-                    previewImage: file.url || file.thumbUrl,
-                    previewVisible: true,
-                  })
-                }}
-            />
+            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                <ImgList fileList={this.props.fileList} ItemWidth={'96px'}/>
+            </div>
+            {/*<Upload*/}
+            {/*    className="demandDetailShow-upload"*/}
+            {/*    listType="picture-card"*/}
+            {/*    fileList={this.props.fileList}*/}
+            {/*    onPreview={(file) => {*/}
+            {/*      this.setState({*/}
+            {/*        previewImage: file.url || file.thumbUrl,*/}
+            {/*        previewVisible: true,*/}
+            {/*      })*/}
+            {/*    }}*/}
+            {/*/>*/}
             <Modal
                 maskClosable={false}
                 footer={null}

+ 27 - 21
js/component/manageCenter/demand/demandAudit/demandAuditDesc.jsx

@@ -8,6 +8,7 @@ import { IndustryObject, getIndustryCategory } from '../../../DicIndustryList.js
 import { getTechField } from '../../../DicTechFieldList.js';
 import { beforeUploadFile, getTechAuditStatus, splitUrl, companySearch, getDemandType, getAchievementCategory,beforeUpload, getBase64 } from '../../../tools.js';
 import throttle from '../../../throttle.js';
+import ImgList from "../../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -120,9 +121,10 @@ const PicturesWall = React.createClass({
                     data={{ 'sign': this.props.pictureSign, 'uid': this.props.uid}}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -388,16 +390,18 @@ const DemandDetailShow = Form.create()(React.createClass({
 	                        wrapperCol={{ span: 18 }}
 	                        label="首页展示图片:" >
 	                        <div className="clearfix">
-	                            <Upload className="demandDetailShow-upload"
-	                                listType="picture-card"
-	                                fileList={this.state.coverImg}
-	                                onPreview={(file) => {
-	                                    this.setState({
-	                                        previewImage: file.url || file.thumbUrl,
-	                                        previewVisible: true,
-	                                    });
-	                                }} >	                               
-	                            </Upload>
+	                            {/*<Upload className="demandDetailShow-upload"*/}
+	                            {/*    listType="picture-card"*/}
+	                            {/*    fileList={this.state.coverImg}*/}
+	                            {/*    onPreview={(file) => {*/}
+	                            {/*        this.setState({*/}
+	                            {/*            previewImage: file.url || file.thumbUrl,*/}
+	                            {/*            previewVisible: true,*/}
+	                            {/*        });*/}
+	                            {/*    }} />*/}
+                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                    <ImgList fileList={this.state.coverImg} ItemWidth={'96px'}/>
+                                </div>
 	                            <Modal maskClosable={false} footer={null}
 	                                visible={this.state.previewVisible}
 	                                onCancel={() => { this.setState({ previewVisible: false }) }}>
@@ -568,16 +572,18 @@ const DemandDetailShow = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="需求文件(图片)" >
                         <div className="clearfix">
-                            <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'}}>
+                                <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                            </div>
                             <Modal maskClosable={false} footer={null}
                                 visible={this.state.previewVisible}
                                 onCancel={() => { this.setState({ previewVisible: false }) }}>

+ 27 - 21
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -8,6 +8,7 @@ import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { getTechField } from '../../DicTechFieldList.js';
 import { beforeUploadFile, getTechAuditStatus, splitUrl, companySearch, getDemandType, getAchievementCategory,beforeUpload, getBase64 } from '../../tools.js';
 import throttle from '../../throttle.js';
+import ImgList from "../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -120,9 +121,10 @@ const PicturesWall = React.createClass({
                     data={{ 'sign': this.props.pictureSign, 'uid': this.props.uid}}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -387,16 +389,18 @@ const DemandDetailShow = Form.create()(React.createClass({
 	                        wrapperCol={{ span: 18 }}
 	                        label="首页展示图片:" >
 	                        <div className="clearfix">
-	                            <Upload className="demandDetailShow-upload"
-	                                listType="picture-card"
-	                                fileList={this.state.coverImg}
-	                                onPreview={(file) => {
-	                                    this.setState({
-	                                        previewImage: file.url || file.thumbUrl,
-	                                        previewVisible: true,
-	                                    });
-	                                }} >	                               
-	                            </Upload>
+	                            {/*<Upload className="demandDetailShow-upload"*/}
+	                            {/*    listType="picture-card"*/}
+	                            {/*    fileList={this.state.coverImg}*/}
+	                            {/*    onPreview={(file) => {*/}
+	                            {/*        this.setState({*/}
+	                            {/*            previewImage: file.url || file.thumbUrl,*/}
+	                            {/*            previewVisible: true,*/}
+	                            {/*        });*/}
+	                            {/*    }} />*/}
+                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                    <ImgList fileList={this.state.coverImg} ItemWidth={'96px'}/>
+                                </div>
 	                            <Modal maskClosable={false} footer={null}
 	                                visible={this.state.previewVisible}
 	                                onCancel={() => { this.setState({ previewVisible: false }) }}>
@@ -554,16 +558,18 @@ const DemandDetailShow = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="需求文件(图片)" >
                         <div className="clearfix">
-                            <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'}}>
+                                <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                            </div>
                             <Modal maskClosable={false} footer={null}
                                 visible={this.state.previewVisible}
                                 onCancel={() => { this.setState({ previewVisible: false }) }}>

+ 43 - 33
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -40,6 +40,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({
@@ -3165,17 +3166,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,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3245,17 +3249,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,*/}
+                        {/*    });*/}
+                        {/*  }}*/}
+                        {/*/>*/}
+                        <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                          <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}
@@ -3591,17 +3598,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,*/}
+                    {/*    });*/}
+                    {/*  }}*/}
+                    {/*/>*/}
+                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                      <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}

+ 25 - 20
js/component/manageCenter/financialManage/distribute/examine.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import $ from 'jquery/src/ajax';
 import { Form,Button, Input, Spin, message, Modal, Upload } from 'antd';
 import {getNewOrderStatus,getLiquidationStatus,splitUrl} from '@/tools.js';
+import ImgList from "../../../common/imgList";
 
 const Examine=React.createClass({
     loadData(record) {
@@ -142,16 +143,18 @@ const Examine=React.createClass({
                                     </FormItem>
                                     <div className="clearfix">
                                         <FormItem labelCol={{ span:5 }} wrapperCol={{ span: 17 }} 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'}}>
+                                                <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                                            </div>
                                             <Modal maskClosable={false} footer={null}
                                                 visible={this.state.previewVisible}
                                                 onCancel={() => { this.setState({ previewVisible: false }) }}>
@@ -161,16 +164,18 @@ const Examine=React.createClass({
                                     </div>
                                     <div className="clearfix">
                                         <FormItem labelCol={{ span:5 }} wrapperCol={{ span: 17 }} label="退单申请表">
-                                            <Upload className="demandDetailShow-upload"
-                                                listType="picture-card"
-                                                fileList={this.state.orgCodeUrlNo}                               
-                                                onPreview={(file) => {
-                                                    this.setState({
-                                                        previewImage: file.url || file.thumbUrl,
-                                                        previewVisible: true,
-                                                    });
-                                                }} >
-                                            </Upload>
+                                            {/*<Upload className="demandDetailShow-upload"*/}
+                                            {/*    listType="picture-card"*/}
+                                            {/*    fileList={this.state.orgCodeUrlNo}                               */}
+                                            {/*    onPreview={(file) => {*/}
+                                            {/*        this.setState({*/}
+                                            {/*            previewImage: file.url || file.thumbUrl,*/}
+                                            {/*            previewVisible: true,*/}
+                                            {/*        });*/}
+                                            {/*    }} />*/}
+                                            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                                <ImgList fileList={this.state.orgCodeUrlNo} ItemWidth={'96px'}/>
+                                            </div>
                                             <Modal maskClosable={false} footer={null}
                                                 visible={this.state.previewVisible}
                                                 onCancel={() => { this.setState({ previewVisible: false }) }}>

+ 15 - 11
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -29,6 +29,7 @@ import ShowModalDiv from "@/showModal.jsx";
 const FormItem = Form.Item;
 const {TabPane} = Tabs
 import OrderDesc from "../../financialManage/orderDetail/orderDesc";
+import ImgList from "../../../common/imgList";
 const inSpecial = React.createClass({
   departmentList() {
     this.setState({
@@ -916,17 +917,20 @@ const inSpecial = React.createClass({
                       </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'}}>
+                      <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}

+ 15 - 11
js/component/manageCenter/financialManage/distribute/kaiPiaoModal.jsx

@@ -12,6 +12,7 @@ import {
   ShowModal,
   getProcessStatus,
 } from "@/tools";
+import ImgList from "../../../common/imgList";
 const FormItem = Form.Item;
 const KaiPiaoModal = React.createClass({
   getInitialState() {
@@ -250,17 +251,20 @@ const KaiPiaoModal = React.createClass({
                     </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'}}>
+                    <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                  </div>
                   <Modal
                     maskClosable={false}
                     footer={null}

+ 2 - 1
js/component/manageCenter/idea/activity/activity.jsx

@@ -86,9 +86,10 @@ const PicturesWall = React.createClass({
                     data={{ 'sign': 'activity_content_picture' }}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />

+ 14 - 11
js/component/manageCenter/order/departmentOrder/servicesOrder/addService.jsx

@@ -3,6 +3,7 @@ import { Table, Modal, message, Spin, Input, Select, Button, Radio,Form ,Upload,
 import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {splitUrl,getOrderType,getProjectState,getOrderState,getTransactionProject,getChangeState,getPaymentState,getOrderChannel,getApprovedState,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
+import ImgList from "../../../../common/imgList";
 const NewService = Form.create()(React.createClass({
 	loadData(record) {
         this.state.data = [];
@@ -1020,17 +1021,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,
-										                                    });
-										                                }} >
-										                            </Upload>
+										                            {/*<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>
 										                            <Modal maskClosable={false} footer={null}
 										                                visible={this.state.previewVisible}
 										                                onCancel={() => { this.setState({ previewVisible: false }) }}>

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

@@ -5,6 +5,7 @@ import $ from 'jquery/src/ajax';
 import '../../userMangagement.less';
 import {orderType} from '../../../../dataDic.js';  
 import {splitUrl,getOrderType,getOrderStage,getProjectState,getOrderState,getTransactionProject,getChangeState,getPaymentState,getOrderChannel,getApprovedState,getLock,getPaymentMethod,getTransactionChannel,beforeUploadFile} from '../../../../tools.js';
+import ImgList from "../../../../common/imgList";
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -53,9 +54,10 @@ const PicturesWall = React.createClass({
                     data={{ 'sign': '' }}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 18 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -1478,17 +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,
-									                                    });
-									                                }} >
-									                            </Upload>
+									                            {/*<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>
 									                            <Modal maskClosable={false} footer={null}
 									                                visible={this.state.previewVisible}
 									                                onCancel={() => { this.setState({ previewVisible: false }) }}>

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

@@ -50,6 +50,7 @@ import {
 import { cuiJieDian } from "@/dataDic.js"
 import PicturesWall from "./changeComponent/picturesWall.js";
 import { changeType, getChangeType } from "./changeComponent/changeDetailYxgly";
+import ImgList from "../../../common/imgList";
 // const Options = Select.Option;
 const Option = AutoComplete.Option;
 const confirm = Modal.confirm;
@@ -4818,17 +4819,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,
-                                      });
-                                    }}
-                                  ></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'}}>
+                                    <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                                  </div>
                                   <Modal
                                     maskClosable={false}
                                     footer={null}
@@ -4898,17 +4902,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,
-                                      });
-                                    }}
-                                  ></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'}}>
+                                    <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>
+                                  </div>
                                   <Modal
                                     maskClosable={false}
                                     footer={null}
@@ -5906,19 +5913,22 @@ const NewService = Form.create()(
                                 label="变更凭证"
                               >
                                 <div>
-                                  <Upload
-                                    className="demandDetailShow-upload"
-                                    listType="picture-card"
-                                    fileList={
-                                      this.state.detailChange.voucherUrl
-                                    }
-                                    onPreview={(file) => {
-                                      this.setState({
-                                        previewImage: file.url || file.thumbUrl,
-                                        previewVisible: true,
-                                      });
-                                    }}
-                                  />
+                                  {/*<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'}}>
+                                    <ImgList fileList={this.state.detailChange.voucherUrl} ItemWidth={'96px'}/>
+                                  </div>
                                   <Modal
                                     maskClosable={false}
                                     footer={null}

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

@@ -92,10 +92,11 @@ const PicturesWall = React.createClass({
           data={{ sign: "" }}
           listType="picture-card"
           fileList={fileList}
+          multiple
           onPreview={this.handlePreview}
           onChange={this.handleChange}
         >
-          {fileList && fileList.length >= 1 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}

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

@@ -22,6 +22,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../orderNew/chooseList";
 import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
+import ImgList from "../../../common/imgList";
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -70,9 +71,10 @@ const PicturesWall = React.createClass({
           data={{ 'sign': 'order_invoice_file' }}
           listType="picture-card"
           fileList={fileList}
+          multiple
           onPreview={this.handlePreview}
           onChange={this.handleChange} >
-          {fileList.length >= 18 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={previewImage} />
@@ -3178,17 +3180,20 @@ const MyService = 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'}}>
+                          <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                        </div>
                         <Modal
                           maskClosable={false}
                           footer={null}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -25,6 +25,7 @@ import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
 import "./xButton.less"
+import ImgList from "../../../../common/imgList";
 
 
 const { RangePicker } = DatePicker;
@@ -1136,17 +1137,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,
-                });
-              }}
-            />
+            {/*<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}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -13,6 +13,7 @@ import "./xButton.less";
 // import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
 import Refund from "./refund.js"
+import ImgList from "../../../../common/imgList";
 const { TextArea } = Input;
 
 const formItemLayout = {
@@ -552,17 +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,
-                });
-              }}
-            />
+            {/*<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}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -25,6 +25,7 @@ import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
 import "./xButton.less"
+import ImgList from "../../../../common/imgList";
 
 
 const { RangePicker } = DatePicker;
@@ -1146,17 +1147,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,
-                });
-              }}
-            />
+            {/*<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}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -10,6 +10,7 @@ import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import "./xButton.less";
 import Refund from "./refund.js"
+import ImgList from "../../../../common/imgList";
 // import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
@@ -438,17 +439,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,
-                });
-              }}
-            />
+            {/*<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}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -12,6 +12,7 @@ import "./xButton.less";
 // import ReactToPrint from "react-to-print";
 const FormItem = Form.Item;
 import Refund from "./refund.js"
+import ImgList from "../../../../common/imgList";
 const { TextArea } = Input;
 
 
@@ -423,17 +424,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,
-                });
-              }}
-            />
+            {/*<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}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -10,6 +10,7 @@ import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import "./xButton.less";
 import Refund from "./refund.js"
+import ImgList from "../../../../common/imgList";
 // import ReactToPrint from "react-to-print";
 
 const formItemLayout = {
@@ -429,17 +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,
-                });
-              }}
-            />
+            {/*<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}

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

@@ -11,6 +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";
 const { TextArea } = Input;
 
 const formItemLayout = {
@@ -453,17 +454,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,
-                });
-              }}
-            />
+            {/*<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}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -10,6 +10,7 @@ import quxiao from "../../../../../../image/quxiao.png";
 import ProAndCuiList from "./proAndCuiList.jsx";
 import Refund from "./refund.js"
 import ReactToPrint from "react-to-print";
+import ImgList from "../../../../common/imgList";
 
 const formItemLayout = {
   labelCol: { span: 8 },
@@ -446,17 +447,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,
-                });
-              }}
-            />
+            {/*<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}

+ 50 - 27
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -12,6 +12,7 @@ import {
 } from "@/tools.js";
 import img from "./img.png"
 import ResolutionDetail from "@/resolutionDetail";
+import ImgList from "../../../../common/imgList";
 
 const FormItem = Form.Item;
 class OrderDetail extends Component {
@@ -529,9 +530,9 @@ class OrderDetail extends Component {
             wrapperCol={{ span: 18 }}
             label="合同扫描件"
           >
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
               fileList={
                 data.contractPictureUrl
                   ? splitUrl(
@@ -541,13 +542,24 @@ class OrderDetail extends Component {
                     )
                   : []
               }
-              onPreview={(file) => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisible: true,
-                });
-              }}
-            />
+            {/*  onPreview={(file) => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisible: true,*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              <ImgList fileList={
+                data.contractPictureUrl
+                    ? splitUrl(
+                    data.contractPictureUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload"
+                    )
+                    : []
+              } ItemWidth={'96px'}/>
+            </div>
             <Modal
               maskClosable={false}
               footer={null}
@@ -620,25 +632,36 @@ class OrderDetail extends Component {
             wrapperCol={{ span: 18 }}
             label="补充协议"
           >
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
-              fileList={
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
+            {/*  fileList={*/}
+            {/*    data.agreementUrl*/}
+            {/*      ? splitUrl(*/}
+            {/*          data.agreementUrl,*/}
+            {/*          ",",*/}
+            {/*          globalConfig.avatarHost + "/upload"*/}
+            {/*        )*/}
+            {/*      : []*/}
+            {/*  }*/}
+            {/*  onPreview={(file) => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisibles: true,*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              <ImgList fileList={
                 data.agreementUrl
-                  ? splitUrl(
-                      data.agreementUrl,
-                      ",",
-                      globalConfig.avatarHost + "/upload"
+                    ? splitUrl(
+                    data.agreementUrl,
+                    ",",
+                    globalConfig.avatarHost + "/upload"
                     )
-                  : []
-              }
-              onPreview={(file) => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisibles: true,
-                });
-              }}
-            />
+                    : []
+              } ItemWidth={'96px'}/>
+            </div>
             <Modal
               maskClosable={false}
               footer={null}

+ 2 - 1
js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js

@@ -54,12 +54,13 @@ class PicturesWall extends Component {
         <Upload
           action={globalConfig.context + this.props.url}
           data={{ sign: this.props.sign }}
+          multiple
           listType="picture-card"
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
         >
-          {fileList.length >= 18 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}

+ 15 - 11
js/component/manageCenter/order/orderNew/changeComponent/refund.js

@@ -5,6 +5,7 @@ import "./table.less";
 import {
   splitUrl,
 } from "@/tools.js";
+import ImgList from "../../../../common/imgList";
 class Refund extends Component {
   constructor(props) {
     super(props);
@@ -109,17 +110,20 @@ class Refund extends Component {
             退款凭证
             </h3>
           <div style={{ marginLeft: 20 }}>
-            <Upload
-              className="demandDetailShow-upload"
-              listType="picture-card"
-              fileList={orgCodeUrl}
-              onPreview={file => {
-                this.setState({
-                  previewImage: file.url || file.thumbUrl,
-                  previewVisible: true
-                });
-              }}
-            />
+            {/*<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}

+ 43 - 33
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -29,6 +29,7 @@ import {
 } from '@/tools.js'
 import './customer.less'
 import ResolutionDetail from '@/resolutionDetail'
+import ImgList from "../../../common/imgList";
 
 const checkOutsourcing = Form.create()(
   React.createClass({
@@ -1383,17 +1384,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,
-                              })
-                            }}
-                          ></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'}}>
+                            <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                          </div>
                           <Modal
                             maskClosable={false}
                             footer={null}
@@ -1463,17 +1467,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,
-                              })
-                            }}
-                          ></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'}}>
+                            <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>
+                          </div>
                           <Modal
                             maskClosable={false}
                             footer={null}
@@ -1747,17 +1754,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,
-                        })
-                      }}
-                    ></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'}}>
+                      <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                    </div>
                     <Modal
                       maskClosable={false}
                       footer={null}

+ 31 - 23
js/component/manageCenter/order/orderNew/examine.jsx

@@ -34,6 +34,7 @@ import "./customer.less";
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
+import ImgList from "../../../common/imgList";
 const confirm = Modal.confirm;
 const { Option } = Select;
 //图片组件
@@ -84,10 +85,11 @@ const PicturesWall = React.createClass({
           data={{ sign: "order_outsource" }}
           listType="picture-card"
           fileList={fileList}
+          multiple
           onPreview={this.handlePreview}
           onChange={this.handleChange}
         >
-          {fileList.length >= 18 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}
@@ -1573,17 +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,
-                                  });
-                                }}
-                              ></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'}}>
+                                <ImgList fileList={this.state.orgCodeUrl} ItemWidth={'96px'}/>
+                              </div>
                               <Modal
                                 maskClosable={false}
                                 footer={null}
@@ -1653,17 +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,
-                                  });
-                                }}
-                              ></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'}}>
+                                <ImgList fileList={this.state.replenishUrl} ItemWidth={'96px'}/>
+                              </div>
                               <Modal
                                 maskClosable={false}
                                 footer={null}

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

@@ -81,13 +81,14 @@ const PicturesWall = React.createClass({
           action={
             globalConfig.context + "/api/admin/outsourceOrg/uploadOutsourceFile"
           }
+          multiple
           data={{ sign: "order_outsource" }}
           listType="picture-card"
           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
         >
-          {fileList.length >= 10 ? null : uploadButton}
+          {uploadButton}
         </Upload>
         <Modal
           maskClosable={false}

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

@@ -66,9 +66,10 @@ const PicturesWall = React.createClass({
                     data={{ 'sign': '' }}
                     listType="picture-card"
                     fileList={fileList}
+                    multiple
                     onPreview={this.handlePreview}
                     onChange={this.handleChange} >
-                    {fileList.length >= 18 ? null : uploadButton}
+                    {uploadButton}
                 </Upload>
                 <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                     <img alt="example" style={{ width: '100%' }} src={previewImage} />

+ 15 - 11
js/component/manageCenter/project/task/myTask.jsx

@@ -50,6 +50,7 @@ import ShowModalDiv from '@/showModal.jsx'
 
 import CheckProject from '../../components/checkProject'
 import NewSupplier from './newSupplier';
+import ImgList from "../../../common/imgList";
 
 const confirm = Modal.confirm
 const FormItem = Form.Item
@@ -5463,17 +5464,20 @@ const Task = 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,*/}
+                      {/*    })*/}
+                      {/*  }}*/}
+                      {/*/>*/}
+                      <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                        <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                      </div>
                       <Modal
                         maskClosable={false}
                         footer={null}

+ 25 - 20
js/component/portal/search/achievementDesc.jsx

@@ -5,6 +5,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { getIndustryCategory } from '../../DicIndustryList.js';
 import { splitUrl, getAchievementCategory, getMaturity, getInnovation, getOrderStatus, beforeUploadFile } from '../../tools.js';
+import ImgList from "../../common/imgList";
 
 
 const AchievementDetail = React.createClass({
@@ -295,16 +296,18 @@ const AchievementDetail = React.createClass({
                             <Col span={4}>技术图片</Col>
                             <Col span={20}>
                                 <div className="clearfix">
-                                    <Upload
-                                        listType="picture-card"
-                                        fileList={this.state.technicalPictureUrl}
-                                        onPreview={(file) => {
-                                            this.setState({
-                                                previewImage: file.url || file.thumbUrl,
-                                                previewVisible: true,
-                                            });
-                                        }} >
-                                    </Upload>
+                                    {/*<Upload*/}
+                                    {/*    listType="picture-card"*/}
+                                    {/*    fileList={this.state.technicalPictureUrl}*/}
+                                    {/*    onPreview={(file) => {*/}
+                                    {/*        this.setState({*/}
+                                    {/*            previewImage: file.url || file.thumbUrl,*/}
+                                    {/*            previewVisible: true,*/}
+                                    {/*        });*/}
+                                    {/*    }} />*/}
+                                    <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                        <ImgList fileList={this.state.technicalPictureUrl} ItemWidth={'96px'}/>
+                                    </div>
                                     <Modal maskClosable={false} footer={null}
                                         visible={this.state.previewVisible}
                                         onCancel={() => { this.setState({ previewVisible: false }) }}>
@@ -322,16 +325,18 @@ const AchievementDetail = React.createClass({
                         <Row>
                             <Col span={4}>成熟度证明材料(图片)</Col>
                             <Col span={20}>
-                                <Upload className="demandDetailShow-upload"
-                                    listType="picture-card"
-                                    fileList={this.state.maturityPictureUrl}
-                                    onPreview={(file) => {
-                                        this.setState({
-                                            previewImage: file.url || file.thumbUrl,
-                                            previewVisible: true,
-                                        });
-                                    }} >
-                                </Upload>
+                                {/*<Upload className="demandDetailShow-upload"*/}
+                                {/*    listType="picture-card"*/}
+                                {/*    fileList={this.state.maturityPictureUrl}*/}
+                                {/*    onPreview={(file) => {*/}
+                                {/*        this.setState({*/}
+                                {/*            previewImage: file.url || file.thumbUrl,*/}
+                                {/*            previewVisible: true,*/}
+                                {/*        });*/}
+                                {/*    }} />*/}
+                                <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                                    <ImgList fileList={this.state.maturityPictureUrl} ItemWidth={'96px'}/>
+                                </div>
                             </Col>
                         </Row>
                         <Row>

+ 13 - 10
js/component/portal/search/demandDesc.jsx

@@ -5,6 +5,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { getIndustryCategory } from '../../DicIndustryList.js';
 import { splitUrl, getDemandType, beforeUploadFile, getOrderStatus } from '../../tools.js';
+import ImgList from "../../common/imgList";
 
 
 const DemandDetail = React.createClass({
@@ -291,16 +292,18 @@ const DemandDetail = React.createClass({
                             <Col span={4}>需求相关文件(图片)</Col>
                             <Col span={20}>
                                 <div className="clearfix">
-                                    <Upload
-                                        listType="picture-card"
-                                        fileList={this.state.pictureUrl}
-                                        onPreview={(file) => {
-                                            this.setState({
-                                                previewImage: file.url || file.thumbUrl,
-                                                previewVisible: true,
-                                            });
-                                        }} >
-                                    </Upload>
+                                    {/*<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>
                                     <Modal maskClosable={false} footer={null}
                                         visible={this.state.previewVisible}
                                         onCancel={() => { this.setState({ previewVisible: false }) }}>

+ 29 - 22
js/component/project.jsx

@@ -25,6 +25,7 @@ import {
 } from '@/tools'
 const FormItem = Form.Item
 import ResolutionDetail from '@/resolutionDetail'
+import ImgList from "./common/imgList";
 const { TabPane } = Tabs
 const project = React.createClass({
   getInitialState() {
@@ -1052,17 +1053,20 @@ const project = React.createClass({
                       wrapperCol={{ span: 18 }}
                       label="附件"
                     >
-                      <Upload
-                        className="demandDetailShow-upload"
-                        listType="picture-card"
-                        fileList={this.state.attachmentUrl}
-                        onPreview={(file) => {
-                          this.setState({
-                            previewImage: file.url || file.thumbUrl,
-                            previewVisible: true,
-                          })
-                        }}
-                      ></Upload>
+                      {/*<Upload*/}
+                      {/*  className="demandDetailShow-upload"*/}
+                      {/*  listType="picture-card"*/}
+                      {/*  fileList={this.state.attachmentUrl}*/}
+                      {/*  onPreview={(file) => {*/}
+                      {/*    this.setState({*/}
+                      {/*      previewImage: file.url || file.thumbUrl,*/}
+                      {/*      previewVisible: true,*/}
+                      {/*    })*/}
+                      {/*  }}*/}
+                      {/*/>*/}
+                      <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                        <ImgList fileList={this.state.attachmentUrl} ItemWidth={'96px'}/>
+                      </div>
                       <Modal
                         maskClosable={false}
                         footer={null}
@@ -1177,17 +1181,20 @@ const project = 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,*/}
+                      {/*    })*/}
+                      {/*  }}*/}
+                      {/*/>*/}
+                      <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+                        <ImgList fileList={this.state.pictureUrl} ItemWidth={'96px'}/>
+                      </div>
                       <Modal
                         maskClosable={false}
                         footer={null}