Browse Source

统一图片上传组件

mentoswzq 4 years ago
parent
commit
82c0adb090
24 changed files with 458 additions and 312 deletions
  1. 15 13
      js/component/account/achievement/techAchievementDesc.jsx
  2. 13 12
      js/component/account/demand/techDemandDesc.jsx
  3. 18 13
      js/component/account/set/company.jsx
  4. 18 13
      js/component/account/set/person.jsx
  5. 32 15
      js/component/common/imgList/index.js
  6. 8 0
      js/component/common/imgList/index.less
  7. 16 12
      js/component/manageCenter/achievement/crmAchievement.jsx
  8. 16 11
      js/component/manageCenter/achievement/techAchievementDesc.jsx
  9. 16 11
      js/component/manageCenter/achievement/techAchievementQueryDesc.jsx
  10. 1 1
      js/component/manageCenter/components/oldInforProject/index.js
  11. 16 12
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  12. 16 12
      js/component/manageCenter/customer/NEW/crm/crmAll.jsx
  13. 17 13
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  14. 17 12
      js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx
  15. 14 12
      js/component/manageCenter/demand/techDemandDesc.jsx
  16. 5 2
      js/component/manageCenter/order/orderNew/addService.jsx
  17. 15 16
      js/component/manageCenter/order/orderNew/billing.jsx
  18. 0 50
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  19. 14 20
      js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js
  20. 14 14
      js/component/manageCenter/order/orderNew/changeComponent/refund.js
  21. 53 3
      js/component/manageCenter/order/orderNew/costAuditList/filterColumn.js
  22. 53 3
      js/component/manageCenter/order/orderNew/glCostAuditList/filterColumn.js
  23. 18 39
      js/component/manageCenter/order/orderNew/reject.jsx
  24. 53 3
      js/component/manageCenter/project/task/payApplyReject/filterColumn.js

+ 15 - 13
js/component/account/achievement/techAchievementDesc.jsx

