Browse Source

报销模块

dev01 1 year ago
parent
commit
26f12924c3

+ 156 - 95
js/component/manageCenter/financialManage/account/accountReview.jsx

@@ -19,6 +19,8 @@ import { ShowModal, splitUrl, getAccountName, getVehicleName, getTypeName, commo
 import ShowModalDiv from "@/showModal.jsx";
 import ImgList from "../../../common/imgList";
 import { accountType, accountStatus } from "@/dataDic";
+import ReactToPrint from "react-to-print";
+import './accountReview.less';
 
 const FormItem = Form.Item;
 const { RangePicker } = DatePicker;
@@ -243,7 +245,7 @@ const AccountReview = React.createClass({
     let datas = Object.assign(searchValues, {
       pageNo: pageNo || 1,
       pageSize: pagination.pageSize,
-      processStatus: this.props.isOperate ? 1 : undefined,
+      processStatus: this.props.isOperate ? 1 : 2,
     });
     $.ajax({
       method: "get",
@@ -424,6 +426,7 @@ const AccountReview = React.createClass({
     })
     this.getDetails(e.id)
     this.getAccountList(e.id)
+    this.getLogData(e.id)
   },
 
   // 报销信息详情
@@ -563,10 +566,10 @@ const AccountReview = React.createClass({
 
   render() {
     const { TextArea } = Input
-    const { searchValues, data, visible, list = [], total, } = this.state
+    const { searchValues, data, visible, list = [], total, logdataSour, } = this.state
     const formItemLayout = {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
+      labelCol: { span: 5 },
+      wrapperCol: { span: 18 },
     };
     const dataSources = this.state.fjlist || [];
     const options = dataSources.map((group) => (
@@ -813,54 +816,68 @@ const AccountReview = React.createClass({
             onOk={false}
             onCancel={() => { this.setState({ showDetails: false }) }}
             width="800px"
-            title='报销详情'
+            title={<span style={{ fontWeight: "bold" }}>{"报销详情-" + getAccountName(data.type, data.typeOther)}</span>}
             footer=""
           >
-            <div>
+            <div className="m_body"
+              ref={(e) => {
+                this.refs.all = e;
+              }}
+            >
               <Form layout="horizontal" id="demand-form">
                 <Spin spinning={this.state.loading}>
-                  <div className="clearfix">
-                    {data.type == 1 &&
-                      <div>
+                  {data.type == 1 &&
+                    <div>
+                      <div style={{ fontSize: 13, fontWeight: "bold" }}>公出信息</div>
+                      <div className="clearfix">
                         <FormItem
-                          className="half-item"
+
                           {...formItemLayout}
                           label="公出企业"
                         >
                           <span>{data.userNames}</span>
                         </FormItem>
+                      </div>
+                      <div className="clearfix">
                         <FormItem
-                          className="half-item"
+
                           {...formItemLayout}
                           label="公出地点"
                         >
                           <span>{data.districtName}</span>
                         </FormItem>
+                      </div>
+                      <div className="clearfix">
                         <FormItem
-                          className="half-item"
+
                           {...formItemLayout}
                           label="时间"
                         >
                           <span>{data.releaseStartStr} 至 {data.releaseEndStr}</span>
                         </FormItem>
+                      </div>
+                      <div className="clearfix">
                         <FormItem
-                          className="half-item"
+
                           {...formItemLayout}
                           label="公出时长"
                         >
                           <span>{data.duration}小时</span>
                         </FormItem>
-                      </div>}
+                      </div>
+                    </div>}
+                  <div style={{ fontSize: 13, fontWeight: "bold" }}>申请类型</div>
+                  <div className="clearfix">
                     <FormItem
-                      className="half-item"
                       {...formItemLayout}
                       label="申请类型"
                     >
                       <span>{getAccountName(data.type, data.typeOther)}</span>
                     </FormItem>
-
+                  </div>
+                  <div className="clearfix">
                     <FormItem
-                      className="half-item"
+
                       {...formItemLayout}
                       label="报销至订单"
                     >
@@ -869,29 +886,34 @@ const AccountReview = React.createClass({
                         <div>{data.contractNo}</div>
                       </div>
                     </FormItem>
+                  </div>
+                  <div className="clearfix">
                     <FormItem
-                      className="half-item"
+
                       {...formItemLayout}
                       label="报销人"
                     >
                       <span>{data.aname}</span>
                     </FormItem>
+                  </div>
+                  <div className="clearfix">
                     <FormItem
-                      className="half-item"
+
                       {...formItemLayout}
                       label="报销公司"
                     >
                       <span>{data.appDepName}</span>
                     </FormItem>
+                  </div>
+                  <div className="clearfix">
                     <FormItem
-                      className="half-item"
+
                       {...formItemLayout}
                       label="支付公司"
                     >
                       <span>{data.payDepName}</span>
                     </FormItem>
                   </div>
-
                   <div className="clearfix">
                     <FormItem
                       labelCol={{ span: 5 }}
@@ -903,33 +925,35 @@ const AccountReview = React.createClass({
                       </p>
                     </FormItem>
                   </div>
-
+                  <div style={{ fontSize: 13, fontWeight: "bold" }}>费用详细</div>
                   {/* 差旅费显示 */}
                   {data.type == 1 &&
                     list.length > 0 && list.map(item =>
                       item.type == 1
-                        ? <div className="clearfix" style={{ border: "1px solid #333", marginBottom: 1 }}>
-                          <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="交通工具"
-                          >
-                            <span>
-                              {getVehicleName(item.vehicle, item.vehicleOther)}
-                              &nbsp;&nbsp;
-                              {!!item.startDistrict && <span>({item.startDistrict}&nbsp;⇀&nbsp;{item.endDistrict})</span>}
-                            </span>
-                          </FormItem>
-                          {/* <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="地点"
-                          >
-                            <span>{item.startDistrict}
-                              <span>&nbsp;⇀&nbsp;</span>
-                              {item.endDistrict}</span>
-                          </FormItem> */}
-                          <div className="clearfix" style={{ marginBottom: "-10px" }}>
+                        ? <div>
+                          <div className="clearfix" >
+                            <FormItem
+                              {...formItemLayout}
+                              label="交通工具"
+                            >
+                              <span>
+                                {getVehicleName(item.vehicle, item.vehicleOther)}
+                                {/* &nbsp;&nbsp; */}
+                                {/* {!!item.startDistrict && <span>({item.startDistrict}&nbsp;⇀&nbsp;{item.endDistrict})</span>} */}
+                              </span>
+                            </FormItem>
+                          </div>
+                          <div className="clearfix" >
+                            <FormItem
+                              {...formItemLayout}
+                              label="地点"
+                            >
+                              <span>{item.startDistrict}
+                                <span>&nbsp;&nbsp;⇀&nbsp;&nbsp;</span>
+                                {item.endDistrict}</span>
+                            </FormItem>
+                          </div>
+                          <div className="clearfix">
                             <FormItem
                               labelCol={{ span: 5 }}
                               wrapperCol={{ span: 18 }}
@@ -938,17 +962,17 @@ const AccountReview = React.createClass({
                               <span>{item.startTimeStr}&nbsp;&nbsp;至&nbsp;&nbsp;{item.endTimeStr}</span>
                             </FormItem>
                           </div>
-                          <FormItem
-                            className="half-item"
-                            {...formItemLayout}
-                            label="交通费"
-                          >
-                            <span>{item.amount}(元)</span>
-                          </FormItem>
+                          <div className="clearfix">
+                            <FormItem
+                              {...formItemLayout}
+                              label="交通费"
+                            >
+                              <span>{item.amount}(元)</span>
+                            </FormItem>
+                          </div>
                         </div>
-                        : <div className="clearfix" style={{ border: "1px solid #333", marginBottom: 1 }}>
+                        : <div className="clearfix" >
                           <FormItem
-                            className="half-item"
                             {...formItemLayout}
                             label={getTypeName(item.type)}
                           >
@@ -961,17 +985,15 @@ const AccountReview = React.createClass({
                   {/* 通用 */}
                   {(data.type == 0 || data.type == 2 || data.type == 4 || data.type == 5) &&
                     list.length > 0 && list.map(item =>
-                      <div className="clearfix" style={{ border: "1px solid #333", marginBottom: 1 }}>
+                      <div className="clearfix" >
                         {!!item.agreeTimeStr &&
                           <FormItem
-                            className="half-item"
                             {...formItemLayout}
                             label={data.type == 5 ? "支付时间:" : "需付款时间:"}
                           >
                             <span>{item.agreeTimeStr.slice(0, 10)}</span>
                           </FormItem>}
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label={data.type == 4
                             ? "预借支金额:" : data.type == 5
@@ -986,10 +1008,9 @@ const AccountReview = React.createClass({
                   {/* 第三方付款 */}
                   {data.type == 3 &&
                     list.length > 0 && list.map(item =>
-                      <div className="clearfix" style={{ border: "1px solid #333", marginBottom: 1 }}>
+                      <div className="clearfix" >
                         {!!item.agreeTimeStr &&
                           <FormItem
-                            className="half-item"
                             {...formItemLayout}
                             label="需付款时间"
                           >
@@ -997,56 +1018,48 @@ const AccountReview = React.createClass({
                           </FormItem>
                         }
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="付款方式"
                         >
                           <span>{["公对公转账"][item.payType]}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="发票类型"
                         >
                           <span>{["普票", "专票"][item.invoiceType]}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="发票号"
                         >
                           <span>{item.invoiceNo}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="付款单位"
                         >
                           <span>{item.payerName}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="开户银行"
                         >
                           <span>{item.openBank}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="银行账户"
                         >
                           <span>{item.bankAccounts}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="开户行地址"
                         >
                           <span>{item.openBankAddress}</span>
                         </FormItem>
                         <FormItem
-                          className="half-item"
                           {...formItemLayout}
                           label="金额(元)"
                         >
@@ -1059,7 +1072,6 @@ const AccountReview = React.createClass({
                   {data.type != 4 && data.debitTotalAmount &&
                     <div className="clearfix">
                       <FormItem
-                        className="half-item"
                         {...formItemLayout}
                         label="预借支"
                       >
@@ -1070,7 +1082,6 @@ const AccountReview = React.createClass({
                   {data.type != 4 && data.type != 5 &&
                     <div className="clearfix">
                       <FormItem
-                        className="half-item"
                         {...formItemLayout}
                         label="总金额"
                       >
@@ -1081,7 +1092,6 @@ const AccountReview = React.createClass({
                   {data.type != 4 && data.type != 5 &&
                     <div className="clearfix">
                       <FormItem
-                        className="half-item"
                         {...formItemLayout}
                         label="实报金额"
                       >
@@ -1091,8 +1101,7 @@ const AccountReview = React.createClass({
 
                   <div className="clearfix">
                     <FormItem
-                      labelCol={{ span: 5 }}
-                      wrapperCol={{ span: 18 }}
+                      {...formItemLayout}
                       label="附件"
                     >
                       <div style={{ paddingTop: '10px', paddingBottom: '10px' }}>
@@ -1100,31 +1109,67 @@ const AccountReview = React.createClass({
                       </div>
                     </FormItem>
                   </div>
-
+                  <div style={{ fontSize: 13, fontWeight: "bold" }}>收款详情</div>
                   {data.type != 3 && data.type != 5 &&
-                    <div className="clearfix" style={{ border: "1px dashed #000" }}>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="收款人"
-                      >
-                        <span>{data.name}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="收款银行"
-                      >
-                        <span>{data.bank}</span>
-                      </FormItem>
-                      <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="收款账户"
-                      >
-                        <span>{data.accounts}</span>
-                      </FormItem>
+                    <div>
+                      <div className="clearfix">
+                        <FormItem
+                          {...formItemLayout}
+                          label="收款人"
+                        >
+                          <span>{data.name}</span>
+                        </FormItem>
+                      </div>
+                      <div className="clearfix">
+                        <FormItem
+                          {...formItemLayout}
+                          label="收款银行"
+                        >
+                          <span>{data.bank}</span>
+                        </FormItem>
+                      </div>
+                      <div className="clearfix">
+                        <FormItem
+                          {...formItemLayout}
+                          label="收款账户"
+                        >
+                          <span>{data.accounts}</span>
+                        </FormItem>
+                      </div>
                     </div>}
+                  <div style={{ fontSize: 13, fontWeight: "bold" }}>审核意见</div>
+                  <ul
+                    style={{
+                      width: "560px",
+                      overflow: "hidden",
+                      paddingLeft: "90px",
+                      position: "relative",
+                    }}
+                  >
+                    {logdataSour.map((item, index) => {
+                      return (
+                        <li
+                          key={index}
+                          style={{
+                            width: "100%",
+                            height: "auto",
+                            wordBreak: "break-all",
+                            marginBottom: "10px",
+                          }}
+                        >
+                          {/* {item.auditorName + ":" + item.status + item.remarks + "(" + item.createTimeStr + ")"} */}
+                          <span>{item.auditorName}:</span>
+                          <span style={{ color: ["#1D4FEA", "#34DE38", "#108EE9", "red", "#1D4FEA"][item.status] }}>
+                            {["【发起】,", "【通过】,", "【完成】,", "【驳回】,", "【重新发起】,"][item.status]}
+                            {this.state.processStatus == item.processStatus && !item.id && data.status != 0 &&
+                              <span style={{ color: "#FFA500" }}>&nbsp;审核中...</span>}
+                          </span>
+                          <span>{item.remarks}</span>
+                          <span>&nbsp;&nbsp;&nbsp;{item.createTimeStr}</span>
+                        </li>
+                      );
+                    })}
+                  </ul>
 
                   <div className="clearfix" style={{ marginTop: 20 }}>
                     <Button
@@ -1190,6 +1235,23 @@ const AccountReview = React.createClass({
                 </Spin>
               </Form>
             </div>
+            <ReactToPrint
+              trigger={() => (
+                <Button
+                  type="primary"
+                  style={{
+                    float: "right",
+                    marginTop: 10,
+                    position: "absolute",
+                    top: 0,
+                    right: 30,
+                  }}
+                >
+                  打印
+                </Button>
+              )}
+              content={() => this.refs.all}
+            />
           </Modal>
         }
         {
@@ -1205,7 +1267,6 @@ const AccountReview = React.createClass({
             onCancel={() => {
               this.setState({
                 logvisible: false,
-                logdataSour: []
               })
             }}
           >

+ 22 - 0
js/component/manageCenter/financialManage/account/accountReview.less

@@ -0,0 +1,22 @@
+// .clearfix{
+//   height: 32px;
+// }
+.ant-modal-body{
+  padding: 0;
+}
+
+.m_body{
+  padding: 16px;
+}
+
+.ant-form-item{
+  margin-bottom: 0 !important;
+}
+
+.ant-form-item-label{
+  line-height: 24px;
+}
+
+.ant-form-item-control{
+  line-height: 24px;
+}

+ 1 - 0
js/component/manageCenter/project/task/newSupplier.js

@@ -412,6 +412,7 @@ class NewSupplier extends Component {
                                             <Option value="4">加急16-20个工作日</Option>
                                             <Option value="5">加急21-25个工作日</Option>
                                             <Option value="6">加急26-30个工作日</Option>
+                                            <Option value="7">加急31个工作日</Option>
                                         </Select>
                                         <span className="mandatory">*</span>
                                     </Form.Item>

+ 1 - 0
js/component/manageCenter/set/projectConfigure/addSoftWritingPrice.js

@@ -103,6 +103,7 @@ class AddSoftWritingPrice extends Component{
                                     <Select.Option value={4}>加急16-20个工作日</Select.Option>
                                     <Select.Option value={5}>加急21-25个工作日</Select.Option>
                                     <Select.Option value={6}>加急26-30个工作日</Select.Option>
+                                    <Select.Option value={7}>加急31个工作日</Select.Option>
                                 </Select>
                             )}
                         </Form.Item>

+ 310 - 307
js/component/manageCenter/set/projectConfigure/softwareConfigure.js

@@ -1,326 +1,329 @@
-import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Tag, Popconfirm, Tabs} from "antd";
+import React, { Component } from 'react';
+import { Button, Input, message, Select, Spin, Table, Tag, Popconfirm, Tabs } from "antd";
 import AddSoftWritingPrice from './addSoftWritingPrice'
 import $ from "jquery/src/ajax";
 import '../content.less';
-import {ChooseList} from "../../order/orderNew/chooseList";
+import { ChooseList } from "../../order/orderNew/chooseList";
 
 const TabPane = Tabs.TabPane;
 
-class SoftwareConfigure extends Component{
-    constructor(props) {
-        super(props);
-        this.state={
-            companyName:'',        //公司名称
-            urgent: undefined,            //加急
-            material: undefined,          //材料
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            dataSource: [],
-            columns: [
-                {
-                    title: '供应商名称',
-                    dataIndex: 'companyName',
-                    key: 'companyName',
-                },
-                {
-                    title: '材料',
-                    dataIndex: 'material',
-                    key: 'material',
-                    render: (text) => {
-                        return text === 0 ? '无材料' : '有材料'
-                    }
-                },
-                {
-                    title: '加急天数',
-                    dataIndex: 'urgent',
-                    key: 'urgent',
-                    render: (text) => {
-                        switch (text) {
-                            case 0:
-                                return '无加急';
-                            case 1:
-                                return '加急3-5个工作日';
-                            case 2:
-                                return '加急6-10个工作日';
-                            case 3:
-                                return '加急11-15个工作日';
-                            case 4:
-                                return '加急16-20个工作日';
-                            case 5:
-                                return '加急21-25个工作日';
-                            case 6:
-                                return '加急26-30个工作日';
-                        }
-                    }
-                },
-                {
-                    title: '价格万元/个',
-                    dataIndex: 'unitPrice',
-                    key: 'unitPrice',
-                },
-                {
-                    title: '备注',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-                },
-                {
-                    title: '状态',
-                    dataIndex: 'status',
-                    key: 'status',
-                    render: (text) => {
-                        return text === 0 ? <Tag color="#87d068">正常</Tag> :
-                            text === 1 ? <Tag>停用</Tag> :  <Tag color="#f50">删除</Tag>
-                    }
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'id',
-                    key: 'id',
-                    render: (text) => {
-                        return <div>
-                            <Popconfirm
-                                title="是否删除?"
-                                onConfirm={() => {
-                                    this.deleteSoftWritingPrice(text);
-                                }}
-                                okText="删除"
-                                cancelText="不删除"
-                            >
-                                <Button type="danger" onClick={(e) => {
-                                    e.stopPropagation()
-                                }}>
-                                    删除
-                                </Button>
-                            </Popconfirm>
-                        </div>
-                    }
-                },
-            ],
-            addSoftVisible: false,
-            infor: {},
-            pageNo: 1,
+class SoftwareConfigure extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      companyName: '',        //公司名称
+      urgent: undefined,            //加急
+      material: undefined,          //材料
+      pagination: {
+        defaultCurrent: 1,
+        defaultPageSize: 10,
+        showQuickJumper: true,
+        pageSize: 10,
+        onChange: function (page) {
+          this.loadData(page);
+        }.bind(this),
+        showTotal: function (total) {
+          return '共' + total + '条数据';
         }
-        this.loadData = this.loadData.bind(this);
-        this.tableRowClick = this.tableRowClick.bind(this);
-        this.reset = this.reset.bind(this);
-        this.changeList = this.changeList.bind(this);
+      },
+      dataSource: [],
+      columns: [
+        {
+          title: '供应商名称',
+          dataIndex: 'companyName',
+          key: 'companyName',
+        },
+        {
+          title: '材料',
+          dataIndex: 'material',
+          key: 'material',
+          render: (text) => {
+            return text === 0 ? '无材料' : '有材料'
+          }
+        },
+        {
+          title: '加急天数',
+          dataIndex: 'urgent',
+          key: 'urgent',
+          render: (text) => {
+            switch (text) {
+              case 0:
+                return '无加急';
+              case 1:
+                return '加急3-5个工作日';
+              case 2:
+                return '加急6-10个工作日';
+              case 3:
+                return '加急11-15个工作日';
+              case 4:
+                return '加急16-20个工作日';
+              case 5:
+                return '加急21-25个工作日';
+              case 6:
+                return '加急26-30个工作日';
+              case 7:
+                return '加急31个工作日';
+            }
+          }
+        },
+        {
+          title: '价格万元/个',
+          dataIndex: 'unitPrice',
+          key: 'unitPrice',
+        },
+        {
+          title: '备注',
+          dataIndex: 'remarks',
+          key: 'remarks',
+        },
+        {
+          title: '状态',
+          dataIndex: 'status',
+          key: 'status',
+          render: (text) => {
+            return text === 0 ? <Tag color="#87d068">正常</Tag> :
+              text === 1 ? <Tag>停用</Tag> : <Tag color="#f50">删除</Tag>
+          }
+        },
+        {
+          title: '操作',
+          dataIndex: 'id',
+          key: 'id',
+          render: (text) => {
+            return <div>
+              <Popconfirm
+                title="是否删除?"
+                onConfirm={() => {
+                  this.deleteSoftWritingPrice(text);
+                }}
+                okText="删除"
+                cancelText="不删除"
+              >
+                <Button type="danger" onClick={(e) => {
+                  e.stopPropagation()
+                }}>
+                  删除
+                </Button>
+              </Popconfirm>
+            </div>
+          }
+        },
+      ],
+      addSoftVisible: false,
+      infor: {},
+      pageNo: 1,
     }
+    this.loadData = this.loadData.bind(this);
+    this.tableRowClick = this.tableRowClick.bind(this);
+    this.reset = this.reset.bind(this);
+    this.changeList = this.changeList.bind(this);
+  }
 
-    componentDidMount() {
-        this.loadData();
-    }
+  componentDidMount() {
+    this.loadData();
+  }
 
-    //搜索功能和初始列表加载
-    loadData(pageNo) {
-        this.setState({
-            loading: true,
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/company/listSoftWritingPrice',
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                companyName:this.state.companyName || undefined,       //公司名称
-                urgent: this.state.urgent,    //加急
-                material: this.state.material,  //材料
-            },
-            success: function (data) {
-                if (!data.data || !data.data.list) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    }
-                } else {
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
-                    if (data.data && data.data.list && !data.data.list.length) {
-                        this.state.pagination.current = 0;
-                        this.state.pagination.total = 0;
-                    }
-                    data.data.list.map((v,i)=>{v.key = i})
-                    this.setState({
-                        dataSource: data.data.list,
-                        pagination: this.state.pagination,
-                        pageNo: data.data.pageNo
-                    });
-                }
+  //搜索功能和初始列表加载
+  loadData(pageNo) {
+    this.setState({
+      loading: true,
+    });
+    $.ajax({
+      method: "get",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/company/listSoftWritingPrice',
+      data: {
+        pageNo: pageNo || 1,
+        pageSize: this.state.pagination.pageSize,
+        companyName: this.state.companyName || undefined,       //公司名称
+        urgent: this.state.urgent,    //加急
+        material: this.state.material,  //材料
+      },
+      success: function (data) {
+        if (!data.data || !data.data.list) {
+          if (data.error && data.error.length) {
+            message.warning(data.error[0].message);
+          }
+        } else {
+          this.state.pagination.current = data.data.pageNo;
+          this.state.pagination.total = data.data.totalCount;
+          if (data.data && data.data.list && !data.data.list.length) {
+            this.state.pagination.current = 0;
+            this.state.pagination.total = 0;
+          }
+          data.data.list.map((v, i) => { v.key = i })
+          this.setState({
+            dataSource: data.data.list,
+            pagination: this.state.pagination,
+            pageNo: data.data.pageNo
+          });
+        }
 
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    }
+      }.bind(this),
+    }).always(function () {
+      this.setState({
+        loading: false
+      });
+    }.bind(this));
+  }
 
-    tableRowClick(infor) {
-        this.setState({
-            addSoftVisible : true,
-            infor: infor
-        })
-    }
+  tableRowClick(infor) {
+    this.setState({
+      addSoftVisible: true,
+      infor: infor
+    })
+  }
 
-    reset(){
-        this.setState({
-            companyName:'',       //公司名称
-            urgent: undefined,    //加急
-            material: undefined,  //材料
-        },()=>{
-            this.loadData();
-        })
-    }
+  reset() {
+    this.setState({
+      companyName: '',       //公司名称
+      urgent: undefined,    //加急
+      material: undefined,  //材料
+    }, () => {
+      this.loadData();
+    })
+  }
 
-    //删除
-    deleteSoftWritingPrice(id) {
-        let _this = this;
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url:globalConfig.context + '/api/admin/company/deleteSoftWritingPrice',
-            data:{
-                id: id
-            },
-        }).done(function (data) {
-            _this.setState({
-                loading: false
-            });
-            if (!data.error.length) {
-                message.success('删除成功!');
-                _this.loadData();
-            } else {
-                message.warning(data.error[0].message);
-            }
-        }.bind(this));
-    }
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    }
+  //删除
+  deleteSoftWritingPrice(id) {
+    let _this = this;
+    this.setState({
+      loading: true
+    });
+    $.ajax({
+      method: "post",
+      dataType: "json",
+      crossDomain: false,
+      url: globalConfig.context + '/api/admin/company/deleteSoftWritingPrice',
+      data: {
+        id: id
+      },
+    }).done(function (data) {
+      _this.setState({
+        loading: false
+      });
+      if (!data.error.length) {
+        message.success('删除成功!');
+        _this.loadData();
+      } else {
+        message.warning(data.error[0].message);
+      }
+    }.bind(this));
+  }
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  }
 
-    render() {
-        return(
-            <div className="user-content" >
-                <div className="content-title">
-                    <Tabs defaultActiveKey="1" className="test">
-                        <TabPane tab="搜索" key="1">
-                            <div className="user-search" style={{display:'flex',flexFlow:'row'}}>
-                                <Input placeholder="公司名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px',marginLeft:10}}
-                                       value={this.state.companyName}
-                                       onChange={(e) => { this.setState({ companyName: e.target.value }); }} />
-                                <div style={{display:'flex',flexFlow:'row nowrap'}}>
-                                    <div style={{marginLeft:10,marginRight:10}}>材料:</div>
-                                    <Select
-                                        placeholder="材料"
-                                        style={{ width:'200px',marginRight:'10px' }}
-                                        value={this.state.material}
-                                        onChange={(e) => {this.setState({ material: e }) }}>
-                                        <Select.Option value={0}>无</Select.Option>
-                                        <Select.Option value={1}>有</Select.Option>
-                                    </Select>
-                                </div>
-                                <div style={{display:'flex',flexFlow:'row nowrap'}}>
-                                    <div style={{marginLeft:10,marginRight:10}}>加急天数:</div>
-                                    <Select placeholder="加急天数"
-                                            style={{ width:'200px',marginRight:'10px' }}
-                                            value={this.state.urgent}
-                                            onChange={(e) => { this.setState({ urgent: e }) }}>
-                                        <Select.Option value={0}>无加急</Select.Option>
-                                        <Select.Option value={1}>加急3-5个工作日</Select.Option>
-                                        <Select.Option value={2}>加急6-10个工作日</Select.Option>
-                                        <Select.Option value={3}>加急11-15个工作日</Select.Option>
-                                        <Select.Option value={4}>加急16-20个工作日</Select.Option>
-                                        <Select.Option value={5}>加急21-25个工作日</Select.Option>
-                                        <Select.Option value={6}>加急26-30个工作日</Select.Option>
-                                    </Select>
-                                </div>
-                                <Button type="primary" onClick={()=>{
-                                    this.loadData();
-                                }} style={{marginRight:'10px'}}>搜索</Button>
-                                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-                                <span style={{marginLeft: 'auto'}}>
-                            <Button type="primary" size={'middle'} onClick={()=>{
-                                this.setState({
-                                    addSoftVisible : true
-                                })
-                            }}>
-                                增加
-                            </Button>
-                        </span>
-                            </div>
-                        </TabPane>
-                        <TabPane tab="更改表格显示数据" key="2">
-                            <div style={{ marginLeft: 10 }}>
-                                <ChooseList
-                                    columns={this.state.columns}
-                                    changeFn={this.changeList}
-                                    changeList={this.state.changeList}
-                                    top={55}
-                                    margin={11}
-                                />
-                            </div>
-                        </TabPane>
-                    </Tabs>
-                    <div className="patent-table">
-                        <Spin spinning={this.state.loading}>
-                            <Table size="middle" columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                                    }
-                                   style={{
-                                       cursor: 'pointer',
-                                   }}
-                                   dataSource={this.state.dataSource}
-                                   pagination={this.state.pagination}
-                                   onRowClick={this.tableRowClick}/>
-                        </Spin>
-                    </div>
+  render() {
+    return (
+      <div className="user-content" >
+        <div className="content-title">
+          <Tabs defaultActiveKey="1" className="test">
+            <TabPane tab="搜索" key="1">
+              <div className="user-search" style={{ display: 'flex', flexFlow: 'row' }}>
+                <Input placeholder="公司名称" style={{ width: '150px', marginRight: '10px', marginBottom: '10px', marginLeft: 10 }}
+                  value={this.state.companyName}
+                  onChange={(e) => { this.setState({ companyName: e.target.value }); }} />
+                <div style={{ display: 'flex', flexFlow: 'row nowrap' }}>
+                  <div style={{ marginLeft: 10, marginRight: 10 }}>材料:</div>
+                  <Select
+                    placeholder="材料"
+                    style={{ width: '200px', marginRight: '10px' }}
+                    value={this.state.material}
+                    onChange={(e) => { this.setState({ material: e }) }}>
+                    <Select.Option value={0}>无</Select.Option>
+                    <Select.Option value={1}>有</Select.Option>
+                  </Select>
                 </div>
-                {this.state.addSoftVisible ? <AddSoftWritingPrice
-                    infor={this.state.infor}
-                    visible={this.state.addSoftVisible}
-                    onCancel={()=>{
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {},
-                        })
-                    }}
-                    successFn={()=>{
-                        this.loadData(this.state.pageNo);
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {}
-                        })
-                    }}/> : <div/>}
-            </div>
-        )
-    }
+                <div style={{ display: 'flex', flexFlow: 'row nowrap' }}>
+                  <div style={{ marginLeft: 10, marginRight: 10 }}>加急天数:</div>
+                  <Select placeholder="加急天数"
+                    style={{ width: '200px', marginRight: '10px' }}
+                    value={this.state.urgent}
+                    onChange={(e) => { this.setState({ urgent: e }) }}>
+                    <Select.Option value={0}>无加急</Select.Option>
+                    <Select.Option value={1}>加急3-5个工作日</Select.Option>
+                    <Select.Option value={2}>加急6-10个工作日</Select.Option>
+                    <Select.Option value={3}>加急11-15个工作日</Select.Option>
+                    <Select.Option value={4}>加急16-20个工作日</Select.Option>
+                    <Select.Option value={5}>加急21-25个工作日</Select.Option>
+                    <Select.Option value={6}>加急26-30个工作日</Select.Option>
+                    <Select.Option value={7}>加急31个工作日</Select.Option>
+                  </Select>
+                </div>
+                <Button type="primary" onClick={() => {
+                  this.loadData();
+                }} style={{ marginRight: '10px' }}>搜索</Button>
+                <Button onClick={this.reset} style={{ marginRight: '10px' }}>重置</Button>
+                <span style={{ marginLeft: 'auto' }}>
+                  <Button type="primary" size={'middle'} onClick={() => {
+                    this.setState({
+                      addSoftVisible: true
+                    })
+                  }}>
+                    增加
+                  </Button>
+                </span>
+              </div>
+            </TabPane>
+            <TabPane tab="更改表格显示数据" key="2">
+              <div style={{ marginLeft: 10 }}>
+                <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+                />
+              </div>
+            </TabPane>
+          </Tabs>
+          <div className="patent-table">
+            <Spin spinning={this.state.loading}>
+              <Table size="middle" columns={
+                this.state.changeList
+                  ? this.state.changeList
+                  : this.state.columns
+              }
+                style={{
+                  cursor: 'pointer',
+                }}
+                dataSource={this.state.dataSource}
+                pagination={this.state.pagination}
+                onRowClick={this.tableRowClick} />
+            </Spin>
+          </div>
+        </div>
+        {this.state.addSoftVisible ? <AddSoftWritingPrice
+          infor={this.state.infor}
+          visible={this.state.addSoftVisible}
+          onCancel={() => {
+            this.setState({
+              addSoftVisible: false,
+              infor: {},
+            })
+          }}
+          successFn={() => {
+            this.loadData(this.state.pageNo);
+            this.setState({
+              addSoftVisible: false,
+              infor: {}
+            })
+          }} /> : <div />}
+      </div>
+    )
+  }
 }
 
 export default SoftwareConfigure

+ 2 - 0
js/component/tools.js

@@ -1808,6 +1808,8 @@ const obj = {
       return "加急21-25个工作日";
     } else if (val == 6) {
       return "加急26-30个工作日";
+    } else if (val == 7) {
+      return "加急31个工作日";
     }
   },
   //审核状态