mentoswzq 5 years ago
parent
commit
0868b92dad

+ 1 - 1
js/component/login/adminLogin.jsx

@@ -17,7 +17,7 @@ var Login = React.createClass({
 
     handleSubmit() {
         if (this.state.user === "" || this.state.password === "") {
-            this.tips('账号或者密码不能为空!');
+            message.warning('账号或者密码不能为空!');
         } else {
             this.setState({
                 loading: true

+ 15 - 11
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -14,7 +14,8 @@ import {
   Modal,
   Upload,
   Tabs,
-  Col
+  Col,
+  Tag
 } from "antd";
 import Receivable from "./receivable";
 import Assign from "@/manageCenter/publicComponent/assign";
@@ -217,6 +218,18 @@ const approvedOutsourcing = React.createClass({
           // fixed: "left"
         },
         {
+          title: "特批状态",
+          dataIndex: "approval",
+          key: "approval",
+          className: "title-table",
+          render: text => {
+            if (text == 1 || text == 2) {
+              return <Tag color="#f50">{getApproval(text)}</Tag>;
+            }
+            return getApproval(text);
+          }
+        },
+        {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
@@ -313,15 +326,6 @@ const approvedOutsourcing = React.createClass({
           }
         },
         {
-          title: "特批状态",
-          dataIndex: "approval",
-          key: "approval",
-          className: "title-table",
-          render: text => {
-            return getApproval(text);
-          }
-        },
-        {
           title: "操作",
           dataIndex: "caozuo",
           key: "caouzo",
@@ -599,7 +603,7 @@ const approvedOutsourcing = React.createClass({
           }
         },
         {
-          title: "时间",
+          title: "时间(天)",
           dataIndex: "waitDay",
           key: "waitDay",
           render: (text, record) => {

+ 15 - 11
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -14,7 +14,8 @@ import {
   Modal,
   Upload,
   Tabs,
-  Col
+  Col,
+  Tag
 } from "antd";
 import Receivable from "./receivable";
 import Assign from "@/manageCenter/publicComponent/assign";
@@ -218,6 +219,18 @@ const approvedOutsourcing = React.createClass({
           // fixed: "left"
         },
         {
+          title: "特批状态",
+          dataIndex: "approval",
+          key: "approval",
+          className: "title-table",
+          render: text => {
+            if (text == 1 || text == 2) {
+              return <Tag color="#f50">{getApproval(text)}</Tag>;
+            }
+            return getApproval(text);
+          }
+        },
+        {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
@@ -313,15 +326,6 @@ const approvedOutsourcing = React.createClass({
             return getProcessStatus(text);
           }
         },
-        {
-          title: "特批状态",
-          dataIndex: "approval",
-          key: "approval",
-          className: "title-table",
-          render: text => {
-            return getApproval(text);
-          }
-        }
         // {
         //   title: "操作",
         //   dataIndex: "caozuo",
@@ -427,7 +431,7 @@ const approvedOutsourcing = React.createClass({
           }
         },
         {
-          title: "时间",
+          title: "时间(天)",
           dataIndex: "waitDay",
           key: "waitDay",
           render: (text, record) => {

+ 14 - 10
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -14,7 +14,8 @@ import {
   DatePicker,
   Modal,
   Tabs,
-  Col
+  Col,
+  Tag
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import Receivable from "./receivable";
@@ -574,6 +575,18 @@ const ShouKuang = React.createClass({
           // fixed: "left"
         },
         {
+          title: "特批状态",
+          dataIndex: "approval",
+          key: "approval",
+          className: "title-table",
+          render: text => {
+            if (text == 1 || text == 2) {
+              return <Tag color="#f50">{getApproval(text)}</Tag>;
+            }
+            return getApproval(text);
+          }
+        },
+        {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
@@ -656,15 +669,6 @@ const ShouKuang = React.createClass({
           render: text => {
             return getProcessStatus(text);
           }
-        },
-        {
-          title: "特批状态",
-          dataIndex: "approval",
-          key: "approval",
-          className: "title-table",
-          render: text => {
-            return getApproval(text);
-          }
         }
 
         //                 {

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

@@ -15,6 +15,7 @@ import {
   Modal,
   Tabs,
   Col,
+  Tag
 } from "antd";
 import OrderDesc from "../orderDetail/orderDesc";
 import Receivable from "./receivable";
@@ -588,6 +589,18 @@ const ShouKuang = React.createClass({
           // fixed: "left"
         },
         {
+          title: "特批状态",
+          dataIndex: "approval",
+          key: "approval",
+          className: "title-table",
+          render: text => {
+            if(text == 1 || text == 2) {
+              return <Tag color="#f50">{getApproval(text)}</Tag>;
+            }
+            return getApproval(text);
+          }
+        },
+        {
           title: "客户名称",
           dataIndex: "buyerName",
           key: "buyerName",
@@ -671,15 +684,6 @@ const ShouKuang = React.createClass({
             return getProcessStatus(text);
           }
         },
-        {
-          title: "特批状态",
-          dataIndex: "approval",
-          key: "approval",
-          className: "title-table",
-          render: text => {
-            return getApproval(text);
-          }
-        },
 
         //                 {
         //                     title: '订单状态',

+ 1 - 1
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -201,7 +201,7 @@ const OrderDetail = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {

+ 41 - 37
js/component/manageCenter/order/orderNew/approveds.jsx

@@ -96,7 +96,7 @@ const IntentionCustomer = Form.create()(
           pageSize: this.state.pagination.pageSize,
           specially: 3, //审核列表
           name: this.state.customerName, //名称
-          orderNo: this.state.orderNo, //订单编号
+          orderNo: this.state.orderNoSearch, //订单编号
           depId: this.state.departmenttSearch, //订单部门
           starTime: this.state.releaseDate[0], //开始时间
           endTime: this.state.releaseDate[1] //结束时间
@@ -337,7 +337,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {
@@ -780,7 +780,8 @@ const IntentionCustomer = Form.create()(
             message.success("该特批订单已被驳回~");
             this.setState({
               visible: false,
-              noVisible: false
+              noVisible: false,
+              reason: ""
             });
             this.loadData();
             this.resets();
@@ -806,7 +807,8 @@ const IntentionCustomer = Form.create()(
     //关闭输入理由框
     noCancel() {
       this.setState({
-        noVisible: false
+        noVisible: false,
+        reason: ""
       });
     },
     //搜索
@@ -935,9 +937,9 @@ const IntentionCustomer = Form.create()(
             <Input
               placeholder="订单编号"
               style={{ width: "150px" }}
-              value={this.state.orderNo}
+              value={this.state.orderNoSearch}
               onChange={e => {
-                this.setState({ orderNo: e.target.value });
+                this.setState({ orderNoSearch: e.target.value });
               }}
             />
             <Select
@@ -1181,7 +1183,39 @@ const IntentionCustomer = Form.create()(
                       </FormItem>
                     </div>
                     <div>
-                      <span style={{ marginLeft: 20, fontSize: "18px" }}>
+                      <span style={{ marginLeft: "50px", fontSize: "18px" }}>
+                        项目业务
+                      </span>
+                      {this.state.processStatus == 0 ? (
+                        <Button
+                          type="primary"
+                          onClick={this.addDetailed}
+                          style={{
+                            float: "right",
+                            marginRight: "50px",
+                            marginBottom: "15px"
+                          }}
+                        >
+                          添加项目明细
+                        </Button>
+                      ) : (
+                        ""
+                      )}
+                    </div>
+                    <div className="patent-table">
+                      <Spin spinning={this.state.loading}>
+                        <Table
+                          columns={this.state.columnsX}
+                          dataSource={this.state.dataSourceX}
+                          pagination={this.state.paginations}
+                          onRowClick={this.tableRowClickX}
+                          bordered
+                          size="small"
+                        />
+                      </Spin>
+                    </div>
+                    <div style={{ marginTop: 10 }}>
+                      <span style={{ marginLeft: 50, fontSize: "18px" }}>
                         催款节点
                       </span>
                       <span
@@ -1220,36 +1254,6 @@ const IntentionCustomer = Form.create()(
                         </Form>
                       </Spin>
                     </div>
-                    <div>
-                      <span style={{ marginLeft: "50px", fontSize: "20px" }}>
-                        项目业务
-                      </span>
-                      {this.state.processStatus == 0 ? (
-                        <Button
-                          type="primary"
-                          onClick={this.addDetailed}
-                          style={{
-                            float: "right",
-                            marginRight: "50px",
-                            marginBottom: "15px"
-                          }}
-                        >
-                          添加项目明细
-                        </Button>
-                      ) : (
-                        ""
-                      )}
-                    </div>
-                    <div className="patent-table">
-                      <Spin spinning={this.state.loading}>
-                        <Table
-                          columns={this.state.columnsX}
-                          dataSource={this.state.dataSourceX}
-                          pagination={this.state.paginations}
-                          onRowClick={this.tableRowClickX}
-                        />
-                      </Spin>
-                    </div>
                     <div className="addSave" style={{ marginTop: "15px" }}>
                       <Button
                         className="cancel"

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

@@ -284,7 +284,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {

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

@@ -270,7 +270,7 @@ const checkOutsourcing = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {

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

@@ -40,6 +40,8 @@ const contractChange = Form.create()(
           startTime: this.state.searchData.releaseDate[0],
           endTime: this.state.searchData.releaseDate[1],
           salesmanName: this.state.searchData.salesmanNameSearch,
+          orderNo: this.state.searchData.orderNoSearch,
+          contractNo: this.state.searchData.contractNoSearch,
           complete: this.state.searchData.completeSearch || 1,
           depId: this.state.searchData.depIdSearch
         },

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

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

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

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

+ 3 - 1
js/component/manageCenter/order/orderNew/contractJszj.js

@@ -39,7 +39,9 @@ const contractChange = Form.create()(
           endTime: this.state.searchData.releaseDate[1],
           salesmanName: this.state.searchData.salesmanNameSearch,
           complete: this.state.searchData.completeSearch || 1,
-          depId: this.state.searchData.depIdSearch
+          depId: this.state.searchData.depIdSearch,
+          orderNo: this.state.searchData.orderNoSearch,
+          contractNo: this.state.searchData.contractNoSearch
         },
         success: function(data) {
           ShowModal(this);

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

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

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

@@ -44,7 +44,9 @@ const contractChange = Form.create()(
           endTime: this.state.searchData.releaseDate[1],
           salesmanName: this.state.searchData.salesmanNameSearch,
           complete: this.state.searchData.completeSearch || 1,
-          depId: this.state.searchData.depIdSearch
+          depId: this.state.searchData.depIdSearch,
+          orderNo: this.state.searchData.orderNoSearch,
+          contractNo: this.state.searchData.contractNoSearch
         },
         success: function(data) {
           ShowModal(this);

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

@@ -370,7 +370,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {

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

@@ -324,7 +324,7 @@ const IntentionCustomer = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {

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

@@ -336,7 +336,7 @@ const outsourcingList = Form.create()(
             }
           },
           {
-            title: "时间",
+            title: "时间(天)",
             dataIndex: "waitDay",
             key: "waitDay",
             render: (text, record) => {

+ 1 - 1
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -993,7 +993,7 @@ const MyTaskCount = Form.create()(
               })}
             </Select>
             <Select
-              placeholder="业务品类"
+              placeholder="项目类别"
               style={{ width: "150", marginRight: "10px" }}
               value={this.state.cid}
               onChange={e => {