mentoswzq 5 years ago
parent
commit
466a3b0a24
22 changed files with 266 additions and 51 deletions
  1. 9 2
      js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx
  2. 9 2
      js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx
  3. 9 3
      js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx
  4. 10 5
      js/component/manageCenter/order/orderNew/addService.jsx
  5. 2 2
      js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js
  6. 9 3
      js/component/manageCenter/order/orderNew/chargeback.jsx
  7. 9 2
      js/component/manageCenter/order/orderNew/contractCwzj.js
  8. 9 2
      js/component/manageCenter/order/orderNew/contractCwzy.js
  9. 9 2
      js/component/manageCenter/order/orderNew/contractJsjl.js
  10. 9 3
      js/component/manageCenter/order/orderNew/contractJsy.js
  11. 9 2
      js/component/manageCenter/order/orderNew/contractJszj.js
  12. 9 2
      js/component/manageCenter/order/orderNew/contractYxgly.js
  13. 9 2
      js/component/manageCenter/order/orderNew/contractYxy.js
  14. 9 2
      js/component/manageCenter/order/orderNew/examine.jsx
  15. 9 2
      js/component/manageCenter/order/orderNew/inquiry.jsx
  16. 9 2
      js/component/manageCenter/order/orderNew/outsourcingList.jsx
  17. 9 2
      js/component/manageCenter/order/orderNew/reject.jsx
  18. 16 5
      js/component/manageCenter/project/project/projectAssignment.jsx
  19. 9 2
      js/component/manageCenter/project/project/projectQuery.jsx
  20. 9 2
      js/component/manageCenter/project/project/zxsglyOutSourcingPaiDan.jsx
  21. 9 2
      js/component/manageCenter/project/task/myTaskOutsource.jsx
  22. 76 0
      js/component/orderRiZi.jsx

