mentoswzq 5 years ago
parent
commit
018de64d72
29 changed files with 898 additions and 144 deletions
  1. 2 0
      js/component/manageCenter/financialManage/bonus/jsBonus.jsx
  2. 81 3
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  3. 8 1
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  4. 2 0
      js/component/manageCenter/financialManage/distribute/inSpecial.jsx
  5. 3 0
      js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx
  6. 4 1
      js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx
  7. 4 1
      js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx
  8. 4 1
      js/component/manageCenter/financialManage/distribute/outSpecial.jsx
  9. 2 0
      js/component/manageCenter/financialManage/distribute/paiDan.jsx
  10. 8 1
      js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx
  11. 7 17
      js/component/manageCenter/financialManage/distribute/shouKuang.jsx
  12. 2 0
      js/component/manageCenter/financialManage/flowWater/departWater.jsx
  13. 2 0
      js/component/manageCenter/financialManage/flowWater/myWater.jsx
  14. 8 2
      js/component/manageCenter/leftTab.less
  15. 1 0
      js/component/manageCenter/order/orderNew/contractJsy.js
  16. 4 0
      js/component/manageCenter/order/orderNew/contractYxgly.js
  17. 1 0
      js/component/manageCenter/order/orderNew/contractYxy.js
  18. 188 107
      js/component/manageCenter/order/orderNew/pressList.jsx
  19. 2 0
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  20. 2 0
      js/component/manageCenter/project/project/projectAssignment.jsx
  21. 10 2
      js/component/manageCenter/project/task/myTask.jsx
  22. 14 3
      js/component/manageCenter/project/task/myTaskCount.jsx
  23. 10 0
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  24. 2 0
      js/component/manageCenter/project/task/taskAssignment.jsx
  25. 12 1
      js/component/manageCenter/project/task/taskQuery.jsx
  26. 15 1
      js/component/manageCenter/publicMenu.js
  27. 497 0
      js/component/project.jsx
  28. 1 1
      package.json
  29. 2 2
      webpack.config.js

+ 2 - 0
js/component/manageCenter/financialManage/bonus/jsBonus.jsx

