Ver código fonte

项目状态修改

HW 4 anos atrás
pai
commit
bfae57f046
44 arquivos alterados com 953 adições e 2392 exclusões
  1. 14 9
      js/component/common/declarationProgress/index.jsx
  2. 111 6
      js/component/common/nowProjectStatus/index.jsx
  3. 43 23
      js/component/common/nowProjectStatus/type.jsx
  4. 161 0
      js/component/common/projectDetailsReadOnly/index.jsx
  5. 25 3
      js/component/dataDic.js
  6. 4 4
      js/component/manageCenter/components/checkProject/index.jsx
  7. 2 35
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  8. 12 96
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  9. 2 16
      js/component/manageCenter/operate/personnel/personnelAll.jsx
  10. 37 44
      js/component/manageCenter/order/orderNew/addService.jsx
  11. 3 17
      js/component/manageCenter/order/orderNew/addorders.js
  12. 13 103
      js/component/manageCenter/order/orderNew/approveds.jsx
  13. 2 33
      js/component/manageCenter/order/orderNew/billing.jsx
  14. 11 52
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  15. 3 16
      js/component/manageCenter/order/orderNew/chargeback.jsx
  16. 12 72
      js/component/manageCenter/order/orderNew/checkOutsourcing.jsx
  17. 12 72
      js/component/manageCenter/order/orderNew/contractCwjl.js
  18. 12 72
      js/component/manageCenter/order/orderNew/contractCwzj.js
  19. 12 72
      js/component/manageCenter/order/orderNew/contractCwzy.js
  20. 12 72
      js/component/manageCenter/order/orderNew/contractJsjl.js
  21. 12 72
      js/component/manageCenter/order/orderNew/contractJsy.js
  22. 12 72
      js/component/manageCenter/order/orderNew/contractJszj.js
  23. 12 72
      js/component/manageCenter/order/orderNew/contractYxgly.js
  24. 12 72
      js/component/manageCenter/order/orderNew/contractYxy.js
  25. 3 20
      js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js
  26. 12 95
      js/component/manageCenter/order/orderNew/examine.jsx
  27. 15 106
      js/component/manageCenter/order/orderNew/inquiry.jsx
  28. 12 72
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  29. 9 17
      js/component/manageCenter/order/orderNew/outsourcingPro.jsx
  30. 11 70
      js/component/manageCenter/personnel/personnel/personnelAll.jsx
  31. 9 74
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  32. 101 105
      js/component/manageCenter/project/project/projectAssignment.jsx
  33. 13 72
      js/component/manageCenter/project/project/projectQuery.jsx
  34. 11 71
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  35. 17 8
      js/component/manageCenter/project/summary/projectDetails.jsx
  36. 55 175
      js/component/manageCenter/project/task/myTask.jsx
  37. 28 84
      js/component/manageCenter/project/task/myTaskCount.jsx
  38. 16 8
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  39. 11 6
      js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js
  40. 11 93
      js/component/manageCenter/project/task/taskAssignment.jsx
  41. 28 84
      js/component/manageCenter/project/task/taskCount.jsx
  42. 26 82
      js/component/manageCenter/project/task/taskQuery.jsx
  43. 13 44
      js/component/project.jsx
  44. 1 1
      package.json

+ 14 - 9
js/component/common/declarationProgress/index.jsx