+ 9 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -18,6 +18,7 @@ import {
 import Receivable from "./receivable";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ReactToPrint from "react-to-print";
+import OrderRiZi from "@/orderRiZi.jsx";
 import {
   getjiedian,
   getProcessStatus,
@@ -2616,7 +2617,7 @@ const approvedOutsourcing = React.createClass({
                         <span>{theData.financeMobile}</span>
                       </FormItem>
                     </div>
-                    <Modal
+                    {/* <Modal
                       visible={this.state.avisible}
                       className="admin-desc-content"
                       width="800px"
@@ -2634,7 +2635,13 @@ const approvedOutsourcing = React.createClass({
                           />
                         </Spin>
                       </div>
-                    </Modal>
+                    </Modal> */}
+                    <OrderRiZi
+                      dataSourcerizhi={this.state.dataSourceY}
+                      closeOrderLog={this.closeOrderLog}
+                      visible={this.state.avisible}
+                      loading={this.state.loading}
+                    />
                     <div className="clearfix">
                       <p style={{ fontSize: 18, marginLeft: 20 }}>项目业务</p>
                       <div className="patent-table">

+ 9 - 2
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -18,6 +18,7 @@ import {
 import Receivable from "./receivable";
 import Assign from "@/manageCenter/publicComponent/assign";
 import ReactToPrint from "react-to-print";
+import OrderRiZi from "@/orderRiZi.jsx";
 import {
   getjiedian,
   getProcessStatus,
@@ -2616,7 +2617,7 @@ const approvedOutsourcing = React.createClass({
                         <span>{theData.financeMobile}</span>
                       </FormItem>
                     </div>
-                    <Modal
+                    {/* <Modal
                       visible={this.state.avisible}
                       className="admin-desc-content"
                       width="800px"
@@ -2634,7 +2635,13 @@ const approvedOutsourcing = React.createClass({
                           />
                         </Spin>
                       </div>
-                    </Modal>
+                    </Modal> */}
+                    <OrderRiZi
+                      dataSourcerizhi={this.state.dataSourceY}
+                      closeOrderLog={this.closeOrderLog}
+                      visible={this.state.avisible}
+                      loading={this.state.loading}
+                    />
                     <div className="clearfix">
                       <p style={{ fontSize: 18, marginLeft: 20 }}>项目业务</p>
                       <div className="patent-table">

+ 9 - 3
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -10,7 +10,7 @@ import {
     Table
 } from 'antd';
 import {getjiedian,splitUrl,getNewOrderType,getProcessStatus,getApproval,getLiquidationStatus,getProjectStatus} from '@/tools';
-
+import OrderRiZi from "@/orderRiZi.jsx";
 const OrderDetail = Form.create()(React.createClass({
     loadXmu(record) {
         this.state.data = [];
@@ -687,7 +687,7 @@ const OrderDetail = Form.create()(React.createClass({
                     <span>{theData.financeMobile}</span>
                   </FormItem>
                 </div>
-                <Modal
+                {/* <Modal
                   visible={this.state.avisible}
                   className="admin-desc-content"
                   width="800px"
@@ -705,7 +705,13 @@ const OrderDetail = Form.create()(React.createClass({
                       />
                     </Spin>
                   </div>
-                </Modal>
+                </Modal> */}
+                <OrderRiZi
+                  dataSourcerizhi={this.state.dataSourceX}
+                  closeOrderLog={this.closeOrderLog}
+                  visible={this.state.avisible}
+                  loading={this.state.loading}
+                />
                 <div className="clearfix">
                   <p style={{ fontSize: 18, marginLeft: 20 }}>项目业务</p>
                   <div className="patent-table">

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

@@ -20,6 +20,7 @@ import "../userMangagement.less";
 import "../billing.less";
 import moment from "moment";
 import Picture from "@/manageCenter/publicComponent/picture";
+import OrderRiZi from "@/orderRiZi.jsx";
 import {
   orderTypes,
   customerType,
@@ -1649,9 +1650,7 @@ const NewService = Form.create()(
                                     <Select.Option key={0}>
                                       非特批
                                     </Select.Option>
-                                    <Select.Option key={1}>
-                                      特批
-                                    </Select.Option>
+                                    <Select.Option key={1}>特批</Select.Option>
                                   </Select>
                                 </FormItem>
                                 <FormItem
@@ -2905,7 +2904,7 @@ const NewService = Form.create()(
               </Spin>
             </Form>
           </Modal>
-          <Modal
+          {/* <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"
             width="800px"
@@ -2923,7 +2922,13 @@ const NewService = Form.create()(
                 />
               </Spin>
             </div>
-          </Modal>
+          </Modal> */}
+          <OrderRiZi
+            dataSourcerizhi={this.state.dataSourcerizhi}
+            closeOrderLog={this.closeOrderLog}
+            visible={this.state.rizhivisible}
+            loading={this.state.loading}
+          />
         </div>
       );
     }

+ 2 - 2
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -257,7 +257,7 @@ class OrderDetail extends Component {
           <span>{getLiquidationStatus(data.liquidationStatus)}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="企业联系人">
-          <span>{data.contacts}</span>
+          {/* <span>{data.contacts}</span> */}
           <span>{this.props.isCaiWu ? "***" : data.contacts}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="联系人电话">
@@ -268,7 +268,7 @@ class OrderDetail extends Component {
           <span>{this.props.isCaiWu ? "***" : data.legalPerson}</span>
         </FormItem>
         <FormItem className="half-item" {...formItemLayout} label="法人电话">
-          <span>{data.legalPersonTel}</span>
+          {/* <span>{data.legalPersonTel}</span> */}
           <span>{this.props.isCaiWu ? "***" : data.legalPersonTel}</span>
         </FormItem>
         <FormItem

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

@@ -16,7 +16,7 @@ import {
 } from "@/tools.js";
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
-
+import OrderRiZi from "@/orderRiZi.jsx";
 
 const IntentionCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -1121,7 +1121,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               </Spin>
             </Form>
           </Modal>
-          <Modal
+          {/* <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"
             width="800px"
@@ -1139,7 +1139,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                 />
               </Spin>
             </div>
-          </Modal>
+          </Modal> */}
+          <OrderRiZi
+            dataSourcerizhi={this.state.dataSourcerizhi}
+            closeOrderLog={this.closeOrderLog}
+            visible={this.state.rizhivisible}
+            loading={this.state.loading}
+          />
         </div>
       </div>
     );

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

@@ -18,6 +18,7 @@ import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -1241,7 +1242,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1260,7 +1261,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -20,6 +20,7 @@ import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 const { RangePicker } = DatePicker;
 import ReactToPrint from "react-to-print";
+import OrderRiZi from "@/orderRiZi.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -1441,7 +1442,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1460,7 +1461,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
             <Modal
               visible={this.state.dvisible}
               footer=""

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

@@ -17,6 +17,7 @@ import { ChangeDetail } from "./changeComponent/changeDetailJsjl.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -1214,7 +1215,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1233,7 +1234,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -17,7 +17,7 @@ import { ChangeDetail } from "./changeComponent/changeDetailJsy.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
-
+import OrderRiZi from "@/orderRiZi.jsx";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -1154,7 +1154,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1173,7 +1173,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -17,6 +17,7 @@ import { ChangeDetail } from "./changeComponent/changeDetailJszj.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -1206,7 +1207,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1225,7 +1226,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -17,6 +17,7 @@ import { ChangeDetail } from "./changeComponent/changeDetailYxgly.js";
 import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -1205,7 +1206,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1224,7 +1225,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -21,6 +21,7 @@ import OrderDetail from "./changeComponent/orderDetail";
 import ChangeApply from "./changeComponent/changeApply";
 import { ChooseList } from "./chooseList.jsx";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -1272,7 +1273,7 @@ const contractChange = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1291,7 +1292,13 @@ const contractChange = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

+ 9 - 2
js/component/manageCenter/order/orderNew/examine.jsx

@@ -29,6 +29,7 @@ import {
 } from "@/tools.js";
 import "./customer.less";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -1676,7 +1677,7 @@ const IntentionCustomer = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1694,7 +1695,13 @@ const IntentionCustomer = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -14,6 +14,7 @@ import {
   ShowModal
 } from "@/tools.js";
 import './customer.less';
+import OrderRiZi from "@/orderRiZi.jsx";
 import ShowModalDiv from "@/showModal.jsx";
 
 const IntentionCustomer = Form.create()(React.createClass({
@@ -1062,7 +1063,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               </Spin>
             </Form>
           </Modal>
-          <Modal
+          {/* <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"
             width="800px"
@@ -1080,7 +1081,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                 />
               </Spin>
             </div>
-          </Modal>
+          </Modal> */}
+          <OrderRiZi
+            dataSourcerizhi={this.state.dataSourcerizhi}
+            closeOrderLog={this.closeOrderLog}
+            visible={this.state.rizhivisible}
+            loading={this.state.loading}
+          />
         </div>
       </div>
     );

+ 9 - 2
js/component/manageCenter/order/orderNew/outsourcingList.jsx

@@ -30,6 +30,7 @@ import {
 } from "@/tools.js";
 import "./customer.less";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 //图片组件
 const PicturesWall = React.createClass({
   getInitialState() {
@@ -1814,7 +1815,7 @@ const outsourcingList = Form.create()(
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1832,7 +1833,13 @@ const outsourcingList = Form.create()(
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         </div>
       );

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

@@ -13,6 +13,7 @@ import {
 } from "@/tools.js";
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx"
+import OrderRiZi from "@/orderRiZi.jsx";
 //图片组件
 const PicturesWall = React.createClass({
 	getInitialState() {
@@ -1837,7 +1838,7 @@ const IntentionCustomer = Form.create()(React.createClass({
               </Spin>
             </Form>
           </Modal>
-          <Modal
+          {/* <Modal
             visible={this.state.rizhivisible}
             className="admin-desc-content"
             width="800px"
@@ -1855,7 +1856,13 @@ const IntentionCustomer = Form.create()(React.createClass({
                 />
               </Spin>
             </div>
-          </Modal>
+          </Modal> */}
+          <OrderRiZi
+            dataSourcerizhi={this.state.dataSourcerizhi}
+            closeOrderLog={this.closeOrderLog}
+            visible={this.state.rizhivisible}
+            loading={this.state.loading}
+          />
         </div>
       </div>
     );

+ 16 - 5
js/component/manageCenter/project/project/projectAssignment.jsx

@@ -28,6 +28,7 @@ import {
   ShowModal
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 
 const PaiDan = React.createClass({
   loadData(pageNo) {
@@ -228,6 +229,11 @@ const PaiDan = React.createClass({
           title: "时间",
           dataIndex: "createDate",
           key: "createDate"
+        },
+        {
+          title: "备注",
+          dataIndex: "remarks",
+          key: "remarks"
         }
       ],
       dataSource: [],
@@ -522,7 +528,8 @@ const PaiDan = React.createClass({
             theArr.push({
               processName: thisdata.processName,
               adminName: thisdata.adminName,
-              createDate: thisdata.createDate
+              createDate: thisdata.createDate,
+              remarks: thisdata.remarks
             });
           }
         }
@@ -1314,7 +1321,6 @@ const PaiDan = React.createClass({
             </Spin>
           </Form>
         </Modal>
-
         <Modal
           maskClosable={false}
           visible={this.state.addserviceVisible}
@@ -1446,7 +1452,6 @@ const PaiDan = React.createClass({
             </Spin>
           </Form>
         </Modal>
-
         <Modal
           maskClosable={false}
           visible={this.state.noVisible}
@@ -1498,7 +1503,7 @@ const PaiDan = React.createClass({
             </Spin>
           </Form>
         </Modal>
-        <Modal
+        {/* <Modal
           visible={this.state.rizhivisible}
           className="admin-desc-content"
           width="800px"
@@ -1516,7 +1521,13 @@ const PaiDan = React.createClass({
               />
             </Spin>
           </div>
-        </Modal>
+        </Modal> */}
+        <OrderRiZi
+          dataSourcerizhi={this.state.dataSourcerizhi}
+          closeOrderLog={this.closeOrderLog}
+          visible={this.state.rizhivisible}
+          loading={this.state.loading}
+        />
       </div>
     );
   }

+ 9 - 2
js/component/manageCenter/project/project/projectQuery.jsx

@@ -17,6 +17,7 @@ import {
   ShowModal
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 const PaiDan = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -982,7 +983,7 @@ const PaiDan = React.createClass({
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1000,7 +1001,13 @@ const PaiDan = React.createClass({
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         );
     }

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

@@ -16,6 +16,7 @@ import {
   ShowModal
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
+import OrderRiZi from "@/orderRiZi.jsx";
 const zxsglyOutSourcingPaiDan = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -1723,7 +1724,7 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                 </Spin>
               </Form>
             </Modal>
-            <Modal
+            {/* <Modal
               visible={this.state.rizhivisible}
               className="admin-desc-content"
               width="800px"
@@ -1741,7 +1742,13 @@ const zxsglyOutSourcingPaiDan = React.createClass({
                   />
                 </Spin>
               </div>
-            </Modal>
+            </Modal> */}
+            <OrderRiZi
+              dataSourcerizhi={this.state.dataSourcerizhi}
+              closeOrderLog={this.closeOrderLog}
+              visible={this.state.rizhivisible}
+              loading={this.state.loading}
+            />
           </div>
         );
     }

+ 9 - 2
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -23,6 +23,7 @@ import {
 import Assign from "@/manageCenter/publicComponent/assign";
 import { areaSelect } from "@/NewDicProvinceList";
 import { ChooseList } from "../../order/orderNew/chooseList";
+import OrderRiZi from "@/orderRiZi.jsx";
 import "./table.less";
 import {
   getProcessStatus,
@@ -3267,7 +3268,7 @@ const MyTaskOutsource = React.createClass({
             </TabPane>
           </Tabs>
         </Modal>
-        <Modal
+        {/* <Modal
           width="800px"
           visible={this.state.visibleA}
           onCancel={this.visitCancelA}
@@ -3284,7 +3285,13 @@ const MyTaskOutsource = React.createClass({
               />
             </Spin>
           </div>
-        </Modal>
+        </Modal> */}
+        <OrderRiZi
+          dataSourcerizhi={this.state.dataSourceA}
+          closeOrderLog={this.visitCancelA}
+          visible={this.state.visibleA}
+          loading={this.state.loading}
+        />
         <Modal
           title="工时记录"
           visible={this.state.timeVisible}

+ 76 - 0
js/component/orderRiZi.jsx

@@ -0,0 +1,76 @@
+import React from "react";
+import $ from "jquery/src/ajax";
+import moment from "moment";
+// import "./public.less";
+import {
+  Button,
+  Form,
+  Input,
+  Select,
+  Spin,
+  Table,
+  message,
+  DatePicker,
+  Modal,
+  Upload,
+  Tabs
+} from "antd";
+
+
+const  orderRiZi= React.createClass({
+    getInitialState(){
+        return {
+          columnsrizhi: [
+            {
+              title: "流程",
+              dataIndex: "processName",
+              key: "processName"
+            },
+            {
+              title: "操作人",
+              dataIndex: "adminName",
+              key: "adminName"
+            },
+            {
+              title: "时间",
+              dataIndex: "createDate",
+              key: "createDate"
+            },
+            {
+              title: "备注",
+              dataIndex: "remarks",
+              key: "remarks"
+            }
+          ]
+        };
+    },
+    
+    render() {
+        return (
+          <Modal
+            visible={this.props.visible}
+            className="admin-desc-content"
+            width="800px"
+            maskClosable={false}
+            title="订单日志"
+            footer={null}
+            onCancel={this.props.closeOrderLog}
+          >
+            <div className="patent-table">
+              <Spin spinning={this.props.loading}>
+                <Table
+                  columns={this.state.columnsrizhi}
+                  dataSource={this.props.dataSourcerizhi}
+                  pagination={false}
+                  bordered
+                  size={"small"}
+                  scroll={{ x: "max-content", y: 0 }}
+                />
+              </Spin>
+            </div>
+          </Modal>
+        );
+    }
+});
+
+export default orderRiZi;