@@ -504,6 +504,8 @@ const JsBonus = React.createClass({
               rowSelection={false}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick}
+              bordered
+              size="small"
             />
           </Spin>
         </div>

+ 81 - 3
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -350,7 +350,8 @@ const approvedOutsourcing = React.createClass({
                   <Button
                     type="primary"
                     onClick={e => {
-                      e.stopPropagation(), this.evaluateZ(recard);
+                      // e.stopPropagation(), this.evaluateZ(recard);
+                      e.stopPropagation(), this.checkRemark(recard);
                     }}
                     style={{ marginLeft: "5px" }}
                   >
@@ -1812,7 +1813,7 @@ const approvedOutsourcing = React.createClass({
   },
   exportPro() {
     const data = {
-      orderNo: this.state.selectedRowKeys[0],
+      orderNo: this.state.selectedRowKeys[0]
     };
     window.location.href =
       globalConfig.context +
@@ -1909,6 +1910,7 @@ const approvedOutsourcing = React.createClass({
       },
       success: function(data) {
         let theArr = [];
+        let totalWaibao = 0;
         if (!data.data) {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
@@ -1916,6 +1918,7 @@ const approvedOutsourcing = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
+            totalWaibao += thisdata.outsourcePrice;
             theArr.push({
               key: i + 1,
               orderNo: thisdata.orderNo,
@@ -1950,8 +1953,10 @@ const approvedOutsourcing = React.createClass({
             });
           }
         }
+        totalWaibao = (Math.round(totalWaibao * 10000) / 10000).toFixed(4);
         this.setState({
-          proDataList: theArr
+          proDataList: theArr,
+          totalWaibao
         });
       }.bind(this)
     }).always(
@@ -1962,6 +1967,51 @@ const approvedOutsourcing = React.createClass({
       }.bind(this)
     );
   },
+  checkRemark(record) {
+    this.setState({
+      checkVisible: true,
+      checkOrderNo: record.orderNo
+    });
+  },
+  checkOk() {
+    if (this.state.checkData.trim() == "") {
+      message.warning("请填写审核内容");
+      return;
+    }
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "post",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/financial/financeApproval",
+      data: {
+        orderNo: this.state.checkOrderNo,
+        remarks: this.state.checkData
+      },
+      success: function(data) {
+        let theArr = [];
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          message.success("通过成功!");
+          this.loadData();
+          this.setState({
+            checkVisible: false
+          });
+        }
+      }.bind(this)
+    }).always(
+      function() {
+        this.setState({
+          loading: false
+        });
+      }.bind(this)
+    );
+  },
   render() {
     const { TextArea } = Input;
     const { RangePicker } = DatePicker;
@@ -3204,6 +3254,9 @@ const approvedOutsourcing = React.createClass({
                 size="small"
               />
             </div>
+            <span style={{ display: "block", marginTop: 10, color: "red" }}>
+              外包(内部)价格总计(万元):{this.state.totalWaibao}
+            </span>
           </Spin>
 
           <ReactToPrint
@@ -3224,6 +3277,31 @@ const approvedOutsourcing = React.createClass({
             content={() => this.refs.all}
           />
         </Modal>
+        <Spin spinning={this.state.loading}>
+          <Modal
+            title="审核订单"
+            visible={this.state.checkVisible}
+            onOk={this.checkOk}
+            okText={"通过"}
+            onCancel={() => {
+              this.loadData();
+              this.setState({
+                checkVisible: false,
+                checkData: ""
+              });
+            }}
+          >
+            <TextArea
+              onChange={(e, recard) => {
+                this.setState({
+                  checkData: e.target.value
+                });
+                console.log(e.target.value);
+              }}
+              placeholder="请填写审核内容"
+            />
+          </Modal>
+        </Spin>
       </div>
     );
   }

+ 8 - 1
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -1909,6 +1909,7 @@ const approvedOutsourcing = React.createClass({
       },
       success: function(data) {
         let theArr = [];
+        let totalWaibao = 0;
         if (!data.data) {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
@@ -1916,6 +1917,7 @@ const approvedOutsourcing = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
+            totalWaibao += thisdata.outsourcePrice;
             theArr.push({
               key: i + 1,
               orderNo: thisdata.orderNo,
@@ -1950,8 +1952,10 @@ const approvedOutsourcing = React.createClass({
             });
           }
         }
+        totalWaibao = (Math.round(totalWaibao * 10000) / 10000).toFixed(4);
         this.setState({
-          proDataList: theArr
+          proDataList: theArr,
+          totalWaibao
         });
       }.bind(this)
     }).always(
@@ -3204,6 +3208,9 @@ const approvedOutsourcing = React.createClass({
                 size="small"
               />
             </div>
+            <span style={{ display: "block", marginTop: 10, color: "red" }}>
+              外包(内部)价格总计(万元):{this.state.totalWaibao}
+            </span>
           </Spin>
 
           <ReactToPrint

+ 2 - 0
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -699,6 +699,7 @@ const inSpecial = React.createClass({
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               bordered
+              size="small"
             />
           </Spin>
         </div>
@@ -1020,6 +1021,7 @@ const inSpecial = React.createClass({
                 dataSource={this.state.recordData}
                 pagination={false}
                 bordered
+                size="small"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem

+ 3 - 0
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -660,6 +660,7 @@ const invoiceApplyList = React.createClass({
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
               bordered
+              size="small"
             />
           </Spin>
         </div>
@@ -991,6 +992,8 @@ const invoiceApplyList = React.createClass({
                 columns={this.state.columnsDate}
                 dataSource={this.state.recordData}
                 pagination={false}
+                bordered
+                size="small"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem

+ 4 - 1
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -230,7 +230,6 @@ const invoiceApplyListWai = React.createClass({
           title: "编号",
           dataIndex: "id",
           key: "id",
-          fixed: "left"
         },
         {
           title: "客户",
@@ -627,6 +626,8 @@ const invoiceApplyListWai = React.createClass({
               onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
+              bordered
+              size="small"
             />
           </Spin>
         </div>
@@ -958,6 +959,8 @@ const invoiceApplyListWai = React.createClass({
                 columns={this.state.columnsDate}
                 dataSource={this.state.recordData}
                 pagination={false}
+                bordered
+                size="small"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem

+ 4 - 1
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -225,7 +225,6 @@ const outInvoiceQuery = React.createClass({
           title: "编号",
           dataIndex: "id",
           key: "id",
-          fixed: "left"
         },
         {
           title: "客户",
@@ -622,6 +621,8 @@ const outInvoiceQuery = React.createClass({
               scroll={{ x: 1500, y: 0 }}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
+              bordered
+              size="small"
             />
           </Spin>
         </div>
@@ -942,6 +943,8 @@ const outInvoiceQuery = React.createClass({
                 columns={this.state.columnsDate}
                 dataSource={this.state.recordData}
                 pagination={false}
+                bordered
+                size="small"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem

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

@@ -210,7 +210,6 @@ const outSpecial = React.createClass({
           title: "编号",
           dataIndex: "id",
           key: "id",
-          fixed: "left"
         },
         {
           title: "客户",
@@ -623,6 +622,8 @@ const outSpecial = React.createClass({
               onRowClick={this.tableRowClick}
               dataSource={this.state.dataSource}
               pagination={this.state.pagination}
+              bordered
+              size="small"
             />
           </Spin>
         </div>
@@ -943,6 +944,8 @@ const outSpecial = React.createClass({
                 columns={this.state.columnsDate}
                 dataSource={this.state.recordData}
                 pagination={false}
+                bordered
+                size="small"
               />
               <div className="clearfix" style={{ marginTop: "20px" }}>
                 <FormItem

+ 2 - 0
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -430,6 +430,8 @@ const PaiDan = React.createClass({
               rowSelection={false}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick.bind(this)}
+              bordered
+              size="small"
             />
           </Spin>
         </div>

+ 8 - 1
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -1279,6 +1279,7 @@ const ShouKuang = React.createClass({
       },
       success: function(data) {
         let theArr = [];
+        let totalWaibao = 0;
         if (!data.data) {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
@@ -1286,6 +1287,7 @@ const ShouKuang = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
+            totalWaibao += thisdata.outsourcePrice;
             theArr.push({
               key: i + 1,
               orderNo: thisdata.orderNo,
@@ -1320,8 +1322,10 @@ const ShouKuang = React.createClass({
             });
           }
         }
+        totalWaibao = (Math.round(totalWaibao * 10000) / 10000).toFixed(4);
         this.setState({
-          proDataList: theArr
+          proDataList: theArr,
+          totalWaibao
         });
       }.bind(this)
     }).always(
@@ -2086,6 +2090,9 @@ const ShouKuang = React.createClass({
                 size="small"
               />
             </div>
+            <span style={{ display: "block", marginTop: 10, color: "red" }}>
+              外包(内部)价格总计(万元):{this.state.totalWaibao}
+            </span>
           </Spin>
 
           <ReactToPrint

+ 7 - 17
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -1173,7 +1173,6 @@ const ShouKuang = React.createClass({
       }.bind(this)
     );
   },
-<<<<<<< HEAD
   exportTime() {
     const data = {
       orderNo: this.state.selectedRowKeys[0],
@@ -1282,6 +1281,7 @@ const ShouKuang = React.createClass({
       },
       success: function(data) {
         let theArr = [];
+        let totalWaibao = 0;
         if (!data.data) {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
@@ -1289,6 +1289,7 @@ const ShouKuang = React.createClass({
         } else {
           for (let i = 0; i < data.data.length; i++) {
             let thisdata = data.data[i];
+            totalWaibao += thisdata.outsourcePrice;
             theArr.push({
               key: i + 1,
               orderNo: thisdata.orderNo,
@@ -1323,8 +1324,10 @@ const ShouKuang = React.createClass({
             });
           }
         }
+        totalWaibao = (Math.round(totalWaibao * 10000) / 10000).toFixed(4)
         this.setState({
-          proDataList: theArr
+          proDataList: theArr,
+          totalWaibao
         });
       }.bind(this)
     }).always(
@@ -1380,17 +1383,6 @@ const ShouKuang = React.createClass({
       }.bind(this)
     );
   },
-=======
-  exportTime () {
-    const data = {
-      orderNo: this.state.selectedRowKeys[0]
-    }
-    window.location.href =
-      globalConfig.context +
-      "/api/admin/orderProject/exportMyTaskList?" +
-      $.param(data);
-  },
->>>>>>> origin/xqh
   render() {
     const formItemLayout = {
       labelCol: { span: 8 },
@@ -1630,7 +1622,6 @@ const ShouKuang = React.createClass({
             >
               导出所选工时信息
             </Button>
-<<<<<<< HEAD
             <Button
               type="primary"
               disabled={this.state.selectedRowKeys.length != 1}
@@ -1647,8 +1638,6 @@ const ShouKuang = React.createClass({
             >
               导出项目详情
             </Button>
-=======
->>>>>>> origin/xqh
           </TabPane>
           <TabPane tab="查看" key="5">
             <Button
@@ -2148,6 +2137,7 @@ const ShouKuang = React.createClass({
                 size="small"
               />
             </div>
+            <span style={{  display: "block", marginTop: 10, color: "red" }}>外包(内部)价格总计(万元):{this.state.totalWaibao}</span>
           </Spin>
 
           <ReactToPrint
@@ -2178,7 +2168,7 @@ const ShouKuang = React.createClass({
               this.loadData();
               this.setState({
                 checkVisible: false,
-                checkRemark: ""
+                checkData: ""
               });
             }}
           >

+ 2 - 0
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -331,6 +331,8 @@ const MyWater = React.createClass({
                   rowSelection={false}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>

+ 2 - 0
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -349,6 +349,8 @@ const MyWater = React.createClass({
               rowSelection={false}
               pagination={this.state.pagination}
               onRowClick={this.tableRowClick}
+              bordered
+              size="small"
             />
           </Spin>
         </div>

+ 8 - 2
js/component/manageCenter/leftTab.less

@@ -1,7 +1,7 @@
 .manage-content {
     .account-left {
         width: 8%;
-        height: 100%;
+        height: 98%;
         margin-top: 2px;
         padding-bottom: 50px;
         float: left;
@@ -12,7 +12,13 @@
                 font-size: 16px;
             }
         }
-      
+        .ant-menu-item {
+            overflow: inherit;
+        }
+        .ant-menu-inline .ant-menu-item:after, .ant-menu-vertical .ant-menu-item:after {
+            content: "";
+            display: none;
+        }
     }
 }
 .containers{

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

@@ -33,6 +33,7 @@ const contractChange = Form.create()(
           pageNo: pageNo || this.state.page || 1,
           pageSize: this.state.pagination.pageSize,
           userName: this.state.searchData.userNameSearch,
+          orderNo: this.state.searchData.orderNoSearch,
           processState: this.props.processState,
           timeType: this.state.searchData.timeTypeSearch,
           startTime: this.state.searchData.releaseDate[0],

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

@@ -954,6 +954,10 @@ const contractChange = Form.create()(
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
       this.state.approval = undefined;
+      // this.state.searchData.completeSearch = 0;
+      this.state.searchData = {
+        completeSearch: 0
+      };
       this.loadData(1);
     },
     outReset() {

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

@@ -974,6 +974,7 @@ const contractChange = Form.create()(
       this.state.releaseDate[0] = undefined;
       this.state.releaseDate[1] = undefined;
       this.state.approval = undefined;
+      this.state.completeSearch = 0;
       this.loadData(1);
     },
     outReset() {

+ 188 - 107
js/component/manageCenter/order/orderNew/pressList.jsx

@@ -477,115 +477,196 @@ const IntentionCustomer = Form.create()(React.createClass({
 			},
 		};
 		let departmentArr = this.state.departmentArr || [];
-		return(
-			<div className="user-content">
-				<div className="content-title">                  
-                    <span>催款节点统计</span>
-                </div>
-               	<div className="user-search">             
-               		<Button type="primary" onClick={this.exportExec} style={{float:'right'}}>导出催款列表</Button>
-                   <Input placeholder="客户名称" style={{width:'150px',marginBottom:'10px'}}
-	                        value={this.state.customerName}
-	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
-                    <Input placeholder="营销员名称" style={{width:'150px',marginBottom:'10px'}}
-	                        value={this.state.adminName}
-	                        onChange={(e) => { this.setState({ adminName: e.target.value }); }} />
-                    <Input placeholder="订单编号" style={{width:'150px'}}
-                        value={this.state.orderNo}
-                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
-                    <Select placeholder="选择部门"
-                        style={{ width: 150 ,marginRight:'10px'}}
-                        value={this.state.departmenttSearch}
-                        onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
-                        {
-                            departmentArr.map(function (item) {
-                                    return <Select.Option key={item.id} >{item.name}</Select.Option>
-                            })
+		return (
+      <div className="user-content">
+        <div className="content-title">
+          <span>催款节点统计</span>
+        </div>
+        <div className="user-search">
+          <Button
+            type="primary"
+            onClick={this.exportExec}
+            style={{ float: "right" }}
+          >
+            导出催款列表
+          </Button>
+          <Input
+            placeholder="客户名称"
+            style={{ width: "150px", marginBottom: "10px" }}
+            value={this.state.customerName}
+            onChange={e => {
+              this.setState({ customerName: e.target.value });
+            }}
+          />
+          <Input
+            placeholder="营销员名称"
+            style={{ width: "150px", marginBottom: "10px" }}
+            value={this.state.adminName}
+            onChange={e => {
+              this.setState({ adminName: e.target.value });
+            }}
+          />
+          <Input
+            placeholder="订单编号"
+            style={{ width: "150px" }}
+            value={this.state.orderNo}
+            onChange={e => {
+              this.setState({ orderNo: e.target.value });
+            }}
+          />
+          <Select
+            placeholder="选择部门"
+            style={{ width: 150, marginRight: "10px" }}
+            value={this.state.departmenttSearch}
+            onChange={e => {
+              this.setState({ departmenttSearch: e });
+            }}
+          >
+            {departmentArr.map(function(item) {
+              return <Select.Option key={item.id}>{item.name}</Select.Option>;
+            })}
+          </Select>
+          <span style={{ marginRight: "10px" }}>下单时间 :</span>
+          <RangePicker
+            value={[
+              this.state.releaseDate[0]
+                ? moment(this.state.releaseDate[0])
+                : null,
+              this.state.releaseDate[1]
+                ? moment(this.state.releaseDate[1])
+                : null
+            ]}
+            onChange={(data, dataString) => {
+              this.setState({ releaseDate: dataString });
+            }}
+          />
+          <Button
+            type="primary"
+            onClick={this.search}
+            style={{ marginLeft: "10px" }}
+          >
+            搜索
+          </Button>
+          <Button onClick={this.reset}>重置</Button>
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table
+                columns={this.state.columns}
+                dataSource={this.state.dataSource}
+                pagination={this.state.pagination}
+                onRowClick={this.tableRowClick}
+                bordered
+                size="small"
+              />
+            </Spin>
+          </div>
+          <Modal
+            className="customeDetails"
+            footer=""
+            title="新增催款记录"
+            width="500px"
+            visible={this.state.visible}
+            onOk={this.visitOk}
+            onCancel={this.visitCancel}
+          >
+            <Form
+              layout="horizontal"
+              onSubmit={this.handleSubmit}
+              id="demand-form"
+              style={{ paddingBottom: "40px" }}
+            >
+              <Spin spinning={this.state.loading}>
+                <div className="clearfix">
+                  <div className="clearfix">
+                    <FormItem
+                      className="half-item"
+                      {...formItemLayout}
+                      label="催款时间"
+                    >
+                      <DatePicker
+                        style={{
+                          marginTop: "2px",
+                          width: "240px",
+                          height: "32px"
+                        }}
+                        showTime
+                        format="YYYY-MM-DD"
+                        onOk={() => {}}
+                        value={
+                          this.state.dumTime ? moment(this.state.dumTime) : null
                         }
-               		 </Select>  
-                    <span style={{marginRight:"10px"}}>下单时间 :</span>
-                    <RangePicker
-	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-	                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button> 
-                   	<div className="patent-table">
-	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
-	                            dataSource={this.state.dataSource}
-	                            pagination={this.state.pagination} 
-								onRowClick={this.tableRowClick}
-								bordered
-								size="small"
-	                           />
-	                    </Spin>
-               		 </div> 
-               		<Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="新增催款记录"
-			          width='500px'
-			          visible={this.state.visible}
-			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
-				        <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
-				            <Spin spinning={this.state.loading}>
-				                <div className="clearfix">
-				                	<div className='clearfix'>
-				                    	<FormItem className="half-item" {...formItemLayout} label="催款时间">
-	                                        <DatePicker 
-	                                            style={{marginTop:"2px",width: '240px',height:"32px" }}
-	                                            showTime
-	                                            format="YYYY-MM-DD"
-	                                            onOk={()=>{}}
-	                                            value={this.state.dumTime ? moment(this.state.dumTime) : null}
-	                                            onChange={(data, dataString) => { this.setState({ dumTime: dataString }); }} />
-	                                    </FormItem>
-				                	 </div>
-				                	<div className='clearfix'>
-				                    	<FormItem
-								            labelCol={{ span: 4 }}
-								            wrapperCol={{ span: 16 }}
-								            label="催款情况" >
-								                <Input type="textarea" placeholder="请输入催款情况" rows={4}  value={this.state.remarks} 
-									    				onChange={(e)=>{this.setState({remarks:e.target.value})}}/>	
-								        </FormItem>
-				                    </div>	
-				                     <div className='clearfix'>
-						                   <Button className="cancel" type="primary" onClick={this.examOk} style={{marginLeft:"50px"}} htmlType="submit">添加</Button>
-			                               <Button className="cancel" type="ghost" onClick={this.noCancel} style={{marginLeft:"50px"}}>取消</Button>
-	                            	</div>
-				                </div>
-				            </Spin>
-				        </Form>
-			        </Modal>
-			        <Modal	
-				      className="customeDetails"
-				      footer=''
-			          title="催款记录查看"
-			          width='500px'
-			          visible={this.state.visibles}
-			          onOk={this.visitOks}
-					  onCancel={this.visitCancels}							          							          
-			        >	
-			        	<div className="user-content">
-					        <div className="patent-table">
-			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={this.state.columnsX}
-			                            dataSource={this.state.dataSources}    
-			                            rowSelection={rowSelection}
-			                            pagination={this.state.paginations} 
-			                            onRowClick={this.tableRowClick}
-			                           />
-			                    </Spin>
-		               		 </div>
-		                </div>
-			        </Modal>
-               	</div>  
+                        onChange={(data, dataString) => {
+                          this.setState({ dumTime: dataString });
+                        }}
+                      />
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <FormItem
+                      labelCol={{ span: 4 }}
+                      wrapperCol={{ span: 16 }}
+                      label="催款情况"
+                    >
+                      <Input
+                        type="textarea"
+                        placeholder="请输入催款情况"
+                        rows={4}
+                        value={this.state.remarks}
+                        onChange={e => {
+                          this.setState({ remarks: e.target.value });
+                        }}
+                      />
+                    </FormItem>
+                  </div>
+                  <div className="clearfix">
+                    <Button
+                      className="cancel"
+                      type="primary"
+                      onClick={this.examOk}
+                      style={{ marginLeft: "50px" }}
+                      htmlType="submit"
+                    >
+                      添加
+                    </Button>
+                    <Button
+                      className="cancel"
+                      type="ghost"
+                      onClick={this.visitCancel}
+                      style={{ marginLeft: "50px" }}
+                    >
+                      取消
+                    </Button>
+                  </div>
+                </div>
+              </Spin>
+            </Form>
+          </Modal>
+          <Modal
+            className="customeDetails"
+            footer=""
+            title="催款记录查看"
+            width="500px"
+            visible={this.state.visibles}
+            onOk={this.visitOks}
+            onCancel={this.visitCancels}
+          >
+            <div className="user-content">
+              <div className="patent-table">
+                <Spin spinning={this.state.loading}>
+                  <Table
+                    columns={this.state.columnsX}
+                    dataSource={this.state.dataSources}
+                    rowSelection={rowSelection}
+                    pagination={this.state.paginations}
+                    onRowClick={this.tableRowClick}
+                  />
+                </Spin>
+              </div>
             </div>
-			);
+          </Modal>
+        </div>
+      </div>
+    );
 	}
 }));
 export default IntentionCustomer;

+ 2 - 0
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -800,6 +800,8 @@ const OutsourceTaskAssignment = React.createClass({
                       dataSource={this.state.dataSourceX}
                       pagination={this.state.paginations}
                       onRowClick={this.tableRowClickX}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>

+ 2 - 0
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -1262,6 +1262,8 @@ const PaiDan = React.createClass({
                       dataSource={this.state.dataSourceX}
                       pagination={this.state.paginations}
                       onRowClick={this.tableRowClickX}
+                      bordered
+                      size={"small"}
                     />
                   </Spin>
                 </div>

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

@@ -2105,6 +2105,8 @@ const Task = React.createClass({
                       dataSource={this.state.dataSourceX}
                       pagination={this.state.paginations}
                       onRowClick={this.tableRowClickX}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>
@@ -2213,7 +2215,7 @@ const Task = React.createClass({
           onOk={this.nextCancel}
           onCancel={this.nextCancel}
           width="800px"
-          title="项目项目详情"
+          title="项目详情"
           footer=""
           className="admin-desc-content"
         >
@@ -2239,7 +2241,7 @@ const Task = React.createClass({
                   {...formItemLayout}
                   label="金额(万元)"
                 >
-                  <span>{this.state.commodityPrice}</span>
+                  <span>{this.state.commodityPrice ? "***" : 0}</span>
                 </FormItem>
                 <FormItem
                   className="half-item"
@@ -2720,6 +2722,8 @@ const Task = React.createClass({
                   columns={this.state.ContactsLists}
                   dataSource={this.state.contactList}
                   pagination={false}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>
@@ -2733,6 +2737,8 @@ const Task = React.createClass({
                   dataSource={this.state.dataSourceX}
                   pagination={this.state.paginations}
                   onRowClick={this.tableRowClickX}
+                  bordered
+                  size="small"
                 />
               </Spin>
             </div>
@@ -2771,6 +2777,8 @@ const Task = React.createClass({
                 columns={this.state.columnsA}
                 dataSource={this.state.dataSourceA}
                 pagination={false}
+                bordered
+                size="small"
               />
             </Spin>
           </div>

+ 14 - 3
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -958,7 +958,9 @@ const MyTaskCount = Form.create()(React.createClass({
 				                	                        <Table columns={this.state.columnsX}
 				                	                            dataSource={this.state.dataSourceX}
 				                	                            pagination={this.state.paginations}
-				                	                            onRowClick={this.tableRowClickX} 
+																onRowClick={this.tableRowClickX}
+																bordered
+																size={"small"} 
 				                	                            />
 				                	                    </Spin>
 				                		            </div>
@@ -1014,7 +1016,10 @@ const MyTaskCount = Form.create()(React.createClass({
 									    className="admin-desc-content">
 										<div className="patent-table patent-table-center">
 										    <Spin spinning={this.state.loading}>
-										        <Table columns={this.state.columnsY}/>
+										        <Table columns={this.state.columnsY}
+													bordered
+													size={"small"}
+												/>
 										    </Spin>
 										</div>
 									</Modal>
@@ -1230,6 +1235,8 @@ const MyTaskCount = Form.create()(React.createClass({
 						    <Spin spinning={this.state.loading}>
 						        <Table columns={this.state.ContactsLists}
 									   dataSource={this.state.contactList}
+									   bordered
+									   size="small"
 									   pagination={false}/>
 						    </Spin>
 						</div>
@@ -1241,7 +1248,9 @@ const MyTaskCount = Form.create()(React.createClass({
 						        <Table columns={this.state.columnsX}
 						            dataSource={this.state.dataSourceX}
 						            pagination={this.state.paginations}
-						            onRowClick={this.tableRowClickX} 
+									onRowClick={this.tableRowClickX} 
+									bordered
+									size="small"
 						            />
 						    </Spin>
 						</div>
@@ -1256,6 +1265,8 @@ const MyTaskCount = Form.create()(React.createClass({
 					    <Spin spinning={this.state.loading}>
 					        <Table columns={this.state.columnsA}
 									dataSource={this.state.dataSourceA}
+									bordered
+									size="small"
 									pagination={false}/>
 					    </Spin>
 					</div>

+ 10 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -2332,6 +2332,8 @@ const MyTaskOutsource = React.createClass({
                           dataSource={this.state.dataSourceX}
                           pagination={this.state.paginations}
                           onRowClick={this.tableRowClickX}
+                          bordered
+                          size="small"
                         />
                       </Spin>
                     </div>
@@ -2496,6 +2498,8 @@ const MyTaskOutsource = React.createClass({
                     columns={this.state.companyColumns}
                     dataSource={this.state.companys}
                     scroll={{ x: 300, y: 0 }}
+                    bordered
+                    size="small"
                     expandedRowRender={record => {
                       return <p>{record.remarks}</p>;
                     }}
@@ -3083,6 +3087,8 @@ const MyTaskOutsource = React.createClass({
                       columns={this.state.ContactsLists}
                       dataSource={this.state.contactList}
                       pagination={false}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>
@@ -3096,6 +3102,8 @@ const MyTaskOutsource = React.createClass({
                       dataSource={this.state.dataSourceX}
                       pagination={this.state.paginations}
                       onRowClick={this.tableRowClickX}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>
@@ -3261,6 +3269,8 @@ const MyTaskOutsource = React.createClass({
                     expandedRowRender={record => {
                       return <p>{record.remarks}</p>;
                     }}
+                    bordered
+                    size="small"
                     pagination={false}
                   />
                 </Spin>

+ 2 - 0
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -801,6 +801,8 @@ const Task = React.createClass({
                       dataSource={this.state.dataSourceX}
                       pagination={this.state.paginations}
                       onRowClick={this.tableRowClickX}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>

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

@@ -1227,6 +1227,8 @@ const Task = React.createClass({
                           dataSource={this.state.dataSourceX}
                           pagination={this.state.paginations}
                           onRowClick={this.tableRowClickX}
+                          bordered
+                          size="small"
                         />
                       </Spin>
                     </div>
@@ -1300,7 +1302,10 @@ const Task = React.createClass({
             >
               <div className="patent-table patent-table-center">
                 <Spin spinning={this.state.loading}>
-                  <Table columns={this.state.columnsY} />
+                  <Table columns={this.state.columnsY} 
+                  bordered
+                  size="small"
+                  />
                 </Spin>
               </div>
             </Modal>
@@ -1609,6 +1614,8 @@ const Task = React.createClass({
                       columns={this.state.ContactsLists}
                       dataSource={this.state.contactList}
                       pagination={false}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>
@@ -1622,6 +1629,8 @@ const Task = React.createClass({
                       dataSource={this.state.dataSourceX}
                       pagination={this.state.paginations}
                       onRowClick={this.tableRowClickX}
+                      bordered
+                      size="small"
                     />
                   </Spin>
                 </div>
@@ -1641,6 +1650,8 @@ const Task = React.createClass({
                     columns={this.state.columnsA}
                     dataSource={this.state.dataSourceA}
                     pagination={false}
+                    bordered
+                    size="small"
                   />
                 </Spin>
               </div>

+ 15 - 1
js/component/manageCenter/publicMenu.js

@@ -20,7 +20,21 @@ module.exports={
 	                    return;
 	                };
 	            };
-	            menuArr=data.data;
+				menuArr=data.data;
+				// 如果不是管理员 某某人员变更审核简单写为变更审核
+				// window.setTimeout(() => {
+				// 	console.log($(".account-left"));
+				// })
+				
+				if(window.adminData.isSuperAdmin) return
+				menuArr.forEach(first => {
+					first.subMenus.forEach(second => {
+						let str = second.name.substring( second.name.length - 6 ,second.name.length)
+						if(str == "变更审核列表") {
+							second.name = "变更审核"
+						}
+					})
+				});
 			}
 		})
 		return menuArr;

+ 497 - 0
js/component/project.jsx

@@ -0,0 +1,497 @@
+import React from "react";
+import { Spin, Button, Tabs, Table, message, Modal } from "antd";
+
+const project = React.createClass({
+  getInitialState() {
+    return {
+      newVisible: false
+    };
+  },
+  componentWillReceiveProps(nextProps) {
+    this.setState({
+      newVisible: nextProps.ShowModal
+    });
+  },
+  handleOk() {
+    this.setState({
+      newVisible: false
+    });
+    // window.setTimeout( () => {
+    //   this.setState({
+    //     newVisible: true
+    //   });
+    // },)
+  },
+  componentDidMount() {
+    
+  },
+  render() {
+    return (
+      <Modal
+        className="customeDetails"
+        footer=""
+        title="项目概况"
+        width="900px"
+        visible={this.state.visible}
+        onOk={this.visitOk}
+        onCancel={this.visitCancel}
+      >
+        <Form
+          layout="horizontal"
+          onSubmit={this.handleSubmit}
+          id="demand-form"
+          style={{ paddingBottom: "0px" }}
+        >
+          <Spin spinning={this.state.loading}>
+            <div className="clearfix">
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="当前项目情况"
+                >
+                  <span>{this.state.status ? "暂停" : "开启"}</span>
+                  <Button
+                    type="primary"
+                    size="small"
+                    style={{ marginTop: "5px", position: "absolute" }}
+                    onClick={this.caozuorizhi}
+                  >
+                    操作日志
+                  </Button>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="合同编号"
+                >
+                  <span>{this.state.contractNo}</span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="项目状态"
+                >
+                  <span>{getProcessStatus(this.state.projectStatus)}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="是否特批"
+                >
+                  <span>{getApproval(this.state.approval)}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="结算状态"
+                >
+                  <span>
+                    {getLiquidationStatus(this.state.liquidationStatus)}
+                  </span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="流程状态"
+                >
+                  <span>{getProcessStatus(this.state.processStatus)}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="订单编号"
+                >
+                  <span>{this.state.orderNo}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="是否外包"
+                >
+                  <span>{this.state.outsource == 0 ? "否" : "是"}</span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="满意度表格"
+                >
+                  <span>{utils.getSatisfaction(this.state.formRetrieve)}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="退单"
+                >
+                  <span>{utils.getChargeback(this.state.taskRefund)}</span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                {
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="(满意度)备注"
+                  >
+                    <span>{this.state.retrieveContent}</span>
+                  </FormItem>
+                }
+                {
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="(退单)备注"
+                  >
+                    <span>{this.state.refundContent}</span>
+                  </FormItem>
+                }
+              </div>
+              <div className="clearfix">
+                <h3 className="sub-title">任务信息</h3>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="任务编号"
+                >
+                  <span>{this.state.id}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="任务名称"
+                >
+                  <span>{this.state.taskName}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="任务状态"
+                >
+                  <span>{getTaskStatus(this.state.taskStatus)}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="任务类别"
+                >
+                  <span>{this.state.cname}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="证书编号"
+                >
+                  <span>{this.state.certificateNumber}</span>
+                </FormItem>
+              </div>
+              {this.state.outsource === 1 ? (
+                <div className="clearfix">
+                  <h3 className="sub-title">外包信息</h3>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="外包公司"
+                  >
+                    <span>{this.state.outsourceName}</span>
+                  </FormItem>
+                  <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="外包成本(万元)"
+                  >
+                    <span>{this.state.outsourcePrice}</span>
+                  </FormItem>
+                </div>
+              ) : (
+                ""
+              )}
+              {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
+              <div className="clearfix">
+                <h3 className="sub-title">联系信息</h3>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="客户名称"
+                >
+                  <span>{this.state.userName}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="企业法人"
+                >
+                  <span>{this.state.legalPerson}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="法人电话"
+                >
+                  <span>{this.state.legalPersonTel}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="客户联系人"
+                >
+                  <span>{this.state.contacts}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="联系人电话"
+                >
+                  <span>{this.state.contactMobile}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="企业地址"
+                >
+                  <span>
+                    {getprovince(this.state.locationProvince)}/
+                    {getprovince(this.state.locationCity)}/
+                    {getprovince(this.state.locationArea)}
+                  </span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label=""
+                ></FormItem>
+                <FormItem className="half-item" {...formItemLayout}>
+                  <span style={{ paddingLeft: "12em" }}>
+                    {this.state.postalAddress}
+                  </span>
+                </FormItem>
+              </div>
+              {/*<hr style={{border:'1px dashed #aaa', width:"90%",margin:'auto'}}/>*/}
+              <div className="clearfix">
+                <h3 className="sub-title">订单负责人信息</h3>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="负责人"
+                >
+                  <span>
+                    {this.state.salesmanName + "(" + this.state.depName + ")"}
+                  </span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="负责人电话"
+                >
+                  <span>{this.state.salesmanMobile}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="当前财务负责人"
+                >
+                  <span>{this.state.nowFinance}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="当前财务负责人电话"
+                >
+                  <span>{this.state.nowFinanceMobile}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  style={{ opacity: ".5" }}
+                  label="原负责人"
+                >
+                  <span>{this.state.oldSalesmanName}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  style={{ opacity: ".5" }}
+                  label="原负责人电话"
+                >
+                  <span>{this.state.oldSalesmanMobile}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  style={{ opacity: ".5" }}
+                  label="实际财务操作人"
+                >
+                  <span>{this.state.financeName}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  style={{ opacity: ".5" }}
+                  label="实际财务操作人电话"
+                >
+                  <span>{this.state.financeMobile}</span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <h3 className="sub-title">申报系统账户信息</h3>
+                {/*<span style={{color:'red'}}>注:仅技术部可见</span>*/}
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="用户名"
+                >
+                  <span>{this.state.declareUser ? "*" : ""}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="密码"
+                >
+                  <span>{this.state.declarePwd ? "*" : ""}</span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <h3 className="sub-title">项目申报进度</h3>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="启动时间"
+                >
+                  <span>{this.state.startDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="完成时间"
+                >
+                  <span>{this.state.endDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="受理时间"
+                >
+                  <span>{this.state.acceptDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="评审时间"
+                >
+                  <span>{this.state.reviewDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="公示时间"
+                >
+                  <span>{this.state.publicityDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="发证时间"
+                >
+                  <span>{this.state.licenceDate}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="立项金额(万元)"
+                >
+                  <span>{this.state.setUpAmount}</span>
+                </FormItem>
+                <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="是否到款"
+                >
+                  <span>
+                    {this.state.arrivalMoney ? "已到企业" : "未到企业"}
+                  </span>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <FormItem
+                  labelCol={{ span: 3 }}
+                  wrapperCol={{ span: 18 }}
+                  label="附件"
+                >
+                  <Upload
+                    className="demandDetailShow-upload"
+                    listType="picture-card"
+                    fileList={this.state.attachmentUrl}
+                    onPreview={file => {
+                      this.setState({
+                        previewImage: file.url || file.thumbUrl,
+                        previewVisible: true
+                      });
+                    }}
+                  ></Upload>
+                  <Modal
+                    maskClosable={false}
+                    footer={null}
+                    visible={this.state.previewVisible}
+                    onCancel={() => {
+                      this.setState({ previewVisible: false });
+                    }}
+                  >
+                    <img
+                      alt=""
+                      style={{ width: "100%" }}
+                      src={this.state.previewImage || ""}
+                    />
+                  </Modal>
+                </FormItem>
+              </div>
+              <div className="clearfix">
+                <FormItem
+                  labelCol={{ span: 3 }}
+                  wrapperCol={{ span: 16 }}
+                  label="备注"
+                >
+                  <span>{this.state.taskComment}</span>
+                </FormItem>
+              </div>
+              <div>
+                <h3 className="sub-title">项目业务</h3>
+                {this.state.processStatus == 0 ? (
+                  <Button
+                    type="primary"
+                    onClick={this.addDetailed}
+                    style={{
+                      float: "right",
+                      marginRight: "50px",
+                      marginBottom: "15px"
+                    }}
+                  >
+                    添加项目明细
+                  </Button>
+                ) : (
+                  ""
+                )}
+              </div>
+              <div className="patent-table">
+                <Spin spinning={this.state.loading}>
+                  <Table
+                    columns={this.state.columnsX}
+                    dataSource={this.state.dataSourceX}
+                    pagination={this.state.paginations}
+                    onRowClick={this.tableRowClickX}
+                    bordered
+                    size="small"
+                  />
+                </Spin>
+              </div>
+            </div>
+          </Spin>
+        </Form>
+      </Modal>
+    );
+  }
+});
+
+export default project;

+ 1 - 1
package.json

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

+ 2 - 2
webpack.config.js

@@ -304,7 +304,7 @@ module.exports = (function () {
     }
 
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = "http://192.168.1.133";
+    let staticHost = "http://172.16.0.253";
     switch (argv.env.deploy) {
         case 'test':
             staticHost = "http://static.jishutao.com";
@@ -343,7 +343,7 @@ module.exports = (function () {
         // }
         devServer: {
             disableHostCheck: true,
-            host: '192.168.1.133',
+            host: '172.16.0.253',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.20','192.168.0.99'],
             headers: {