dev01 2 yıl önce
ebeveyn
işleme
3768fb7a50

+ 132 - 0
js/component/common/logPopup/index.jsx

@@ -0,0 +1,132 @@
+// 开票历史记录--日志弹窗
+import React, { Component } from "react";
+import { Button, message, Modal, Spin, Table } from "antd";
+import { ShowModal } from "../../tools";
+import $ from "jquery/src/ajax";
+
+class LogPopup extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      visible: false,
+      columnsDate: [
+        {
+          title: "编号",
+          dataIndex: "id",
+          key: "id",
+        },
+        {
+          title: "操作人",
+          dataIndex: "adminName",
+          key: "adminName",
+        },
+        {
+          title: "操作时间",
+          dataIndex: "createTimes",
+          key: "createTimes",
+        },
+        {
+          title: "操作",
+          dataIndex: "status",
+          key: "status",
+          render: (text, record) => {
+            return (
+              <div>
+                {
+                  [
+                    "发起",
+                    "开票通过",
+                    "开票拒绝",
+                    "特批通过",
+                    "特批拒绝",
+                    "修改提交",
+                  ][text]
+                }
+              </div>
+            );
+          },
+        },
+      ],
+      recordData: [],
+    };
+  }
+
+  componentDidMount() {}
+
+  getData() {
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + "/api/admin/orderInvoice/invoice/log",
+      data: {
+        id: this.props.id,
+      },
+      success: function (data) {
+        ShowModal(this);
+        let theArr = [];
+        if (!data.data) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.setState({
+            recordData: data.data,
+          });
+        }
+      }.bind(this),
+    }).always(
+      function () {
+        this.setState({
+          loading: false,
+        });
+      }.bind(this)
+    );
+  }
+
+  render() {
+    return (
+      <span>
+        <Button
+          type="primary"
+          onClick={(e) => {
+            e.stopPropagation();
+            this.getData();
+            this.setState({
+              visible: true,
+            })
+          }}
+          style={{ marginLeft: "10px" }}
+        >
+          日志
+        </Button>
+        <Modal
+          maskClosable={false}
+          visible={this.state.visible}
+          footer=""
+          title="开票日志"
+          className="admin-desc-content"
+          width="600px"
+          onCancel={(e) => {
+            this.setState({
+              visible: false,
+            });
+          }}
+          style={{ zIndex: 10 }}
+        >
+          <Spin spinning={this.state.loading}>
+            <div className="patent-table">
+              <Table
+                columns={this.state.columnsDate}
+                dataSource={this.state.recordData || []}
+                pagination={false}
+              />
+            </div>
+          </Spin>
+        </Modal>
+      </span>
+    );
+  }
+}
+
+export default LogPopup;

Dosya farkı çok büyük olduğundan ihmal edildi
+ 4217 - 4144
js/component/manageCenter/customerService/administration/order.jsx


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

@@ -46,6 +46,7 @@ import {getProjectName} from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
+import LogPopup from "../../../common/logPopup";
 import ContentUrl from '../../order/orderNew/contentUrl'
 const FormItem = Form.Item
 
@@ -1191,8 +1192,8 @@ const approvedOutsourcing = React.createClass({
           title: '开票状态',
           dataIndex: 'status',
           key: 'status',
-          render: (text) => {
-            return getInvoiceStatus(text)
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
           },
         },
       ],
@@ -2120,6 +2121,7 @@ const approvedOutsourcing = React.createClass({
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             })
           }
         }

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

@@ -43,6 +43,7 @@ import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
+import LogPopup from "../../../common/logPopup";
 import ContentUrl from "../../order/orderNew/contentUrl";
 const FormItem = Form.Item;
 
@@ -1137,8 +1138,8 @@ const approvedOutsourcing = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: (text) => {
-            return getInvoiceStatus(text);
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
           },
         },
       ],
@@ -2122,6 +2123,7 @@ const approvedOutsourcing = React.createClass({
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }

+ 5 - 3
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -30,6 +30,8 @@ import {
 import { ChooseList } from "../../../../component/manageCenter/order/orderNew/chooseList";
 import "./huiKuan.less"
 
+import LogPopup from "../../../common/logPopup";
+
 const { RangePicker } = DatePicker;
 const FormItem = Form.Item;
 const { TextArea } = Input;
@@ -367,9 +369,9 @@ const HuiKuan = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text);
-          }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],