@@ -8,9 +8,13 @@ class DeclarationProgress extends Component{
     render() {
         return (
             <div style={{display:'flex',flexFlow:'row wrap',marginLeft: '11px',marginTop:'20px'}}>
-                {this.props.startDate ? <div style={{marginRight:'30px',marginBottom:'15px'}}>
-                    <span style={{marginRight:'15px'}}>启动时间:</span>
-                    <span>{this.props.startDate}</span>
+                {/*{this.props.startDate ? <div style={{marginRight:'30px',marginBottom:'15px'}}>*/}
+                {/*    <span style={{marginRight:'15px'}}>启动时间:</span>*/}
+                {/*    <span>{this.props.startDate}</span>*/}
+                {/*</div> : null}*/}
+                {this.props.taskDate ? <div style={{marginRight:'30px',marginBottom:'15px'}}>
+                    <span style={{marginRight:'15px'}}>分配时间:</span>
+                    <span>{this.props.taskDate}</span>
                 </div> : null}
                 {/*旧数据处理*/}
                 {/* endDate           完成时间      对应已提交时间     4*/}
@@ -23,31 +27,32 @@ class DeclarationProgress extends Component{
                 {
                     this.props.timeRecordparse && Object.keys(this.props.timeRecordparse).map(v=>(
                         <div style={{marginBottom:'15px'}}>
-                            <span style={{marginRight:'8px'}}>{this.props.timeRecordparse[v]['title']}:</span>
-                            <span style={{marginRight:'30px',}}>{this.props.timeRecordparse[v]['date']}</span>
+                            {this.props.timeRecordparse[v]['date'] && <span style={{marginRight:'8px'}}>{this.props.timeRecordparse[v]['title']}:</span>}
+                            <span style={{marginRight:'30px'}}>{this.props.timeRecordparse[v]['date']}</span>
                             <span>
                                 {
                                     v === '18' ? <span style={{marginBottom:'15px'}}>
                                         <span style={{marginRight:'8px'}}>拨款金额(万元):</span>
-                                        <span style={{marginRight:'30px',}}>{this.props.timeRecordparse[v]['appropriation']}</span>
+                                        <span style={{marginRight:'30px'}}>{this.props.timeRecordparse[v]['appropriation']}</span>
                                     </span> : null
                                 }
                                 {
                                     v === '15' ? <span style={{marginBottom:'15px'}}>
                                         <span style={{marginRight:'8px'}}>立项金额(万元):</span>
-                                        <span style={{marginRight:'30px',}}>{this.props.timeRecordparse[v]['setUpAmount']}</span>
+                                        <span style={{marginRight:'30px'}}>{this.props.timeRecordparse[v]['setUpAmount']}</span>
                                     </span> : null
                                 }
                             </span>
                         </div>
                     ))
                 }
+                {/*以前的立项金额不显示*/}
                 {
                     this.props.list.map(v=>(
-                        !this.props.timeRecordparse[parseInt(v.id)] && v.value && <div style={{marginRight:'30px',marginBottom:'15px'}}>
+                        (!this.props.timeRecordparse[parseInt(v.id)] && v.value && v.id !== '15') ? <div style={{marginRight:'30px',marginBottom:'15px'}}>
                             <span style={{marginRight:'15px'}}>{v.name}:</span>
                             <span>{v.value}</span>
-                        </div>
+                        </div> : null
                     ))
                 }
             </div>

+ 111 - 6
js/component/common/nowProjectStatus/index.jsx

@@ -9,6 +9,8 @@ import {
 } from './type';
 import moment from "moment";
 import $ from "jquery";
+import {splitUrl} from '@/tools'
+import ImgList from "../imgList";
 
 class NowProjectStatus extends Component{
     constructor(props) {
@@ -27,6 +29,7 @@ class NowProjectStatus extends Component{
                     [],//projectType  0 正常 1专利 2软著 3审计 4双软 5高新 6商标   cSort: 3 科技项目  6: 会员
             dataInfor:Object.assign({},props.projectTypeJSON),
             loading: false,
+            fileList:[],
         }
     }
 
@@ -36,13 +39,54 @@ class NowProjectStatus extends Component{
         if(this.state.dataInfor[this.state.projectStatus] && this.state.dataInfor[this.state.projectStatus]['title']){
             dataInforLength -= 1;
         }
+        if(this.state.dataInfor[this.state.projectStatus] && this.state.dataInfor[this.state.projectStatus]['suspendImg']){
+            dataInforLength -= 1;
+        }
         if(arr.length !== 0 && arr[0]['valueType'] && dataInforLength !== arr[0]['valueType'].length){
-            message.warning('有内容没有填写,请补充完整!')
+            arr[0]['valueType'].map((v)=>{
+                if(!this.state.dataInfor[this.state.projectStatus][v]){
+                    if(v === 'date'){
+                        message.warning('请将'+arr[0]['name']+'时间补充完整')
+                    }
+                    if(v === 'certificateNumber'){
+                        message.warning('请将'+arr[0]['name']+'的证书编号补充完整')
+                    }
+                    if(v === 'setUpAmount'){
+                        message.warning('请将'+arr[0]['name']+'的立项金额补充完整')
+                    }
+                    if(v === 'appropriation'){
+                        message.warning('请将'+arr[0]['name']+'的拨款金额补充完整')
+                    }
+                    return false;
+                }
+            })
+            return false;
+        }
+        if((this.state.projectStatus === 2 || this.state.projectStatus === 3) && this.state.fileList.length === 0){
+            message.warning('暂停附件未上传,请上传后保存!')
             return false;
         }
         this.setState({
             loading: true,
         })
+        if((this.state.projectStatus === 2 || this.state.projectStatus === 3)){
+            if (this.state.fileList.length) {
+                let picArr = []
+                this.state.fileList.map(function (item) {
+                    if (item.response && item.response.data && item.response.data.length) {
+                        picArr.push(item.response.data)
+                    }
+                })
+                if(!this.state.dataInfor[2]){
+                    this.state.dataInfor[2] = {};
+                }
+                if(!this.state.dataInfor[3]){
+                    this.state.dataInfor[3] = {};
+                }
+                this.state.dataInfor[2]['suspendImg'] = picArr.join(',');
+                this.state.dataInfor[3]['suspendImg'] = picArr.join(',');
+            }
+        }
         let data = Object.assign({},this.state.dataInfor);
         Object.keys(data).map(v=>{
             if(Object.keys(data[v]).length === 0){
@@ -113,9 +157,23 @@ class NowProjectStatus extends Component{
             this.state.dataInfor[10]={title:'发证时间'};
             this.state.dataInfor[10]['date'] = licenceDate;
         }
-        if((!this.props.projectTypeJSON[15]) && setUpAmount){
-            this.state.dataInfor[15]={title:'立项金额'};
-            this.state.dataInfor[15]['setUpAmount'] = setUpAmount;
+        // if((!this.props.projectTypeJSON[15]) && setUpAmount){
+        //     this.state.dataInfor[15]={title:'立项金额'};
+        //     this.state.dataInfor[15]['setUpAmount'] = setUpAmount;
+        // }
+        //图片
+        if(this.props.projectTypeJSON[2] && this.props.projectTypeJSON[2]['suspendImg']){
+            this.setState({
+                fileList: splitUrl(
+                    this.props.projectTypeJSON[2]['suspendImg'],
+                    ',',
+                    globalConfig.avatarHost + '/upload'
+                )
+            })
+        }else{
+            this.setState({
+                fileList: []
+            })
         }
         this.setState({
             dataInfor: this.state.dataInfor,
@@ -195,7 +253,11 @@ class NowProjectStatus extends Component{
                                                         if(!this.state.dataInfor[v.id]){
                                                             this.state.dataInfor[v.id] = {};
                                                         }
-                                                        this.state.dataInfor[v.id][d] = dataString;
+                                                        if(!dataString && this.state.dataInfor[v.id][d]){
+                                                            delete this.state.dataInfor[v.id][d];
+                                                        }else{
+                                                            this.state.dataInfor[v.id][d] = dataString;
+                                                        }
                                                         this.setState({
                                                             dataInfor:this.state.dataInfor,
                                                         })
@@ -217,7 +279,11 @@ class NowProjectStatus extends Component{
                                                                 if(!this.state.dataInfor[v.id]){
                                                                     this.state.dataInfor[v.id] = {};
                                                                 }
-                                                                this.state.dataInfor[v.id][d] = e.target.value;
+                                                                if(!e.target.value && this.state.dataInfor[v.id][d]){
+                                                                    delete this.state.dataInfor[v.id][d];
+                                                                }else{
+                                                                    this.state.dataInfor[v.id][d] = e.target.value;
+                                                                }
                                                                 this.setState({
                                                                     dataInfor:this.state.dataInfor,
                                                                 })
@@ -231,6 +297,44 @@ class NowProjectStatus extends Component{
                                 ))
                             }
                         </Radio.Group>
+                        {
+                            (this.state.projectStatus === 2 || this.state.projectStatus === 3 || this.state.fileList.length > 0) &&
+                                <div>
+                                    <div style={{
+                                        paddingTop:'20px',
+                                        paddingBottom:'10px'
+                                    }}>
+                                        <div>暂停附件:</div>
+                                        <div style={{color:'#f00'}}>(请上传截图证明)</div>
+                                    </div>
+                                    <div style={{
+                                        display:(this.state.projectStatus === 2 || this.state.projectStatus === 3) ? 'block':'none'
+                                    }}>
+                                        <ImgList
+                                            domId='nowProjectStatus'
+                                            uploadConfig={{
+                                                action:globalConfig.context + "/api/admin/orderProject/uploadOrderTaskFile",
+                                                data:{ 'sign': "order_task_file"},
+                                                multiple:true,
+                                                listType:"picture-card",
+                                            }}
+                                            onChange={(info)=>{
+                                                let fileList = info.fileList;
+                                                this.setState({ fileList });
+                                            }}
+                                            fileList={this.state.fileList}
+                                        />
+                                    </div>
+                                     <div style={{
+                                         display:(this.state.projectStatus === 2 || this.state.projectStatus === 3) ? 'none':'block'
+                                     }}>
+                                         <ImgList
+                                             domId='nowProjectStatus1'
+                                             fileList={this.state.fileList}
+                                         />
+                                     </div>
+                                </div>
+                        }
                         <div style={{
                             display:'flex',
                             justifyContent:'center',
@@ -238,6 +342,7 @@ class NowProjectStatus extends Component{
                             paddingBottom: '20px',
                         }}>
                             <Button
+                                loading={this.state.loading}
                                 className="cancel"
                                 type="ghost"
                                 onClick={()=>{

+ 43 - 23
js/component/common/nowProjectStatus/type.jsx

@@ -7,12 +7,14 @@ const highTechColumnsVIP =[
     {
         id:2,
         name:'暂停(客户通知暂停)',
-        valueType:['date']
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:3,
-        name:'暂停(业务线通知暂停)',
-        valueType:['date']
+        name:'暂停(业务线、总经理通知暂停)',
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:21,
@@ -52,12 +54,12 @@ const highTechColumnsVIP =[
     },
     {
         id:11,
-        name:'退单(已申报)',
+        name:'退单(已申报/已下证)',
         valueType:['date']
     },
     {
         id:12,
-        name:'退单(未申报)',
+        name:'退单(未申报/未下证)',
         valueType:['date']
     }
 ]
@@ -70,12 +72,14 @@ const highTechColumns =[
     {
         id:2,
         name:'暂停(客户通知暂停)',
-        valueType:['date']
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:3,
-        name:'暂停(业务线通知暂停)',
-        valueType:['date']
+        name:'暂停(业务线、总经理通知暂停)',
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:4,
@@ -121,12 +125,12 @@ const highTechColumns =[
     },
     {
         id:11,
-        name:'退单(已申报)',
+        name:'退单(已申报/已下证)',
         valueType:['date']
     },
     {
         id:12,
-        name:'退单(未申报)',
+        name:'退单(未申报/未下证)',
         valueType:['date']
     }
 ];
@@ -140,12 +144,14 @@ const science = [
     {
         id:2,
         name:'暂停(客户通知暂停)',
-        valueType:['date']
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:3,
-        name:'暂停(业务线通知暂停)',
-        valueType:['date']
+        name:'暂停(业务线、总经理通知暂停)',
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:4,
@@ -194,12 +200,12 @@ const science = [
     },
     {
         id:11,
-        name:'退单(已申报)',
+        name:'退单(已申报/已下证)',
         valueType:['date']
     },
     {
         id:12,
-        name:'退单(未申报)',
+        name:'退单(未申报/未下证)',
         valueType:['date']
     }
 ];
@@ -212,12 +218,14 @@ const patent = [
     {
         id:2,
         name:'暂停(客户通知暂停)',
-        valueType:['date']
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:3,
-        name:'暂停(业务线通知暂停)',
-        valueType:['date']
+        name:'暂停(业务线、总经理通知暂停)',
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:4,
@@ -236,12 +244,12 @@ const patent = [
     },
     {
         id:11,
-        name:'退单(已申报)',
+        name:'退单(已申报/已下证)',
         valueType:['date']
     },
     {
         id:12,
-        name:'退单(未申报)',
+        name:'退单(未申报/未下证)',
         valueType:['date']
     }
 ];
@@ -255,12 +263,14 @@ const currency = [
     {
         id:2,
         name:'暂停(客户通知暂停)',
-        valueType:['date']
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:3,
-        name:'暂停(业务线通知暂停)',
-        valueType:['date']
+        name:'暂停(业务线、总经理通知暂停)',
+        valueType:['date'],
+        explain:'需上传截图证明'
     },
     {
         id:4,
@@ -277,6 +287,16 @@ const currency = [
         name:'已驳回',
         valueType:['date']
     },
+    {
+        id:11,
+        name:'退单(已申报/已下证)',
+        valueType:['date']
+    },
+    {
+        id:12,
+        name:'退单(未申报/未下证)',
+        valueType:['date']
+    }
 ];
 
 export {

+ 161 - 0
js/component/common/projectDetailsReadOnly/index.jsx

@@ -0,0 +1,161 @@
+import React,{Component} from 'react';
+import {Form, Input, Modal, Select, Spin} from "antd";
+import {
+    getboutique,
+} from "@/tools";
+
+const formItemLayout = {
+    labelCol: { span: 8 },
+    wrapperCol: { span: 14 }
+};
+
+const FormItem = Form.Item;
+
+class ProjectDetailsReadOnly extends Component{
+    constructor(props) {
+        super(props);
+        this.state={
+            loading: false,
+            isIso: this.props.infor.commodityName.indexOf("贯标") !== -1,
+        }
+    }
+
+    render() {
+        const {
+            commodityName,
+            commodityQuantity,
+            officialCost,
+            costReduction,
+            commodityPrice,
+            main,
+            taskComment,
+            ifCertificationFee,//是否包含认证费
+            certificationFee,//认证费
+            certificationCorporate,//认证费公司
+            declarationBatch,//批次
+            type,//项目类型  0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+        } = this.props.infor;
+        const { isIso } = this.state;
+        return (
+            <Modal
+                    maskClosable={false}
+                    visible={this.props.visible}
+                    onOk={this.props.onCancel}
+                    onCancel={this.props.onCancel}
+                    width="800px"
+                    title="项目任务详情"
+                    footer=""
+                    className="admin-desc-content"
+                >
+                    <Form layout="horizontal" id="demand-form">
+                        <div className="clearfix">
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="项目名称"
+                            >
+                                <span>{commodityName}</span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="项目数量"
+                            >
+                                <span>{commodityQuantity}</span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="官费"
+                                style={{ display: this.state.displayFees }}
+                            >
+                              <span>
+                                {officialCost === 0 ? "无官费" : "有官费"}
+                              </span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="费减"
+                                style={{ display: this.state.displayFees }}
+                            >
+                              <span>
+                                {costReduction === 0 ? "无费减" : "有费减"}
+                              </span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="金额(万元)"
+                            >
+                                <span>{commodityPrice}</span>
+                            </FormItem>
+                            <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="主要项目"
+                            >
+                                <span>{getboutique(String(main))}</span>
+                            </FormItem>
+                            {type === 5 && <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="企业申报批次"
+                            >
+                                <span>
+                                    {
+                                        declarationBatch === 1 ? '第一批' :
+                                            declarationBatch === 1 ? '第二批' :
+                                                declarationBatch === 1 ? '第三批' :
+                                                    declarationBatch === 1 ? '第四批' : '未知'
+                                    }
+                                </span>
+                            </FormItem>}
+                            {isIso && <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费"
+                            >
+                                <span>
+                                    {
+                                        ifCertificationFee === 1 ? '包含' :
+                                            ifCertificationFee === 0 ? '不包含' :'未知'
+                                    }
+                                </span>
+                            </FormItem> }
+                            {isIso && ifCertificationFee === 1 ?<FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="认证费(万元)"
+                            >
+                               <span>{certificationFee || '暂无'}</span>
+                            </FormItem> : null}
+                            {isIso && ifCertificationFee === 1 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label=""
+                            /> : null}
+                            {isIso && ifCertificationFee === 1 ? <FormItem
+                                className="half-item"
+                                {...formItemLayout}
+                                label="付款公司名称"
+                            >
+                                <span>{certificationCorporate || '暂无'}</span>
+                            </FormItem>:null}
+                            <div className="clearfix">
+                                <FormItem
+                                    labelCol={{ span: 4 }}
+                                    wrapperCol={{ span: 16 }}
+                                    label="服务说明"
+                                >
+                                    <span>{taskComment}</span>
+                                </FormItem>
+                            </div>
+                        </div>
+                    </Form>
+                </Modal>
+        );
+    }
+}
+
+export default ProjectDetailsReadOnly;

+ 25 - 3
js/component/dataDic.js

@@ -3651,6 +3651,24 @@ module.exports = {
         },
       ],
     },
+    {
+      value: "9",
+      key: "高新",
+      children: [
+        {
+          value: "1",
+          key: "首期款",
+        },
+        {
+          value: "2",
+          key: "已拟公示",
+        },
+        {
+          value: "3",
+          key: "已下证",
+        },
+      ],
+    },
   ],
 //  项目状态列表
   projectStatusList:[
@@ -3668,7 +3686,7 @@ module.exports = {
     },
     {
       value:3,
-      label:'暂停(业务线通知暂停)',
+      label:'暂停(业务线、总经理通知暂停)',
     },
     {
       value:4,
@@ -3700,11 +3718,11 @@ module.exports = {
     },
     {
       value:11,
-      label:'退单(已申报)',
+      label:'退单(已申报/已下证)',
     },
     {
       value:12,
-      label:'退单(未申报)',
+      label:'退单(未申报/未下证)',
     },
     {
       value:13,
@@ -3766,5 +3784,9 @@ module.exports = {
       value:27,
       label:'所有会员服务全部完成',
     },
+    {
+      value:28,
+      label:'抽查未备案',
+    },
   ]
 };

+ 4 - 4
js/component/manageCenter/components/checkProject/index.jsx

@@ -11,8 +11,7 @@ import {
   Tooltip,
   Popconfirm,
 } from 'antd'
-import {getProjectName,} from '@/tools'
-import { getMaterialStatus, getUrgentStatus } from '@/tools'
+import { getMaterialStatus, getUrgentStatus,getProjectName } from '@/tools'
 import ApplyPaymentModal from './applyPaymentModal';
 import PayRecord from './payRecord';
 import ImgList from '../../../common/imgList/index';
@@ -1047,7 +1046,8 @@ class CheckProject extends Component {
               })
               if (!data.error.length) {
                 message.success('驳回成功!')
-                _this.props.onRefresh()
+                _this.props.onRefresh();
+                _this.getSelectOutsourceLog();
               } else {
                 message.warning(data.error[0].message)
               }
@@ -1076,7 +1076,7 @@ class CheckProject extends Component {
                         <div>供应商信息(普通单)</div>
                   }
                   <div style={{marginLeft:'auto'}}>
-                    <span style={{color:'#58a3ff'}}>项目状态:</span>{getProjectName(this.props.projectStatus)}
+                    <span style={{color:'#58a3ff'}}>项目状态:</span>{getProjectName(parseInt(this.props.projectStatus))}
                   </div>
                 </div>
                 {

+ 2 - 35
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -1727,41 +1727,8 @@ const ShouKuang = React.createClass({
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
             totalWaibao += thisdata.outsourcePrice;
-            theArr.push({
-              key: i + 1,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo,
-              contractNo: thisdata.contractNo,
-              userName: thisdata.userName,
-              buyerName: thisdata.buyerName,
-              departmentName: thisdata.departmentName,
-              salesmanName: thisdata.salesmanName,
-              depName: thisdata.depName,
-              orderStatus: thisdata.orderStatus,
-              projectStatus: thisdata.projectStatus,
-              commodityName: thisdata.commodityName,
-              totalAmount: thisdata.totalAmount,
-              liquidationStatus: thisdata.liquidationStatus,
-              settlementAmount: thisdata.settlementAmount,
-              accountsReceivable: thisdata.accountsReceivable,
-              dunSubject: thisdata.dunSubject,
-              startDate: thisdata.startDate,
-              taskStatus: thisdata.taskStatus,
-              cname: thisdata.cname,
-              costAmount: thisdata.costAmount,
-              taskName: thisdata.taskName,
-              hours: thisdata.hours,
-              taskDistributionTime: thisdata.taskDistributionTime,
-              taskEndTime: thisdata.taskEndTime,
-              commodityQuantity: thisdata.commodityQuantity,
-              commodityPrice: thisdata.commodityPrice,
-              certificateNumber: thisdata.certificateNumber,
-              taskComment: thisdata.taskComment,
-              outsourceName: thisdata.outsourceName,
-              outsourcePrice: thisdata.outsourcePrice,
-              outsource: thisdata.outsource,
-              splitStatus: thisdata.splitStatus,
-            });
+            thisdata.key = i + 1;
+            theArr.push(thisdata);
           }
         }
         totalWaibao = (Math.round(totalWaibao * 1000000) / 1000000).toFixed(6);

+ 12 - 96
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -26,6 +26,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const OrderDetail = Form.create()(
   React.createClass({
     loadXmu(record) {
@@ -50,27 +51,9 @@ const OrderDetail = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo,
-                commodityName: thisdata.commodityName,
-                commodityPrice: thisdata.commodityPrice,
-                commodityQuantity: thisdata.commodityQuantity,
-                taskStatus: thisdata.taskStatus,
-                taskComment: thisdata.taskComment,
-                main: thisdata.main,
-                contacts: thisdata.contacts,
-                contactsMobile: thisdata.contactsMobile,
-                cname: thisdata.cname,
-                certificateNumber: thisdata.certificateNumber,
-                projectStatus: thisdata.projectStatus,
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-                officialCost: thisdata.officialCost,
-                costReduction: thisdata.costReduction,
-                type: thisdata.type,
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -92,6 +75,8 @@ const OrderDetail = Form.create()(
         visible: false,
         avisible: false,
         loading: false,
+        declarationBatch: 1,
+        dataInfor: {},
         addnextVisible:false,
         jsDate: [],
         replenishUrl: [],
@@ -336,6 +321,7 @@ const OrderDetail = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0,
       });
     },
@@ -1291,81 +1277,6 @@ const OrderDetail = Form.create()(
                   </Spin>
                 </div>
               </div>
-              <Modal
-                maskClosable={false}
-                visible={this.state.addnextVisible}
-                onOk={this.nextCancel}
-                onCancel={this.nextCancel}
-                confirmLoading={this.state.confirmLoading}
-                width="800px"
-                title={"项目任务详情"}
-                footer=""
-                className="admin-desc-content"
-              >
-                <Form layout="horizontal" id="demand-form">
-                  <Spin spinning={this.state.loading}>
-                    <div className="clearfix">
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目名称"
-                      >
-                        <span>{this.state.commodityName}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="项目数量"
-                      >
-                        <span>{this.state.commodityQuantity}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="官费"
-                        style={{ display: this.state.displayFees }}
-                      >
-                        <span>
-                          {this.state.officialCost == 0 ? "无官费" : "有官费"}
-                        </span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="费减"
-                        style={{ display: this.state.displayFees }}
-                      >
-                        <span>
-                          {this.state.costReduction == 0 ? "无费减" : "有费减"}
-                        </span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="金额(万元)"
-                      >
-                        <span>{this.state.commodityPrice}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="主要项目"
-                      >
-                        <span>{getboutique(this.state.main)}</span>
-                      </FormItem>
-                      <div className="clearfix">
-                        <FormItem
-                          labelCol={{ span: 4 }}
-                          wrapperCol={{ span: 16 }}
-                          label="服务说明"
-                        >
-                          <span>{this.state.taskComment}</span>
-                        </FormItem>
-                      </div>
-                    </div>
-                  </Spin>
-                </Form>
-              </Modal>
               <div>
                 <span style={{ marginLeft: 20, fontSize: "18px" }}>
                   催款节点
@@ -1408,6 +1319,11 @@ const OrderDetail = Form.create()(
               </div>
             </Spin>
           </Form>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     },

+ 2 - 16
js/component/manageCenter/operate/personnel/personnelAll.jsx

@@ -443,22 +443,8 @@ const PersonnelAll = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus,
-            });
+            thisdata.key = i;
+            theArr.push(thisdata);
           }
         }
         this.setState({

+ 37 - 44
js/component/manageCenter/order/orderNew/addService.jsx

@@ -81,28 +81,11 @@ const NewService = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-                type: thisdata.type,
-                officialCost: thisdata.officialCost,
-                costReduction: thisdata.costReduction,
-                declarationBatch: thisdata.declarationBatch || undefined,//申报批次
-                ifCertificationFee: thisdata.ifCertificationFee ? String(thisdata.ifCertificationFee) : undefined,//是否包含申报批次
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              thisdata.declarationBatch = thisdata.declarationBatch || undefined;//申报批次
+              thisdata.ifCertificationFee = isNaN(parseInt(thisdata.ifCertificationFee)) ? undefined : thisdata.ifCertificationFee;//是否包含申报批次
+              theArr.push(thisdata);
             }
           }
           this.departmentList();
@@ -179,6 +162,7 @@ const NewService = Form.create()(
         voucherUrl: [],
         replenishUrl: [],
         customerArr: [],
+        declarationBatch: 1,//申报批次  默认第一批
         // 禁用变更类型转换
         changeFlag: false,
         // 合同额禁用
@@ -852,6 +836,9 @@ const NewService = Form.create()(
                     return <span>{str}</span>;
                   }
                 }
+                if(!str){
+                  return <span>未知</span>;
+                }
               }
               if (this.state.getLoad) {
                 return (
@@ -2384,7 +2371,7 @@ const NewService = Form.create()(
         addProjectType: "",
         ifCertificationFee: "",//是否包含认证费用
         isIso: false,//是否为贯标项目
-        declarationBatch: '',
+        declarationBatch: 1,
       });
     },
 
@@ -2916,13 +2903,31 @@ const NewService = Form.create()(
         message.warning("请选择企业要求申报批次!");
         return false;
       }
-      if((this.state.isIso || this.state.addProjectType === 5) && !this.state.ifCertificationFee){
+      if(this.state.isIso && !this.state.ifCertificationFee){
         message.warning("请选择是否包含认证费用!");
         return false;
       }
       this.setState({
         loading: true,
       });
+      let infor = {
+        commodityId: this.state.gid, //商品ID
+        orderNo: this.props.datauser.orderNo, //订单编号
+        commodityName: this.state.commodityName, //商品名称
+        commodityQuantity: this.state.commodityQuantity, //商品数量
+        commodityPrice: this.state.commodityPrice, //签单总价
+        taskComment: this.state.taskComment, //服务说明
+
+        main: this.state.main, //是否为主要项目
+        officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
+        costReduction: this.state.displayFees==='block' ?this.state.costReduction : '', //是否有费减
+      }
+      if(this.state.addProjectType === 5){
+        infor.declarationBatch = this.state.declarationBatch || 1//申报批次
+      }
+       if(this.state.isIso){
+         infor.ifCertificationFee = this.state.ifCertificationFee || undefined;//是否包含认证费用
+       }
       let api = this.state.addState
         ? "/api/admin/newOrder/addOrderTask"
         : "/api/bianji";
@@ -2931,19 +2936,7 @@ const NewService = Form.create()(
         dataType: "json",
         crossDomain: false,
         url: globalConfig.context + api,
-        data: {
-          commodityId: this.state.gid, //商品ID
-          orderNo: this.props.datauser.orderNo, //订单编号
-          commodityName: this.state.commodityName, //商品名称
-          commodityQuantity: this.state.commodityQuantity, //商品数量
-          commodityPrice: this.state.commodityPrice, //签单总价
-          taskComment: this.state.taskComment, //服务说明
-          declarationBatch:this.state.declarationBatch || undefined,//申报批次
-          ifCertificationFee:this.state.ifCertificationFee || undefined,//是否包含认证费用
-          main: this.state.main, //是否为主要项目
-          officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
-          costReduction: this.state.displayFees==='block' ?this.state.costReduction : '', //是否有费减
-        },
+        data: infor,
       }).done(
         function (data) {
           this.setState({
@@ -2984,8 +2977,8 @@ const NewService = Form.create()(
         addState: 0,
         addnextVisible: true,
         addProjectType: record.type,
-        declarationBatch: record.declarationBatch || '',//申报批次(只有高新有)
-        ifCertificationFee: record.ifCertificationFee || '',//是否包含认证费
+        declarationBatch: record.declarationBatch || 1,//申报批次(只有高新有)
+        ifCertificationFee: isNaN(parseInt(record.ifCertificationFee)) ? '' : record.ifCertificationFee,//是否包含认证费
         isIso: record.commodityName.indexOf("贯标") !== -1,
       });
     },
@@ -3025,7 +3018,7 @@ const NewService = Form.create()(
           officialCost: this.state.officialCost, //是否有官费
           costReduction: this.state.costReduction, //是否有费减
           declarationBatch: this.state.declarationBatch || undefined,//申报批次
-          ifCertificationFee: this.state.ifCertificationFee ||undefined,//是否包含官费
+          ifCertificationFee: isNaN(parseInt(this.state.ifCertificationFee)) ? undefined : this.state.ifCertificationFee,
         },
       }).done(
         function (data) {
@@ -6407,7 +6400,7 @@ const NewService = Form.create()(
                     </div>: null
                     }
                     {
-                      this.state.isIso || this.state.addProjectType === 5 ?<div className="clearfix">
+                      this.state.isIso?<div className="clearfix">
                         <FormItem
                             className="half-item"
                             {...formItemLayout}
@@ -6613,7 +6606,7 @@ const NewService = Form.create()(
                             </div>: null
                         }
                         {
-                          this.state.isIso || this.state.addProjectType === 5 ?<div className="clearfix">
+                          this.state.isIso ?<div className="clearfix">
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
@@ -6627,10 +6620,10 @@ const NewService = Form.create()(
                                     this.setState({ ifCertificationFee: e });
                                   }}
                               >
-                                <Select.Option value={'0'}>
+                                <Select.Option value={0}>
                                   不包含
                                 </Select.Option>
-                                <Select.Option value={'1'}>
+                                <Select.Option value={1}>
                                   包含
                                 </Select.Option>
                               </Select>

+ 3 - 17
js/component/manageCenter/order/orderNew/addorders.js

@@ -59,23 +59,9 @@ const Addorders = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.departmentList();

+ 13 - 103
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -40,6 +40,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const { TabPane } = Tabs;
 const { TextArea } = Input;
 //图片组件
@@ -181,6 +182,8 @@ const IntentionCustomer = Form.create()(
     getInitialState() {
       return {
         page: 1,
+        declarationBatch: 1,
+        dataInfor: {},
         releaseDate: [],
         selectedRowKeys: [],
         rotateDeg: 0,
@@ -938,6 +941,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0,
       });
     },
@@ -1030,21 +1034,8 @@ const IntentionCustomer = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1775,40 +1766,8 @@ const IntentionCustomer = Form.create()(
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
               totalWaibao += thisdata.outsourcePrice;
-              theArr.push({
-                key: i + 1,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo,
-                contractNo: thisdata.contractNo,
-                userName: thisdata.userName,
-                buyerName: thisdata.buyerName,
-                departmentName: thisdata.departmentName,
-                salesmanName: thisdata.salesmanName,
-                depName: thisdata.depName,
-                orderStatus: thisdata.orderStatus,
-                projectStatus: thisdata.projectStatus,
-                commodityName: thisdata.commodityName,
-                totalAmount: thisdata.totalAmount,
-                liquidationStatus: thisdata.liquidationStatus,
-                settlementAmount: thisdata.settlementAmount,
-                accountsReceivable: thisdata.accountsReceivable,
-                dunSubject: thisdata.dunSubject,
-                startDate: thisdata.startDate,
-                taskStatus: thisdata.taskStatus,
-                cname: thisdata.cname,
-                id: thisdata.id,
-                taskName: thisdata.taskName,
-                hours: thisdata.hours,
-                taskDistributionTime: thisdata.taskDistributionTime,
-                taskEndTime: thisdata.taskEndTime,
-                commodityQuantity: thisdata.commodityQuantity,
-                commodityPrice: thisdata.commodityPrice,
-                certificateNumber: thisdata.certificateNumber,
-                taskComment: thisdata.taskComment,
-                outsourceName: thisdata.outsourceName,
-                outsourcePrice: thisdata.outsourcePrice,
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i + 1;
+              theArr.push(thisdata);
             }
           }
           totalWaibao = (Math.round(totalWaibao * 1000000) / 1000000).toFixed(6);
@@ -2578,60 +2537,6 @@ const IntentionCustomer = Form.create()(
                 </Spin>
               </Form>
             </Modal> : <div/>}
-            <Modal
-              maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
             {this.state.noVisible ? <Modal
               maskClosable={false}
               visible={this.state.noVisible}
@@ -3105,6 +3010,11 @@ const IntentionCustomer = Form.create()(
               />
             </Modal> : <div/>}
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     },

+ 2 - 33
js/component/manageCenter/order/orderNew/billing.jsx

@@ -1618,39 +1618,8 @@ const MyService = Form.create()(
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
               totalWaibao += thisdata.outsourcePrice;
-              theArr.push({
-                key: i + 1,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo,
-                contractNo: thisdata.contractNo,
-                userName: thisdata.userName,
-                buyerName: thisdata.buyerName,
-                departmentName: thisdata.departmentName,
-                salesmanName: thisdata.salesmanName,
-                depName: thisdata.depName,
-                orderStatus: thisdata.orderStatus,
-                projectStatus: thisdata.projectStatus,
-                commodityName: thisdata.commodityName,
-                totalAmount: thisdata.totalAmount,
-                liquidationStatus: thisdata.liquidationStatus,
-                settlementAmount: thisdata.settlementAmount,
-                accountsReceivable: thisdata.accountsReceivable,
-                dunSubject: thisdata.dunSubject,
-                startDate: thisdata.startDate,
-                taskStatus: thisdata.taskStatus,
-                cname: thisdata.cname,
-                taskName: thisdata.taskName,
-                hours: thisdata.hours,
-                taskDistributionTime: thisdata.taskDistributionTime,
-                taskEndTime: thisdata.taskEndTime,
-                commodityQuantity: thisdata.commodityQuantity,
-                commodityPrice: thisdata.commodityPrice,
-                certificateNumber: thisdata.certificateNumber,
-                taskComment: thisdata.taskComment,
-                outsourceName: thisdata.outsourceName,
-                outsourcePrice: thisdata.outsourcePrice,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i + 1;
+              theArr.push(thisdata);
             }
           }
           totalWaibao = (Math.round(totalWaibao * 1000000) / 1000000).toFixed(6);

+ 11 - 52
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -14,12 +14,14 @@ import img from "./img.png"
 import ResolutionDetail from "@/resolutionDetail";
 import ImgList from "../../../../common/imgList";
 import {getProjectName} from "../../../../tools";
+import ProjectDetailsReadOnly from "../../../../common/projectDetailsReadOnly";
 
 const FormItem = Form.Item;
 class OrderDetail extends Component {
   constructor(props) {
     super(props);
     this.state = {
+      dataInfor:{},
       newContactsLists: [
         {
           title: "项目名称",
@@ -42,6 +44,9 @@ class OrderDetail extends Component {
                 return <span>{str}</span>;
               }
             }
+            if(!str){
+              return <span>未知</span>;
+            }
           }
         },
         {
@@ -244,6 +249,7 @@ class OrderDetail extends Component {
   //点击打卡项目详情
   tableRowClickX(record) {
     this.setState({
+      dataInfor: record,
       jid: record.id, //项目ID
       kid: record.commodityId, //商品ID
       commodityName: record.commodityName, //金额
@@ -821,58 +827,11 @@ class OrderDetail extends Component {
             <Col span={24} offset={9} style={{ marginTop: "15px" }}></Col>
           </Form>
         </div>
-        <Modal
-          maskClosable={false}
-          visible={this.state.visible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title={"项目任务详情"}
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" id="demand-form">
-            <div className="clearfix">
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
-                label="项目名称"
-              >
-                <span>{this.state.commodityName}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
-                label="项目数量"
-              >
-                <span>{this.state.commodityQuantity}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
-                label="金额(万元)"
-              >
-                <span>{this.state.commodityPrice}</span>
-              </FormItem>
-              <FormItem
-                className="half-item"
-                {...formItemLayout}
-                label="主要项目"
-              >
-                <span>{getboutique(this.state.main)}</span>
-              </FormItem>
-              <div className="clearfix">
-                <FormItem
-                  labelCol={{ span: 4 }}
-                  wrapperCol={{ span: 16 }}
-                  label="服务说明"
-                >
-                  <span>{this.state.taskComment}</span>
-                </FormItem>
-              </div>
-            </div>
-          </Form>
-        </Modal>
+        {this.state.visible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.visible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   }

+ 3 - 16
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -688,22 +688,9 @@ const IntentionCustomer = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({

+ 12 - 72
js/component/manageCenter/order/orderNew/checkOutsourcing.jsx

@@ -32,6 +32,7 @@ import ResolutionDetail from '@/resolutionDetail'
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const checkOutsourcing = Form.create()(
   React.createClass({
@@ -96,6 +97,8 @@ const checkOutsourcing = Form.create()(
         rotateDeg: 0,
         page: 1,
         releaseDate: [],
+        declarationBatch: 1,
+        dataInfor: {},
         selectedRowKeys: [],
         pictureUrl: [],
         attachmentUrl: [],
@@ -441,6 +444,7 @@ const checkOutsourcing = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0,
       })
     },
@@ -538,23 +542,9 @@ const checkOutsourcing = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i]
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                splitStatus: thisdata.splitStatus,
-                sort: thisdata.cSort,
-              })
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1927,61 +1917,6 @@ const checkOutsourcing = Form.create()(
           </Modal> : <div/>}
           <Modal
             maskClosable={false}
-            visible={this.state.addnextVisible}
-            onOk={this.nextCancel}
-            onCancel={this.nextCancel}
-            confirmLoading={this.state.confirmLoading}
-            width="800px"
-            title={'项目任务详情'}
-            footer=""
-            className="admin-desc-content"
-          >
-            <Form layout="horizontal" id="demand-form">
-              <Spin spinning={this.state.loading}>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="项目名称"
-                  >
-                    <span>{this.state.commodityName}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="项目数量"
-                  >
-                    <span>{this.state.commodityQuantity}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="金额(万元)"
-                  >
-                    <span>{this.state.commodityPrice}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="主要项目"
-                  >
-                    <span>{getboutique(this.state.main)}</span>
-                  </FormItem>
-                  <div className="clearfix">
-                    <FormItem
-                      labelCol={{ span: 4 }}
-                      wrapperCol={{ span: 16 }}
-                      label="服务说明"
-                    >
-                      <span>{this.state.taskComment}</span>
-                    </FormItem>
-                  </div>
-                </div>
-              </Spin>
-            </Form>
-          </Modal>
-          <Modal
-            maskClosable={false}
             visible={this.state.noVisible}
             onOk={this.handleOk}
             onCancel={this.noCancel}
@@ -2054,6 +1989,11 @@ const checkOutsourcing = Form.create()(
               </Spin>
             </div>
           </Modal> : <div/>}
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       )
     },

+ 12 - 72
js/component/manageCenter/order/orderNew/contractCwjl.js

@@ -22,6 +22,7 @@ const { RangePicker } = DatePicker;
 import ReactToPrint from "react-to-print";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -114,6 +115,8 @@ const contractChange = Form.create()(
         orderData: {}, //现订单数据
         pictureUrl: [],
         voucherUrl: [],
+        declarationBatch: 1,
+        dataInfor: {},
         attachmentUrl: [],
         //收款数据
         proceedsData: {},
@@ -400,6 +403,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -612,23 +616,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1511,61 +1501,6 @@ const contractChange = Form.create()(
             </Modal>
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1703,6 +1638,11 @@ const contractChange = Form.create()(
               />
             </Modal>
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractCwzj.js

@@ -20,6 +20,7 @@ import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -107,6 +108,8 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        declarationBatch: 1,
+        dataInfor: {},
         primaryOrderData: {}, //原订单数据
         orderData: {}, //现订单数据
         pictureUrl: [],
@@ -359,6 +362,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -560,23 +564,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1318,61 +1308,6 @@ const contractChange = Form.create()(
             </Modal>
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1451,6 +1386,11 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractCwzy.js

@@ -22,6 +22,7 @@ const { RangePicker } = DatePicker;
 import ReactToPrint from "react-to-print";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -110,6 +111,8 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        declarationBatch: 1,
+        dataInfor: {},
         primaryOrderData: {}, //原订单数据
         orderData: {}, //现订单数据
         pictureUrl: [],
@@ -400,6 +403,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -605,23 +609,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1504,61 +1494,6 @@ const contractChange = Form.create()(
             </Modal>
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1696,6 +1631,11 @@ const contractChange = Form.create()(
               />
             </Modal>
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -20,6 +20,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -107,6 +108,8 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        declarationBatch: 1,
+        dataInfor: {},
         primaryOrderData: {}, //原订单数据
         orderData: {}, //现订单数据
         pictureUrl: [],
@@ -357,6 +360,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -554,23 +558,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1314,61 +1304,6 @@ const contractChange = Form.create()(
             </Modal>
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1447,6 +1382,11 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -20,6 +20,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -110,6 +111,8 @@ const contractChange = Form.create()(
         orderData: {}, //现订单数据
         pictureUrl: [],
         voucherUrl: [],
+        declarationBatch: 1,
+        dataInfor: {},
         attachmentUrl: [],
         contractData: {},
         additionalOrderData: {},
@@ -370,6 +373,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -518,23 +522,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1253,61 +1243,6 @@ const contractChange = Form.create()(
             </Modal>
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1386,6 +1321,11 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -20,6 +20,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -106,6 +107,8 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        declarationBatch: 1,
+        dataInfor: {},
         primaryOrderData: {}, //原订单数据
         orderData: {}, //现订单数据
         pictureUrl: [],
@@ -355,6 +358,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -552,23 +556,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1308,61 +1298,6 @@ const contractChange = Form.create()(
             </Modal>:<div/>}
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1441,6 +1376,11 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -20,6 +20,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -106,6 +107,8 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        declarationBatch: 1,
+        dataInfor: {},
         primaryOrderData: {}, //原订单数据
         orderData: {}, //现订单数据
         pictureUrl: [],
@@ -350,6 +353,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -547,23 +551,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1322,61 +1312,6 @@ const contractChange = Form.create()(
             </Modal> : <div/>}
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1455,6 +1390,11 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 12 - 72
js/component/manageCenter/order/orderNew/contractYxy.js

@@ -23,6 +23,7 @@ import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -110,6 +111,8 @@ const contractChange = Form.create()(
         searchData: {
           releaseDate: []
         },
+        declarationBatch: 1,
+        dataInfor: {},
         primaryOrderData: {}, //原订单数据
         orderData: {}, //现订单数据
         pictureUrl: [],
@@ -359,6 +362,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -568,23 +572,9 @@ const contractChange = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1361,61 +1351,6 @@ const contractChange = Form.create()(
             </Modal> : <div/>}
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -1494,6 +1429,11 @@ const contractChange = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 3 - 20
js/component/manageCenter/order/orderNew/costAuditList/detailsModal/projectOverview.js

@@ -515,19 +515,10 @@ class projectOverview extends Component{
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="当前项目情况"
+                                label="项目状态"
                             >
-                                <span>
-                                    {
-                                        this.state.status === 0 ? '未开始':
-                                            this.state.status === 1 ? '进行中':
-                                                this.state.status === 2 ? '已暂停':
-                                                    this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                                        this.state.status === 4 ? '已完成':
-                                                            this.state.status === 5 ? '项目已完成 已退单':
-                                                                this.state.status === 6 ? '项目未完成 已退单': ''
-                                    }
-                                </span>
+                                {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
+                                <span>{getProjectName(this.state.projectStatus)}</span>
                                 <Button
                                     type="primary"
                                     size="small"
@@ -549,14 +540,6 @@ class projectOverview extends Component{
                             <FormItem
                                 className="half-item"
                                 {...formItemLayout}
-                                label="项目状态"
-                            >
-                                {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
-                                <span>{getProjectName(this.state.projectStatus)}</span>
-                            </FormItem>
-                            <FormItem
-                                className="half-item"
-                                {...formItemLayout}
                                 label="是否特批"
                             >
                                 <span>{getApproval(this.state.approval)}</span>

+ 12 - 95
js/component/manageCenter/order/orderNew/examine.jsx

@@ -37,6 +37,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const confirm = Modal.confirm;
 const { Option } = Select;
 //图片组件
@@ -45,6 +46,8 @@ const PicturesWall = React.createClass({
     return {
       previewVisible: false,
       previewImage: "",
+      declarationBatch: 1,
+      dataInfor: {},
       fileList: this.props.pictureUrl
     };
   },
@@ -531,6 +534,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0,
       });
     },
@@ -631,26 +635,9 @@ const IntentionCustomer = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-                officialCost: thisdata.officialCost,
-                costReduction: thisdata.costReduction,
-                type: thisdata.type,
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -2122,81 +2109,6 @@ const IntentionCustomer = Form.create()(
                 </TabPane> */}
               </Tabs>
             </Modal> : <div/>}
-            {this.state.addnextVisible ? <Modal
-              maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="官费"
-                      style={{ display: this.state.displayFees }}
-                    >
-                      <span>
-                        {this.state.officialCost == 0 ? "无官费" : "有官费"}
-                      </span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="费减"
-                      style={{ display: this.state.displayFees }}
-                    >
-                      <span>
-                        {this.state.costReduction == 0 ? "无费减" : "有费减"}
-                      </span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal> : <div/>}
             {this.state.noVisible ? <Modal
               maskClosable={false}
               visible={this.state.noVisible}
@@ -2347,6 +2259,11 @@ const IntentionCustomer = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     },

+ 15 - 106
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -46,6 +46,7 @@ import { ChooseList } from "../orderNew/chooseList";
 import ReactToPrint from "react-to-print";
 import Project from "../../../../component/project";
 import ImgList from "../../../common/imgList";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -53,7 +54,9 @@ const PicturesWall = React.createClass({
     return {
       previewVisible: false,
       previewImage: "",
-      fileList: this.props.pictureUrl
+      fileList: this.props.pictureUrl,
+      declarationBatch: 1,
+      dataInfor: {},
     };
   },
   getDefaultProps() {
@@ -1560,6 +1563,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0,
       });
     },
@@ -1662,23 +1666,9 @@ const IntentionCustomer = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -2071,40 +2061,8 @@ const IntentionCustomer = Form.create()(
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
               totalWaibao += thisdata.outsourcePrice;
-              theArr.push({
-                key: i + 1,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo,
-                contractNo: thisdata.contractNo,
-                userName: thisdata.userName,
-                buyerName: thisdata.buyerName,
-                departmentName: thisdata.departmentName,
-                salesmanName: thisdata.salesmanName,
-                depName: thisdata.depName,
-                orderStatus: thisdata.orderStatus,
-                projectStatus: thisdata.projectStatus,
-                commodityName: thisdata.commodityName,
-                totalAmount: thisdata.totalAmount,
-                liquidationStatus: thisdata.liquidationStatus,
-                settlementAmount: thisdata.settlementAmount,
-                accountsReceivable: thisdata.accountsReceivable,
-                dunSubject: thisdata.dunSubject,
-                startDate: thisdata.startDate,
-                taskStatus: thisdata.taskStatus,
-                cname: thisdata.cname,
-                id: thisdata.id,
-                taskName: thisdata.taskName,
-                hours: thisdata.hours,
-                taskDistributionTime: thisdata.taskDistributionTime,
-                taskEndTime: thisdata.taskEndTime,
-                commodityQuantity: thisdata.commodityQuantity,
-                commodityPrice: thisdata.commodityPrice,
-                certificateNumber: thisdata.certificateNumber,
-                taskComment: thisdata.taskComment,
-                outsourceName: thisdata.outsourceName,
-                outsourcePrice: thisdata.outsourcePrice,
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i + 1;
+              theArr.push(thisdata);
             }
           }
           totalWaibao = (Math.round(totalWaibao * 1000000) / 1000000).toFixed(6);
@@ -3990,60 +3948,6 @@ const IntentionCustomer = Form.create()(
                 content={() => this.refs.all}
               />
             </Modal>
-            <Modal
-              maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
             {this.state.visible ? <Modal
               className="customeDetails"
               footer=""
@@ -4475,6 +4379,11 @@ const IntentionCustomer = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     },

+ 12 - 72
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -38,12 +38,15 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "./chooseList";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
     return {
       previewVisible: false,
       previewImage: "",
+      declarationBatch: 1,
+      dataInfor: {},
       fileList: []
     };
   },
@@ -714,6 +717,7 @@ const outsourcingList = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0,
       });
     },
@@ -811,23 +815,9 @@ const outsourcingList = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                sort: thisdata.cSort,
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i;
+              thisdata.sort = thisdata.cSort;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -2509,61 +2499,6 @@ const outsourcingList = Form.create()(
             </Modal> : <div/>}
             <Modal
               maskClosable={false}
-              visible={this.state.addnextVisible}
-              onOk={this.nextCancel}
-              onCancel={this.nextCancel}
-              confirmLoading={this.state.confirmLoading}
-              width="800px"
-              title={"项目任务详情"}
-              footer=""
-              className="admin-desc-content"
-            >
-              <Form layout="horizontal" id="demand-form">
-                <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目名称"
-                    >
-                      <span>{this.state.commodityName}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="项目数量"
-                    >
-                      <span>{this.state.commodityQuantity}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="金额(万元)"
-                    >
-                      <span>{this.state.commodityPrice}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="主要项目"
-                    >
-                      <span>{getboutique(this.state.main)}</span>
-                    </FormItem>
-                    <div className="clearfix">
-                      <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 16 }}
-                        label="服务说明"
-                      >
-                        <span>{this.state.taskComment}</span>
-                      </FormItem>
-                    </div>
-                  </div>
-                </Spin>
-              </Form>
-            </Modal>
-            <Modal
-              maskClosable={false}
               visible={this.state.noVisible}
               onOk={this.handleOk}
               onCancel={this.noCancel}
@@ -2641,6 +2576,11 @@ const outsourcingList = Form.create()(
               loading={this.state.loading}
             />
           </div>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     },

+ 9 - 17
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

@@ -647,22 +647,8 @@ const outsourcingPro = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                projectStatus: thisdata.projectStatus, //项目状态
-                splitStatus: thisdata.splitStatus,
-              });
+              thisdata.key = i;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -1535,7 +1521,7 @@ const outsourcingPro = Form.create()(
                     </div>
                   }
               >
-                <TabPane tab="外包审核" key="1">
+                <TabPane tab="外包审核1" key="1">
                   {this.state.activeKey === '1' ? <Spin spinning={this.state.loading || this.state.getOrderTaskLoading}>
                     <CheckProject
                         {...this.props}
@@ -1551,6 +1537,12 @@ const outsourcingPro = Form.create()(
                         fileList={this.state.pictureUrl}
                         startType={this.state.startType}
                         projectStatus={this.state.projectStatus}
+                        onRefresh={()=>{
+                          this.waiDetail();
+                          this.thirdTable(this.state.tid);
+                          this.payNodeTable(this.state.tid);
+                          this.xiangqing(this.state.orderNo);
+                        }}
                     />
                     {this.state.refundStatus == 0 ? (
                       <div>

+ 11 - 70
js/component/manageCenter/personnel/personnel/personnelAll.jsx

@@ -27,6 +27,7 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import {getProjectName} from "../../../tools";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 // import ResolutionPro from "../task/resolutionPro";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
@@ -112,6 +113,8 @@ const PersonnelAll = React.createClass({
       assignVisible: false,
       releaseDate: [],
       roleName: "",
+      declarationBatch: 1,
+      dataInfor: {},
       boHuivisible: false,
       departmentArr: [],
       selectedRowKeys: [],
@@ -437,22 +440,8 @@ const PersonnelAll = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus,
-            });
+            thisdata.key = i;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -509,6 +498,7 @@ const PersonnelAll = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0,
     });
   },
@@ -1126,60 +1116,11 @@ const PersonnelAll = React.createClass({
             </Spin>
           </Form>
         </Modal>
-        <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal>
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   },

+ 9 - 74
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -18,6 +18,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "../task/resolutionPro";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const FormItem = Form.Item;
 const {TabPane} = Tabs
 const OutsourceTaskAssignment = React.createClass({
@@ -105,6 +106,8 @@ const OutsourceTaskAssignment = React.createClass({
       activeKey: "1",
       searchMore: true,
       assignVisible: false,
+      declarationBatch: 1,
+      dataInfor: {},
       releaseDate: [],
       roleName: "",
       boHuivisible: false,
@@ -510,6 +513,7 @@ const OutsourceTaskAssignment = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0,
     });
   },
@@ -1329,80 +1333,11 @@ const OutsourceTaskAssignment = React.createClass({
             </TabPane>
           </Tabs>
         </Modal>
-        {this.state.addnextVisible ? <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="官费"
-                    style={{ display: this.state.displayFees }}
-                >
-                        <span>
-                          {this.state.officialCost == 0 ? "无官费" : "有官费"}
-                        </span>
-                </FormItem>
-                <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="费减"
-                    style={{ display: this.state.displayFees }}
-                >
-                        <span>
-                          {this.state.costReduction == 0 ? "无费减" : "有费减"}
-                        </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal> : <div/>}
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   },

+ 101 - 105
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -4,6 +4,7 @@ import moment from "moment";
 import "../../order/userMangagement.less";
 import { boutique } from "../../../dataDic.js";
 import "@/manageCenter/financialManage/distribute/public.less";
+import ProjectDetailsReadOnly from '../../../common/projectDetailsReadOnly';
 import ResolutionDetail from "@/resolutionDetail";
 import {
   Button,
@@ -115,11 +116,13 @@ const PaiDan = React.createClass({
       assignVisible: false,
       releaseDate: [],
       departmentArr: [],
+      declarationBatch: 1,
       boHuivisible: false,
       selectedRowKeys: [],
       resVisible: false,
       selectedRows: [],
       loading: false,
+      dataInfor: {},
       paginations: false,
       page: 1,
       pagination: {
@@ -525,25 +528,8 @@ const PaiDan = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus,
-              officialCost: thisdata.officialCost,
-              costReduction: thisdata.costReduction,
-              type: thisdata.type,
-            });
+            thisdata.key = i;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -692,28 +678,43 @@ const PaiDan = React.createClass({
       this.refs.commodityQuantity.focus();
       return false;
     }
+    if(this.state.addProjectType === 5 && !this.state.declarationBatch){
+      message.warning("请选择企业要求申报批次!");
+      return false;
+    }
+    if(this.state.isIso && !this.state.ifCertificationFee){
+      message.warning("请选择是否包含认证费用!");
+      return false;
+    }
     this.setState({
       loading: true
     });
     let api = this.state.addState
       ? "/api/admin/newOrder/addOrderTask"
       : "/api/bianji";
+    let infor = {
+      commodityId: this.state.gid, //商品ID
+      orderNo: this.state.RowData.orderNo, //订单编号
+      commodityName: this.state.commodityName, //商品名称
+      commodityQuantity: this.state.commodityQuantity, //商品数量
+      commodityPrice: this.state.commodityPrice, //签单总价
+      taskComment: this.state.taskComment, //服务说明
+      main: this.state.main, //是否为主要项目
+      officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
+      costReduction: this.state.displayFees==='block' ?this.state.costReduction : '', //是否有费减
+    }
+    if(this.state.addProjectType === 5){
+      infor.declarationBatch = this.state.declarationBatch || 1//申报批次
+    }
+    if(this.state.isIso){
+      infor.ifCertificationFee = this.state.ifCertificationFee || undefined;//是否包含认证费用
+    }
     $.ajax({
       method: "POST",
       dataType: "json",
       crossDomain: false,
       url: globalConfig.context + api,
-      data: {
-        commodityId: this.state.gid, //商品ID
-        orderNo: this.state.RowData.orderNo, //订单编号
-        commodityName: this.state.commodityName, //商品名称
-        commodityQuantity: this.state.commodityQuantity, //商品数量
-        commodityPrice: this.state.commodityPrice, //签单总价
-        taskComment: this.state.taskComment, //服务说明
-        main: this.state.main, //是否为主要项目
-        officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
-        costReduction: this.state.displayFees==='block' ?this.state.costReduction : '', //是否有费减
-      }
+      data: infor
     }).done(
       function(data) {
         this.setState({
@@ -754,6 +755,8 @@ const PaiDan = React.createClass({
       commodityName: value,
       gid: kid.id,
       //commodityPrice:kid.price==0?kid.price.toString():kid.price,
+      isIso: value.indexOf("贯标") !== -1,// 是否为贯标项目
+      addProjectType:  kid.type,
       commodityFirstPayment:
         kid.firstPayment == 0 ? kid.firstPayment.toString() : kid.firstPayment
     });
@@ -903,6 +906,8 @@ const PaiDan = React.createClass({
       officialCost: "", //是否有官费
       costReduction: "", //是否有费减
       addnextVisible: false,
+      declarationBatch: 1,
+      ifCertificationFee: '',
     });
   },
   //点击打卡项目详情
@@ -927,7 +932,8 @@ const PaiDan = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
-      addState: 0
+      addState: 0,
+      dataInfor:record,
     });
   },
   searchSwitch() {
@@ -1410,80 +1416,6 @@ const PaiDan = React.createClass({
             </Spin>
           </Form>
         </Modal> : <div/>}
-        {this.state.addnextVisible ? <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="官费"
-                  style={{ display: this.state.displayFees }}
-                >
-                  <span>
-                    {this.state.officialCost == 0 ? "无官费" : "有官费"}
-                  </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="费减"
-                  style={{ display: this.state.displayFees }}
-                >
-                  <span>
-                    {this.state.costReduction == 0 ? "无费减" : "有费减"}
-                  </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal> : <div/>}
         {this.state.addserviceVisible ? <Modal
           maskClosable={false}
           visible={this.state.addserviceVisible}
@@ -1637,6 +1569,65 @@ const PaiDan = React.createClass({
                     />
                   </FormItem>
                 </div>
+                {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                {this.state.addProjectType === 5 ?
+                    <div className="clearfix">
+                      <FormItem
+                          className="half-item"
+                          {...formItemLayout}
+                          label="企业要求申报批次"
+                      >
+                        <Select
+                            placeholder="请选择企业要求申报批次"
+                            style={{ width: "200px" }}
+                            value={this.state.declarationBatch}
+                            onChange={(e) => {
+                              this.setState({ declarationBatch: e });
+                            }}
+                        >
+                          <Select.Option value={1}>
+                            第一批
+                          </Select.Option>
+                          <Select.Option value={2}>
+                            第二批
+                          </Select.Option>
+                          <Select.Option value={3}>
+                            第三批
+                          </Select.Option>
+                          <Select.Option value={4}>
+                            第四批
+                          </Select.Option>
+                        </Select>
+                        <span className="mandatory">*</span>
+                      </FormItem>
+                    </div>: null
+                }
+                {
+                  this.state.isIso?<div className="clearfix">
+                    <FormItem
+                        className="half-item"
+                        {...formItemLayout}
+                        label="是否包含认证费用"
+                    >
+                      <Select
+                          placeholder="请选择是否包含认证费用"
+                          style={{ width: "200px" }}
+                          value={this.state.ifCertificationFee}
+                          onChange={(e) => {
+                            this.setState({ ifCertificationFee: e });
+                          }}
+                      >
+                        <Select.Option value={'0'}>
+                          否
+                        </Select.Option>
+                        <Select.Option value={'1'}>
+                          是
+                        </Select.Option>
+                      </Select>
+                      <span className="mandatory">*</span>
+                    </FormItem>
+                  </div>: null
+                }
                 <FormItem
                   wrapperCol={{ span: 12, offset: 4 }}
                   className="half-middle"
@@ -1736,6 +1727,11 @@ const PaiDan = React.createClass({
           visible={this.state.rizhivisible}
           loading={this.state.loading}
         />
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   }

+ 13 - 72
js/component/manageCenter/project/project/projectQuery.jsx

@@ -21,6 +21,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const {TabPane} = Tabs
 const PaiDan = React.createClass({
@@ -101,6 +102,8 @@ const PaiDan = React.createClass({
       releaseDate: [],
       boHuivisible: false,
       selectedRowKeys: [],
+      declarationBatch: 1,
+      dataInfor: {},
       selectedRows: [],
       loading: false,
       resVisible: false,
@@ -394,22 +397,8 @@ const PaiDan = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus
-            });
+            thisdata.key = i;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -551,6 +540,7 @@ const PaiDan = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0
     });
   },
@@ -1235,60 +1225,6 @@ const PaiDan = React.createClass({
             </Spin>
           </Form>
         </Modal> : <div/>}
-        <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal>
         {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
@@ -1314,9 +1250,14 @@ const PaiDan = React.createClass({
           visible={this.state.rizhivisible}
           loading={this.state.loading}
         />
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   }
 });
- 
-export default PaiDan;
+
+export default PaiDan;

+ 11 - 71
js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx

@@ -34,6 +34,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "../../order/orderNew/chooseList";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const zxsglyOutSourcingPaiDan = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
@@ -113,6 +114,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
       customerArr: [],
       searchMore: true,
       assignVisible: false,
+      declarationBatch: 1,
+      dataInfor: {},
       releaseDate: [],
       attachmentUrl: [],
       pictureUrl: [],
@@ -560,22 +563,8 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus
-            });
+            thisdata.key = i;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -1114,6 +1103,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0
     });
   },
@@ -1690,61 +1680,6 @@ const zxsglyOutSourcingPaiDan = React.createClass({
         </Modal>
         <Modal
           maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal>
-
-        <Modal
-          maskClosable={false}
           visible={this.state.addserviceVisible}
           onOk={this.nextCancel}
           onCancel={this.nextCancel}
@@ -2006,6 +1941,11 @@ const zxsglyOutSourcingPaiDan = React.createClass({
           visible={this.state.rizhivisible}
           loading={this.state.loading}
         />
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   }

+ 17 - 8
js/component/manageCenter/project/summary/projectDetails.jsx

@@ -488,6 +488,7 @@ class ProjectDetails extends Component{
                         outsourcePrice: thisdata.outsourcePrice, //外包价格
                         declarationBatch: thisdata.declarationBatch,
                         bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+                        cSort: thisdata.sort,
                         specialComment: thisdata.specialComment,
                         urgentDay: thisdata.urgentDay, //有无材料
                         ifMaterial: thisdata.ifMaterial, //加急情况
@@ -983,9 +984,9 @@ class ProjectDetails extends Component{
                                         <div className="clearfix">
                                             <h3 className="sub-title">任务信息</h3>
                                             {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                                            {/*高新与贯标需要显示*/}
+                                            {/*贯标需要显示*/}
                                             {
-                                                this.state.bpType === 5 || this.state.isIso ?
+                                                this.state.isIso ?
                                                     <div>
                                                         <FormItem
                                                             className="half-item"
@@ -1243,6 +1244,7 @@ class ProjectDetails extends Component{
                                                 <DeclarationProgress
                                                     timeRecordparse={this.state.timeRecordparse}
                                                     startDate={this.state.startDate}
+                                                    taskDate={this.state.taskDate}
                                                     list={[
                                                         {id:4,name:'完成时间',value:this.state.endDate},
                                                         {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -1250,13 +1252,15 @@ class ProjectDetails extends Component{
                                                         {id:10,name:'发证时间',value:this.state.licenceDate},
                                                         {id:15,name:'立项金额',value:this.state.setUpAmount}
                                                     ]}/>
-                                                <FormItem
+                                                {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                                                {/*cSort: 3 科技项目  6: 会员*/}
+                                                {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                                                     className="half-item"
                                                     {...formItemLayout}
                                                     label="申报批次"
                                                 >
                                                     <span>{this.state.declarationBatch}</span>
-                                                </FormItem>
+                                                </FormItem>}
                                                 <FormItem
                                                     className="half-item"
                                                     {...formItemLayout}
@@ -1281,6 +1285,7 @@ class ProjectDetails extends Component{
                                                 <DeclarationProgress
                                                     timeRecordparse={this.state.timeRecordparse}
                                                     startDate={this.state.startDate}
+                                                    taskDate={this.state.taskDate}
                                                     list={[
                                                         {id:4,name:'完成时间',value:this.state.endDate},
                                                         {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -1345,14 +1350,18 @@ class ProjectDetails extends Component{
                                                         >
                                                             {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
                                                         </FormItem> : null}
-                                                        <FormItem
+                                                        {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                                                        {/*cSort: 3 科技项目  6: 会员*/}
+                                                        {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                                                             className="half-item"
                                                             {...formItemLayout}
                                                             label="申报批次"
                                                         >
                                                             <span>{this.state.declarationBatch}</span>
-                                                        </FormItem>
-                                                        <FormItem
+                                                        </FormItem>}
+                                                        {/*只有科技项目才有是否到款*/}
+                                                        {/*cSort: 3 科技项目  6: 会员*/}
+                                                        {this.state.cSort === 3 && <FormItem
                                                             className="half-item"
                                                             {...formItemLayout}
                                                             label="是否到款"
@@ -1360,7 +1369,7 @@ class ProjectDetails extends Component{
                                                             <span>
                                                               {this.state.arrivalMoney ? "已到企业" : "未到企业"}
                                                             </span>
-                                                        </FormItem>
+                                                        </FormItem>}
                                                     </div>
                                             }
                                         </div>}

+ 55 - 175
js/component/manageCenter/project/task/myTask.jsx

@@ -36,13 +36,12 @@ import {getMaterialStatus,
   getApproval,
   getTaskStatus,
   getLiquidationStatus,
-  getProjectStatus,
   splitUrl,
   getboutique,
   ShowModal,
   getRefundStatus,
   getProjectName} from '@/tools'
-import { taskStatus, projectStatus, cuiJieDian,projectStatusCascader } from '@/dataDic.js'
+import {cuiJieDian,projectStatusCascader } from '@/dataDic.js'
 import ShowModalDiv from '@/showModal.jsx';
 import NowProjectStatus from '../../../common/nowProjectStatus';
 import DeclarationProgress from '../../../../component/common/declarationProgress';
@@ -52,8 +51,7 @@ import NewSupplier from './newSupplier';
 import ImgList from "../../../common/imgList";
 import OperationPayNode from "./operationPayNode";
 import PatentSchedule from './patentSchedule';
-import {number, object} from "prop-types";
-import {currency, highTechColumns, highTechColumnsVIP, patent, science} from "../../../common/nowProjectStatus/type";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const confirm = Modal.confirm
 const FormItem = Form.Item
 const { TabPane } = Tabs
@@ -173,6 +171,8 @@ const Task = React.createClass({
     return {
       containOfficialFees:0,//官费缴费情况
       audit: 1,
+      declarationBatch: 1,
+      dataInfor: {},
       projectType: '', //项目分类
       paySubject: [],
       paySubjectName: '', //付款科目名称
@@ -1715,28 +1715,9 @@ const Task = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i]
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要项目
-              taskComment: thisdata.taskComment, //项目说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              contractNo: thisdata.contractNo, //合同编号
-              certificateNumber: thisdata.certificateNumber,
-              splitStatus: thisdata.splitStatus,
-              officialCost: thisdata.officialCost,
-              costReduction: thisdata.costReduction,
-              type: thisdata.type,
-              cSort: thisdata.cSort,
-            })
+            thisdata.key = i;
+            thisdata.sort = thisdata.cSort;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -2040,6 +2021,7 @@ const Task = React.createClass({
       taskCommentData: record.taskComment,
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0,
     })
   },
@@ -2214,7 +2196,7 @@ const Task = React.createClass({
     )
   },
   showDeleteConfirm(num, fn) {
-    let text = getProjectStatus(num)
+    let text = getProjectName(num)
     confirm({
       title: <p style={{ fontSize: 16, fontWeight: 900 }}>注意</p>,
       content: (
@@ -3380,21 +3362,6 @@ const Task = React.createClass({
                       })
                   }}
               />
-              {/*<Select*/}
-              {/*  */}
-              {/* */}
-              {/*  value={this.state.projectStatusSearch}*/}
-              {/*  onChange={(e) => {*/}
-              {/*    this.setState({ projectStatusSearch: e })*/}
-              {/*    console.log(this.state.projectStatusSearch)*/}
-              {/*  }}*/}
-              {/*>*/}
-              {/*  {projectStatus.map(function (item) {*/}
-              {/*    return (*/}
-              {/*      <Select.Option key={item.value}>{item.key}</Select.Option>*/}
-              {/*    )*/}
-              {/*  })}*/}
-              {/*</Select>*/}
               <Select
                 placeholder="特批状态"
                 style={{ width: 150, marginRight: '10px' }}
@@ -4045,9 +4012,9 @@ const Task = React.createClass({
                     <div className="clearfix">
                       <h3 className="sub-title">项目信息</h3>
                       {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                      {/*高新与贯标需要显示*/}
+                      {/*贯标需要显示*/}
                       {
-                        this.state.projectType === 5 || this.state.isIso ?
+                        this.state.isIso ?
                             <div>
                               <FormItem
                                   className="half-item"
@@ -4185,6 +4152,17 @@ const Task = React.createClass({
                     </div>
                     <div className="clearfix">
                       <h3 className="sub-title">项目申报进度</h3>
+                      <DeclarationProgress
+                          timeRecordparse={this.state.timeRecordparse}
+                          startDate={this.state.startDate}
+                          taskDate={this.state.taskDate}
+                          list={[
+                            {id:4,name:'完成时间',value:this.state.endDate},
+                            {id:6,name:'受理时间',value:this.state.acceptDate},
+                            {id:8,name:'公示时间',value:this.state.publicityDate},
+                            {id:10,name:'发证时间',value:this.state.licenceDate},
+                            {id:15,name:'立项金额',value:this.state.setUpAmount}
+                          ]}/>
                         {/*专利显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                         {
                             this.state.bpType === 1 || this.state.bpType === 6 ?
@@ -4233,16 +4211,6 @@ const Task = React.createClass({
                                     />
                                 </div> :
                       <div>
-                          <DeclarationProgress
-                              timeRecordparse={this.state.timeRecordparse}
-                              startDate={this.state.startDate}
-                              list={[
-                                  {id:4,name:'完成时间',value:this.state.endDate},
-                                  {id:6,name:'受理时间',value:this.state.acceptDate},
-                                  {id:8,name:'公示时间',value:this.state.publicityDate},
-                                  {id:10,name:'发证时间',value:this.state.licenceDate},
-                                  {id:15,name:'立项金额',value:this.state.setUpAmount}
-                              ]}/>
                           {/*高新显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
                           {this.state.bpType === 5 ?  <FormItem
                               className="half-item"
@@ -4299,7 +4267,9 @@ const Task = React.createClass({
                                 }}
                             /> : null }
                           </FormItem> : null}
-                          <FormItem
+                        {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                        {/*cSort: 3 科技项目  6: 会员*/}
+                        {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                             className="half-item"
                             {...formItemLayout}
                             label="申报批次"
@@ -4323,22 +4293,24 @@ const Task = React.createClass({
                               <Option value={3}>第三批</Option>
                               <Option value={4}>第四批</Option>
                             </Select>
-                          </FormItem>
-                          <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="是否到款"
-                          >
-                            <Radio.Group
-                              value={this.state.arrivalMoney}
-                              onChange={(e) => {
-                                this.setState({ arrivalMoney: e.target.value })
-                              }}
+                          </FormItem>}
+                          {/*只有科技项目才有是否到款*/}
+                          {/*cSort: 3 科技项目  6: 会员*/}
+                          {this.state.cSort === 3 && <FormItem
+                              className="half-item"
+                              {...formItemLayout}
+                              label="是否到款"
                             >
-                              <Radio value={0}>未到企业</Radio>
-                              <Radio value={1}>已到企业</Radio>
-                            </Radio.Group>
-                          </FormItem>
+                              <Radio.Group
+                                value={this.state.arrivalMoney}
+                                onChange={(e) => {
+                                  this.setState({ arrivalMoney: e.target.value })
+                                }}
+                              >
+                                <Radio value={0}>未到企业</Radio>
+                                <Radio value={1}>已到企业</Radio>
+                              </Radio.Group>
+                            </FormItem>}
                         </div>}
                     </div>
                     {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
@@ -4424,13 +4396,9 @@ const Task = React.createClass({
                         onClick={() => {
                           let num = this.state.projectStatus
                           if (
-                            num != 0 &&
-                            num != 10 &&
-                            num != 11 &&
-                            num != 12 &&
-                            num != 2 &&
-                            num != 5 &&
-                            num != 6
+                            num != 1 &&
+                            num != 20 &&
+                            num != 21
                           ) {
                             this.showDeleteConfirm(num, this.tijiaoOk)
                           } else {
@@ -5125,80 +5093,6 @@ const Task = React.createClass({
             </Spin>
           </Form>
         </Modal>
-        {this.state.addnextVisible ? <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="官费"
-                  style={{ display: this.state.displayFees }}
-                >
-                  <span>
-                    {this.state.officialCost == 0 ? '无官费' : '有官费'}
-                  </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="费减"
-                  style={{ display: this.state.displayFees }}
-                >
-                  <span>
-                    {this.state.costReduction == 0 ? '无费减' : '有费减'}
-                  </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice ? '***' : 0}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 3 }}
-                    wrapperCol={{ span: 18 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal> : <div/>}
         {this.state.speVisible ? <Modal
           maskClosable={false}
           visible={this.state.speVisible}
@@ -5307,28 +5201,6 @@ const Task = React.createClass({
                 </FormItem>
               </div>
               <div className="clearfix">
-                {/*<FormItem*/}
-                {/*  className="half-item"*/}
-                {/*  {...formItemLayout}*/}
-                {/*  label="项目状态"*/}
-                {/*>*/}
-                {/*  <Select*/}
-                {/*    placeholder="选择项目状态"*/}
-                {/*    style={{ width: '200px' }}*/}
-                {/*    value={this.state.projectStatus}*/}
-                {/*    onChange={(e) => {*/}
-                {/*      this.setState({ projectStatus: e })*/}
-                {/*    }}*/}
-                {/*  >*/}
-                {/*    {projectStatus.map(function (item) {*/}
-                {/*      return (*/}
-                {/*        <Select.Option key={item.value}>*/}
-                {/*          {item.key}*/}
-                {/*        </Select.Option>*/}
-                {/*      )*/}
-                {/*    })}*/}
-                {/*  </Select>*/}
-                {/*</FormItem>*/}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -5778,6 +5650,7 @@ const Task = React.createClass({
                   <DeclarationProgress
                     timeRecordparse={this.state.timeRecordparse}
                     startDate={this.state.startDate}
+                    taskDate={this.state.taskDate}
                     list={[
                         {id:4,name:'完成时间',value:this.state.endDate},
                         {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -5785,7 +5658,9 @@ const Task = React.createClass({
                         {id:10,name:'发证时间',value:this.state.licenceDate},
                         {id:15,name:'立项金额',value:this.state.setUpAmount}
                     ]}/>
-                <FormItem
+                {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                {/*cSort: 3 科技项目  6: 会员*/}
+                {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label="申报批次"
@@ -5809,7 +5684,7 @@ const Task = React.createClass({
                     <Option value={3}>第三批</Option>
                     <Option value={4}>第四批</Option>
                   </Select>
-                </FormItem>
+                </FormItem>}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -6543,6 +6418,11 @@ const Task = React.createClass({
               }}
           /> : null
         }
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     )
   },

+ 28 - 84
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -30,6 +30,7 @@ import {
 import {ChooseList} from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const { TabPane } = Tabs
 const MyTaskCount = Form.create()(
@@ -208,6 +209,8 @@ const MyTaskCount = Form.create()(
         loading: false,
         page: 1,
         releaseDate: [],
+        declarationBatch: 1,
+        dataInfor: {},
         selectedRowKeys: [],
         timeRecordparse:{},
         orgCodeUrl: [],
@@ -571,6 +574,7 @@ const MyTaskCount = Form.create()(
               outsourcePrice: thisdata.outsourcePrice, //外包价格
               declarationBatch: thisdata.declarationBatch,
               bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+              cSort: thisdata.sort,
               specialComment: thisdata.specialComment,
               urgentDay: thisdata.urgentDay, //有无材料
               ifMaterial: thisdata.ifMaterial, //加急情况
@@ -774,24 +778,8 @@ const MyTaskCount = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                taskStatus: thisdata.taskStatus, //是否分配
-                splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
-                splitSuper: thisdata.splitSuper,
-                splitId: thisdata.splitId
-              });
+              thisdata.key = i;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -888,6 +876,7 @@ const MyTaskCount = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -1357,9 +1346,9 @@ const MyTaskCount = Form.create()(
                   <div className="clearfix">
                     <h3 className="sub-title">任务信息</h3>
                     {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                    {/*高新与贯标需要显示*/}
+                    {/*贯标需要显示*/}
                     {
-                      this.state.bpType === 5 || this.state.isIso ?
+                      this.state.isIso ?
                           <div>
                             <FormItem
                                 className="half-item"
@@ -1580,6 +1569,7 @@ const MyTaskCount = Form.create()(
                     <DeclarationProgress
                         timeRecordparse={this.state.timeRecordparse}
                         startDate={this.state.startDate}
+                        taskDate={this.state.taskDate}
                         list={[
                           {id:4,name:'完成时间',value:this.state.endDate},
                           {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -1616,14 +1606,18 @@ const MyTaskCount = Form.create()(
                             />
                           </div> :
                           <div>
-                            <FormItem
+                            {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            {/*cSort: 3 科技项目  6: 会员*/}
+                            {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                               className="half-item"
                               {...formItemLayout}
                               label="申报批次"
                             >
                               <span>{this.state.declarationBatch}</span>
-                            </FormItem>
-                            <FormItem
+                            </FormItem>}
+                            {/*只有科技项目才有是否到款*/}
+                            {/*cSort: 3 科技项目  6: 会员*/}
+                            {this.state.cSort === 3 && <FormItem
                               className="half-item"
                               {...formItemLayout}
                               label="是否到款"
@@ -1631,7 +1625,7 @@ const MyTaskCount = Form.create()(
                               <span>
                                 {this.state.arrivalMoney ? "已到企业" : "未到企业"}
                               </span>
-                            </FormItem>
+                            </FormItem>}
                           </div>}
                   </div>
                   {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
@@ -1711,64 +1705,6 @@ const MyTaskCount = Form.create()(
             </Form>
           </Modal>
           <Modal
-            maskClosable={false}
-            visible={this.state.addnextVisible}
-            onOk={this.nextCancel}
-            onCancel={this.nextCancel}
-            width="900px"
-            title="项目任务详情"
-            footer=""
-            className="admin-desc-content"
-          >
-            <Form
-              layout="horizontal"
-              onSubmit={this.nextSubmit}
-              id="demand-form"
-            >
-              <Spin spinning={this.state.loading}>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="项目名称"
-                  >
-                    <span>{this.state.commodityName}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="项目数量"
-                  >
-                    <span>{this.state.commodityQuantity}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="金额(万元)"
-                  >
-                    <span>{this.state.commodityPrice}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="主要项目"
-                  >
-                    <span>{getboutique(this.state.main)}</span>
-                  </FormItem>
-                  <div className="clearfix">
-                    <FormItem
-                      labelCol={{ span: 4 }}
-                      wrapperCol={{ span: 16 }}
-                      label="服务说明"
-                    >
-                      <span>{this.state.taskComment}</span>
-                    </FormItem>
-                  </div>
-                </div>
-              </Spin>
-            </Form>
-          </Modal>
-          <Modal
             width="800px"
             title="操作日志"
             footer=""
@@ -2101,6 +2037,7 @@ const MyTaskCount = Form.create()(
               <DeclarationProgress
                   timeRecordparse={this.state.timeRecordparse}
                   startDate={this.state.startDate}
+                  taskDate={this.state.taskDate}
                   list={[
                     {id:4,name:'完成时间',value:this.state.endDate},
                     {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -2108,13 +2045,15 @@ const MyTaskCount = Form.create()(
                     {id:10,name:'发证时间',value:this.state.licenceDate},
                     {id:15,name:'立项金额',value:this.state.setUpAmount}
                   ]}/>
-              <FormItem
+              {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+              {/*cSort: 3 科技项目  6: 会员*/}
+              {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="申报批次"
               >
                 <span>{this.state.declarationBatch}</span>
-              </FormItem>
+              </FormItem>}
               <FormItem
                 className="half-item"
                 {...formItemLayout}
@@ -2170,6 +2109,11 @@ const MyTaskCount = Form.create()(
               </Spin>
             </div>
           </Modal>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 16 - 8
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -3749,9 +3749,9 @@ const MyTaskOutsource = React.createClass({
                     <div className="clearfix">
                       <h3 className="sub-title">项目信息</h3>
                       {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                      {/*高新与贯标需要显示*/}
+                      {/*贯标需要显示*/}
                       {
-                        this.state.projectType === 5 || this.state.isIso ?
+                        this.state.isIso ?
                             <div>
                               <FormItem
                                   className="half-item"
@@ -3892,6 +3892,7 @@ const MyTaskOutsource = React.createClass({
                       <DeclarationProgress
                           timeRecordparse={this.state.timeRecordparse}
                           startDate={this.state.startDate}
+                          taskDate={this.state.taskDate}
                           list={[
                             {id:4,name:'完成时间',value:this.state.endDate},
                             {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -4003,7 +4004,9 @@ const MyTaskOutsource = React.createClass({
                                     }}
                                 /> : null }
                               </FormItem> : null}
-                              <FormItem
+                              {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                              {/*sort: 3 科技项目  6: 会员*/}
+                              {(this.state.bpType  === 5 || this.state.sort === 3) && <FormItem
                                 className="half-item"
                                 {...formItemLayout}
                                 label="申报批次"
@@ -4027,8 +4030,10 @@ const MyTaskOutsource = React.createClass({
                                   <Option value={3}>第三批</Option>
                                   <Option value={4}>第四批</Option>
                                 </Select>
-                              </FormItem>
-                              <FormItem
+                              </FormItem>}
+                              {/*只有科技项目才有是否到款*/}
+                              {/*cSort: 3 科技项目  6: 会员*/}
+                              {this.state.sort === 3 && <FormItem
                                 className="half-item"
                                 {...formItemLayout}
                                 label="是否到款"
@@ -4042,7 +4047,7 @@ const MyTaskOutsource = React.createClass({
                                   <Radio value={0}>未到企业</Radio>
                                   <Radio value={1}>已到企业</Radio>
                                 </Radio.Group>
-                              </FormItem>
+                              </FormItem>}
                          </div>}
                     </div>
                     {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
@@ -5259,6 +5264,7 @@ const MyTaskOutsource = React.createClass({
                 <DeclarationProgress
                     timeRecordparse={this.state.timeRecordparse}
                     startDate={this.state.startDate}
+                    taskDate={this.state.taskDate}
                     list={[
                       {id:4,name:'完成时间',value:this.state.endDate},
                       {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -5266,7 +5272,9 @@ const MyTaskOutsource = React.createClass({
                       {id:10,name:'发证时间',value:this.state.licenceDate},
                       {id:15,name:'立项金额',value:this.state.setUpAmount}
                     ]}/>
-                <FormItem
+                {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                {/*sort: 3 科技项目  6: 会员*/}
+                {(this.state.bpType  === 5 || this.state.sort === 3) && <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label="申报批次"
@@ -5290,7 +5298,7 @@ const MyTaskOutsource = React.createClass({
                     <Option value={3}>第三批</Option>
                     <Option value={4}>第四批</Option>
                   </Select>
-                </FormItem>
+                </FormItem>}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}

+ 11 - 6
js/component/manageCenter/project/task/payApplyReject/detailsModal/projectOverview.js

@@ -675,9 +675,9 @@ class projectOverview extends Component{
                         <div className="clearfix">
                             <h3 className="sub-title">任务信息</h3>
                             {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                            {/*高新与贯标需要显示*/}
+                            {/*贯标需要显示*/}
                             {
-                                this.state.bpType === 5 || this.state.isIso ?
+                                this.state.isIso ?
                                     <div>
                                         <FormItem
                                             className="half-item"
@@ -925,6 +925,7 @@ class projectOverview extends Component{
                             <h3 className="sub-title">项目申报进度</h3>
                             <DeclarationProgress
                                 timeRecordparse={this.state.timeRecordparse}
+                                taskDate={this.state.taskDate}
                                 startDate={this.state.startDate}
                                 list={[
                                     {id:4,name:'完成时间',value:this.state.endDate},
@@ -990,14 +991,18 @@ class projectOverview extends Component{
                                         >
                                             {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
                                         </FormItem> : null}
-                                        <FormItem
+                                        {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                                        {/*cSort: 3 科技项目  6: 会员*/}
+                                        {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                                             className="half-item"
                                             {...formItemLayout}
                                             label="申报批次"
                                         >
                                             <span>{this.state.declarationBatch}</span>
-                                        </FormItem>
-                                        <FormItem
+                                        </FormItem>}
+                                        {/*只有科技项目才有是否到款*/}
+                                        {/*cSort: 3 科技项目  6: 会员*/}
+                                        {this.state.cSort === 3 && <FormItem
                                             className="half-item"
                                             {...formItemLayout}
                                             label="是否到款"
@@ -1005,7 +1010,7 @@ class projectOverview extends Component{
                                           <span>
                                             {this.state.arrivalMoney ? '已到企业' : '未到企业'}
                                           </span>
-                                        </FormItem>
+                                        </FormItem>}
                                         <div className="clearfix">
                                             <FormItem
                                                 labelCol={{ span: 3 }}

+ 11 - 93
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -18,6 +18,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "./resolutionPro"
 import {ChooseList} from "../../order/orderNew/chooseList";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 const FormItem = Form.Item;
 const {TabPane} = Tabs
 const Task = React.createClass({
@@ -101,6 +102,8 @@ const Task = React.createClass({
       orderNo: "",
       jiedian: [],
       jiedianNew: [],
+      declarationBatch: 1,
+      dataInfor: {},
       activeKey: "1",
       searchMore: true,
       assignVisible: false,
@@ -432,25 +435,8 @@ const Task = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus,
-              officialCost: thisdata.officialCost,
-              costReduction: thisdata.costReduction,
-              type: thisdata.type,
-            });
+            thisdata.key = i;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -522,6 +508,7 @@ const Task = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0,
     });
   },
@@ -1338,80 +1325,11 @@ const Task = React.createClass({
             </TabPane>
           </Tabs>
         </Modal>
-        <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="800px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="官费"
-                  style={{ display: this.state.displayFees }}
-                >
-                  <span>
-                    {this.state.officialCost == 0 ? "无官费" : "有官费"}
-                  </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="费减"
-                  style={{ display: this.state.displayFees }}
-                >
-                  <span>
-                    {this.state.costReduction == 0 ? "无费减" : "有费减"}
-                  </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal>
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   },

+ 28 - 84
js/component/manageCenter/project/task/taskCount.jsx

@@ -20,6 +20,7 @@ import OrderRiZi from "@/orderRiZi.jsx";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import PatentSchedule from './patentSchedule';
 import DeclarationProgress from "../../../common/declarationProgress";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const {TabPane} = Tabs
 
@@ -171,6 +172,8 @@ const IntentionCustomer = Form.create()(
         selectedRowKeys: [],
         timeRecordparse:{},
         orgCodeUrl: [],
+        declarationBatch: 1,
+        dataInfor: {},
         loadingA: false,
         paginations: false,
         pagination: {
@@ -568,6 +571,7 @@ const IntentionCustomer = Form.create()(
               splitId: thisdata.splitId,
               declarationBatch: thisdata.declarationBatch,
               bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+              cSort: thisdata.sort,
               specialComment: thisdata.specialComment,
               urgentDay: thisdata.urgentDay, //有无材料
               ifMaterial: thisdata.ifMaterial, //加急情况
@@ -763,24 +767,8 @@ const IntentionCustomer = Form.create()(
           } else {
             for (let i = 0; i < data.data.length; i++) {
               let thisdata = data.data[i];
-              theArr.push({
-                key: i,
-                id: thisdata.id,
-                orderNo: thisdata.orderNo, //订单编号
-                commodityId: thisdata.commodityId, //项目ID
-                commodityName: thisdata.commodityName, //项目名称
-                cname: thisdata.cname, //项目类别
-                commodityPrice: thisdata.commodityPrice, //项目价格
-                commodityQuantity: thisdata.commodityQuantity, //项目数量
-                main: thisdata.main, //是否为主要任务
-                taskComment: thisdata.taskComment, //任务说明
-                contacts: thisdata.contacts, //联系人
-                contactsMobile: thisdata.contactsMobile, //联系人电话
-                taskStatus: thisdata.taskStatus, //是否分配
-                splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
-                splitSuper: thisdata.splitSuper,
-                splitId: thisdata.splitId
-              });
+              thisdata.key = i;
+              theArr.push(thisdata);
             }
           }
           this.setState({
@@ -890,6 +878,7 @@ const IntentionCustomer = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
+        dataInfor:record,
         addState: 0
       });
     },
@@ -1384,9 +1373,9 @@ const IntentionCustomer = Form.create()(
                   <div className="clearfix">
                     <h3 className="sub-title">任务信息</h3>
                     {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                    {/*高新与贯标需要显示*/}
+                    {/*贯标需要显示*/}
                     {
-                      this.state.bpType === 5 || this.state.isIso ?
+                      this.state.isIso ?
                           <div>
                             <FormItem
                                 className="half-item"
@@ -1661,6 +1650,7 @@ const IntentionCustomer = Form.create()(
                     <DeclarationProgress
                         timeRecordparse={this.state.timeRecordparse}
                         startDate={this.state.startDate}
+                        taskDate={this.state.taskDate}
                         list={[
                           {id:4,name:'完成时间',value:this.state.endDate},
                           {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -1725,14 +1715,18 @@ const IntentionCustomer = Form.create()(
                             >
                               {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
                             </FormItem> : null}
-                            <FormItem
+                            {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                            {/*cSort: 3 科技项目  6: 会员*/}
+                            {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                               className="half-item"
                               {...formItemLayout}
                               label="申报批次"
                             >
                               <span>{this.state.declarationBatch}</span>
-                            </FormItem>
-                            <FormItem
+                            </FormItem>}
+                            {/*只有科技项目才有是否到款*/}
+                            {/*cSort: 3 科技项目  6: 会员*/}
+                            {this.state.cSort === 3 && <FormItem
                               className="half-item"
                               {...formItemLayout}
                               label="是否到款"
@@ -1740,7 +1734,7 @@ const IntentionCustomer = Form.create()(
                               <span>
                                 {this.state.arrivalMoney ? "已到企业" : "未到企业"}
                               </span>
-                            </FormItem>
+                            </FormItem>}
                           </div>}
                   </div>
                   {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
@@ -1820,64 +1814,6 @@ const IntentionCustomer = Form.create()(
             </Form>
           </Modal>
           <Modal
-            maskClosable={false}
-            visible={this.state.addnextVisible}
-            onOk={this.nextCancel}
-            onCancel={this.nextCancel}
-            width="900px"
-            title="项目任务详情"
-            footer=""
-            className="admin-desc-content"
-          >
-            <Form
-              layout="horizontal"
-              onSubmit={this.nextSubmit}
-              id="demand-form"
-            >
-              <Spin spinning={this.state.loading}>
-                <div className="clearfix">
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="项目名称"
-                  >
-                    <span>{this.state.commodityName}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="项目数量"
-                  >
-                    <span>{this.state.commodityQuantity}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="金额(万元)"
-                  >
-                    <span>{this.state.commodityPrice}</span>
-                  </FormItem>
-                  <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="主要项目"
-                  >
-                    <span>{getboutique(this.state.main)}</span>
-                  </FormItem>
-                  <div className="clearfix">
-                    <FormItem
-                      labelCol={{ span: 4 }}
-                      wrapperCol={{ span: 16 }}
-                      label="服务说明"
-                    >
-                      <span>{this.state.taskComment}</span>
-                    </FormItem>
-                  </div>
-                </div>
-              </Spin>
-            </Form>
-          </Modal>
-          <Modal
             width="800px"
             title="操作日志"
             footer=""
@@ -2226,6 +2162,7 @@ const IntentionCustomer = Form.create()(
               <DeclarationProgress
                   timeRecordparse={this.state.timeRecordparse}
                   startDate={this.state.startDate}
+                  taskDate={this.state.taskDate}
                   list={[
                     {id:4,name:'完成时间',value:this.state.endDate},
                     {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -2233,13 +2170,15 @@ const IntentionCustomer = Form.create()(
                     {id:10,name:'发证时间',value:this.state.licenceDate},
                     {id:15,name:'立项金额',value:this.state.setUpAmount}
                   ]}/>
-              <FormItem
+              {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+              {/*cSort: 3 科技项目  6: 会员*/}
+              {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label="申报批次"
               >
                 <span>{this.state.declarationBatch}</span>
-              </FormItem>
+              </FormItem>}
               <FormItem
                 className="half-item"
                 {...formItemLayout}
@@ -2289,6 +2228,11 @@ const IntentionCustomer = Form.create()(
               </Spin>
             </div>
           </Modal>
+          {this.state.addnextVisible && <ProjectDetailsReadOnly
+              infor={this.state.dataInfor}
+              visible={this.state.addnextVisible}
+              onCancel={this.nextCancel}
+          />}
         </div>
       );
     }

+ 26 - 82
js/component/manageCenter/project/task/taskQuery.jsx

@@ -39,6 +39,7 @@ import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import moment from "moment";
 import DeclarationProgress from "../../../common/declarationProgress";
+import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 
 const Task = React.createClass({
   loadData(pageNo) {
@@ -124,6 +125,8 @@ const Task = React.createClass({
       orderData: [],
       orderNo: "",
       jiedian: [],
+      declarationBatch: 1,
+      dataInfor: {},
       jiedianNew: [],
       timeRecordparse:{},
       activeKey: "1",
@@ -480,6 +483,7 @@ const Task = React.createClass({
             outsourcePrice: thisdata.outsourcePrice, //外包价格
             declarationBatch: thisdata.declarationBatch,
             bpType:thisdata.bpType,//0 正常 1专利 2软著 3审计 4双软 5高新 6商标
+            cSort: thisdata.sort,
             specialComment: thisdata.specialComment,
             urgentDay: thisdata.urgentDay, //有无材料
             ifMaterial: thisdata.ifMaterial, //加急情况
@@ -752,6 +756,7 @@ const Task = React.createClass({
       taskComment: record.taskComment, //备注
       main: record.main.toString(), //是否为主要
       addnextVisible: true,
+      dataInfor:record,
       addState: 0,
     });
   },
@@ -1296,9 +1301,9 @@ const Task = React.createClass({
                     <div className="clearfix">
                       <h3 className="sub-title">任务信息</h3>
                       {/*0通用 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                      {/*高新与贯标需要显示*/}
+                      {/*贯标需要显示*/}
                       {
-                        this.state.bpType === 5 || this.state.isIso ?
+                        this.state.isIso ?
                             <div>
                               <FormItem
                                   className="half-item"
@@ -1571,6 +1576,7 @@ const Task = React.createClass({
                       <DeclarationProgress
                           timeRecordparse={this.state.timeRecordparse}
                           startDate={this.state.startDate}
+                          taskDate={this.state.taskDate}
                           list={[
                             {id:4,name:'完成时间',value:this.state.endDate},
                             {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -1636,14 +1642,18 @@ const Task = React.createClass({
                               >
                                 {this.state.setUpStatus === 1 ?this.state.setUpTime : null }
                               </FormItem> : null}
-                              <FormItem
+                              {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                              {/*cSort: 3 科技项目  6: 会员*/}
+                              {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                                 className="half-item"
                                 {...formItemLayout}
                                 label="申报批次"
                               >
                                 <span>{this.state.declarationBatch}</span>
-                              </FormItem>
-                              <FormItem
+                              </FormItem>}
+                              {/*只有科技项目才有是否到款*/}
+                              {/*cSort: 3 科技项目  6: 会员*/}
+                              {this.state.cSort === 3 && <FormItem
                                 className="half-item"
                                 {...formItemLayout}
                                 label="是否到款"
@@ -1651,7 +1661,7 @@ const Task = React.createClass({
                                 <span>
                                   {this.state.arrivalMoney ? "已到企业" : "未到企业"}
                                 </span>
-                              </FormItem>
+                              </FormItem>}
                        </div>}
                     </div>
                     {this.state.bpType !== 1 && this.state.bpType !== 6 ? <div className="clearfix">
@@ -1759,80 +1769,6 @@ const Task = React.createClass({
             )}
           </Tabs>
         </Modal> : <div/>}
-        {this.state.addnextVisible ? <Modal
-          maskClosable={false}
-          visible={this.state.addnextVisible}
-          onOk={this.nextCancel}
-          onCancel={this.nextCancel}
-          width="900px"
-          title="项目任务详情"
-          footer=""
-          className="admin-desc-content"
-        >
-          <Form layout="horizontal" onSubmit={this.nextSubmit} id="demand-form">
-            <Spin spinning={this.state.loading}>
-              <div className="clearfix">
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目名称"
-                >
-                  <span>{this.state.commodityName}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="项目数量"
-                >
-                  <span>{this.state.commodityQuantity}</span>
-                </FormItem>
-                <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="官费"
-                    style={{ display: this.state.displayFees }}
-                >
-                        <span>
-                          {this.state.officialCost == 0 ? "无官费" : "有官费"}
-                        </span>
-                </FormItem>
-                <FormItem
-                    className="half-item"
-                    {...formItemLayout}
-                    label="费减"
-                    style={{ display: this.state.displayFees }}
-                >
-                        <span>
-                          {this.state.costReduction == 0 ? "无费减" : "有费减"}
-                        </span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="金额(万元)"
-                >
-                  <span>{this.state.commodityPrice}</span>
-                </FormItem>
-                <FormItem
-                  className="half-item"
-                  {...formItemLayout}
-                  label="主要项目"
-                >
-                  <span>{getboutique(this.state.main)}</span>
-                </FormItem>
-                <div className="clearfix">
-                  <FormItem
-                    labelCol={{ span: 4 }}
-                    wrapperCol={{ span: 16 }}
-                    label="服务说明"
-                  >
-                    <span>{this.state.taskComment}</span>
-                  </FormItem>
-                </div>
-              </div>
-            </Spin>
-          </Form>
-        </Modal> : <div/>}
         <Modal
           width="800px"
           title="操作日志"
@@ -2207,6 +2143,7 @@ const Task = React.createClass({
                 <DeclarationProgress
                     timeRecordparse={this.state.timeRecordparse}
                     startDate={this.state.startDate}
+                    taskDate={this.state.taskDate}
                     list={[
                       {id:4,name:'完成时间',value:this.state.endDate},
                       {id:6,name:'受理时间',value:this.state.acceptDate},
@@ -2214,13 +2151,15 @@ const Task = React.createClass({
                       {id:10,name:'发证时间',value:this.state.licenceDate},
                       {id:15,name:'立项金额',value:this.state.setUpAmount}
                     ]}/>
-                <FormItem
+                {/*高新和科技项目显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+                {/*cSort: 3 科技项目  6: 会员*/}
+                {(this.state.bpType  === 5 || this.state.cSort === 3) && <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label="申报批次"
                 >
                   <span>{this.state.declarationBatch}</span>
-                </FormItem>
+                </FormItem>}
                 <FormItem
                   className="half-item"
                   {...formItemLayout}
@@ -2314,6 +2253,11 @@ const Task = React.createClass({
         ) : (
           ""
         )}
+        {this.state.addnextVisible && <ProjectDetailsReadOnly
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
+        />}
       </div>
     );
   },

+ 13 - 44
js/component/project.jsx

@@ -420,24 +420,10 @@ const project = React.createClass({
           }
         } else {
           for (let i = 0; i < data.data.length; i++) {
-            let thisdata = data.data[i]
-            theArr.push({
-              key: i,
-              id: thisdata.id,
-              orderNo: thisdata.orderNo, //订单编号
-              commodityId: thisdata.commodityId, //项目ID
-              commodityName: thisdata.commodityName, //项目名称
-              cname: thisdata.cname, //项目类别
-              commodityPrice: thisdata.commodityPrice, //项目价格
-              commodityQuantity: thisdata.commodityQuantity, //项目数量
-              main: thisdata.main, //是否为主要任务
-              taskComment: thisdata.taskComment, //任务说明
-              contacts: thisdata.contacts, //联系人
-              contactsMobile: thisdata.contactsMobile, //联系人电话
-              taskStatus: thisdata.taskStatus, //是否分配
-              splitStatus: thisdata.splitStatus,
-              sort: thisdata.cSort,
-            })
+            let thisdata = data.data[i];
+            thisdata.key = i;
+            thisdata.sort = thisdata.cSort;
+            theArr.push(thisdata);
           }
         }
         this.setState({
@@ -872,26 +858,17 @@ const project = React.createClass({
                 <div className="clearfix">
                   <div className="clearfix">
                     <FormItem
-                      className="half-item"
-                      {...formItemLayout}
-                      label="当前项目情况"
+                        className="half-item"
+                        {...formItemLayout}
+                        label="项目状态"
                     >
-                      <span>
-                        {
-                          this.state.status === 0 ? '未开始':
-                              this.state.status === 1 ? '进行中':
-                                  this.state.status === 2 ? '已暂停':
-                                      this.state.status === 3 ? '已驳回(专利、软著项目编写)':
-                                          this.state.status === 4 ? '已完成':
-                                              this.state.status === 5 ? '项目已完成 已退单':
-                                                  this.state.status === 6 ? '项目未完成 已退单': ''
-                        }
-                      </span>
+                      {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
+                      <span>{getProjectName(this.state.projectStatus)}</span>
                       <Button
-                        type="primary"
-                        size="small"
-                        style={{ marginTop: '5px', position: 'absolute' }}
-                        onClick={this.caozuorizhi}
+                          type="primary"
+                          size="small"
+                          style={{ marginTop: '5px', position: 'absolute' }}
+                          onClick={this.caozuorizhi}
                       >
                         操作日志
                       </Button>
@@ -908,14 +885,6 @@ const project = React.createClass({
                     <FormItem
                       className="half-item"
                       {...formItemLayout}
-                      label="项目状态"
-                    >
-                      {/* <span>{getProcessStatus(this.state.projectStatus)}</span> */}
-                      <span>{getProjectName(this.state.projectStatus)}</span>
-                    </FormItem>
-                    <FormItem
-                      className="half-item"
-                      {...formItemLayout}
                       label="是否特批"
                     >
                       <span>{getApproval(this.state.approval)}</span>

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.64",
+  "version": "1.1.65",
   "description": "",
   "main": "index.js",
   "scripts": {