Przeglądaj źródła

样式调整,跳转RD库添加

dev01 2 lat temu
rodzic
commit
7eef7f5bce

+ 23 - 20
js/component/login/loginTop.jsx

@@ -4,26 +4,29 @@ import logo from '../../../image/logo.png';
 import erweima from '../../../image/erweima.jpg';
 
 const LoginTop = React.createClass({
-    render() {
-        return (
-            <div className="login-header">
-                <div className="login-logo">
-                	<div className="erweima">
-                        <img src={erweima} alt="" />
-                    </div>
-                    <div className="logo">
-                        <img src={logo} alt="" />
-                    </div>
-                    
-                    <div className="logo-text">
-                        <span>科技交易认知计算平台</span>
-                        <span className="back"><a href={jumpUrl + "/portal/index.html"}>返回首页</a></span>
-                    </div>
-                    
-                </div>
-            </div>
-        )
-    }
+  render() {
+    return (
+      <div className="login-header">
+        <div className="login-logo">
+          <div className="erweima">
+            <img src={erweima} alt="" />
+          </div>
+          <div className="logo">
+            <img src={logo} alt="" />
+          </div>
+
+          <div className="logo-text">
+            <span>科技交易认知计算平台</span>
+            <span className="back">
+              {/* <a href={jumpUrl + "/portal/index.html"}>返回首页</a> */}
+              <a href={globalConfig.context + "/RD/admin/login"}>前往RD库</a>
+            </span>
+          </div>
+
+        </div>
+      </div>
+    )
+  }
 });
 
 export default LoginTop;

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

@@ -882,7 +882,7 @@ const MyService = Form.create()(
             orderNo: this.state.orderNo3,
             type: this.state.type,
             status: this.state.status,
-            approval: this.state.ordapproval,
+            approval: !this.state.ordapproval ? 0 : 1,
             remarks: this.state.remarks,
             invoiceType: this.state.invoiceType,
             unitName: this.state.unitName,

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

@@ -64,7 +64,7 @@ class Rizhi extends Component {
           title: "创建时间",
           dataIndex: "createTimes",
           key: "createTimes",
-          width: 180
+          width: 160
         },
         {
           title: "操作人名称",
@@ -76,7 +76,7 @@ class Rizhi extends Component {
           title: "状态",
           dataIndex: "status",
           key: "status",
-          width: 150,
+          width: 100,
           render: text => {
             return getStatus(text);
           }

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

@@ -41,7 +41,7 @@ import {
   getCuikuan,
   getjiedian, getProjectName
 } from "../../../tools.js";
-import { salesList } from "@/dataDic.js";
+import { salesList, processStatus } from "@/dataDic.js";
 import ShowModalDiv from "@/showModal.jsx";
 import { ChooseList } from "../orderNew/chooseList";
 import ReactToPrint from "react-to-print";
@@ -2744,13 +2744,11 @@ const IntentionCustomer = Form.create()(
                     }}
                   >
                     <Option value="">全部</Option>
-                    <Option value="0">已派营销员</Option>
-                    <Option value="1">已派营销员管理员</Option>
-                    <Option value="2">已派财务管理员</Option>
-                    <Option value="3">已派财务专员</Option>
-                    <Option value="4">已派咨询师管理员</Option>
-                    <Option value="5">已部分派咨询师经理</Option>
-                    <Option value="6">已部全部派咨询师经理</Option>
+                    {
+                      processStatus.map((item) =>
+                        <Option value={item.value} key={item.value}>{item.key}</Option>
+                      )
+                    }
                   </Select>
                   <Button
                     type="primary"

+ 2 - 1
js/component/manageCenter/topTab.jsx

@@ -811,7 +811,8 @@ const TopTab = React.createClass({
             <a onClick={this.logOut}>[ 退出 ]</a>
           </span>
           <span className="acc-top-user-toindex">
-            <a href={jumpUrl || "" + "/portal/index.html"}>返回首页</a>
+            {/* <a href={jumpUrl || "" + "/portal/index.html"}>返回首页</a> */}
+            <a href={globalConfig.context + "/RD/admin/login"}>前往RD库</a>
           </span>
           {this.props.active ? (
             <a