@@ -6,6 +6,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { beforeUploadFile, splitUrl, getAchievementCategory, getDemandType } from '../../tools.js';
+import ImgList from "../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -113,20 +114,19 @@ const PicturesWall = React.createClass({
         );
         return (
             <div className="clearfix">
-                <Upload
-                    beforeUpload={beforeUploadFile}
-                    action={globalConfig.context + "/api/user/achievement/uploadPicture"}
-                    data={{ 'sign': this.props.pictureSign }}
-                    listType="picture-card"
-                    multiple
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/user/achievement/uploadPicture",
+                        data:{ 'sign': this.props.pictureSign },
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -926,6 +926,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="技术图片" >
                         <PicturesWall
+                            domId={'techAchievementDesc1'}
                             pictureSign="achievement_technical_picture"
                             fileList={this.getTechnicalPictureUrl}
                             pictureUrl={this.state.technicalPictureUrl} />
@@ -981,6 +982,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="成熟度证明材料(图片)" >
                         <PicturesWall
+                            domId={'techAchievementDesc2'}
                             pictureSign="achievement_maturity_picture"
                             fileList={this.getMaturityPictureUrl}
                             pictureUrl={this.state.maturityPictureUrl} />

+ 13 - 12
js/component/account/demand/techDemandDesc.jsx

@@ -115,19 +115,19 @@ const PicturesWall = React.createClass({
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/user/demand/uploadPicture"}
-                    data={{ 'sign': 'demand_picture', 'uid': this.props.uid }}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/user/demand/uploadPicture",
+                        data:{ 'sign': 'demand_picture', 'uid': this.props.uid },
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    multiple
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -776,6 +776,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="需求文件(图片)" >
                         <PicturesWall
+                            domId={'techDemandDesc1'}
                             uid={theData.employerId}
                             fileList={this.getPictureUrl}
                             pictureUrl={this.state.pictureUrl}

+ 18 - 13
js/component/account/set/company.jsx

@@ -7,6 +7,7 @@ import $ from 'jquery/src/ajax';
 import { areaSelect } from '../../NewDicProvinceList';
 import { splitUrl, getBase64, beforeUpload } from '../../tools.js';
 import { eduLevelList, zizhiArr, schoolArr ,mechanism} from '../../dataDic.js';
+import ImgList from "../../common/imgList";
 
 class Avatar extends React.Component {
     constructor(props) {
@@ -92,19 +93,19 @@ class PicturesWall extends React.Component {
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/user/avatar/upload"}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/user/avatar/upload",
+                        data:{ 'sign': this.props.pictureSign, 'uid': this.props.uid},
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    multiple
-                    onPreview={this.handlePreview.bind(this)}
-                    onChange={this.handleChange.bind(this)}
-                >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel.bind(this)}>
-                    <img alt="" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -569,7 +570,11 @@ const PersonFrom = Form.create()(React.createClass({
                     label="宣传图片"
                 >
                     {getFieldDecorator('companyLifePic')(
-                        <PicturesWall fileList={this.companyLifePicUrl} lifePhotoList={this.state.companyLifePicList} />
+                        <PicturesWall
+                            domId={'company1'}
+                            fileList={this.companyLifePicUrl}
+                            lifePhotoList={this.state.companyLifePicList}
+                        />
                     )}
                 </FormItem>
                 <FormItem wrapperCol={{ span: 12, offset: 3 }}>

+ 18 - 13
js/component/account/set/person.jsx

@@ -5,6 +5,7 @@ import { splitUrl, getBase64, beforeUpload } from '../../tools.js';
 import { areaSelect } from '../../NewDicProvinceList';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
+import ImgList from "../../common/imgList";
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -94,19 +95,19 @@ class PicturesWall extends React.Component {
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/user/avatar/upload"}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/user/avatar/upload",
+                        data:{ 'sign': this.props.pictureSign, 'uid': this.props.uid},
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    multiple
-                    onPreview={this.handlePreview.bind(this)}
-                    onChange={this.handleChange.bind(this)}
-                >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel.bind(this)}>
-                    <img alt="" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -271,7 +272,11 @@ const PersonFrom = Form.create()(React.createClass({
                     label="生活照"
                 >
                     {getFieldDecorator('livePic')(
-                        <PicturesWall fileList={this.livePicFileList} lifePhotoList={this.state.lifePhotoList} />
+                        <PicturesWall
+                            domId={'person1'}
+                            fileList={this.livePicFileList}
+                            lifePhotoList={this.state.lifePhotoList}
+                        />
                     )}
                 </FormItem>
                 <FormItem

+ 32 - 15
js/component/common/imgList/index.js

@@ -41,21 +41,25 @@ class ImgList extends Component{
     }
 
     imgLoading(){
-        let num = this.state.imgLoadNum + 1;
-        if(num >= this.props.fileList.length){
-            this.state.gallery && this.state.gallery.destroy();
-            this.setState({
-                gallery: new Viewer(document.getElementById(this.props.domId))
-            },()=>{
-                this.setTimeOutObj && clearTimeout(this.setTimeOutObj);
+        if(Object.keys(this.props.uploadConfig).length !== 0){
+            this.setTimeOutObj && clearTimeout(this.setTimeOutObj);
+        }else{
+            let num = this.state.imgLoadNum + 1;
+            if(num >= this.props.fileList.length){
+                this.state.gallery && this.state.gallery.destroy();
                 this.setState({
-                    loading: false
+                    gallery: new Viewer(document.getElementById(this.props.domId))
+                },()=>{
+                    this.setTimeOutObj && clearTimeout(this.setTimeOutObj);
+                    this.setState({
+                        loading: false
+                    })
                 })
+            }
+            this.setState({
+                imgLoadNum: num
             })
         }
-        this.setState({
-            imgLoadNum: num
-        })
     }
 
     componentWillUnmount() {
@@ -70,10 +74,10 @@ class ImgList extends Component{
         return (
             <div className='ImgListComponent'>
                 <div className='ImgList'>
-                    <Spin spinning={fileList.length === 0 ? false : this.state.loading} tip="图片加载中...">
+                    <Spin spinning={Object.keys(this.props.uploadConfig).length !== 0 ? false : (fileList.length === 0 ? false : this.state.loading)} tip="图片加载中...">
                         <Upload
                             {...this.props.uploadConfig}
-                            className="demandDetailShow-upload"
+                            className={Object.keys(this.props.uploadConfig).length !== 0 ? "" : "demandDetailShow-upload" }
                             listType="picture-card"
                             fileList={
                                 Object.keys(this.props.uploadConfig).length !== 0 ?
@@ -98,7 +102,20 @@ class ImgList extends Component{
                                     )
                             }
                             onPreview={(file) => {
-                                this.state.gallery.view(file.index).show();
+                                if(Object.keys(this.props.uploadConfig).length !== 0){
+                                    //TODO 上传组件,查看图片临时解决方法,无法查看下一张
+                                    let image = new Image();
+                                    image.src = file.url || file.thumbUrl;
+                                    let viewer = new Viewer(image, {
+                                        hidden: function () {
+                                            viewer.destroy();
+                                        },
+                                    });
+
+                                    viewer.show();
+                                }else{
+                                    this.state.gallery.view(file.index).show();
+                                }
                             }}
                             onChange={(infor)=>{
                                 this.state.gallery && this.state.gallery.destroy();
@@ -132,7 +149,7 @@ ImgList.propTypes = {
     domId : PropTypes.string,                            //如果一个界面有多个该组件,需要传入自定义id名称,用于图片列表显示
     fileList: PropTypes.array.isRequired,                //图片文件列表
     uploadConfig: PropTypes.object,                      //上传图片配置参数(需要上传图片时需要,存在与否,用于区分是否为上传或者为查看)
-    onChange: PropTypes.func,                        //选择图片
+    onChange: PropTypes.func,                            //选择图片
 }
 
 ImgList.defaultProps = {

+ 8 - 0
js/component/common/imgList/index.less

@@ -74,4 +74,12 @@
   .ant-modal-content{
     box-shadow: 0 2px 8px rgba(0, 0, 0, 0);
   }
+}
+.demandDetailShow-upload {
+  .anticon-eye-o {
+    margin-left: -8px;
+  }
+  .anticon-delete {
+    display: none
+  }
 }

+ 16 - 12
js/component/manageCenter/achievement/crmAchievement.jsx

@@ -7,6 +7,7 @@ import { maturityList, innovationList, transferModeList,achievementCategoryList
 import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { beforeUploadFile, splitUrl, companySearch, getTransferMode, getAchievementCategory, getTechAuditStatus, getDemandType, getMaturity, getInnovation,beforeUpload, getBase64,getboutique } from '../../tools.js';
 import throttle from '../../throttle.js';
+import ImgList from "../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -114,19 +115,19 @@ const PicturesWall = React.createClass({
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/admin/achievement/uploadPicture"}
-                    data={{ 'sign': this.props.pictureSign }}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/admin/achievement/uploadPicture",
+                        data:{ 'sign': this.props.pictureSign },
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    multiple={true}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -1127,6 +1128,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                          	style={{display:'block'}}
                             >
 	                        <PicturesWall
+                                domId={'crmAchievement1'}
 	                            pictureSign="achievement_cover_picture"
 	                            fileList={this.getcoverImg}	                            
 	                            pictureUrl={this.state.coverImg} />
@@ -1224,6 +1226,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="技术图片" >
                         <PicturesWall
+                            domId={'crmAchievement2'}
                             pictureSign="achievement_technical_picture"
                             fileList={this.getTechnicalPictureUrl}
                             pictureUrl={this.state.technicalPictureUrl} />
@@ -1277,6 +1280,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="成熟度证明材料(图片)" >
                         <PicturesWall
+                            domId={'crmAchievement3'}
                             pictureSign="achievement_maturity_picture"
                             fileList={this.getMaturityPictureUrl}
                             pictureUrl={this.state.maturityPictureUrl} />

+ 16 - 11
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -7,6 +7,7 @@ import { maturityList, innovationList, transferModeList } from '../../dataDic';
 import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { beforeUploadFile, splitUrl, companySearch, getTransferMode, getAchievementCategory, getTechAuditStatus, getDemandType, getMaturity, getInnovation,beforeUpload, getBase64,getboutique } from '../../tools.js';
 import throttle from '../../throttle.js';
+import ImgList from "../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -114,18 +115,19 @@ const PicturesWall = React.createClass({
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/admin/achievement/uploadPicture"}
-                    data={{ 'sign': this.props.pictureSign }}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/admin/achievement/uploadPicture",
+                        data:{ 'sign': this.props.pictureSign },
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -1149,6 +1151,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                          	style={{display:'block'}}
                             >
 	                        <PicturesWall
+                                domId={'techAchievementDesc1'}
 	                            pictureSign="achievement_cover_picture"
 	                            fileList={this.getcoverImg}	                            
 	                            pictureUrl={this.state.coverImg} />
@@ -1246,6 +1249,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="技术图片" >
                         <PicturesWall
+                            domId={'techAchievementDesc2'}
                             pictureSign="achievement_technical_picture"
                             fileList={this.getTechnicalPictureUrl}
                             pictureUrl={this.state.technicalPictureUrl} />
@@ -1299,6 +1303,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="成熟度证明材料(图片)" >
                         <PicturesWall
+                            domId={'techAchievementDesc3'}
                             pictureSign="achievement_maturity_picture"
                             fileList={this.getMaturityPictureUrl}
                             pictureUrl={this.state.maturityPictureUrl} />

+ 16 - 11
js/component/manageCenter/achievement/techAchievementQueryDesc.jsx

@@ -7,6 +7,7 @@ import { maturityList, innovationList, transferModeList } from '../../dataDic';
 import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { beforeUploadFile, splitUrl, companySearch, getTransferMode, getAchievementCategory, getTechAuditStatus, getDemandType, getMaturity, getInnovation,beforeUpload, getBase64,getboutique } from '../../tools.js';
 import throttle from '../../throttle.js';
+import ImgList from "../../common/imgList";
 
 const KeyWordTagGroup = React.createClass({
     getInitialState() {
@@ -114,18 +115,19 @@ const PicturesWall = React.createClass({
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/admin/achievement/uploadPicture"}
-                    data={{ 'sign': this.props.pictureSign }}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/admin/achievement/uploadPicture",
+                        data:{ 'sign': this.props.pictureSign },
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 5 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -1133,6 +1135,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                          	style={{display:'block'}}
                             >
 	                        <PicturesWall
+                                domId={'techAchievementQueryDesc1'}
 	                            pictureSign="achievement_cover_picture"
 	                            fileList={this.getcoverImg}	                            
 	                            pictureUrl={this.state.coverImg} />
@@ -1230,6 +1233,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="技术图片" >
                         <PicturesWall
+                            domId={'techAchievementQueryDesc2'}
                             pictureSign="achievement_technical_picture"
                             fileList={this.getTechnicalPictureUrl}
                             pictureUrl={this.state.technicalPictureUrl} />
@@ -1283,6 +1287,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="成熟度证明材料(图片)" >
                         <PicturesWall
+                            domId={'techAchievementQueryDesc3'}
                             pictureSign="achievement_maturity_picture"
                             fileList={this.getMaturityPictureUrl}
                             pictureUrl={this.state.maturityPictureUrl} />

+ 1 - 1
js/component/manageCenter/components/oldInforProject/index.js

@@ -72,7 +72,7 @@ class OldInforProject extends Component{
                         label="合同/协议扫描件"
                     >
                         <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-                            <ImgList fileList={oldInfor.pictureUrl} ItemWidth={'96px'}/>
+                            <ImgList fileList={oldInfor.pictureUrl}/>
                         </div>
                     </Form.Item>
                 </div>

+ 16 - 12
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -27,6 +27,7 @@ import {
 import './customer.less';
 const TabPane = Tabs.TabPane;
 import ShowModalDiv from "@/showModal.jsx";
+import ImgList from "../../../../common/imgList";
 const Dragger = Upload.Dragger;
 //图片组件
 const PicturesWall = React.createClass({
@@ -73,18 +74,19 @@ const PicturesWall = React.createClass({
 		);
 		return(
 			<div style={{display:"inline-block"}}>
-                <Upload
-                    action={globalConfig.context + "/api/admin/customer/uploadCustomerImg"}
-                    data={{ 'sign': '' }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 1 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+				<ImgList
+					domId={this.props.domId}
+					uploadConfig={{
+						action:globalConfig.context + "/api/admin/customer/uploadCustomerImg",
+						data:{ 'sign': '' },
+						multiple:true,
+						listType:"picture-card",
+					}}
+					onChange={(infor)=>{
+						this.handleChange(infor)
+					}}
+					fileList={fileList}
+				/>
             </div>
 		);
 	}
@@ -1813,6 +1815,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                           label="机构证书(PIC)"
                         >
                           <PicturesWall
+							domId={'crm1'}
                             fileList={this.getOrgCodeUrl}
                             pictureUrl={this.state.orgCodeUrl}
                           />
@@ -1830,6 +1833,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                           label="单位LOGO"
                         >
                           <PicturesWall
+							domId={'crm2'}
                             fileList={this.getCompanyLogoUrl}
                             pictureUrl={this.state.companyLogoUrl}
                           />

+ 16 - 12
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -8,6 +8,7 @@ import { citySelect, provinceList ,areaSelect} from '@/NewDicProvinceList';
 import { socialAttribute, industry, auditStatusL, lvl, currentMember ,slcRedit,dataGrade} from '@/dataDic.js';
 import { getSocialAttribute, beforeUploadFile,splitUrl ,getSlcRedit,getDataGrade,getAchievementCategory,getTechAuditStatus,getboutique,getXiangmoState} from '@/tools.js';
 import './customer.less';
+import ImgList from "../../../../common/imgList";
 const TabPane = Tabs.TabPane;
 //图片组件
 const PicturesWall = React.createClass({
@@ -53,18 +54,19 @@ const PicturesWall = React.createClass({
 		);
 		return(
 			<div style={{display:"inline-block"}}>
-                <Upload
-                    action={globalConfig.context + "/api/admin/customer/uploadCustomerImg"}
-                    data={{ 'sign': '' }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 1 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+				<ImgList
+					domId={this.props.domId}
+					uploadConfig={{
+						action:globalConfig.context + "/api/admin/customer/uploadCustomerImg",
+						data:{ 'sign': '' },
+						multiple:true,
+						listType:"picture-card",
+					}}
+					onChange={(infor)=>{
+						this.handleChange(infor)
+					}}
+					fileList={fileList}
+				/>
             </div>
 		);
 	}
@@ -1157,6 +1159,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 10 }}
 							                        label="机构证书(PIC)" >
 							                        <PicturesWall
+														domId={'crmAll1'}
 							                            fileList={this.getOrgCodeUrl}
 							                            pictureUrl={this.state.orgCodeUrl} />
 							                            <p>建议:图片要清晰。</p>
@@ -1166,6 +1169,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 10 }}
 							                        label="单位LOGO" > 
 							                        <PicturesWall
+														domId={'crmAll2'}
 							                            fileList={this.getCompanyLogoUrl}
 							                            pictureUrl={this.state.companyLogoUrl} />
 							                            <p>建议:图片要清晰。</p>

+ 17 - 13
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -22,6 +22,7 @@ import {
 } from "@/tools.js";
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
+import ImgList from "../../../../common/imgList";
 const Option = AutoComplete.Option;
 //图片组件
 const PicturesWall = React.createClass({
@@ -64,19 +65,20 @@ const PicturesWall = React.createClass({
         );
         return (
             <div style={{display:"inline-block"}}>
-                <Upload
-                	beforeUpload={beforeUploadFile}
-                    action={globalConfig.context + "/api/admin/patentNew/uploadFile"}
-                    data={{ 'sign': '' }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 18 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+				<ImgList
+					domId={this.props.domId}
+					uploadConfig={{
+						action:globalConfig.context + "/api/admin/patentNew/uploadFile",
+						data:{ 'sign': '' },
+						multiple:true,
+						listType:"picture-card",
+						beforeUpload:(infor)=>{beforeUploadFile(infor)}
+					}}
+					onChange={(infor)=>{
+						this.handleChange(infor)
+					}}
+					fileList={fileList}
+				/>
             </div>
         );
     }
@@ -743,6 +745,7 @@ const PatentPayment = Form.create()(React.createClass({
                   label="合同扫描件"
                 >
                   <PicturesWall
+					domId={'patentPayment1'}
                     fileList={this.getOrgCodeUrl}
                     pictureUrl={this.state.orgCodeUrl}
                   />
@@ -959,6 +962,7 @@ const PatentPayment = Form.create()(React.createClass({
                   label="合同扫描件"
                 >
                   <PicturesWall
+					domId={'patentPayment2'}
                     fileList={this.getOrgCodeUrl}
                     pictureUrl={this.state.orgCodeUrl}
                   />

+ 17 - 12
js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx

@@ -12,6 +12,7 @@ const monthFormat = 'YYYY/MM';
 import CustomerDetail from './myClientDesc.jsx';
 import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
 import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+import ImgList from "../../../common/imgList";
 
 //图片组件
 const PicturesWall = React.createClass({
@@ -49,18 +50,19 @@ const PicturesWall = React.createClass({
 		);
 		return(
 			<div style={{display:"inline-block"}}>
-                <Upload
-                    action={globalConfig.context + "/api/admin/customer/uploadCustomerImg"}
-                    data={{ 'sign': '' }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {fileList.length >= 1 ? null : uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+				<ImgList
+					domId={this.props.domId}
+					uploadConfig={{
+						action:globalConfig.context + "/api/admin/customer/uploadCustomerImg",
+						data:{ 'sign': '' },
+						multiple:true,
+						listType:"picture-card",
+					}}
+					onChange={(infor)=>{
+						this.handleChange(infor)
+					}}
+					fileList={fileList}
+				/>
             </div>
 		);
 	}
@@ -2327,6 +2329,7 @@ const QueryCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 10 }}
 							                        label="身份证正面" >
 							                        <PicturesWall
+														domId={'publicManagesOne1'}
 							                            pictureSign="ID"
 							                            fileList={this.getPositiveIdUrl}
 							                            pictureUrl={this.state.positiveIdUrl} />
@@ -2337,6 +2340,7 @@ const QueryCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 10 }}
 							                        label="身份证反面" > 
 							                        <PicturesWall
+														domId={'publicManagesOne2'}
 							                            pictureSign="ID"
 							                            fileList={this.getOppositeIdUrl}
 							                            pictureUrl={this.state.oppositeIdUrl} />
@@ -2347,6 +2351,7 @@ const QueryCustomer = Form.create()(React.createClass({
 							                        wrapperCol={{ span: 10 }}
 							                        label="客户照片" > 
 							                        <PicturesWall
+														domId={'publicManagesOne3'}
 							                            pictureSign="portrait"
 							                            fileList={this.getHeadPortraitUrl}
 							                            pictureUrl={this.state.headPortraitUrl} />

+ 14 - 12
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -116,19 +116,19 @@ const PicturesWall = React.createClass({
         );
         return (
             <div className="clearfix">
-                <Upload
-                    action={globalConfig.context + "/api/admin/demand/uploadPicture"}                                      
-                    data={{ 'sign': this.props.pictureSign, 'uid': this.props.uid}}
-                    listType="picture-card"
+                <ImgList
+                    domId={this.props.domId}
+                    uploadConfig={{
+                        action:globalConfig.context + "/api/admin/demand/uploadPicture",
+                        data:{ 'sign': this.props.pictureSign, 'uid': this.props.uid},
+                        multiple:true,
+                        listType:"picture-card",
+                    }}
+                    onChange={(infor)=>{
+                        this.handleChange(infor)
+                    }}
                     fileList={fileList}
-                    multiple
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+                />
             </div>
         );
     }
@@ -1031,6 +1031,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 	                        wrapperCol={{ span: 18 }}
 	                        label="首页展示图片:" >
 	                        <PicturesWall
+                                domId={'techDemandDesc1'}
 	                            pictureSign='demand_cover_picture'
 	                            uid={theData.employerId}
 	                            fileList={this.getcoverImg}
@@ -1243,6 +1244,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         wrapperCol={{ span: 18 }}
                         label="需求文件(图片)" >
                         <PicturesWall
+                            domId={'techDemandDesc2'}
                             pictureSign="demand_picture"
                             uid={theData.employerId}
                             fileList={this.getPictureUrl}

+ 5 - 2
js/component/manageCenter/order/orderNew/addService.jsx

@@ -4778,6 +4778,7 @@ const NewService = Form.create()(
                                   }
                                 >
                                   <PicturesWall
+                                    domId={'addService1'}
                                     fileList={this.getOrgCodeUrl}
                                     pictureUrl={this.state.orgCodeUrl}
                                     url="/api/admin/order/uploadOrderImg"
@@ -4801,6 +4802,7 @@ const NewService = Form.create()(
                                   label={<span>补充协议</span>}
                                 >
                                   <PicturesWall
+                                    domId={'addService2'}
                                     fileList={this.getReplenishUrl}
                                     pictureUrl={this.state.replenishUrl}
                                     url="/api/admin/order/uploadOrderImg"
@@ -5655,6 +5657,7 @@ const NewService = Form.create()(
                               >
                                 {/* {!this.state.mark ? ( */}
                                 <PicturesWall
+                                  domId={'addService3'}
                                   fileList={this.getVoucherUrl}
                                   pictureUrl={this.state.voucherUrl}
                                   url="/api/admin/orderChange/uploadFile"
@@ -6612,7 +6615,7 @@ const NewService = Form.create()(
                     label="终止合同"
                   >
                     <Picture
-                      domId={'addService1'}
+                      domId={'addService4'}
                       fileList={(e) => {
                         this.setState({ contractUrl: e });
                       }}
@@ -6633,7 +6636,7 @@ const NewService = Form.create()(
                     label="退单申请表"
                   >
                     <Picture
-                      domId={'addService2'}
+                      domId={'addService5'}
                       fileList={(e) => {
                         this.setState({ applicationUrl: e });
                       }}

+ 15 - 16
js/component/manageCenter/order/orderNew/billing.jsx

@@ -65,20 +65,19 @@ const PicturesWall = React.createClass({
     );
     return (
       <div style={{ display: "inline-block" }}>
-        <Upload
-          beforeUpload={beforeUploadFile}
-          action={globalConfig.context + "/api/admin/orderInvoice/uploadOrderInvoiceFile"}
-          data={{ 'sign': 'order_invoice_file' }}
-          listType="picture-card"
-          fileList={fileList}
-          multiple
-          onPreview={this.handlePreview}
-          onChange={this.handleChange} >
-          {uploadButton}
-        </Upload>
-        <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-          <img alt="example" style={{ width: '100%' }} src={previewImage} />
-        </Modal>
+        <ImgList
+            domId={this.props.domId}
+            uploadConfig={{
+              action:globalConfig.context + "/api/admin/orderInvoice/uploadOrderInvoiceFile",
+              data:{ 'sign': 'order_invoice_file' },
+              multiple:true,
+              listType:"picture-card",
+            }}
+            onChange={(infor)=>{
+              this.handleChange(infor)
+            }}
+            fileList={fileList}
+        />
       </div>
     );
   }
@@ -917,7 +916,6 @@ const MyService = Form.create()(
         type: undefined,
         orgCodeUrl: "",
         invoiceType: undefined,
-        unitName: "",
         taxNumber: "",
         unitName: "",
         amount: "",
@@ -1642,7 +1640,6 @@ const MyService = Form.create()(
                 startDate: thisdata.startDate,
                 taskStatus: thisdata.taskStatus,
                 cname: thisdata.cname,
-                id: thisdata.id,
                 taskName: thisdata.taskName,
                 hours: thisdata.hours,
                 taskDistributionTime: thisdata.taskDistributionTime,
@@ -2255,6 +2252,7 @@ const MyService = Form.create()(
                         }
                       >
                         <PicturesWall
+                          domId={'billing1'}
                           fileList={this.getOrgCodeUrl}
                           pictureUrl={this.state.orgCodeUrl}
                         />
@@ -2816,6 +2814,7 @@ const MyService = Form.create()(
                         }
                       >
                         <PicturesWall
+                          domId={'billing2'}
                           fileList={this.getOrgCodeUrl}
                           pictureUrl={this.state.orgCodeUrl}
                         />

+ 0 - 50
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -461,56 +461,6 @@ class ChangeDetail extends Component {
             {orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
               <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>
             </div> : <div/>}
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"70%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 });
-              }}
-            >
-              <img
-                alt=""
-                style={{
-                  width: "100%",
-                  transform: `rotate(${this.state.rotateDeg}deg)`,
-                }}
-                src={this.state.previewImage || ""}
-              />
-              <Button
-                onClick={this.rotate}
-                style={{
-                  position: "relative",
-                  left: "50%",
-                  transform: "translateX(-50%)",
-                }}
-              >
-                旋转
-              </Button>
-              <Button
-                onClick={this.upImg}
-                style={{
-                  position: "absolute",
-                  left: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                上一张
-              </Button>
-              <Button
-                onClick={this.downImg}
-                style={{
-                  position: "absolute",
-                  right: -81,
-                  top: "50%",
-                  transform: "translateY(-50%)",
-                }}
-              >
-                下一张
-              </Button>
-            </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
           {/* {this.props.data.type === 0 && this.props.data.processState >= 2 ? (

+ 14 - 20
js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { Modal, Icon, Upload } from "antd";
 import { timingSafeEqual } from "crypto";
+import ImgList from "../../../../common/imgList";
 
 class PicturesWall extends Component {
   constructor(props) {
@@ -51,26 +52,19 @@ class PicturesWall extends Component {
     );
     return (
       <div style={{ display: "inline-block" }}>
-        <Upload
-          action={globalConfig.context + this.props.url}
-          data={{ sign: this.props.sign }}
-          multiple
-          listType="picture-card"
-          fileList={fileList}
-          onPreview={this.handlePreview}
-          onChange={this.handleChange}
-        >
-          {uploadButton}
-        </Upload>
-        <Modal
-          maskClosable={false}
-          visible={previewVisible}
-          footer={null}
-          width={"50%"}
-          onCancel={this.handleCancel}
-        >
-          <img alt="example" style={{ width: "100%" }} src={previewImage} />
-        </Modal>
+        <ImgList
+            domId={this.props.domId}
+            uploadConfig={{
+              action:globalConfig.context + this.props.url,
+              data:{ sign: this.props.sign },
+              multiple:true,
+              listType:"picture-card",
+            }}
+            onChange={(infor)=>{
+              this.handleChange(infor)
+            }}
+            fileList={fileList}
+        />
       </div>
     );
   }

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

@@ -110,20 +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
-                });
-              }}
-            />
-            {/*<div style={{paddingTop:'10px',paddingBottom:'10px'}}>*/}
-            {/*  <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>*/}
-            {/*</div>*/}
+            {/*<Upload*/}
+            {/*  className="demandDetailShow-upload"*/}
+            {/*  listType="picture-card"*/}
+            {/*  fileList={orgCodeUrl}*/}
+            {/*  onPreview={file => {*/}
+            {/*    this.setState({*/}
+            {/*      previewImage: file.url || file.thumbUrl,*/}
+            {/*      previewVisible: true*/}
+            {/*    });*/}
+            {/*  }}*/}
+            {/*/>*/}
+            {orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
+              <ImgList fileList={orgCodeUrl} domId={'refund1'}/>
+            </div> : <div/>}
             <Modal
               maskClosable={false}
               footer={null}

+ 53 - 3
js/component/manageCenter/order/orderNew/costAuditList/filterColumn.js

@@ -1,10 +1,19 @@
 import React,{Component} from 'react';
-import {Button, Form, Input,Select} from "antd";
+import {Button, Form, Input, message, Select} from "antd";
+import $ from "jquery/src/ajax";
 
 class FilterColumn extends Component{
     constructor(props) {
         super(props);
+        this.state={
+            departmentArr: [],
+        }
         this.handleReset = this.handleReset.bind(this);
+        this.departmentList = this.departmentList.bind(this);
+    }
+
+    componentDidMount() {
+        this.departmentList();
     }
 
     handleReset(){
@@ -22,6 +31,40 @@ class FilterColumn extends Component{
         })
     }
 
+    //部门
+    departmentList() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/organization/selectSuperId",
+            data: {},
+            success: function (data) {
+                let thedata = data.data;
+                let theArr = [];
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    thedata.map(function (item, index) {
+                        theArr.push({
+                            key: index,
+                            name: item.name,
+                            id: item.id,
+                        });
+                    });
+                }
+                this.setState({
+                    departmentArr: theArr,
+                });
+            }.bind(this),
+        }).always(
+            function () {
+            }.bind(this)
+        );
+    }
+
     render() {
         const { getFieldDecorator } = this.props.form;
         return (
@@ -64,13 +107,20 @@ class FilterColumn extends Component{
                         )}
                     </Form.Item>
                     <Form.Item
-                        label="部门编号"
+                        label="部门"
                     >
                         {getFieldDecorator('depId', {
                             rules: [{ required: false, message: '' }],
                         })(
-                            <Input style={{ width: '200px' }} placeholder="请输入部门编号"/>
+                            <Select placeholder="请选择部门" style={{ width: 150, marginRight: '10px', marginLeft: '10px' }}>
+                                {
+                                    this.state.departmentArr.map(function (item) {
+                                        return <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
+                                    })
+                                }
+                            </Select>
                         )}
+
                     </Form.Item>
                     <Form.Item
                         label="发起人"

+ 53 - 3
js/component/manageCenter/order/orderNew/glCostAuditList/filterColumn.js

@@ -1,10 +1,19 @@
 import React,{Component} from 'react';
-import {Button, Form, Input,Select} from "antd";
+import {Button, Form, Input, message, Select} from "antd";
+import $ from "jquery/src/ajax";
 
 class FilterColumn extends Component{
     constructor(props) {
         super(props);
+        this.state={
+            departmentArr: [],
+        }
         this.handleReset = this.handleReset.bind(this);
+        this.departmentList = this.departmentList.bind(this);
+    }
+
+    componentDidMount() {
+        this.departmentList();
     }
 
     handleReset(){
@@ -22,6 +31,40 @@ class FilterColumn extends Component{
         })
     }
 
+    //部门
+    departmentList() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/organization/selectSuperId",
+            data: {},
+            success: function (data) {
+                let thedata = data.data;
+                let theArr = [];
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    thedata.map(function (item, index) {
+                        theArr.push({
+                            key: index,
+                            name: item.name,
+                            id: item.id,
+                        });
+                    });
+                }
+                this.setState({
+                    departmentArr: theArr,
+                });
+            }.bind(this),
+        }).always(
+            function () {
+            }.bind(this)
+        );
+    }
+
     render() {
         const { getFieldDecorator } = this.props.form;
         return (
@@ -64,13 +107,20 @@ class FilterColumn extends Component{
                         )}
                     </Form.Item>
                     <Form.Item
-                        label="部门编号"
+                        label="部门"
                     >
                         {getFieldDecorator('depId', {
                             rules: [{ required: false, message: '' }],
                         })(
-                            <Input style={{ width: '200px' }} placeholder="请输入部门编号"/>
+                            <Select placeholder="请选择部门" style={{ width: 150, marginRight: '10px', marginLeft: '10px' }}>
+                                {
+                                    this.state.departmentArr.map(function (item) {
+                                        return <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
+                                    })
+                                }
+                            </Select>
                         )}
+
                     </Form.Item>
                     <Form.Item
                         label="发起人"

+ 18 - 39
js/component/manageCenter/order/orderNew/reject.jsx

@@ -16,26 +16,14 @@ import ShowModalDiv from "@/showModal.jsx"
 import OrderRiZi from "@/orderRiZi.jsx";
 import { cuiJieDian } from "@/dataDic.js";
 import ResolutionDetail from "@/resolutionDetail";
+import ImgList from "../../../common/imgList";
 //图片组件
 const PicturesWall = React.createClass({
 	getInitialState() {
 		return {
-			previewVisible: false,
-			previewImage: '',
 			fileList: [],
 		}
 	},
-	handleCancel() {
-		this.setState({
-			previewVisible: false
-		})
-	},
-	handlePreview(file) {
-		this.setState({
-			previewImage: file.url || file.thumbUrl,
-			previewVisible: true,
-		});
-	},
 	handleChange(info) {
 		let fileList = info.fileList;
 		this.setState({
@@ -48,32 +36,22 @@ const PicturesWall = React.createClass({
 		this.state.pojectApplicationUrl = undefined;
 	},
 	render() {
-		const {
-			previewVisible,
-			previewImage,
-			fileList
-		} = this.state;
-		const uploadButton = (
-			<div>
-                <Icon type="plus" />
-                <div className="ant-upload-text">点击上传</div>
-            </div>
-		);
+		const {fileList} = this.state;
 		return(
 			<div style={{display:"inline-block"}}>
-                <Upload
-                    action={globalConfig.context + "/api/admin/customer/uploadCustomerImg"}
-                    data={{ 'sign': '' }}
-                    listType="picture-card"
-                    fileList={fileList}
-                    multiple
-                    onPreview={this.handlePreview}
-                    onChange={this.handleChange} >
-                    {uploadButton}
-                </Upload>
-                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
-                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
-                </Modal>
+              <ImgList
+                  domId={this.props.domId}
+                  uploadConfig={{
+                    action:globalConfig.context + "/api/admin/customer/uploadCustomerImg",
+                    data:{ 'sign': '' },
+                    multiple:true,
+                    listType:"picture-card",
+                  }}
+                  onChange={(infor)=>{
+                    this.handleChange(infor)
+                  }}
+                  fileList={fileList}
+              />
             </div>
 		);
 	}
@@ -2047,7 +2025,7 @@ const IntentionCustomer = Form.create()(
                 />
               </Spin>
             </div>
-            <Modal
+            {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
               title="订单详情"
@@ -2290,6 +2268,7 @@ const IntentionCustomer = Form.create()(
                         }
                       >
                         <PicturesWall
+                          domId={'reject1'}
                           fileList={this.getOrgCodeUrl}
                           pictureUrl={this.state.orgCodeUrl}
                         />
@@ -2574,7 +2553,7 @@ const IntentionCustomer = Form.create()(
                   </div>
                 </Spin>
               </Form>
-            </Modal>
+            </Modal> : <div/>}
             <Modal
               maskClosable={false}
               visible={this.state.addnextVisible}

+ 53 - 3
js/component/manageCenter/project/task/payApplyReject/filterColumn.js

@@ -1,10 +1,19 @@
 import React,{Component} from 'react';
-import {Button, Form, Input,Select} from "antd";
+import {Button, Form, Input, message, Select} from "antd";
+import $ from "jquery/src/ajax";
 
 class FilterColumn extends Component{
     constructor(props) {
         super(props);
+        this.state={
+            departmentArr: [],
+        }
         this.handleReset = this.handleReset.bind(this);
+        this.departmentList = this.departmentList.bind(this);
+    }
+
+    componentDidMount() {
+        this.departmentList();
     }
 
     handleReset(){
@@ -22,6 +31,40 @@ class FilterColumn extends Component{
         })
     }
 
+    //部门
+    departmentList() {
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/organization/selectSuperId",
+            data: {},
+            success: function (data) {
+                let thedata = data.data;
+                let theArr = [];
+                if (!thedata) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    }
+                } else {
+                    thedata.map(function (item, index) {
+                        theArr.push({
+                            key: index,
+                            name: item.name,
+                            id: item.id,
+                        });
+                    });
+                }
+                this.setState({
+                    departmentArr: theArr,
+                });
+            }.bind(this),
+        }).always(
+            function () {
+            }.bind(this)
+        );
+    }
+
     render() {
         const { getFieldDecorator } = this.props.form;
         return (
@@ -64,13 +107,20 @@ class FilterColumn extends Component{
                         )}
                     </Form.Item>
                     <Form.Item
-                        label="部门编号"
+                        label="部门"
                     >
                         {getFieldDecorator('depId', {
                             rules: [{ required: false, message: '' }],
                         })(
-                            <Input style={{ width: '200px' }} placeholder="请输入部门编号"/>
+                            <Select placeholder="请选择部门" style={{ width: 150, marginRight: '10px', marginLeft: '10px' }}>
+                                {
+                                    this.state.departmentArr.map(function (item) {
+                                        return <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
+                                    })
+                                }
+                            </Select>
                         )}
+
                     </Form.Item>
                     <Form.Item
                         label="发起人"