Просмотр исходного кода

pdf处理、增加变更类型、注释项目内的打印

dev01 лет назад: 2
Родитель
Сommit
953d2e5534
100 измененных файлов с 1092 добавлено и 717 удалено
  1. BIN
      image/pdf_logo.png
  2. 3 3
      js/component/account/achievement/techAchievementDesc.jsx
  3. 1 1
      js/component/account/demand/techDemandDesc.jsx
  4. 1 1
      js/component/account/services/achievement.jsx
  5. 1 1
      js/component/account/services/activity.jsx
  6. 1 1
      js/component/account/services/activityCostList.jsx
  7. 2 2
      js/component/account/services/copyright/comPatentChange.jsx
  8. 1 1
      js/component/account/services/finance.jsx
  9. 1 1
      js/component/account/services/honorList.jsx
  10. 1 1
      js/component/account/services/intellectualDesc.jsx
  11. 2 2
      js/component/account/services/orgTechCenter.jsx
  12. 1 1
      js/component/account/services/patentAdd.jsx
  13. 1 1
      js/component/account/services/ratepay.jsx
  14. 1 1
      js/component/account/services/standard.jsx
  15. 1 1
      js/component/account/services/techProduct.jsx
  16. 1 1
      js/component/account/services/technologyChange.jsx
  17. 2 2
      js/component/account/set/hrSituation.jsx
  18. 1 1
      js/component/common/enterpriseNameChange/index.jsx
  19. 57 20
      js/component/common/imgList/index.js
  20. 2 2
      js/component/common/nowProjectStatus/index.jsx
  21. 104 0
      js/component/common/pdfupload/index.jsx
  22. 22 0
      js/component/common/pdfupload/index.less
  23. 1 1
      js/component/common/tabelContent/index.jsx
  24. 8 0
      js/component/dataDic.js
  25. 3 3
      js/component/groupCertify/personal.jsx
  26. 1 1
      js/component/manageCenter/channelList/channelunit/detail/visitDetail.jsx
  27. 1 1
      js/component/manageCenter/components/checkProject/payRecord.js
  28. 1 1
      js/component/manageCenter/customer/NEW/intentionCustomer/followDetail/businessName.jsx
  29. 1 1
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visitDetail.jsx
  30. 2 2
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx
  31. 1 1
      js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx
  32. 1 1
      js/component/manageCenter/customer/customerData/myClient.jsx
  33. 2 2
      js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx
  34. 2 2
      js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx
  35. 1 1
      js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx
  36. 2 2
      js/component/manageCenter/customer/individualCustomer/publicQueryOne.jsx
  37. 1 1
      js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx
  38. 1 1
      js/component/manageCenter/customer/publicStatistics/detailedList.jsx
  39. 2 2
      js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx
  40. 27 5
      js/component/manageCenter/customer/signcustomer/statistics.jsx
  41. 2 2
      js/component/manageCenter/customerService/administration/order.jsx
  42. 1 1
      js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx
  43. 1 1
      js/component/manageCenter/demand/demandRelease/techDemandRelease.jsx
  44. 5 5
      js/component/manageCenter/demand/myTechDemand.jsx
  45. 1 1
      js/component/manageCenter/demand/sichuan/sichuan.jsx
  46. 1 1
      js/component/manageCenter/demand/techDemandQuery.jsx
  47. 1 1
      js/component/manageCenter/demand/techDemandQueryDesc.jsx
  48. 1 1
      js/component/manageCenter/financialManage/distribute/huiKuan.jsx
  49. 1 1
      js/component/manageCenter/index/content.jsx
  50. 2 2
      js/component/manageCenter/legalAffairs/collectioning/index.jsx
  51. 5 5
      js/component/manageCenter/legalAffairs/collectioning/legalRecd.jsx
  52. 1 1
      js/component/manageCenter/legalAffairs/completedLegalAffairs/index.jsx
  53. 3 3
      js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx
  54. 155 33
      js/component/manageCenter/order/orderNew/addService.jsx
  55. 2 2
      js/component/manageCenter/order/orderNew/approveds.jsx
  56. 1 1
      js/component/manageCenter/order/orderNew/arrearsList.jsx
  57. 1 1
      js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js
  58. 84 9
      js/component/manageCenter/order/orderNew/changeComponent/changeApply.js
  59. 21 28
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js
  60. 21 28
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js
  61. 62 108
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js
  62. 21 28
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js
  63. 21 29
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js
  64. 121 129
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js
  65. 134 142
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js
  66. 21 28
      js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js
  67. 11 11
      js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js
  68. 9 1
      js/component/manageCenter/order/orderNew/changeComponent/searchInput.js
  69. 1 1
      js/component/manageCenter/order/orderNew/chargeback.jsx
  70. 4 4
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  71. 9 0
      js/component/manageCenter/order/orderNew/contractCwjl.js
  72. 9 0
      js/component/manageCenter/order/orderNew/contractCwzj.js
  73. 9 0
      js/component/manageCenter/order/orderNew/contractCwzy.js
  74. 9 0
      js/component/manageCenter/order/orderNew/contractJsjl.js
  75. 9 0
      js/component/manageCenter/order/orderNew/contractJsy.js
  76. 9 0
      js/component/manageCenter/order/orderNew/contractJszj.js
  77. 9 0
      js/component/manageCenter/order/orderNew/contractYxgly.js
  78. 9 0
      js/component/manageCenter/order/orderNew/contractYxy.js
  79. 2 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  80. 2 2
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  81. 2 2
      js/component/manageCenter/order/orderStatistics/orderStatistics.jsx
  82. 3 3
      js/component/manageCenter/order/pressMoney/dunningRecord.jsx
  83. 5 5
      js/component/manageCenter/order/pressMoney/index.jsx
  84. 1 1
      js/component/manageCenter/project/project/projectAssignment.jsx
  85. 1 1
      js/component/manageCenter/project/project/projectQuery.jsx
  86. 2 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  87. 5 1
      js/component/manageCenter/project/summary/highTechConfig.jsx
  88. 2 2
      js/component/manageCenter/project/task/myTask.jsx
  89. 3 4
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  90. 1 1
      js/component/manageCenter/project/task/resolutionPro.jsx
  91. 1 1
      js/component/manageCenter/project/task/taskQuery.jsx
  92. 2 2
      js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx
  93. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx
  94. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx
  95. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx
  96. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx
  97. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx
  98. 2 2
      js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx
  99. 1 1
      js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx
  100. 0 0
      js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx

BIN
image/pdf_logo.png


+ 3 - 3
js/component/account/achievement/techAchievementDesc.jsx

