dev01 2 years ago
parent
commit
512c67e62a

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

@@ -4939,7 +4939,7 @@ const NewService = Form.create()(
                         <Button
                           className="cancel"
                           type="primary"
-                          onClick={this.handleCancel}
+                          // onClick={this.handleCancel}
                           style={{ marginLeft: "150px" }}
                           htmlType="submit"
                         >

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

@@ -105,7 +105,7 @@ class Itemlist extends Component {
               <div>{pageData.dataA}</div>
             </Form.Item>}
         <Form.Item
-          label={pageData.labelB+2}
+          label={pageData.labelB}
           {...pageData.formItemLayoutB}
           className="half-item"
         >

+ 74 - 74
js/component/manageCenter/order/orderNew/contractYxgly.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { Button, Input, Spin, Table, message, Form, Modal, Tabs,Tooltip } from "antd";
+import { Button, Input, Spin, Table, message, Form, Modal, Tabs, Tooltip } from "antd";
 import $ from "jquery/src/ajax";
 import {
   getNewOrderStatus,
@@ -18,8 +18,8 @@ import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
-import {ChooseList} from "./chooseList";
-import {getProjectName} from "../../../tools";
+import { ChooseList } from "./chooseList";
+import { getProjectName } from "../../../tools";
 import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import OrderItemStatus from "../../../common/orderItemStatus";
 const contractChange = Form.create()(
@@ -104,7 +104,7 @@ const contractChange = Form.create()(
     },
     getInitialState() {
       return {
-        page: 1,
+        pageNo: 1,
         searchData: {
           releaseDate: []
         },
@@ -114,12 +114,12 @@ const contractChange = Form.create()(
         orderData: {}, //现订单数据
         pictureUrl: [],
         voucherUrl: [],
-        attachment:[],
+        attachment: [],
         attachmentUrl: [],
         contractData: {},
         additionalOrderData: {},
         proceedsData: [],
-        orderNos:'',
+        orderNos: '',
         paginations: false,
         activeKey: "a",
         confirmLoading: false,
@@ -129,8 +129,8 @@ const contractChange = Form.create()(
           defaultPageSize: 10,
           showQuickJumper: true,
           pageSize: 10,
-          onChange: function (page) {
-            this.loadData(page);
+          onChange: function (pageNo) {
+            this.loadData(pageNo);
           }.bind(this),
           showTotal: function (total) {
             return "共" + total + "条数据";
@@ -151,16 +151,16 @@ const contractChange = Form.create()(
             title: "客户名称",
             dataIndex: "nickname",
             key: "nickname",
-            render:text=>{
-              return(
-                  <Tooltip title={text}>
-                    <div style={{
-                      maxWidth:'150px',
-                      overflow:'hidden',
-                      textOverflow: "ellipsis",
-                      whiteSpace:'nowrap',
-                    }}>{text}</div>
-                  </Tooltip>
+            render: text => {
+              return (
+                <Tooltip title={text}>
+                  <div style={{
+                    maxWidth: '150px',
+                    overflow: 'hidden',
+                    textOverflow: "ellipsis",
+                    whiteSpace: 'nowrap',
+                  }}>{text}</div>
+                </Tooltip>
               )
             }
           },
@@ -368,7 +368,7 @@ const contractChange = Form.create()(
         taskComment: record.taskComment, //备注
         main: record.main.toString(), //是否为主要
         addnextVisible: true,
-        dataInfor:record,
+        dataInfor: record,
         addState: 0
       });
     },
@@ -410,7 +410,7 @@ const contractChange = Form.create()(
                   url
                 )
                 : [],
-                attachment: thisdata.attachmentUrl
+              attachment: thisdata.attachmentUrl
                 ? splitUrl(
                   thisdata.attachmentUrl,
                   ",",
@@ -500,7 +500,7 @@ const contractChange = Form.create()(
               // arrears: thisdata.arrears,
               orderData: thisdata,
               isAddition: thisdata.additionalOrder ? true : false,
-              deleteSign:thisdata.deleteSign,
+              deleteSign: thisdata.deleteSign,
             });
           }
         }.bind(this)
@@ -1093,7 +1093,7 @@ const contractChange = Form.create()(
           });
         }
       );
-      this.loadData(this.state.page);
+      this.loadData(this.state.pageNo);
     },
     visitOk() {
       this.setState({
@@ -1158,11 +1158,11 @@ const contractChange = Form.create()(
               <TabPane tab="更改表格显示数据" key="2">
                 <div style={{ marginLeft: 10 }}>
                   <ChooseList
-                      columns={this.state.columns}
-                      changeFn={this.changeList}
-                      changeList={this.state.changeList}
-                      top={55}
-                      margin={11}
+                    columns={this.state.columns}
+                    changeFn={this.changeList}
+                    changeList={this.state.changeList}
+                    top={55}
+                    margin={11}
                   />
                 </div>
               </TabPane>
@@ -1174,8 +1174,8 @@ const contractChange = Form.create()(
                   bordered
                   columns={
                     this.state.changeList
-                        ? this.state.changeList
-                        : this.state.columns
+                      ? this.state.changeList
+                      : this.state.columns
                   }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
@@ -1197,8 +1197,8 @@ const contractChange = Form.create()(
                 onChange={this.callback}
                 type="card"
                 tabBarExtraContent={
-                  <div style={{fontWeight:'bold',paddingRight:'15px'}}>
-                    <OrderItemStatus deleteSign={this.state.deleteSign}/>
+                  <div style={{ fontWeight: 'bold', paddingRight: '15px' }}>
+                    <OrderItemStatus deleteSign={this.state.deleteSign} />
                   </div>
                 }
               >
@@ -1219,7 +1219,7 @@ const contractChange = Form.create()(
                         contactList={this.state.contactList}
                         contactListNew={this.state.contactListNew}
                         orderNo={this.state.orderNo}
-                      /> : <div/>}
+                      /> : <div />}
                     </Spin>
                   </Form>
                 </TabPane>
@@ -1242,22 +1242,22 @@ const contractChange = Form.create()(
                     <TabPane tab={"合同变更记录" + (index + 1)} key={item.id}>
                       {
                         this.state.activeKey === String(item.id) ?
-                            <ChangeDetail
-                                id={item.id}
-                                orderNo={this.state.orderNo}
-                                orderUid={this.state.orderUid}
-                                money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
-                                data={this.state.contractData}
-                                pictureUrl={this.state.voucherUrl}
-                                attachment = {this.state.attachment}
-                                processState={this.props.processState}
-                                dataSource={this.state.dataProps}
-                                proceedsData={this.state.proceedsData}
-                                proceedsTotal={this.state.proTotal}
-                                invoiceTotal={this.state.invTotal}
-                                contactList={this.state.refundInvoice}
-                                onCancel={this.visitCancel}
-                            /> : <div/>
+                          <ChangeDetail
+                            id={item.id}
+                            orderNo={this.state.orderNo}
+                            orderUid={this.state.orderUid}
+                            money={index == arr.length - 1 ? this.state.orderData.totalAmount + "" : undefined}
+                            data={this.state.contractData}
+                            pictureUrl={this.state.voucherUrl}
+                            attachment={this.state.attachment}
+                            processState={this.props.processState}
+                            dataSource={this.state.dataProps}
+                            proceedsData={this.state.proceedsData}
+                            proceedsTotal={this.state.proTotal}
+                            invoiceTotal={this.state.invTotal}
+                            contactList={this.state.refundInvoice}
+                            onCancel={this.visitCancel}
+                          /> : <div />
                       }
                     </TabPane>
                   );
@@ -1303,15 +1303,15 @@ const contractChange = Form.create()(
                           <Spin spinning={this.state.loading}>
                             {
                               this.state.activeKey === String(item.usedOrder) ?
-                                  <OrderDetail
-                                      orderData={this.state.primaryOrderData}
-                                      getOrderLog={this.getOrderLog}
-                                      dataSourceX={this.state.dataSourceX}
-                                      contactList={this.state.contactList}
-                                      orderNo={this.state.primaryOrderNo}
-                                      totalCui={this.state.totalCui}
-                                      contactListNew={this.state.contactListNew}
-                                  /> : <div/>
+                                <OrderDetail
+                                  orderData={this.state.primaryOrderData}
+                                  getOrderLog={this.getOrderLog}
+                                  dataSourceX={this.state.dataSourceX}
+                                  contactList={this.state.contactList}
+                                  orderNo={this.state.primaryOrderNo}
+                                  totalCui={this.state.totalCui}
+                                  contactListNew={this.state.contactListNew}
+                                /> : <div />
                             }
                           </Spin>
                         </Form>
@@ -1326,25 +1326,25 @@ const contractChange = Form.create()(
                     <TabPane tab="附加订单" key="c">
                       {
                         this.state.activeKey === "c" ?
-                            <OrderDetail
-                                orderData={this.state.additionalOrderData}
-                                getOrderLog={this.getOrderLog}
-                                dataSourceX={this.state.dataSourceX}
-                                totalCui={this.state.totalCui}
-                                contactListNew={this.state.contactListNew}
-                                contactList={this.state.contactList}
-                                orderNo={this.state.additionalOrder}
-                            /> : <div/>
+                          <OrderDetail
+                            orderData={this.state.additionalOrderData}
+                            getOrderLog={this.getOrderLog}
+                            dataSourceX={this.state.dataSourceX}
+                            totalCui={this.state.totalCui}
+                            contactListNew={this.state.contactListNew}
+                            contactList={this.state.contactList}
+                            orderNo={this.state.additionalOrder}
+                          /> : <div />
                       }
                     </TabPane>
                   ) : (
-                      ""
-                    )
-                ) : (
                     ""
-                  )}
+                  )
+                ) : (
+                  ""
+                )}
               </Tabs>
-            </Modal> : <div/>}
+            </Modal> : <div />}
             <Modal
               maskClosable={false}
               visible={this.state.noVisible}
@@ -1426,9 +1426,9 @@ const contractChange = Form.create()(
             />
           </div>
           {this.state.addnextVisible && <ProjectDetailsReadOnly
-              infor={this.state.dataInfor}
-              visible={this.state.addnextVisible}
-              onCancel={this.nextCancel}
+            infor={this.state.dataInfor}
+            visible={this.state.addnextVisible}
+            onCancel={this.nextCancel}
           />}
         </div>
       );

+ 27 - 14
js/component/manageCenter/order/source/order.jsx

@@ -157,7 +157,7 @@ class OrderList extends Component {
           key: "approval",
           render: (text, record) =>
             <span >
-              {["非特批", "特批"][text]}
+              {["非特批", "特批", "特批通过"][text]}
             </span>
         },
         {
@@ -270,6 +270,9 @@ class OrderList extends Component {
   }
   //订单详情
   xiangqing(orderNos) {
+    this.setState({
+      loading: true
+    })
     $.ajax({
       method: "get",
       dataType: "json",
@@ -279,6 +282,9 @@ class OrderList extends Component {
         orderNo: orderNos
       },
       success: function (data) {
+        this.setState({
+          loading: false
+        })
         if (data.error.length || data.data.list == "") {
           if (data.error && data.error.length) {
             message.warning(data.error[0].message);
@@ -304,7 +310,13 @@ class OrderList extends Component {
           );
         }
       }.bind(this)
-    });
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
+      }.bind(this)
+    );
   }
   createTabs(orderNos) {
     $.ajax({
@@ -326,7 +338,6 @@ class OrderList extends Component {
   }
   //整行点击
   tableRowClick(record) {
-
     this.setState(
       {
         details: true,
@@ -639,17 +650,19 @@ class OrderList extends Component {
               })
             }}
           >
-            <OrderDetail
-              domId='dindanxiangqing'
-              orderUid={this.state.orderUid}
-              orderData={this.state.orderData}
-              getOrderLog={this.getOrderLog.bind(this)}
-              totalCui={parseFloat(this.state.totalCui)}
-              dataSourceX={this.state.dataSourceX}
-              contactList={this.state.contactList}
-              contactListNew={this.state.contactListNew}
-              orderNo={this.state.orderNo}
-            />
+            <Spin spinning={this.state.loading}>
+              <OrderDetail
+                domId='dindanxiangqing'
+                orderUid={this.state.orderUid}
+                orderData={this.state.orderData}
+                getOrderLog={this.getOrderLog.bind(this)}
+                totalCui={parseFloat(this.state.totalCui)}
+                dataSourceX={this.state.dataSourceX}
+                contactList={this.state.contactList}
+                contactListNew={this.state.contactListNew}
+                orderNo={this.state.orderNo}
+              />
+            </Spin>
           </Modal>
         }
         <OrderRiZi

+ 1 - 1
package.json

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