+ 11 - 8
js/component/manageCenter/financialManage/distribute/inSpecial.jsx

@@ -31,6 +31,7 @@ import OrderDesc from "../../financialManage/orderDetail/orderDesc";
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
+import LogPopup from "../../../common/logPopup";
 const inSpecial = React.createClass({
 
   loadData(pageNo) {
@@ -227,8 +228,9 @@ const inSpecial = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getStatus(text);
+          render: (text,record) => {
+            // return getStatus(text);
+            return getInvoiceStatus(text, record);
           }
         },
         {
@@ -385,9 +387,9 @@ const inSpecial = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text);
-          }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],
@@ -509,7 +511,8 @@ const inSpecial = React.createClass({
               amount: thisdata.amount, //签单金额
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
-              rejectReason: thisdata.rejectReason
+              rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }
@@ -983,7 +986,7 @@ const inSpecial = React.createClass({
                 ) : (
                   ""
                 )}
-                <FormItem
+                {/* <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label={
@@ -993,7 +996,7 @@ const inSpecial = React.createClass({
                   }
                 >
                   <span>{this.state.alreadyAmount}万元</span>
-                </FormItem>
+                </FormItem> */}
               </div>
             </Spin>
           </Form>

+ 10 - 7
js/component/manageCenter/financialManage/distribute/invoiceApplyList.jsx

@@ -29,6 +29,7 @@ import OrderDesc from "../orderDetail/orderDesc";
 import KaiPiaoModal from "./kaiPiaoModal"
 import {getProjectName} from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
+import LogPopup from "../../../common/logPopup";
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
@@ -53,7 +54,7 @@ const invoiceApplyList = React.createClass({
         orderDep: this.state.departmenttList,
         status: this.state.statusSearch,
         type: 0,
-        approval: this.state.processStatus
+        approval: this.state.processStatus,
       },
       success: function (data) {
         ShowModal(this);
@@ -225,8 +226,9 @@ const invoiceApplyList = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getStatus(text);
+          render: (text,record) => {
+            // return getStatus(text);
+            return getInvoiceStatus(text, record);
           }
         },
         {
@@ -383,9 +385,9 @@ const invoiceApplyList = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text);
-          }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],
@@ -507,7 +509,8 @@ const invoiceApplyList = React.createClass({
               amount: thisdata.amount, //签单金额
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
-              rejectReason: thisdata.rejectReason
+              rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }

+ 13 - 9
js/component/manageCenter/financialManage/distribute/invoiceApplyListQuery.jsx

@@ -29,6 +29,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import OrderDesc from "../orderDetail/orderDesc";
 import {getProjectName} from "../../../tools";
 import DepartmentList from '../../../common/departmentList';
+import LogPopup from "../../../common/logPopup";
 const FormItem = Form.Item;
 const { TabPane } = Tabs
 
@@ -53,7 +54,8 @@ const invoiceApplyListQuery = React.createClass({
         orderDep: this.state.departmenttList,
         status: this.state.statusSearch,
         type: 0,
-        approval: this.state.processStatus
+        approval: this.state.processStatus,
+        all:1,
       },
       success: function (data) {
         ShowModal(this);
@@ -223,8 +225,9 @@ const invoiceApplyListQuery = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getStatus(text);
+          render: (text,record) => {
+            // return getStatus(text);
+            return getInvoiceStatus(text, record);
           }
         },
         {
@@ -359,9 +362,9 @@ const invoiceApplyListQuery = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text);
-          }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],
@@ -483,7 +486,8 @@ const invoiceApplyListQuery = React.createClass({
               amount: thisdata.amount, //签单金额
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
-              rejectReason: thisdata.rejectReason
+              rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }
@@ -936,7 +940,7 @@ const invoiceApplyListQuery = React.createClass({
                 ) : (
                     ""
                   )}
-                <FormItem
+                {/* <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label={
@@ -946,7 +950,7 @@ const invoiceApplyListQuery = React.createClass({
                   }
                 >
                   <span>{this.state.alreadyAmount}万元</span>
-                </FormItem>
+                </FormItem> */}
               </div>
             </Spin>
           </Form>

+ 12 - 8
js/component/manageCenter/financialManage/distribute/invoiceApplyListWai.jsx

@@ -29,6 +29,8 @@ import OrderDesc from "../orderDetail/orderDesc";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import {getProjectName} from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
+import LogPopup from "../../../common/logPopup";
+
 const invoiceApplyListWai = React.createClass({
   loadData(pageNo) {
     this.state.data = [];
@@ -225,8 +227,9 @@ const invoiceApplyListWai = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getStatus(text);
+          render: (text,record) => {
+            // return getStatus(text);
+            return getInvoiceStatus(text, record);
           }
         },
         {
@@ -383,9 +386,9 @@ const invoiceApplyListWai = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text);
-          }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],
@@ -507,7 +510,8 @@ const invoiceApplyListWai = React.createClass({
               amount: thisdata.amount, //签单金额
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
-              rejectReason: thisdata.rejectReason
+              rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }
@@ -946,7 +950,7 @@ const invoiceApplyListWai = React.createClass({
                 ) : (
                   ""
                 )}
-                <FormItem
+                {/* <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label={
@@ -956,7 +960,7 @@ const invoiceApplyListWai = React.createClass({
                   }
                 >
                   <span>{this.state.alreadyAmount}万元</span>
-                </FormItem>
+                </FormItem> */}
               </div>
             </Spin>
           </Form>

+ 2 - 2
js/component/manageCenter/financialManage/distribute/kaiPiaoModal.jsx

@@ -373,7 +373,7 @@ const KaiPiaoModal = React.createClass({
               ) : (
                 ""
               )}
-              <FormItem
+              {/* <FormItem
                 className="half-item"
                 {...formItemLayout}
                 label={
@@ -383,7 +383,7 @@ const KaiPiaoModal = React.createClass({
                 }
               >
                 <span>{this.state.alreadyAmount}万元</span>
-              </FormItem>
+              </FormItem> */}
             </div>
           </Spin>
         </Form>

+ 19 - 11
js/component/manageCenter/financialManage/distribute/outInvoiceQuery.jsx

@@ -29,6 +29,7 @@ import { ChooseList } from "../../../../component/manageCenter/order/orderNew/ch
 import ImgList from "../../../common/imgList";
 import {getProjectName} from "../../../tools";
 import DepartmentList from "../../../common/departmentList";
+import LogPopup from "../../../common/logPopup";
 
 const FormItem = Form.Item;
 const { TabPane } = Tabs
@@ -54,7 +55,8 @@ const outInvoiceQuery = React.createClass({
         orderDep: this.state.departmenttList,
         status: this.state.statusSearch,
         type: 1,
-        approval: this.state.processStatus
+        approval: this.state.processStatus,
+        all:1,
       },
       success: function (data) {
         ShowModal(this);
@@ -221,8 +223,9 @@ const outInvoiceQuery = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getStatus(text);
+          render: (text,record) => {
+            // return getStatus(text);
+            return getInvoiceStatus(text, record);
           }
         },
         {
@@ -346,11 +349,15 @@ const outInvoiceQuery = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text, {
-              approval: 0
-            });
-          }
+          // render: text => {
+          //   return getInvoiceStatus(text, {
+          //     approval: 0
+          //   });
+            
+          // }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],
@@ -472,7 +479,8 @@ const outInvoiceQuery = React.createClass({
               amount: thisdata.amount, //签单金额
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
-              rejectReason: thisdata.rejectReason
+              rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }
@@ -928,7 +936,7 @@ const outInvoiceQuery = React.createClass({
                 ) : (
                     ""
                   )}
-                <FormItem
+                {/* <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label={
@@ -938,7 +946,7 @@ const outInvoiceQuery = React.createClass({
                   }
                 >
                   <span>{this.state.alreadyAmount}万元</span>
-                </FormItem>
+                </FormItem> */}
               </div>
             </Spin>
           </Form>

+ 11 - 8
js/component/manageCenter/financialManage/distribute/outSpecial.jsx

@@ -17,6 +17,7 @@ const FormItem = Form.Item;
 import OrderDesc from "../orderDetail/orderDesc";
 import {ChooseList} from "../../order/orderNew/chooseList";
 import {getProjectName} from "../../../tools";
+import LogPopup from "../../../common/logPopup";
 
 const outSpecial = React.createClass({
   loadData(pageNo) {
@@ -203,8 +204,9 @@ const outSpecial = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getStatus(text);
+          render: (text,record) => {
+            // return getStatus(text);
+            return getInvoiceStatus(text, record);
           }
         },
         {
@@ -361,9 +363,9 @@ const outSpecial = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: text => {
-            return getInvoiceStatus(text);
-          }
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
+          },
         }
       ],
       dataSource: [],
@@ -485,7 +487,8 @@ const outSpecial = React.createClass({
               amount: thisdata.amount, //签单金额
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
-              rejectReason: thisdata.rejectReason
+              rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }
@@ -940,7 +943,7 @@ const outSpecial = React.createClass({
                 ) : (
                   ""
                 )}
-                <FormItem
+                {/* <FormItem
                   className="half-item"
                   {...formItemLayout}
                   label={
@@ -950,7 +953,7 @@ const outSpecial = React.createClass({
                   }
                 >
                   <span>{this.state.alreadyAmount}万元</span>
-                </FormItem>
+                </FormItem> */}
               </div>
             </Spin>
           </Form>

+ 4 - 2
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -38,6 +38,7 @@ import {
 import { ChooseList } from "../../order/orderNew/chooseList";
 import Project from "../../../../component/project";
 import { getProjectName } from "../../../tools";
+import LogPopup from "../../../common/logPopup";
 const FormItem = Form.Item;
 const { TabPane } = Tabs;
 
@@ -1066,8 +1067,8 @@ const ShouKuang = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: (text) => {
-            return getInvoiceStatus(text);
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
           },
         },
       ],
@@ -1392,6 +1393,7 @@ const ShouKuang = React.createClass({
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }

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

@@ -38,6 +38,7 @@ import {
 } from "@/tools";
 import { ChooseList } from "../../order/orderNew/chooseList"
 import Project from "../../../../component/project"
+import LogPopup from "../../../common/logPopup";
 import { throws } from "assert";
 import {getProjectName} from "../../../tools";
 const FormItem = Form.Item;
@@ -1085,8 +1086,8 @@ const ShouKuang = React.createClass({
           title: "开票状态",
           dataIndex: "status",
           key: "status",
-          render: (text) => {
-            return getInvoiceStatus(text);
+          render: (text, record) => {
+            return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
           },
         },
       ],
@@ -1456,6 +1457,7 @@ const ShouKuang = React.createClass({
               createTime: thisdata.createTime, //流程状态
               status: thisdata.status, //结算状态
               rejectReason: thisdata.rejectReason,
+              approval:thisdata.approval,//0非特批 1待审核 2审核通过
             });
           }
         }

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

@@ -46,6 +46,7 @@ import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from './changeComponent/orderCoor';
 import ContentUrl from './contentUrl';
+import LogPopup from "../../../common/logPopup";
 const { TabPane } = Tabs;
 const { TextArea } = Input;
 //图片组件
@@ -224,8 +225,8 @@ const IntentionCustomer = Form.create()(
             title: "开票状态",
             dataIndex: "status",
             key: "status",
-            render: (text) => {
-              return getInvoiceStatus(text);
+            render: (text, record) => {
+              return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
             },
           },
         ],
@@ -1826,6 +1827,7 @@ const IntentionCustomer = Form.create()(
                 createTime: thisdata.createTime, //流程状态
                 status: thisdata.status, //结算状态
                 rejectReason: thisdata.rejectReason,
+                approval:thisdata.approval,//0非特批 1待审核 2审核通过
               });
             }
           }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 994 - 952