@@ -999,7 +999,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             fileList={this.state.textFileList}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {
@@ -1156,7 +1156,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             fileList={this.state.techPlanFileList}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {
@@ -1191,7 +1191,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                             fileList={this.state.businessPlanFileList}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/demand/techDemandDesc.jsx

@@ -794,7 +794,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                             fileList={this.state.textFileList}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/achievement.jsx

@@ -168,7 +168,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/activity.jsx

@@ -367,7 +367,7 @@ const ActivityForm = Form.create()(React.createClass({
                                 fileList={this.state.fileList}
                                 onChange={(info) => {
                                     if (info.file.status !== 'uploading') {
-                                        console.log(info.file, info.fileList);
+                                        // console.log(info.file, info.fileList);
                                     }
                                     if (info.file.status === 'done') {
                                         if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/activityCostList.jsx

@@ -303,7 +303,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 2 - 2
js/component/account/services/copyright/comPatentChange.jsx

@@ -331,7 +331,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                         fileList={this.state.fileList_copyright_apply}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {
@@ -360,7 +360,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                         fileList={this.state.fileList_copyright_auth}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/finance.jsx

@@ -294,7 +294,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/honorList.jsx

@@ -121,7 +121,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/intellectualDesc.jsx

@@ -210,7 +210,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 2 - 2
js/component/account/services/orgTechCenter.jsx

@@ -121,7 +121,7 @@ const CenterListDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList_protocol}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {
@@ -481,7 +481,7 @@ const CenterList = React.createClass({
                             fileList={this.state.fileList_institution}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/patentAdd.jsx

@@ -178,7 +178,7 @@ const PatentAddFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/ratepay.jsx

@@ -246,7 +246,7 @@ const RatepayDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/standard.jsx

@@ -148,7 +148,7 @@ const StandardDesc = React.createClass({
                                 fileList={this.state.fileList}
                                 onChange={(info) => {
                                     if (info.file.status !== 'uploading') {
-                                        console.log(info.file, info.fileList);
+                                        // console.log(info.file, info.fileList);
                                     }
                                     if (info.file.status === 'done') {
                                         if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/techProduct.jsx

@@ -286,7 +286,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/account/services/technologyChange.jsx

@@ -312,7 +312,7 @@ const ApplyChangeFrom = Form.create()(React.createClass({
                             fileList={this.state.fileList}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 2 - 2
js/component/account/set/hrSituation.jsx

@@ -459,7 +459,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList_roster}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {
@@ -488,7 +488,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList_social_security}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/common/enterpriseNameChange/index.jsx

@@ -171,7 +171,7 @@ class EnterpriseNameChange extends Component {
                 <Modal
                     footer={null}
                     maskClosable={false}
-                    width={this.props.type === 'journal' ? '1200px' : this.props.type === 'modify' ? '300px' : ''}
+                    width={this.props.type === 'journal' ? '900px' : this.props.type === 'modify' ? '300px' : ''}
                     title={this.props.type === 'journal' ? '更名日志' : this.props.type === 'modify' ? '企业更名' : ''}
                     visible={this.state.visible}
                     onCancel={this.onCancel}>

+ 57 - 20
js/component/common/imgList/index.js

@@ -4,6 +4,8 @@ import './index.less';
 import Viewer from 'viewerjs';
 import 'viewerjs/dist/viewer.css';
 import PropTypes from 'prop-types';
+// import PDFView from "../pdfupload";
+import pdfimg from '../../../../image/pdf_logo.png';
 
 const uploadButton = (
     <div>
@@ -26,6 +28,8 @@ class ImgList extends Component {
 
             newUploadArr: [],
             newUploadInforArr: {},
+            isPDF: false,
+            file: {},
         }
         this.imgLoading = this.imgLoading.bind(this);
         this.beforeUpload = this.beforeUpload.bind(this);
@@ -82,10 +86,14 @@ class ImgList extends Component {
             return isLt2M;
         } else {
             const isJPG = file.type.split('/');
-            if (isJPG[0] !== 'image') {
-                message.error('只能上传图片文件!');
+            if (isJPG[0] !== 'image' && isJPG[0] !== "application") {
+                message.error('只能上传图片或pdf文件!');
                 return false;
             }
+            // if (isJPG[0] !== 'image') {
+            //     message.error('只能上传图片!');
+            //     return false;
+            // }
             if (isJPG && isLt2M) {
                 //用于计算当次选择的图片数量
                 this.state.newUploadArr.push(file)
@@ -112,7 +120,7 @@ class ImgList extends Component {
                     <Spin spinning={Object.keys(this.props.uploadConfig).length !== 0 ? false : (fileList.length === 0 ? false : this.state.loading)} tip="文件加载中...">
                         <Upload
                             {...this.props.uploadConfig}
-                            accept={this.props.accept || "image/*"}
+                            accept={this.props.accept || "image/*,application/pdf"}
                             className={Object.keys(this.props.uploadConfig).length !== 0 ? "" : "demandDetailShow-upload"}
                             listType={this.props.accept ? this.props.uploadConfig.listType : "picture-card"}
                             fileList={
@@ -120,34 +128,52 @@ class ImgList extends Component {
                                     (
                                         fileList.map((v, i) => {
                                             v.index = i;
+                                            v.url = v.url;
+                                            v.thumbUrl = v.name.substr(v.name.lastIndexOf(".") + 1) == "pdf" ? pdfimg : v.url
                                             return v
                                         })
                                     ) : (
                                         this.state.seeMore ?
                                             fileList.map((v, i) => {
                                                 v.index = i;
+                                                v.url = v.url;
+                                                v.thumbUrl = v.name.substr(v.name.lastIndexOf(".") + 1) == "pdf" ? pdfimg : v.url
                                                 return v
                                             }) :
                                             fileList.map((v, i) => {
                                                 v.index = i;
+                                                v.url = v.url;
+                                                v.thumbUrl = v.name.substr(v.name.lastIndexOf(".") + 1) == "pdf" ? pdfimg : v.url
                                                 return v
                                             }).slice(0, 10)
                                     )
                             }
                             onPreview={(file) => {
-                                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();
+                                let types = file.name.substr(file.name.lastIndexOf(".") + 1)
+                                if (!!file.type && file.type.split('/')[0] == "application" || types == "pdf") {
+                                    // let url = file.url || file.thumbUrl
+                                    // this.setState({
+                                    //     isPDF: true,
+                                    //     file: url,
+                                    // })
+                                    let url = file.response.data.indexOf("/upload") == -1
+                                        ? globalConfig.avatarHost + "/upload" + file.response.data
+                                        : file.response.data
+                                    window.open(url)
                                 } else {
-                                    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();
+                                    }
                                 }
                             }}
                             beforeUpload={this.beforeUpload}
@@ -157,7 +183,7 @@ class ImgList extends Component {
                                     this.state.gallery && this.state.gallery.destroy();
                                     this.props.onChange(infor);
                                     if (infor.file && infor.file.status === 'error') {
-                                        message.error('图片上传失败,请重新上传!');
+                                        message.error('上传失败,请重新上传!');
                                     }
                                     //用于控制进度条
                                     if (infor.file && infor.file.status !== 'removed' && infor.event) {
@@ -209,14 +235,16 @@ class ImgList extends Component {
                         </Upload>
                     </Spin>
                 </div>
-                {fileList.length > 10 && Object.keys(this.props.uploadConfig).length === 0 ? <div className='seeMore' onClick={() => { this.setState({ seeMore: !this.state.seeMore }) }}>
-                    {this.state.seeMore ? '收起' : '查看更多'}
-                </div> : <div />}
+                {fileList.length > 10 && Object.keys(this.props.uploadConfig).length === 0
+                    ? <div className='seeMore' onClick={() => { this.setState({ seeMore: !this.state.seeMore }) }}>
+                        {this.state.seeMore ? '收起' : '查看更多'}
+                    </div>
+                    : <div />}
                 <ul id={this.props.domId} style={{ display: 'none', zIndex: -1, }}>
                     {
                         fileList.map((value, index) => (
                             <li key={index}>
-                                <img src={value.url || value.thumbUrl} onLoad={() => {
+                                <img src={value.name.substr(value.name.lastIndexOf(".") + 1) == "pdf" ? pdfimg : (value.url || value.thumbUrl)} onLoad={() => {
                                     this.imgLoading();
                                 }} />
                             </li>
@@ -232,6 +260,15 @@ class ImgList extends Component {
                     />
                     <div className='promptText'>文件上传中...</div>
                 </div> : <div />}
+                {/* {
+                    this.state.isPDF &&
+                    <PDFView
+                        fileType="pdf"
+                        visible={this.state.isPDF}
+                        file={this.state.file}
+                        closeFile={() => { this.setState({ isPDF: false }) }}
+                    />
+                } */}
             </div>
         )
     }

+ 2 - 2
js/component/common/nowProjectStatus/index.jsx

@@ -251,7 +251,7 @@ class NowProjectStatus extends Component {
                     value8: 1,
                   });
                 }
-                console.log(this.state.list);
+                // console.log(this.state.list);
                 if (!this.state.dataInfor[e.target.value]) {
                   this.state.dataInfor[e.target.value] = {};
                 }
@@ -295,7 +295,7 @@ class NowProjectStatus extends Component {
                               : null
                           }
                           onChange={(data, dataString) => {
-                            console.log(dataString);
+                            // console.log(dataString);
                             if (!this.state.dataInfor[v.id]) {
                               this.state.dataInfor[v.id] = {};
                             }

+ 104 - 0
js/component/common/pdfupload/index.jsx

@@ -0,0 +1,104 @@
+import React, { Component } from "react";
+import { Modal, Button } from "antd";
+import "./index.less";
+// import PDF from 'react-pdf-js';
+
+/**
+ * PDF上传  2022-08-15
+ */
+class PDFView extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      fileState: props.visible,//父类传递的fileState
+      type: props.fileType,//父类传递的fileType
+      page: 1,
+      pages: null,
+    };
+    this.onDocumentComplete = this.onDocumentComplete.bind(this);
+    this.onDocumentLoadSuccess = this.onDocumentLoadSuccess.bind(this);
+    this.onDocumentComplete = this.onDocumentComplete.bind(this);
+    this.handlePrevious = this.handlePrevious.bind(this);
+    this.handleNext = this.handleNext.bind(this);
+
+  }
+
+  componentWillReceiveProps(nextProps) {//props发生变化时执行
+    this.setState({
+      fileState: nextProps.visible,//父类传递的fileState
+      type: nextProps.fileType,//父类传递的fileType
+    })
+  }
+
+  componentDidMount() {
+
+  }
+
+  onDocumentLoadSuccess(numPages) {
+    this.setState({
+      numPages,
+      pageNumber: numPages
+    })
+  }
+
+  //获取所有页
+  onDocumentComplete(pages) {
+    this.setState({ page: 1, pages })
+  }
+  //点击上一页
+  handlePrevious() {
+    this.setState({ page: this.state.page - 1 })
+  }
+  //点击下一页
+  handleNext() {
+    this.setState({ page: this.state.page + 1 })
+  }
+
+
+
+  render() {
+    const { page, pages, type } = this.state;
+    const { file, } = this.props
+    return (<React.Fragment>
+      <Modal
+        title=""
+        visible={this.state.fileState}
+        footer={null}
+        onCancel={this.props.closeFile}
+      >
+        <div>
+          {
+            type == 'pdf' ?
+              <div>
+                <div className={styles.filePdf}>
+                  <PDF
+                    file={file}
+                    onDocumentComplete={this.onDocumentComplete}
+                    page={page}
+                  />
+                </div>
+                <div className={styles.filePdfFooter}>
+                  {page === 1 ?
+                    null
+                    :
+                    <Button type='primary' onClick={this.handlePrevious}>上一页</Button>
+                  }
+                  <div className={styles.filePdfPage}>
+                    <span>第{page}页</span>/<span>共{pages}页</span>
+                  </div>
+                  {page === pages ?
+                    null
+                    :
+                    <Button style={{ marginLeft: '10px' }} type='primary' onClick={this.handleNext}>下一页</Button>
+                  }
+                </div>
+              </div>
+              : ''
+          }
+        </div>
+      </Modal>
+    </React.Fragment>)
+  }
+}
+
+export default PDFView;

+ 22 - 0
js/component/common/pdfupload/index.less

@@ -0,0 +1,22 @@
+.flieContent{
+  width: 100%;
+  height: calc(100% - 42px);
+}
+.filePdf{
+  width: 100%;
+  height: calc(100% - 84px);
+  display: flex;
+  justify-content: center;
+  overflow: scroll;
+  overflow-x: hidden;
+}
+.filePdfFooter{
+  height: 42px;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.filePdfPage{
+  margin: 0 10px;
+}

+ 1 - 1
js/component/common/tabelContent/index.jsx

@@ -138,7 +138,7 @@ class TabelContent extends Component {
 
     let data = {};
     let obj1 = JSON.parse(JSON.stringify(this.state.searchValues));
-    console.log(obj1);
+    // console.log(obj1);
     data = Object.assign(data, obj1);
 
     if (this.props.exportExecProcessing) {

+ 8 - 0
js/component/dataDic.js

@@ -3657,6 +3657,14 @@ module.exports = {
       value: "5",
       key: "赠送",
     },
+    {
+      value: "6",
+      key: "退单不退款",
+    },
+    {
+      value: "7",
+      key: "仅变更合同",
+    },
   ],
   cuiJieDian: [
     {

+ 3 - 3
js/component/groupCertify/personal.jsx

@@ -437,9 +437,9 @@ const Content = Form.create()(React.createClass({
                                 beforeUpload={beforeUploadFile}
                                 fileList={this.state.fileList}
                                 onChange={(info) => {
-                                    if (info.file.status !== 'uploading') {
-                                        console.log(info.file, info.fileList);
-                                    }
+                                    // if (info.file.status !== 'uploading') {
+                                    //     console.log(info.file, info.fileList);
+                                    // }
                                     if (info.file.status === 'done') {
                                         if (!info.file.response.error.length) {
                                             message.success(`${info.file.name} 文件上传成功!`);

+ 1 - 1
js/component/manageCenter/channelList/channelunit/detail/visitDetail.jsx

@@ -76,7 +76,7 @@ const VisitDetail = React.createClass({
               <Button
                 ype="primary"
                 onClick={() => {
-                  console.log(arr);
+                  // console.log(arr);
                   this.setState({
                     visitImgModul: true,
                     enclosure: arr,

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

@@ -147,7 +147,7 @@ class PayRecord extends Component{
         e.preventDefault();
         this.props.form.validateFieldsAndScroll((err, values) => {
             if (err) {
-                console.log(err)
+                // console.log(err)
                 return;
             }
             if(values.quantity !== undefined && (isNaN(parseFloat(values.quantity)) || values.quantity<=0)){

+ 1 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/followDetail/businessName.jsx

@@ -145,7 +145,7 @@ const BusName = React.createClass({
 		                            label="已签单业务" >
 		    			   			{
 		    			   				businessData.map((item,index)=>{
-		    			   					console.log(item)
+		    			   					// console.log(item)
 		    			   					return <Tag key={index} color='#2db7f5'>{item}</Tag>
 		    			   				})
 		    			   			}

+ 1 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionDetail/detail/visitDetail.jsx

@@ -74,7 +74,7 @@ const VisitDetail = React.createClass({
               <Button
                 ype="primary"
                 onClick={() => {
-                  console.log(arr);
+                  // console.log(arr);
                   this.setState({
                     visitImgModul: true,
                     enclosure: arr,

+ 2 - 2
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/business.jsx

@@ -279,7 +279,7 @@ const Business = React.createClass({
           dataBusiness: theArr,
           paginationt: this.state.paginationt || [],
         });
-        console.log(this.state.dataBusiness);
+        // console.log(this.state.dataBusiness);
       }.bind(this),
     }).always(
       function () {
@@ -298,7 +298,7 @@ const Business = React.createClass({
   },
   componentWillMount() {
     this.BusinessList();
-    console.log(this.state.dataBusiness);
+    // console.log(this.state.dataBusiness);
   },
   detailsModal() {
     this.props.closeDetail(false, false);

+ 1 - 1
js/component/manageCenter/customer/NEW/signCustomer/intentionDetail/detail/visitDetail.jsx

@@ -64,7 +64,7 @@ const VisitDetail = React.createClass({
 						)
 						return (
 							arr.length !== 0 ? <Button ype="primary" onClick={()=>{
-								console.log(arr)
+								// console.log(arr)
 								this.setState({
 									visitImgModul:true,
 									enclosure:arr

+ 1 - 1
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -2039,7 +2039,7 @@ const MyClient = Form.create()(React.createClass({
                         showUploadList={false}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 2 - 2
js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx

@@ -523,8 +523,8 @@ const DiurnalStatistics = React.createClass({
 	},
 	//重构排序
 	tabChange(pagination, filter, sorter) {
-		console.log(pagination)
-		console.log(sorter)
+		// console.log(pagination)
+		// console.log(sorter)
 	},
 	changeList(arr) {
 		const newArr = [];

+ 2 - 2
js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx

@@ -477,8 +477,8 @@ const DiurnalStatistics = React.createClass({
 	},
 	//重构排序
 	tabChange(pagination,filter,sorter){
-		console.log(pagination)
-		console.log(sorter)
+		// console.log(pagination)
+		// console.log(sorter)
 	},
 	componentWillMount() {
 		//this.loadData();

+ 1 - 1
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -2110,7 +2110,7 @@ const IndividualCustomer = Form.create()(React.createClass({
                         showUploadList={false}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 2 - 2
js/component/manageCenter/customer/individualCustomer/publicQueryOne.jsx

@@ -1124,10 +1124,10 @@ const QueryCustomer = Form.create()(React.createClass({
 			callnubs: e,
 		})
 		if(e == '1') {
-			console.log(this.state.callnubs);
+			// console.log(this.state.callnubs);
 		}
 		if(e == '2') {
-			console.log(this.state.callnubs);
+			// console.log(this.state.callnubs);
 		}
 		
 	},

+ 1 - 1
js/component/manageCenter/customer/operationalData/signatureStatistics/detailedList.jsx

@@ -352,7 +352,7 @@ class DetailedList extends Component{
                             })
                         }}
                         onCancel={()=>{
-                            console.log(this.state.searchConfig,'this.state.searchConfig')
+                            // console.log(this.state.searchConfig,'this.state.searchConfig')
                             this.setState({
                                 visible1:false
                             })

+ 1 - 1
js/component/manageCenter/customer/publicStatistics/detailedList.jsx

@@ -706,7 +706,7 @@ class DetailedList extends Component {
         delete data[i];
       }
     }
-    console.log(data);
+    // console.log(data);
     $.ajax({
       method: "get",
       dataType: "json",

+ 2 - 2
js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx

@@ -1283,10 +1283,10 @@ const QueryCustomer = Form.create()(React.createClass({
 			callnubs: e,
 		})
 		if(e == '1') {
-			console.log(this.state.callnubs);
+			// console.log(this.state.callnubs);
 		}
 		if(e == '2') {
-			console.log(this.state.callnubs);
+			// console.log(this.state.callnubs);
 		}
 
 	},

+ 27 - 5
js/component/manageCenter/customer/signcustomer/statistics.jsx

@@ -20,6 +20,7 @@ import $ from "jquery/src/ajax";
 import "./index.less";
 import moment from "moment";
 import DetailList from "./detaillist";
+import Cascaders from '../../../common/cascaders'
 
 const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
@@ -268,6 +269,10 @@ class SignStatistics extends Component {
 
   loadData(pageNo) {
     const { searchInfor, pagination } = this.state;
+    if (!searchInfor.deps) {
+      message.warn("请选择你要查询的部门!")
+      return
+    }
     this.setState({
       loading: true,
     });
@@ -322,12 +327,15 @@ class SignStatistics extends Component {
     const { companyList } = this.state
     this.setState(
       {
-        searchInfor: { depId: companyList[0].id },
+        // searchInfor: { depId: companyList[0].id },
+        searchInfor: JSON.parse(JSON.stringify({})),
         params: JSON.parse(JSON.stringify({})),
         aname: "",
+        dataSource: [],
       },
       () => {
-        this.loadData();
+        this.Cascaders.empty();
+        // this.loadData();
       }
     );
   }
@@ -434,7 +442,7 @@ class SignStatistics extends Component {
   }
 
   componentWillMount() {
-    this.selectSuperId();
+    // this.selectSuperId();
   }
 
   render() {
@@ -462,7 +470,21 @@ class SignStatistics extends Component {
                 }}
               >
                 <span style={{ marginRight: "10px" }}>
-                  <Select
+                  <Cascaders
+                    ref={node => this.Cascaders = node}
+                    placeholder="选择部门"
+                    id="id"
+                    name="name"
+                    children="list"
+                    height={28}
+                    onSel={(e) => {
+                      searchInfor["deps"] = JSON.stringify(e);
+                      this.setState({
+                        searchInfor: searchInfor,
+                      });
+                    }}
+                  />
+                  {/* <Select
                     placeholder="选择部门"
                     style={{ width: 200 }}
                     value={searchInfor.depId}
@@ -476,7 +498,7 @@ class SignStatistics extends Component {
                     notFoundContent="未获取到上级组织列表"
                   >
                     {this.state.contactsOption}
-                  </Select>
+                  </Select> */}
                 </span>
                 <span style={{ marginRight: "10px" }}>
                   <AutoComplete

+ 2 - 2
js/component/manageCenter/customerService/administration/order.jsx

@@ -1224,7 +1224,7 @@ const Order = Form.create()(
       });
     },
     rizhi() {
-      console.log(this.state.orderNo);
+      // console.log(this.state.orderNo);
       this.setState({
         loading: true,
       });
@@ -2022,7 +2022,7 @@ const Order = Form.create()(
     },
     onSelectChange(selectedRowKeys) {
       this.setState({ selectedRowKeys });
-      console.log(selectedRowKeys);
+      // console.log(selectedRowKeys);
     },
     // inRecordData() {
     //   this.setState({

+ 1 - 1
js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx

@@ -483,7 +483,7 @@ const TechDemandPublish = React.createClass({
                             showUploadList={false}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/demand/demandRelease/techDemandRelease.jsx

@@ -477,7 +477,7 @@ const TechDemandPublish = React.createClass({
                             showUploadList={false}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 5 - 5
js/component/manageCenter/demand/myTechDemand.jsx

@@ -753,7 +753,7 @@ const DemandList = React.createClass({
 				idTmr = window.setInterval("Cleanup();", 1);
 			}
 		} else {
-			console.log(table);
+			// console.log(table);
 			this.tableToExcel(table,this.getExplorer());
 		}
 		function Cleanup() {
@@ -773,9 +773,9 @@ const DemandList = React.createClass({
 						return c[p];
 					})
 			}
-			console.log(table.nodeType);
+			// console.log(table.nodeType);
 			if(!table.nodeType) table = document.getElementById(table);
-			console.log(table);
+			// console.log(table);
 			var ctx = {
 				worksheet: name || 'Worksheet',
 				table: table.innerHTML
@@ -944,7 +944,7 @@ const DemandList = React.createClass({
     },
     //点开详情
     mateTableRowClick(record, index){
-    	console.log(record);
+    	// console.log(record);
     	this.mateTop();
     	this.setState({ 
     		addmatevisibles: true,
@@ -1091,7 +1091,7 @@ const DemandList = React.createClass({
                             showUploadList={false}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/demand/sichuan/sichuan.jsx

@@ -280,7 +280,7 @@ class Achievement extends React.Component {
 			});
 			 return;
 		}
-		console.log(this.state.ProvinceCity);
+		// console.log(this.state.ProvinceCity);
 		if(!this.state.ProvinceCity||this.state.ProvinceCity.length==0||this.state.ProvinceCity[0]==""){
 			 message.warning("地区必须选择");
 			 this.setState({

+ 1 - 1
js/component/manageCenter/demand/techDemandQuery.jsx

@@ -448,7 +448,7 @@ const DemandList = React.createClass({
                             showUploadList={false}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/demand/techDemandQueryDesc.jsx

@@ -1257,7 +1257,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                             fileList={this.state.textFileList}
                             onChange={(info) => {
                                 if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
+                                    // console.log(info.file, info.fileList);
                                 }
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {

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

@@ -1130,7 +1130,7 @@ const HuiKuan = React.createClass({
               }
               onChange={(v, e) => {
                 this.state.modalData.receivablesTimes = e;
-                console.log(e);
+                // console.log(e);
 
                 this.setState({ modalData: this.state.modalData });
               }}

+ 1 - 1
js/component/manageCenter/index/content.jsx

@@ -421,7 +421,7 @@ const MessageModal = React.createClass({
                 urls: '#';
                 dataJson = {};
         };
-        console.log(rid);
+        // console.log(rid);
         if (rid) {
             var data = dataJson;
             var newData = JSON.stringify(data);

+ 2 - 2
js/component/manageCenter/legalAffairs/collectioning/index.jsx

@@ -200,7 +200,7 @@ class Collectioningn extends Component {
       this.setState({
         adminHid:"none"
       })
-      console.log(adminData.isLegal);
+      // console.log(adminData.isLegal);
     }
   }
   tableRowClick(record, index) {
@@ -222,7 +222,7 @@ class Collectioningn extends Component {
     });
   }
   onCancel() {
-    console.log(1);
+    // console.log(1);
   }
   onFresh() {
     this.setState({

+ 5 - 5
js/component/manageCenter/legalAffairs/collectioning/legalRecd.jsx

@@ -129,12 +129,12 @@ class LegalRecd extends Component {
   downloadAll() {
     let list = this.state.downloadList;
     list.forEach((element, key) => {
-      console.log(element);
+      // console.log(element);
       setTimeout(() => {
         const a = document.createElement("a");
         a.style.display = "none";
         a.href = `${window.window.globalConfig.context}/open/download?fileName=${element.url}&delete=false&attName=${element.name}`;
-        console.log(a.href);
+        // console.log(a.href);
         document.body.appendChild(a);
         a.click(); // 自动触发点击a标签的click事件
         document.body.removeChild(a);
@@ -142,7 +142,7 @@ class LegalRecd extends Component {
     });
   }
   onCancel() {
-    console.log(this.state.visible);
+    // console.log(this.state.visible);
   }
 
   addLegal() {
@@ -182,7 +182,7 @@ class LegalRecd extends Component {
         attachmentUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
       },
       success: function (data) {
-        console.log(data);
+        // console.log(data);
         if (data.error.length) {
           this.setState({
             loading: false,
@@ -195,7 +195,7 @@ class LegalRecd extends Component {
             LegalKeys: this.state.LegalKeys + 2,
             fileList: undefined,
           });
-          console.log(typeof this.state.type);
+          // console.log(typeof this.state.type);
           if (this.state.type == "2" || this.state.type == "1") {
             this.props.onFresh();
             this.setState({});

+ 1 - 1
js/component/manageCenter/legalAffairs/completedLegalAffairs/index.jsx

@@ -162,7 +162,7 @@ class CompletedLegalAffairs extends Component {
       this.setState({
         adminHid:"none"
       })
-      console.log(adminData.isLegal);
+      // console.log(adminData.isLegal);
     }
   }
   render() {

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

@@ -427,7 +427,7 @@ const NewService = Form.create()(React.createClass({
 	},
 
 	rizhi() {
-		console.log(this.state.orderNo)
+		// console.log(this.state.orderNo)
 		this.setState({
 			loading: true
 		})
@@ -791,8 +791,8 @@ const NewService = Form.create()(React.createClass({
 		let dataList = this.state.dataSource,
 			idsList = [];
 		dataList.map((item, index) => {
-			console.log(item);
-			console.log(this.state.commodityId);
+			// console.log(item);
+			// console.log(this.state.commodityId);
 			idsList.push({
 				businessId: '',
 				businessProjectId: item.commodityId,

+ 155 - 33
js/component/manageCenter/order/orderNew/addService.jsx

@@ -18,7 +18,8 @@ import {
   Tag,
   Radio,
   Icon,
-  Tooltip
+  Tooltip,
+  Switch
 } from "antd";
 // import $ from "jquery/src/ajax";
 import "../userMangagement.less";
@@ -55,7 +56,7 @@ import {
   getProcessStatusNew,
 } from "../../../tools.js";
 import PicturesWall from "./changeComponent/picturesWall.js";
-import { changeType, getChangeType } from "./changeComponent/changeDetailYxgly";
+import { getChangeType } from "./changeComponent/changeDetailYxgly";
 import ImgList from "../../../common/imgList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
@@ -299,6 +300,7 @@ const NewService = Form.create()(
         voucherUrl: [],
         replenishUrl: [],
         contentUrl: [],
+        newContractUrl: [],
         customerArr: [],
         declarationBatch: 1, //申报批次  默认第一批
         // 禁用变更类型转换
@@ -1172,7 +1174,7 @@ const NewService = Form.create()(
               }
               if (this.state.getLoad) {
                 let arr = record.arr || [];
-                console.log("record==", record)
+                // console.log("record==", record)
                 return (
                   <div>
                     <Select
@@ -1975,6 +1977,7 @@ const NewService = Form.create()(
         addyear: undefined,//
         isGive: 0,//是否赠送
         cPeriod: false, // 合同期是否可编辑
+        isNew: false,// 是否替换合同
       };
     },
     getpatentTypeList() {
@@ -2983,6 +2986,15 @@ const NewService = Form.create()(
                       url
                     )
                     : [],
+                  newContractUrl: thisdata.contractPictureUrl
+                    ? splitUrl(
+                      thisdata.contractPictureUrl,
+                      ",",
+                      globalConfig.avatarHost + "/upload",
+                      url
+                    )
+                    : [],
+                  isNew: !thisdata.contractPictureUrl ? false : true,
                   processState: thisdata.processState,
                   status: thisdata.status,
                 });
@@ -3030,6 +3042,23 @@ const NewService = Form.create()(
                     tuiKuanFlag: true,
                     displayList: false,
                   });
+                } else if (e == 6) {
+                  this.setState({
+                    listFlag: true,
+                    listCuiFlag: true,
+                    hetongFlag: true,
+                    tuiKuanFlag: true,
+                    displayList: false,
+                  });
+                } else if (e == 7) {
+                  this.setState({
+                    listFlag: true,
+                    listCuiFlag: true,
+                    hetongFlag: true,
+                    tuiKuanFlag: true,
+                    displayList: false,
+                    isNew: true,
+                  });
                 } else {
                   this.setState({
                     listFlag: true,
@@ -3179,6 +3208,9 @@ const NewService = Form.create()(
     getVoucherUrl(e) {
       this.setState({ voucherUrl: e });
     },
+    getNewContractUrl(e) {
+      this.setState({ newContractUrl: e });
+    },
     //加载(自动补全)
     supervisor(e, state) {
       //客户名称与服务名称自动补全
@@ -3653,6 +3685,24 @@ const NewService = Form.create()(
         });
         theorgCodeUrl = picArr.join(",");
       }
+      let newContractUrl = [];
+      if (this.state.newContractUrl.length) {
+        let cArr = [];
+        this.state.newContractUrl.map(function (item) {
+          if (
+            item.response &&
+            item.response.data &&
+            item.response.data.length
+          ) {
+            cArr.push(item.response.data);
+          }
+        });
+        newContractUrl = cArr.join(",");
+      }
+      if (this.state.isNew && newContractUrl.length == 0) {
+        message.warning("请上传新合同扫描件!");
+        return
+      }
       this.setState({
         loading: true,
       });
@@ -3675,6 +3725,8 @@ const NewService = Form.create()(
             applicant: this.state.salesmanName,
             depName: this.state.depName,
             type: this.state.typeChange,
+            contractPictureUrl: this.state.isNew
+              ? newContractUrl : undefined,//合同替换件
           },
         }).done(
           function (data) {
@@ -3711,6 +3763,8 @@ const NewService = Form.create()(
             applicant: this.state.salesmanName,
             depName: this.state.depName,
             type: this.state.typeChange,
+            contractPictureUrl: this.state.isNew
+              ? newContractUrl : undefined,//合同替换件
           },
         }).done(
           function (data) {
@@ -3741,6 +3795,7 @@ const NewService = Form.create()(
         startRemarks: "",
         remarksC: "",
         voucherUrl: [],
+        newContractUrl: [],
         totalAmount: undefined,
         settlementAmount: undefined,
         changeAmount: "0",
@@ -3818,6 +3873,14 @@ const NewService = Form.create()(
                 url
               )
               : [];
+            thisdata.contractPictureUrl = thisdata.contractPictureUrl
+              ? splitUrl(
+                thisdata.contractPictureUrl,
+                ",",
+                globalConfig.avatarHost + "/upload",
+                url
+              )
+              : [];
             this.proList(thisdata.id);
             this.cuiList(thisdata.id);
             this.logList(thisdata.id);
@@ -4284,6 +4347,24 @@ const NewService = Form.create()(
         });
         theorgCodeUrl = picArr.join(",");
       }
+      let newContractUrl = [];
+      if (this.state.newContractUrl.length) {
+        let cArr = [];
+        this.state.newContractUrl.map(function (item) {
+          if (
+            item.response &&
+            item.response.data &&
+            item.response.data.length
+          ) {
+            cArr.push(item.response.data);
+          }
+        });
+        newContractUrl = cArr.join(",");
+      }
+      if (this.state.isNew && newContractUrl.length == 0) {
+        message.warning("请上传新合同扫描件!");
+        return
+      }
       this.setState({
         loading: true,
       });
@@ -4304,6 +4385,8 @@ const NewService = Form.create()(
           applicant: this.state.salesmanName,
           depName: this.state.depName,
           type: this.state.typeChange,
+          contractPictureUrl: this.state.isNew
+            ? newContractUrl : undefined,//合同替换件
         },
       }).done(
         function (data) {
@@ -7291,6 +7374,23 @@ const NewService = Form.create()(
                                         tuiKuanFlag: true,
                                         displayList: false,
                                       });
+                                    } else if (e == 6) {
+                                      this.setState({
+                                        listFlag: true,
+                                        listCuiFlag: true,
+                                        hetongFlag: true,
+                                        tuiKuanFlag: true,
+                                        displayList: false,
+                                      });
+                                    } else if (e == 7) {
+                                      this.setState({
+                                        listFlag: true,
+                                        listCuiFlag: true,
+                                        hetongFlag: true,
+                                        tuiKuanFlag: true,
+                                        displayList: false,
+                                        isNew: true, //上传替换合同
+                                      });
                                     } else {
                                       this.setState({
                                         listFlag: true,
@@ -7308,6 +7408,8 @@ const NewService = Form.create()(
                                   <Option value={3}>仅金额变更</Option>
                                   <Option value={4}>重报</Option>
                                   <Option value={5}>赠送</Option>
+                                  <Option value={6}>退单不退款</Option>
+                                  <Option value={7}>仅变更合同</Option>
                                 </Select>
                                 <Button
                                   style={{ marginLeft: 10 }}
@@ -7321,6 +7423,8 @@ const NewService = Form.create()(
                                       startRemarks: "",
                                       remarksC: "",
                                       voucherUrl: [],
+                                      newContractUrl: [],
+                                      isNew: false,
                                       changeAmount: "0",
                                       applicant: undefined,
                                       depNameChange: undefined,
@@ -7576,6 +7680,35 @@ const NewService = Form.create()(
                               </FormItem>
                             </div>
                             <div className="clearfix">
+                              <FormItem
+                                labelCol={{ span: 4 }}
+                                wrapperCol={{ span: 18 }}
+                                label="上传替换合同"
+                              >
+                                <Switch disabled={this.state.typeChange == 7} checked={this.state.isNew} onChange={e => { this.setState({ isNew: e }) }} />,
+                                <p style={{ color: "red" }}>注:原上传合同为空或作废时,需上传替换合同</p>
+                              </FormItem>
+                            </div>
+                            {
+                              this.state.isNew &&
+                              <div className="clearfix">
+                                <FormItem
+                                  labelCol={{ span: 4 }}
+                                  wrapperCol={{ span: 18 }}
+                                  label="合同扫描件"
+                                >
+                                  <PicturesWall
+                                    domId={"newcontract"}
+                                    fileList={this.getNewContractUrl}
+                                    pictureUrl={this.state.newContractUrl}
+                                    url="/api/admin/orderChange/uploadFile"
+                                    sign=""
+                                  />
+                                  <p>图片建议:要清晰。</p>
+                                </FormItem>
+                              </div>
+                            }
+                            <div className="clearfix">
                               <Button
                                 type="primary"
                                 style={{ float: "right", marginRight: 40 }}
@@ -7804,23 +7937,9 @@ 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,*/}
-                                  {/*    });*/}
-                                  {/*  }}*/}
-                                  {/*/>*/}
                                   <div
                                     style={{
                                       paddingTop: "10px",
-                                      paddingBottom: "10px",
                                     }}
                                   >
                                     {this.state.detailChange &&
@@ -7837,22 +7956,6 @@ const NewService = Form.create()(
                                       <div />
                                     )}
                                   </div>
-                                  {/*<Modal*/}
-                                  {/*  maskClosable={false}*/}
-                                  {/*  footer={null}*/}
-                                  {/*  visible={this.state.previewVisible}*/}
-                                  {/*  onCancel={() => {*/}
-                                  {/*    this.setState({*/}
-                                  {/*      previewVisible: false,*/}
-                                  {/*    });*/}
-                                  {/*  }}*/}
-                                  {/*>*/}
-                                  {/*  <img*/}
-                                  {/*    alt=""*/}
-                                  {/*    style={{ width: "100%" }}*/}
-                                  {/*    src={this.state.previewImage || ""}*/}
-                                  {/*  />*/}
-                                  {/*</Modal>*/}
                                   {this.state.status === 3 ? (
                                     <Button
                                       type="danger"
@@ -7882,6 +7985,25 @@ const NewService = Form.create()(
                                 </div>
                               </FormItem>
                             </div>
+                            {
+                              this.state.detailChange.contractPictureUrl.length != 0 &&
+                              <div className="clearfix">
+                                <FormItem
+                                  labelCol={{ span: 4 }}
+                                  wrapperCol={{ span: 18 }}
+                                  label="最新合同"
+                                >
+                                  <div style={{ paddingTop: 10 }}>
+                                    <ImgList
+                                      fileList={
+                                        this.state.detailChange.contractPictureUrl
+                                      }
+                                      ItemWidth={"96px"}
+                                    />
+                                  </div>
+                                </FormItem>
+                              </div>
+                            }
                             <ul
                               style={{
                                 width: "868px",

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

@@ -971,7 +971,7 @@ const IntentionCustomer = Form.create()(
     },
     //点击打卡项目详情
     tableRowClickX(record) {
-      console.log(record);
+      // console.log(record);
       this.setState({
         jid: record.id, //项目ID
         kid: record.commodityId, //商品ID
@@ -1101,7 +1101,7 @@ const IntentionCustomer = Form.create()(
     },
 
     rizhi() {
-      console.log(this.state.orderNo);
+      // console.log(this.state.orderNo);
       this.setState({
         loading: true,
       });

+ 1 - 1
js/component/manageCenter/order/orderNew/arrearsList.jsx

@@ -393,7 +393,7 @@ const ArrearsList = Form.create()(
       });
     },
     viewLegal() {
-      console.log(this.state.rowkey);
+      // console.log(this.state.rowkey);
       if (this.state.recordt == undefined || this.state.recordt == [] || this.state.rowkey.length == 0) {
         message.info("请选择查看的单号")
         return

+ 1 - 1
js/component/manageCenter/order/orderNew/changeComponent/agreeButton.js

@@ -157,7 +157,7 @@ class ReasonInput extends Component {
   }
 
   onOk(data, backData) {
-    console.log(this.props);
+    // console.log(this.props);
 
     if (!this.props.reason) {
       message.error("理由不能为空!");

+ 84 - 9
js/component/manageCenter/order/orderNew/changeComponent/changeApply.js

@@ -16,6 +16,7 @@ import {
   DatePicker,
   Radio,
   Tooltip,
+  Switch,
 } from "antd";
 import $ from "jquery/src/ajax";
 import moment from "moment";
@@ -733,10 +734,12 @@ class ChangeApply extends Component {
       addyear: undefined,//
       isGive: undefined,//是否赠送
       cPeriod: false, // 合同期是否可编辑
+      isNew: false,
     };
     this.departmentList = this.departmentList.bind(this);
     this.changeApply = this.changeApply.bind(this);
     this.getVoucherUrl = this.getVoucherUrl.bind(this);
+    this.getNewContractUrl = this.getNewContractUrl.bind(this);
     this.proList = this.proList.bind(this);
     this.cuiList = this.cuiList.bind(this);
     this.showConfirm = this.showConfirm.bind(this);
@@ -994,14 +997,32 @@ class ChangeApply extends Component {
         return;
       }
     }
-    this.setState({
-      loading: true
-    })
+    let newContractUrl = [];
+    if (this.state.newContractUrl.length) {
+      let cArr = [];
+      this.state.newContractUrl.map(function (item) {
+        if (
+          item.response &&
+          item.response.data &&
+          item.response.data.length
+        ) {
+          cArr.push(item.response.data);
+        }
+      });
+      newContractUrl = cArr.join(",");
+    }
+    if (this.state.isNew && newContractUrl.length == 0) {
+      message.warning("请上传新合同扫描件!");
+      return
+    }
     let theorgCodeUrl = [];
     if (this.state.voucherUrl.length) {
       let picArr = [];
       this.state.voucherUrl.map(function (item) {
-        if (item.response && item.response.data && item.response.data.length) {
+        if (item.response &&
+          item.response.data &&
+          item.response.data.length
+        ) {
           picArr.push(item.response.data);
         }
       });
@@ -1012,8 +1033,13 @@ class ChangeApply extends Component {
       changeType: 0,
       voucherUrl: theorgCodeUrl.length ? theorgCodeUrl : "",
       consultantExamine: [],
-      managerExamine: []
+      managerExamine: [],
+      contractPictureUrl: this.state.isNew
+        ? newContractUrl : undefined,//合同替换件
     });
+    this.setState({
+      loading: true
+    })
     $.ajax({
       method: "post",
       dataType: "json",
@@ -1192,9 +1218,11 @@ class ChangeApply extends Component {
   }
 
   getVoucherUrl(e) {
-    this.setState({
-      voucherUrl: e
-    });
+    this.setState({ voucherUrl: e });
+  }
+
+  getNewContractUrl(e) {
+    this.setState({ newContractUrl: e });
   }
 
   changeAddPro() {
@@ -2333,6 +2361,23 @@ class ChangeApply extends Component {
                       tuiKuanFlag: true,
                       displayList: false,
                     });
+                  } else if (e == 6) {
+                    this.setState({
+                      listFlag: true,
+                      listCuiFlag: true,
+                      hetongFlag: true,
+                      tuiKuanFlag: true,
+                      displayList: false,
+                    });
+                  } else if (e == 7) {
+                    this.setState({
+                      listFlag: true,
+                      listCuiFlag: true,
+                      hetongFlag: true,
+                      tuiKuanFlag: true,
+                      displayList: false,
+                      isNew: true, //上传替换合同
+                    });
                   } else {
                     this.setState({
                       listFlag: true,
@@ -2351,6 +2396,8 @@ class ChangeApply extends Component {
                 <Option value={3}>仅金额变更</Option>
                 <Option value={4}>重报</Option>
                 <Option value={5}>赠送</Option>
+                <Option value={6}>退单不退款</Option>
+                <Option value={7}>仅变更合同</Option>
               </Select>
               <Button
                 style={{ marginLeft: 10 }}
@@ -2616,7 +2663,35 @@ class ChangeApply extends Component {
               <p>图片建议:要清晰。</p>
             </FormItem>
           </div>
-
+          <div className="clearfix">
+            <FormItem
+              labelCol={{ span: 4 }}
+              wrapperCol={{ span: 18 }}
+              label="上传替换合同"
+            >
+              <Switch disabled={data.type == 7} checked={this.state.isNew} onChange={e => { this.setState({ isNew: e }) }} />,
+              <p style={{ color: "red" }}>注:原上传合同为空或作废时,需上传替换合同</p>
+            </FormItem>
+          </div>
+          {
+            this.state.isNew &&
+            <div className="clearfix">
+              <FormItem
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="合同扫描件"
+              >
+                <PicturesWall
+                  domId={"newcontract"}
+                  fileList={this.getNewContractUrl}
+                  pictureUrl={this.state.newContractUrl}
+                  url="/api/admin/orderChange/uploadFile"
+                  sign=""
+                />
+                <p>图片建议:要清晰。</p>
+              </FormItem>
+            </div>
+          }
           {/* <ul
           style={{
             width: "868px",

+ 21 - 28
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwjl.js

@@ -18,6 +18,7 @@ import PicturesWall from "./picturesWall";
 import moment from "moment";
 import { getProcessStatusNew, moneyVerify } from "@/tools.js";
 import { shenghePeo, changeColor } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import ReactToPrint from "react-to-print";
 import tongguo from "../../../../../../image/tongguo.png";
@@ -40,38 +41,12 @@ const formItemLayoutRefund = {
   wrapperCol: { span: 11 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
 
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -1194,7 +1169,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           <ul
             style={{
               width: "868px",

+ 21 - 28
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzj.js

@@ -4,6 +4,7 @@ import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import "../../../../../../css/changeDetail.less"
 import quxiao from "../../../../../../image/quxiao.png";
@@ -22,38 +23,12 @@ const formItemLayout = {
   wrapperCol: { span: 14 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
 
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -632,7 +607,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
           <ul
             style={{

+ 62 - 108
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -18,6 +18,7 @@ import PicturesWall from "./picturesWall";
 import moment from "moment";
 import { getProcessStatusNew, moneyVerify } from "@/tools.js";
 import { shenghePeo, changeColor } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import ReactToPrint from "react-to-print";
 import tongguo from "../../../../../../image/tongguo.png";
@@ -40,38 +41,12 @@ const formItemLayoutRefund = {
   wrapperCol: { span: 11 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
 
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -1249,7 +1224,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           <ul
             style={{
               width: "868px",
@@ -1829,86 +1822,47 @@ class ChangeDetail extends Component {
                   );
                 })}
               </div>
-
-              <Select
-                defaultValue="0"
-                style={{
-                  width: 120,
-                  float: "left",
-                  position: "relative",
-                  bottom: "28px",
-                  right: "-600px",
-                }}
-                onChange={(val) => {
-                  this.setState({ rejectState: val });
-                  // console.log(val, this.state.rejectState);
-                }}
-              >
-                <Option
-                  value="0"
-                  style={{
-                    display: this.props.processState >= 1 ? "block" : "none",
-                  }}
-                >
-                  营销员
-                </Option>
-                <Option
-                  value="1"
-                  style={{
-                    display: this.props.processState >= 2 ? "block" : "none",
-                  }}
-                >
-                  营销管理员
-                </Option>
-                <Option
-                  value="2"
-                  style={{
-                    display: this.props.processState >= 3 ? "block" : "none",
-                  }}
-                >
-                  咨询师
-                </Option>
-                <Option
-                  value="3"
-                  style={{
-                    display: this.props.processState >= 4 ? "block" : "none",
-                  }}
-                >
-                  咨询师经理
-                </Option>
-                <Option
-                  value="4"
-                  style={{
-                    display: this.props.processState >= 5 ? "block" : "none",
-                  }}
-                >
-                  咨询师总监
-                </Option>
-                <Option
-                  value="5"
-                  style={{
-                    display: this.props.processState >= 6 ? "block" : "none",
-                  }}
-                >
-                  财务专员(退单)
-                </Option>
-                <Option
-                  value="6"
-                  style={{
-                    display: this.props.processState >= 7 ? "block" : "none",
-                  }}
-                >
-                  财务总监
-                </Option>
-                <Option
-                  value="7"
-                  style={{
-                    display: this.props.processState >= 8 ? "block" : "none",
-                  }}
-                >
-                  总裁
-                </Option>
-              </Select>
+              {
+                this.props.data.type == 7
+                  ? <Select
+                    defaultValue="0"
+                    style={{ width: 120, float: "left", position: "relative", bottom: "28px", right: "-600px", }}
+                    onChange={(val) => {
+                      this.setState({ rejectState: val });
+                    }}
+                  >
+                    <Option value="0" style={{ display: this.props.processState >= 1 ? "block" : "none", }}
+                    >营销员</Option>
+                    <Option value="1" style={{ display: this.props.processState >= 2 ? "block" : "none", }}
+                    >营销管理员</Option>
+                    <Option value="5" style={{ display: this.props.processState >= 6 ? "block" : "none", }}
+                    >财务专员(退单)</Option>
+                  </Select>
+                  : <Select
+                    defaultValue="0"
+                    style={{ width: 120, float: "left", position: "relative", bottom: "28px", right: "-600px", }}
+                    onChange={(val) => {
+                      this.setState({ rejectState: val });
+                    }}
+                  >
+                    <Option value="0" style={{ display: this.props.processState >= 1 ? "block" : "none", }}
+                    >营销员</Option>
+                    <Option value="1" style={{ display: this.props.processState >= 2 ? "block" : "none", }}
+                    >营销管理员</Option>
+                    <Option value="2" style={{ display: this.props.processState >= 3 ? "block" : "none", }}
+                    >咨询师</Option>
+                    <Option value="3" style={{ display: this.props.processState >= 4 ? "block" : "none", }}
+                    >咨询师经理</Option>
+                    <Option value="4" style={{ display: this.props.processState >= 5 ? "block" : "none", }}
+                    >咨询师总监</Option>
+                    <Option value="5" style={{ display: this.props.processState >= 6 ? "block" : "none", }}
+                    >财务专员(退单)</Option>
+                    <Option value="6" style={{ display: this.props.processState >= 7 ? "block" : "none", }}
+                    >财务总监</Option>
+                    <Option value="7" style={{ display: this.props.processState >= 8 ? "block" : "none", }}
+                    >总裁</Option>
+                  </Select>
+              }
             </div>
           ) : (
             ""

+ 21 - 28
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsjl.js

@@ -4,6 +4,7 @@ import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
@@ -18,38 +19,12 @@ const formItemLayout = {
   wrapperCol: { span: 14 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
 
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -498,7 +473,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           <ul
             style={{
               width: "868px",

+ 21 - 29
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJsy.js

@@ -4,6 +4,7 @@ import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js"
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
@@ -22,38 +23,11 @@ const formItemLayout = {
   wrapperCol: { span: 14 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
-
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -490,7 +464,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           {/* <ul>
             {this.props.data.consultantExamine.map((item, index) => {
               return (

+ 121 - 129
js/component/manageCenter/order/orderNew/changeComponent/changeDetailJszj.js

@@ -1,9 +1,10 @@
 import React, { Component } from "react";
-import {Form, Upload, Modal, Input, Button, message, Select, Table, Tooltip} from "antd";
+import { Form, Upload, Modal, Input, Button, message, Select, Table, Tooltip } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor, splitUrl } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
@@ -19,38 +20,11 @@ const formItemLayout = {
   wrapperCol: { span: 14 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
-
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -73,7 +47,7 @@ class Itemlist extends Component {
           {...pageData.formItemLayoutA}
           className="half-item"
         >
-          {pageData.labelA ===  '变更原因' ? <Tooltip placement="topLeft" title={pageData.dataA}>
+          {pageData.labelA === '变更原因' ? <Tooltip placement="topLeft" title={pageData.dataA}>
             <div style={{
               width: '150px !important',
               whiteSpace: 'nowrap',
@@ -81,11 +55,11 @@ class Itemlist extends Component {
               overflow: 'hidden',
               textOverflow: 'ellipsis',
             }}>{pageData.dataA}</div>
-          </Tooltip>: pageData.dataA}
+          </Tooltip> : pageData.dataA}
           {pageData.labelA === '客户名称' ? <EnterpriseNameChange
-              type='journal'
-              style={{ marginLeft: 10 }}
-              enterpriseId={this.props.orderUid}/> : null}
+            type='journal'
+            style={{ marginLeft: 10 }}
+            enterpriseId={this.props.orderUid} /> : null}
         </Form.Item>
         <Form.Item
           label={pageData.labelB}
@@ -273,15 +247,15 @@ class ChangeDetail extends Component {
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
             ? shenghePeo(
-                this.props.data.processState == 2
-                  ? this.props.data.consultantExamine
-                  : this.props.data.managerExamine,
-                this.props.data.processState
-              )
+              this.props.data.processState == 2
+                ? this.props.data.consultantExamine
+                : this.props.data.managerExamine,
+              this.props.data.processState
+            )
             : getProcessStatusNew(
-                this.props.data.processState,
-                this.props.data.status
-              ),
+              this.props.data.processState,
+              this.props.data.status
+            ),
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
@@ -397,7 +371,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -436,7 +410,7 @@ class ChangeDetail extends Component {
             合同变更记录
           </h2>
           {pageData.map((item, index) => {
-            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid}/>;
+            return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
           })}
           <Form.Item
             label="变更凭证"
@@ -454,9 +428,9 @@ class ChangeDetail extends Component {
             {/*    });*/}
             {/*  }}*/}
             {/*/>*/}
-            {orgCodeUrl ? <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList fileList={orgCodeUrl} domId={'changeDetailJszj1'}/>
-            </div> : <div/>}
+            {orgCodeUrl ? <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList fileList={orgCodeUrl} domId={'changeDetailJszj1'} />
+            </div> : <div />}
             <Modal
               maskClosable={false}
               footer={null}
@@ -513,7 +487,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           <ul
             style={{
               width: "868px",
@@ -597,18 +589,18 @@ class ChangeDetail extends Component {
                 : "0"}
             </p>
           </div>
-          
+
           <div
             style={{
               display: this.props.data.processState > 5 ? "block" : "none",
-              marginTop:'10px'
+              marginTop: '10px'
             }}
           >
             <h3 style={{ marginLeft: 20, fontWeight: 800, marginBottom: 10 }}>
               当前财务状态(财务填写)
             </h3>
             {financeData.map((item, index) => {
-              return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid}/>;
+              return <Itemlist key={index} pageData={item} orderUid={this.props.orderUid} />;
             })}
           </div>
           {/* {this.props.data.type === 0 ? (
@@ -629,7 +621,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
             }}
@@ -646,17 +638,17 @@ class ChangeDetail extends Component {
             />
           </div>
 
-{/* 完成审核,上传附件 */}
-<div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -667,7 +659,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -683,70 +675,70 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'changeDetailCwjlqq2'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <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%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'changeDetailCwjlqq2'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.previewVisible}
+                  onCancel={() => {
+                    this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <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>
             </div>
+          </div>
           {/* {this.props.data.processState >= 4 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
@@ -776,8 +768,8 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}
@@ -786,7 +778,7 @@ class ChangeDetail extends Component {
           </div>
         </div>
         {this.props.data.processState === 4 &&
-        (this.props.data.status == 1 || this.props.data.status == 3) ? (
+          (this.props.data.status == 1 || this.props.data.status == 3) ? (
           // this.state.buttonStatus ? (
           <div>
             <div style={{ marginBottom: 10 }}>

+ 134 - 142
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxgly.js

@@ -1,9 +1,10 @@
 import React, { Component } from "react";
-import {Form, Upload, Modal, Button, message, Input, Table, Tooltip} from "antd";
+import { Form, Upload, Modal, Button, message, Input, Table, Tooltip } from "antd";
 import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew } from "../../../../tools.js";
 import { shenghePeo, changeColor } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
@@ -22,38 +23,11 @@ const formItemLayout = {
   wrapperCol: { span: 14 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
-
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -72,21 +46,21 @@ class Itemlist extends Component {
     return (
       <div className="clearfix">
         {pageData.labelA === '客户名称' ? <Form.Item
-            label={pageData.labelA}
-            {...pageData.formItemLayoutA}
-            className="half-item"
+          label={pageData.labelA}
+          {...pageData.formItemLayoutA}
+          className="half-item"
         >
           <div>
             {pageData.dataA}
             <EnterpriseNameChange
-                type='journal'
-                style={{ marginLeft: 10 }}
-                enterpriseId={this.props.orderUid}/>
+              type='journal'
+              style={{ marginLeft: 10 }}
+              enterpriseId={this.props.orderUid} />
           </div>
-        </Form.Item> : pageData.labelA === '当前进度' || pageData.labelA ===  '变更原因' ? <Form.Item
-            label={pageData.labelA}
-            {...pageData.formItemLayoutA}
-            className="half-item"
+        </Form.Item> : pageData.labelA === '当前进度' || pageData.labelA === '变更原因' ? <Form.Item
+          label={pageData.labelA}
+          {...pageData.formItemLayoutA}
+          className="half-item"
         >
           <Tooltip placement="topLeft" title={pageData.dataA}>
             <div style={{
@@ -98,12 +72,12 @@ class Itemlist extends Component {
             }}>{pageData.dataA}</div>
           </Tooltip>
         </Form.Item> : <Form.Item
-                label={pageData.labelA}
-                {...pageData.formItemLayoutA}
-                className="half-item"
-            >
-              <div>{pageData.dataA}</div>
-            </Form.Item>}
+          label={pageData.labelA}
+          {...pageData.formItemLayoutA}
+          className="half-item"
+        >
+          <div>{pageData.dataA}</div>
+        </Form.Item>}
         <Form.Item
           label={pageData.labelB}
           {...pageData.formItemLayoutB}
@@ -325,15 +299,15 @@ class ChangeDetail extends Component {
         dataA:
           this.props.data.processState == 2 || this.props.data.processState == 3
             ? shenghePeo(
-                this.props.data.processState == 2
-                  ? this.props.data.consultantExamine
-                  : this.props.data.managerExamine,
-                this.props.data.processState
-              )
+              this.props.data.processState == 2
+                ? this.props.data.consultantExamine
+                : this.props.data.managerExamine,
+              this.props.data.processState
+            )
             : getProcessStatusNew(
-                this.props.data.processState,
-                this.props.data.status
-              ),
+              this.props.data.processState,
+              this.props.data.status
+            ),
         labelB: "变更类型",
         formItemLayoutB: formItemLayout,
         dataB: getChangeType(this.props.data.type),
@@ -413,8 +387,8 @@ class ChangeDetail extends Component {
     ];
     const orgCodeUrl = this.props.pictureUrl;
     const attachment = this.props.attachment
-    console.log(this.props.attachment);
-    console.log(this.props.orderUid);
+    // console.log(this.props.attachment);
+    // console.log(this.props.orderUid);
     return (
       <div className="clearfix changeDetail">
         <div
@@ -436,7 +410,7 @@ class ChangeDetail extends Component {
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4
+                  this.props.data.status == 4
                   ? "block"
                   : "none",
             }}
@@ -493,8 +467,8 @@ class ChangeDetail extends Component {
             {/*    });*/}
             {/*  }}*/}
             {/*/>*/}
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-              <ImgList fileList={orgCodeUrl} ItemWidth={'96px'}/>
+            <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+              <ImgList fileList={orgCodeUrl} ItemWidth={'96px'} />
             </div>
             <Modal
               maskClosable={false}
@@ -548,7 +522,25 @@ class ChangeDetail extends Component {
             </Modal>
             <Rizhi changeId={this.props.id} />
           </Form.Item>
-
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
           <ul
             style={{
@@ -631,8 +623,8 @@ class ChangeDetail extends Component {
                 : "0"}
             </p>
           </div>
-{/* 当前财务状态 */}
-<div
+          {/* 当前财务状态 */}
+          <div
             style={{
               display: this.props.data.processState > 5 ? "block" : "none",
             }}
@@ -644,13 +636,13 @@ class ChangeDetail extends Component {
               return <Itemlist orderUid={this.props.orderUid} key={index} pageData={item} />;
             })}
           </div>
-{/* 回收退票 */}
+          {/* 回收退票 */}
           <div
             style={{
               display:
                 (this.props.data.processState == 8 ||
                   this.props.data.processState == 7) &&
-                (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
+                  (this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6)
                   ? "block"
                   : "none",
             }}
@@ -667,17 +659,17 @@ class ChangeDetail extends Component {
               dataSource={this.state.contactList}
             />
           </div>
-{/* 完成审核,上传附件 */}
-<div style={{
-              position: "relative",
-              display:
-                (this.props.data.processState == 7 ||
-                  this.props.data.processState == 8) &&
-                  this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
-                    ? "block"
-                    : "none",
-              marginTop: 10,
-            }}
+          {/* 完成审核,上传附件 */}
+          <div style={{
+            position: "relative",
+            display:
+              (this.props.data.processState == 7 ||
+                this.props.data.processState == 8) &&
+                this.props.data.status == 2 || this.props.data.status == 4 || this.props.data.status == 3 || this.props.data.status == 6
+                ? "block"
+                : "none",
+            marginTop: 10,
+          }}
           >
             <hr
               style={{
@@ -688,7 +680,7 @@ class ChangeDetail extends Component {
                 border: "none",
               }}
             />
-          <h3
+            <h3
               style={{
                 marginLeft: 20,
                 fontWeight: 800,
@@ -704,71 +696,71 @@ class ChangeDetail extends Component {
               </span>
             </h3>
             <div>
-            <Form.Item
-            label="变更附件"
-            labelCol={{ span: 4 }}
-            wrapperCol={{ span: 18 }}
-          >
-            <div style={{paddingTop:'10px',paddingBottom:'10px'}}>
-             { attachment.length > 0  ? <ImgList domId={this.props.domId+2 ? this.props.domId+2 : 'changeDetailyxgly1'} fileList={attachment} ItemWidth={'96px'}/> :'无附件'}
-            </div>
-            <Modal
-              maskClosable={false}
-              footer={null}
-              width={"50%"}
-              visible={this.state.previewVisible}
-              onCancel={() => {
-                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
-                  // this.reset();
-                });
-              }}
-            >
-              <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%)",
-                }}
+              <Form.Item
+                label="变更附件"
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
               >
-                下一张
-              </Button>
-            </Modal>
-            {/* <Rizhi changeId={this.props.id} /> */}
-          </Form.Item>
-            </div>
+                <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
+                  {attachment.length > 0 ? <ImgList domId={this.props.domId + 2 ? this.props.domId + 2 : 'changeDetailyxgly1'} fileList={attachment} ItemWidth={'96px'} /> : '无附件'}
+                </div>
+                <Modal
+                  maskClosable={false}
+                  footer={null}
+                  width={"50%"}
+                  visible={this.state.previewVisible}
+                  onCancel={() => {
+                    this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
+                      // this.reset();
+                    });
+                  }}
+                >
+                  <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>
             </div>
-          
+          </div>
+
           {/* {this.props.data.type === 0 && this.props.data.processState >= 2 ? (
             <div>
               <h3 style={{ marginLeft: 10, fontWeight: 800, marginBottom: 10 }}>
@@ -808,14 +800,14 @@ class ChangeDetail extends Component {
           ) : (
             ""
           )} */}
-          
+
           <div
             style={{
               display:
                 (this.props.data.processState == 7 ||
                   this.props.data.processState == 8) &&
-                this.props.data.status == 4 &&
-                this.props.data.refundStatus
+                  this.props.data.status == 4 &&
+                  this.props.data.refundStatus
                   ? "block"
                   : "none",
             }}
@@ -910,4 +902,4 @@ class ChangeDetail extends Component {
   }
 }
 
-export { ChangeDetail, changeType, getChangeType };
+export { ChangeDetail, getChangeType };

+ 21 - 28
js/component/manageCenter/order/orderNew/changeComponent/changeDetailYxy.js

@@ -4,6 +4,7 @@ import AgreeButton from "./agreeButton.js";
 import Rizhi from "./rizhi.js";
 import { getProcessStatusNew, changeColor } from "@/tools.js";
 import { shenghePeo } from "@/tools.js";
+import { typeList } from '@/dataDic.js'
 import $ from "jquery/src/ajax";
 import tongguo from "../../../../../../image/tongguo.png";
 import quxiao from "../../../../../../image/quxiao.png";
@@ -19,38 +20,11 @@ const formItemLayout = {
   wrapperCol: { span: 14 }
 };
 
-const changeType = [
-  {
-    value: "0",
-    key: "退单退款"
-  },
-  {
-    value: "1",
-    key: "项目及金额变更"
-  },
-  {
-    value: "2",
-    key: "仅项目变更"
-  },
-  {
-    value: "3",
-    key: "仅金额变更"
-  },
-  {
-    value: "4",
-    key: "重报"
-  },
-  {
-    value: "5",
-    key: "赠送"
-  }
-];
-
 const getChangeType = function (e) {
   if (e || e == 0) {
     let str = e.toString();
     let theType = "";
-    changeType.map(function (item) {
+    typeList.map(function (item) {
       if (item.value == str) {
         theType = item.key;
       }
@@ -548,6 +522,25 @@ class ChangeDetail extends Component {
             ""
           )} */}
           {/* <h2 style={{ textAlign: "center", marginBottom: 0 }}>变更日志</h2> */}
+          {
+            this.props.contractPictureUrl && this.props.contractPictureUrl.length != 0 &&
+            <div className="clearfix">
+              <Form.Item
+                labelCol={{ span: 4 }}
+                wrapperCol={{ span: 18 }}
+                label="最新合同"
+              >
+                <div style={{ paddingTop: 10 }}>
+                  <ImgList
+                    fileList={
+                      this.props.contractPictureUrl
+                    }
+                    ItemWidth={"96px"}
+                  />
+                </div>
+              </Form.Item>
+            </div>
+          }
           <ul
             style={{
               width: "868px",

+ 11 - 11
js/component/manageCenter/order/orderNew/changeComponent/picturesWall.js

@@ -53,17 +53,17 @@ class PicturesWall extends Component {
     return (
       <div style={{ display: "inline-block" }}>
         <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}
+          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>
     );

+ 9 - 1
js/component/manageCenter/order/orderNew/changeComponent/searchInput.js

@@ -327,7 +327,15 @@ class SearchInput extends Component {
           {
             name: "赠送",
             id: "5"
-          }
+          },
+          {
+            name: "退单不退款",
+            id: "6",
+          },
+          {
+            name: "仅变更合同",
+            id: "7",
+          },
         ],
         getValue: value => {
           this.setState({

+ 1 - 1
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -586,7 +586,7 @@ const IntentionCustomer = Form.create()(
     },
 
     rizhi() {
-      console.log(this.state.orderNo);
+      // console.log(this.state.orderNo);
       this.setState({
         loading: true,
       });

+ 4 - 4
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -928,10 +928,10 @@ const checkOutsourcing = Form.create()(
         })
       }
       if (key === '2') {
-        console.log(
-          typeof this.state.refundStatus,
-          !(this.state.refundStatus === 1)
-        )
+        // console.log(
+        //   typeof this.state.refundStatus,
+        //   !(this.state.refundStatus === 1)
+        // )
         this.setState({
           loading: true,
         })

+ 9 - 0
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -513,6 +513,14 @@ const contractChange = Form.create()(
                   globalConfig.avatarHost + "/upload",
                   url
                 )
+                : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
                 : []
             });
           }
@@ -1473,6 +1481,7 @@ const contractChange = Form.create()(
                         // loadData={this.ChangeDetail}
                         txt={this.state.processStateText}
                         pictureUrl={this.state.voucherUrl}
+                        contractPictureUrl={this.state.contractPictureUrl}
                         attachment={this.state.attachment}
                         processState={this.props.processState}
                         loadData={this.callback}

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

@@ -473,6 +473,14 @@ const contractChange = Form.create()(
                   url
                 )
                 : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
+                : []
             });
           }
         }.bind(this)
@@ -1316,6 +1324,7 @@ const contractChange = Form.create()(
                         orderData={this.state.orderData}
                         txt={this.state.processStateText}
                         pictureUrl={this.state.voucherUrl}
+                        contractPictureUrl={this.state.contractPictureUrl}
                         attachment={this.state.attachment}
                         processState={this.props.processState}
                         loadData={this.callback}

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

@@ -514,6 +514,14 @@ const contractChange = Form.create()(
                   url
                 )
                 : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
+                : []
             });
           }
         }.bind(this)
@@ -1466,6 +1474,7 @@ const contractChange = Form.create()(
                         loadData={this.ChangeDetail}
                         txt={this.state.processStateText}
                         pictureUrl={this.state.voucherUrl}
+                        contractPictureUrl={this.state.contractPictureUrl}
                         attachment={this.state.attachment}
                         processState={this.props.processState}
                         loadData={this.callback}

+ 9 - 0
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -471,6 +471,14 @@ const contractChange = Form.create()(
                   globalConfig.avatarHost + "/upload",
                   url
                 )
+                : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
                 : []
             });
           }
@@ -1314,6 +1322,7 @@ const contractChange = Form.create()(
                         money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
                         data={this.state.contractData}
                         pictureUrl={this.state.voucherUrl}
+                        contractPictureUrl={this.state.contractPictureUrl}
                         attachment={this.state.attachment}
                         processState={this.props.processState}
                         // loadData={this.callback}

+ 9 - 0
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -485,6 +485,14 @@ const contractChange = Form.create()(
                   globalConfig.avatarHost + "/upload",
                   url
                 )
+                : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
                 : []
             });
           }
@@ -1247,6 +1255,7 @@ const contractChange = Form.create()(
                         orderUid={this.state.orderUid}
                         data={this.state.contractData}
                         pictureUrl={this.state.voucherUrl}
+                        contractPictureUrl={this.state.contractPictureUrl}
                         attachment={this.state.attachment}
                         processState={this.props.processState}
                         loadData={this.callback}

+ 9 - 0
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -470,6 +470,14 @@ const contractChange = Form.create()(
                   url
                 )
                 : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
+                : []
             });
           }
         }.bind(this)
@@ -1309,6 +1317,7 @@ const contractChange = Form.create()(
                         money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
                         data={this.state.contractData}
                         pictureUrl={this.state.voucherUrl}
+                        contractPictureUrl={this.state.contractPictureUrl}
                         attachment={this.state.attachment}
                         processState={this.props.processState}
                         loadData={this.callback}

+ 9 - 0
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -466,6 +466,14 @@ const contractChange = Form.create()(
                   url
                 )
                 : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
+                : []
             });
           }
         }.bind(this)
@@ -1320,6 +1328,7 @@ const contractChange = Form.create()(
                             money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
                             data={this.state.contractData}
                             pictureUrl={this.state.voucherUrl}
+                            contractPictureUrl={this.state.contractPictureUrl}
                             attachment={this.state.attachment}
                             processState={this.props.processState}
                             dataSource={this.state.dataProps}

+ 9 - 0
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -475,6 +475,14 @@ const contractChange = Form.create()(
                   url
                 )
                 : [],
+              contractPictureUrl: thisdata.contractPictureUrl
+                ? splitUrl(
+                  thisdata.contractPictureUrl,
+                  ",",
+                  globalConfig.avatarHost + "/upload",
+                  url
+                )
+                : []
             });
           }
         }.bind(this)
@@ -1348,6 +1356,7 @@ const contractChange = Form.create()(
                                     visitCancel={this.visitCancel}
                                     data={this.state.contractData}
                                     pictureUrl={this.state.voucherUrl}
+                                    contractPictureUrl={this.state.contractPictureUrl}
                                     attachment={this.state.attachment}
                                     processState={this.props.processState}
                                     dataSource={this.state.dataProps}

+ 2 - 2
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -1299,7 +1299,7 @@ const IntentionCustomer = Form.create()(
       });
     },
     rizhi() {
-      console.log(this.state.orderNo);
+      // console.log(this.state.orderNo);
       this.setState({
         loading: true,
       });
@@ -2102,7 +2102,7 @@ const IntentionCustomer = Form.create()(
     },
     onSelectChange(selectedRowKeys) {
       this.setState({ selectedRowKeys });
-      console.log(selectedRowKeys);
+      // console.log(selectedRowKeys);
     },
     // inRecordData() {
     //   this.setState({

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

@@ -932,8 +932,8 @@ const outsourcingPro = Form.create()(
             if (!allTotalAmount) {
               allTotalAmount = 0
             }
-            console.log(theArr)
-            console.log(companyNameArr)
+            // console.log(theArr)
+            // console.log(companyNameArr)
 
             this.setState({
               tid: id,

+ 2 - 2
js/component/manageCenter/order/orderStatistics/orderStatistics.jsx

@@ -726,8 +726,8 @@ const DiurnalStatistics = React.createClass({
 	},
 	//重构排序
 	tabChange(pagination,filter,sorter){
-		console.log(pagination)
-		console.log(sorter)
+		// console.log(pagination)
+		// console.log(sorter)
 	},
 	componentWillMount() {
 		//this.loadData();

+ 3 - 3
js/component/manageCenter/order/pressMoney/dunningRecord.jsx

@@ -76,7 +76,7 @@ class DunningRecord extends Component {
                     visibleDownload: true,
                     downloadList: data,
                   });
-                  console.log(data);
+                  // console.log(data);
                 }}
               >
                 {this.state.voucher}
@@ -106,7 +106,7 @@ class DunningRecord extends Component {
         const a = document.createElement("a");
         a.style.display = "none";
         a.href = `${window.window.globalConfig.context}/open/download?fileName=${element.url}&delete=false&attName=${element.name}`;
-        console.log(a.href);
+        // console.log(a.href);
         document.body.appendChild(a);
         a.click(); // 自动触发点击a标签的click事件
         document.body.removeChild(a);
@@ -180,7 +180,7 @@ class DunningRecord extends Component {
   // }
   render() {
     const { visibleDownload, downloadList } = this.state;
-    console.log(this.props.dataInfor);
+    // console.log(this.props.dataInfor);
     return (
       <Modal
         maskClosable={false}

+ 5 - 5
js/component/manageCenter/order/pressMoney/index.jsx

@@ -270,7 +270,7 @@ class PressMoney extends Component {
                     visibleTree: true,
                     downloadList: data,
                   });
-                  console.log(data);
+                  // console.log(data);
                 }}
               >
                 下载凭证
@@ -342,12 +342,12 @@ class PressMoney extends Component {
   downloadAll() {
     let list = this.state.downloadList;
     list.forEach((element, key) => {
-      console.log(element);
+      // console.log(element);
       setTimeout(() => {
         const a = document.createElement("a");
         a.style.display = "none";
         a.href = `${window.window.globalConfig.context}/open/download?fileName=${element.url}&delete=false&attName=${element.name}`;
-        console.log(a.href);
+        // console.log(a.href);
         document.body.appendChild(a);
         a.click(); // 自动触发点击a标签的click事件
         document.body.removeChild(a);
@@ -512,7 +512,7 @@ class PressMoney extends Component {
               tabelApi={"/api/admin/lagalAffairs/lagalAffairsLogList"}
               query={{ orderNo: this.state.dataInfor.orderNo }}
               dataProcessing={(data) => {
-                console.log(this.state);
+                // console.log(this.state);
                 // console.log(data.data);
                 let theArr = [];
                 for (let i = 0; i < data.data.length; i++) {
@@ -544,7 +544,7 @@ class PressMoney extends Component {
                   } else if (thisdata.type == 4) {
                     thisdata.type = "营销转交";
                   }
-                  console.log(thisdata);
+                  // console.log(thisdata);
                   theArr.push(thisdata);
                 }
                 return theArr;

+ 1 - 1
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -625,7 +625,7 @@ const PaiDan = React.createClass({
   },
 
   rizhi() {
-    console.log(this.state.orderNo);
+    // console.log(this.state.orderNo);
     this.setState({
       loading: true
     });

+ 1 - 1
js/component/manageCenter/project/project/projectQuery.jsx

@@ -510,7 +510,7 @@ const PaiDan = React.createClass({
   },
 
   rizhi() {
-    console.log(this.state.orderNo);
+    // console.log(this.state.orderNo);
     this.setState({
       loading: true
     });

+ 2 - 2
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -652,7 +652,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
   },
 
   rizhi() {
-    console.log(this.state.orderNo);
+    // console.log(this.state.orderNo);
     this.setState({
       loading: true
     });
@@ -807,7 +807,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         },
         success: function (data) {
           let thisdata = data.data;
-          console.log(thisdata);
+          // console.log(thisdata);
           if (thisdata) {
             this.setState({
               id: thisdata.id,

+ 5 - 1
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -136,7 +136,7 @@ const member = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
-        width: 200,
+        width: 300,
     },
     {
         title: "特别说明",
@@ -281,6 +281,7 @@ const highTechColumns = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
+        width: 300,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -404,6 +405,7 @@ const doubleSoft = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
+        width: 300,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -561,6 +563,7 @@ const softWriting = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
+        width: 300,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'
@@ -730,6 +733,7 @@ const patent = [
         title: "项目说明",
         dataIndex: "taskComment",
         key: "taskComment",
+        width: 300,
         // render: (v) => (
         //     <Tooltip placement="topRight" title={v} overlayStyle={{
         //         wordBreak: 'break-all'

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

@@ -3769,7 +3769,7 @@ const Task = React.createClass({
                                 value={this.state.approvalSearch}
                                 onChange={(e) => {
                                     this.setState({ approvalSearch: e })
-                                    console.log(this.state.approvalSearch)
+                                    // console.log(this.state.approvalSearch)
                                 }}
                             >
                                 <Select.Option key={0}>非特批</Select.Option>
@@ -3781,7 +3781,7 @@ const Task = React.createClass({
                                 value={this.state.outsourceStatusSearch}
                                 onChange={(e) => {
                                     this.setState({ outsourceStatusSearch: e })
-                                    console.log(this.state.outsourceStatusSearch)
+                                    // console.log(this.state.outsourceStatusSearch)
                                 }}
                             >
                                 <Select.Option key={0}>外包待审核</Select.Option>

+ 3 - 4
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -1625,7 +1625,6 @@ const MyTaskOutsource = React.createClass({
   //判断
   companyJugle() {
     if (this.state.cName === undefined) {
-      console.log(2345);
       message.warning("公司名称不能为空!");
       return;
     }
@@ -1858,7 +1857,7 @@ const MyTaskOutsource = React.createClass({
     });
   },
   timeDetail(record) {
-    console.log(record);
+    // console.log(record);
 
     this.setState({
       loading: true,
@@ -1880,7 +1879,7 @@ const MyTaskOutsource = React.createClass({
           this.setState({
             dataSourceTime: data.data,
           });
-          console.log(this.state.dataSourceTime);
+          // console.log(this.state.dataSourceTime);
         }
       }.bind(this),
     }).always(
@@ -3305,7 +3304,7 @@ const MyTaskOutsource = React.createClass({
                 value={this.state.approvalSearch}
                 onChange={(e) => {
                   this.setState({ approvalSearch: e });
-                  console.log(this.state.approvalSearch);
+                  // console.log(this.state.approvalSearch);
                 }}
               >
                 <Select.Option key={0}>非特批</Select.Option>

+ 1 - 1
js/component/manageCenter/project/task/resolutionPro.jsx

@@ -211,7 +211,7 @@ const ResolutionPro = React.createClass({
                           proArr: this.state.proArr
                         },
                         () => {
-                          console.log(this.state.proArr);
+                          // console.log(this.state.proArr);
                         }
                       );
                     }}

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

@@ -1295,7 +1295,7 @@ const Task = React.createClass({
               }
               dataSource={this.state.dataSource}
               onHeaderRow={(column) => {
-                console.log(column.index);
+                // console.log(column.index);
               }}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}

+ 2 - 2
js/component/manageCenter/servicesManage/copyright/comPatentChange.jsx

@@ -372,7 +372,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                         fileList={this.state.fileList_copyright_apply}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {
@@ -408,7 +408,7 @@ const CopyrightDescForm = Form.create()(React.createClass({
                         fileList={this.state.fileList_copyright_auth}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/achievement.jsx

@@ -169,7 +169,7 @@ const AchievementDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/activity.jsx

@@ -364,7 +364,7 @@ const ActivityForm = Form.create()(React.createClass({
                                 fileList={this.state.fileList}
                                 onChange={(info) => {
                                     if (info.file.status !== 'uploading') {
-                                        console.log(info.file, info.fileList);
+                                        // console.log(info.file, info.fileList);
                                     }
                                     if (info.file.status === 'done') {
                                         if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/activityCostList.jsx

@@ -288,7 +288,7 @@ const ActivityDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/finance.jsx

@@ -295,7 +295,7 @@ const FinanceDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/honorList.jsx

@@ -122,7 +122,7 @@ const HonorListDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 2 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -461,7 +461,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList_roster}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {
@@ -498,7 +498,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList_social_security}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 1 - 1
js/component/manageCenter/servicesManage/highTech/fosterDesc/intellectualDesc.jsx

@@ -203,7 +203,7 @@ const IntellectualDescFrom = Form.create()(React.createClass({
                         fileList={this.state.fileList}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
-                                console.log(info.file, info.fileList);
+                                // console.log(info.file, info.fileList);
                             }
                             if (info.file.status === 'done') {
                                 if (!info.file.response.error.length) {

+ 0 - 0
js/component/manageCenter/servicesManage/highTech/fosterDesc/orgTechCenter.jsx


Некоторые файлы не были показаны из-за большого количества измененных файлов