dev01 лет назад: 2
Родитель
Сommit
9bc55078c8

+ 5 - 1
src/components/common/userquery/index.jsx

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { View, Button } from "@tarojs/components";
 import { AtModal, AtModalContent, AtSearchBar, AtList, AtListItem } from "taro-ui";
 import { getadminByName } from "../../../utils/servers/servers";
+import { isOneself } from "../../../utils/tools"
 import './index.less';
 import "taro-ui/dist/style/components/modal.scss";
 import Taro from "@tarojs/taro";
@@ -96,7 +97,10 @@ class UserQuery extends Component {
                     title={v.name}
                     onClick={() => {
                       if (coorderList.includes(v.id)) {
-                        Taro.showToast({ title: "你已经邀请过Ta了", icon: "none" });
+                        Taro.showToast({ title: "你已经邀请过Ta了~", icon: "none" });
+                        return
+                      } else if (isOneself(v.id)) {
+                        Taro.showToast({ title: "你不能邀请自己哦~", icon: "none" });
                         return
                       } else {
                         coorderList.push(v.id);

+ 0 - 1
src/pages/applyDepart/index.jsx

@@ -65,7 +65,6 @@ class ApplyDepart extends Component {
         current: 1,
         enterpriseInfor: arg,
       });
-      console.log(arg);
     });
     Taro.eventCenter.on("publicContent", (arg) => {
       this.setState({

+ 3 - 0
src/pages/applyDepart/publicContent.jsx

@@ -531,6 +531,9 @@ class PublicContent extends Component {
             {cList.length < 5 && <Button className="addbuttom" type='primary' onClick={this.popupClick.bind(this)}>新增技术协单</Button>}
           </View>
         </View>
+        <View className="tips">
+          技术协单,将统计相关的公出成本等
+        </View>
         <View
           className="formItem"
           style={{ display: "block", paddingTop: "15px" }}

+ 3 - 0
src/pages/egressDetails/publicContent.jsx

@@ -529,6 +529,9 @@ class PublicContent extends Component {
             {cList.length < 5 && <Button className="addbuttom" type='primary' onClick={this.popupClick.bind(this)}>新增技术协单</Button>}
           </View>
         </View>
+        <View className="tips">
+          技术协单,将统计相关的公出成本等
+        </View>
         {this.state.validDates.length !== 0 ? (
           <View
             className="formItem"

+ 3 - 3
src/utils/servers/baseUrl.js

@@ -1,14 +1,14 @@
 const getBaseUrl = (url) => {
   let BASE_URL = '';
   if (process.env.NODE_ENV === 'development') {
-    //开发环境 - 根据请求不同返回不同的BASE_URL
+    // 开发环境 - 根据请求不同返回不同的BASE_URL
     // BASE_URL = 'http://172.16.0.255:8080'
     BASE_URL = 'https://uat.jishutao.com'
     // BASE_URL = 'https://bm.jishutao.com'
   } else {
     // 生产环境
-     BASE_URL = 'http://172.16.0.255:8080'
-    // BASE_URL = 'https://uat.jishutao.com'
+    // BASE_URL = 'http://172.16.0.255:8080'
+    BASE_URL = 'https://uat.jishutao.com'
     // BASE_URL = 'https://bm.jishutao.com'
   }
   return BASE_URL