js/component/manageCenter/order/orderNew/billing.jsx


+ 8 - 7
js/component/manageCenter/order/orderNew/inquiry.jsx

@@ -52,6 +52,7 @@ import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import OrderCoor from "./changeComponent/orderCoor.jsx";
 import ContentUrl from "./contentUrl.jsx";
 import Order from "../../customerService/administration/order.jsx";
+import LogPopup from "../../../common/logPopup";
 const { Option } = Select;
 const { TabPane } = Tabs;
 const PicturesWall = React.createClass({
@@ -788,7 +789,7 @@ const IntentionCustomer = Form.create()(
             dataIndex: "status",
             key: "status",
             render: (text, record) => {
-              return <div>{getInvoiceStatus(text, record)}</div>;
+              return <div>{getInvoiceStatus(text, record)} <LogPopup id={record.id} /></div>;
             },
           },
         ],
@@ -2931,7 +2932,7 @@ const IntentionCustomer = Form.create()(
                     ) : (
                       ""
                     )}
-                    <FormItem
+                    {/* <FormItem
                       className="half-item"
                       {...formItemLayout}
                       label={
@@ -2964,7 +2965,7 @@ const IntentionCustomer = Form.create()(
                         以前已开票订单,请填写已开票的总计<br></br>
                         金额,便于审核核对!
                       </span>
-                    </FormItem>
+                    </FormItem> */}
                   </div>
                   <Button
                     className="cancel"
@@ -3495,7 +3496,7 @@ const IntentionCustomer = Form.create()(
                     ) : (
                       ""
                     )}
-                    <FormItem
+                    {/* <FormItem
                       className="half-item"
                       {...formItemLayout}
                       label={
@@ -3528,7 +3529,7 @@ const IntentionCustomer = Form.create()(
                         以前已开票订单,请填写已开票的总计<br></br>
                         金额,便于审核核对!
                       </span>
-                    </FormItem>
+                    </FormItem> */}
                   </div>
                   <Button
                     className="cancel"
@@ -3826,7 +3827,7 @@ const IntentionCustomer = Form.create()(
                       ""
                     )}
                   </div>
-                  <FormItem
+                  {/* <FormItem
                     className="half-item"
                     {...formItemLayout}
                     label={
@@ -3837,7 +3838,7 @@ const IntentionCustomer = Form.create()(
                     }
                   >
                     <span>{this.state.alreadyAmount}万元</span>
-                  </FormItem>
+                  </FormItem> */}
                 </Spin>
               </Form>
             </Modal>

+ 40 - 12
js/component/tools.js

@@ -1920,22 +1920,50 @@ module.exports = {
     }
   },
   //开票状态
+  // getInvoiceStatus: function (e, record) {
+  //   if (record && record.approval == 1) {
+  //     return "特批待审核";
+  //   } else {
+  //     if (e || e == 0) {
+  //       let str = e.toString();
+  //       let theType = "";
+  //       invoiceStatus.map(function (item) {
+  //         if (item.value == str) {
+  //           theType = item.key;
+  //         }
+  //       });
+  //       return theType;
+  //     }
+  //   }
+  // },
+
+  // approval(0非特批 1待审核 2审核通过)    status(0未提交 1处理中 2通过 3拒绝 4撤销)
   getInvoiceStatus: function (e, record) {
-    if (record && record.approval == 1) {
-      return "特批待审核";
-    } else {
-      if (e || e == 0) {
-        let str = e.toString();
-        let theType = "";
-        invoiceStatus.map(function (item) {
-          if (item.value == str) {
-            theType = item.key;
-          }
-        });
-        return theType;
+    let theType = "";
+    if (record) {
+      if (record.status === 4) {
+        theType = "撤销"
       }
+      if (record.approval === 1) {
+        theType = "特批审核中"
+        if(record.status === 3){
+          theType = "特批被拒"
+        }
+      } else {
+        if (record.status === 1) {
+          theType = "开票处理中"
+        } else if (record.status === 2) {
+          theType = "已完成"
+        } else if (record.status === 3) {
+          theType = "开票被拒"
+        }
+      }
+    } else {
+      theType = "-";
     }
+    return theType;
   },
+
   getApprovalA: function (e) {
     if (e || e == 0) {
       let str = e.toString();

+ 1 - 1
package.json

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