dev01 1 year ago
parent
commit
06d5ec2298

File diff suppressed because it is too large
+ 0 - 1
src/components/common/mapSDK/qqmap-wx-jssdk.min.js


+ 0 - 140
src/components/common/userquery/index.jsx

@@ -1,140 +0,0 @@
-import React, { Component } from "react";
-import { View, Button, Text } 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";
-
-class UserQuery extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      value: "",
-      list: [],
-      listState: "NO_DATA",
-      pageNo: 1,
-      listVisible: false,
-      listValue: {},
-    };
-    this.onChange = this.onChange.bind(this);
-  }
-
-  onChange(value, lv = true) {
-    this.setState({
-      value,
-    });
-    if (value.length < 2 && !lv) {
-      Taro.showToast({ title: "最少输入两个字符", icon: "none" });
-      return;
-    }
-    if (value.length < 4 && lv) {
-      return;
-    }
-    this.getList(value);
-  }
-
-  getList(value = this.state.value, pageNo = 1) {
-    this.setState({
-      listState: "LOADING",
-    });
-    getadminByName({
-      adminName: value,
-      pageNo: pageNo,
-      pageSize: 10,
-    })
-      .then((msg) => {
-        if (msg.error.length === 0) {
-          this.setState({
-            list: msg
-          })
-        } else {
-          Taro.showToast({ title: msg.error[0].message, icon: "none" });
-          this.setState({
-            listState: msg.error[0].field === "403" ? "NO_DATA" : "RELOAD",
-          });
-        }
-      })
-      .catch(() => {
-        this.setState({
-          listState: "RELOAD",
-        });
-      });
-  }
-
-
-  render() {
-    //selList 本次共出的协单人或协单助手
-    //req是否调用接口添加   addClick接口
-    const { selList = [], coorderList, cList, req = false, addClick } = this.props
-    return (
-      <AtModal
-        isOpened={this.props.isOpened}
-        onClose={this.props.onDesc}
-      >
-        <AtModalContent>
-          <AtSearchBar
-            placeholder="请输入协单人/助手姓名"
-            showActionButton
-            value={this.state.value}
-            onChange={this.onChange}
-            onActionClick={() => {
-              this.onChange(this.state.value, false);
-            }}
-            onConfirm={() => {
-              this.onChange(this.state.value, false);
-            }}
-            onClear={() => {
-              this.setState({
-                value: "",
-                list: [],
-                listState: "NO_DATA",
-                pageNo: 1,
-                listVisible: false,
-              });
-            }}
-          />
-          <AtList>
-            {
-              this.state.list.map(v =>
-                <View key={v.id}>
-                  <AtListItem
-                    title={v.name}
-                    onClick={() => {
-                      if (coorderList.includes(v.id)) {
-                        Taro.showToast({ title: "你已经邀请过Ta了~", icon: "none" });
-                        return
-                      } else if (isOneself(v.id)) {
-                        Taro.showToast({ title: "你不能邀请自己哦~", icon: "none" });
-                        return
-                      } else if (selList.includes(v.id)) {
-                        Taro.showToast({ title: "本次公出已经邀请过Ta了", icon: "none" });
-                        return
-                      } else {
-                        if (req) {
-                          addClick(v.id)
-                        } else {
-                          coorderList.push(v.id);
-                          cList.push(v);
-                          this.props.setList(cList, coorderList);
-                          this.props.onDesc();
-                        }
-                      }
-                    }}
-                  />
-                </View>
-              )
-            }
-          </AtList>
-          <View
-            style={{ color: "red", margin: "20px auto 0", textAlign: "center" }}
-            onClick={this.props.onDesc}
-          >点击关闭弹窗</View>
-        </AtModalContent>
-      </AtModal>
-    );
-  }
-}
-
-export default UserQuery;

+ 0 - 4
src/components/common/userquery/index.less

@@ -1,4 +0,0 @@
-.main {
-  width: 90%;
-
-}

+ 3 - 2
src/pages/punchClock/punchClocks.jsx

@@ -396,8 +396,9 @@ class PunchClocks extends Component {
                           </View>
                         </View>
                       </View>
-                      : <View style={{ color: "red" }}>
-                        当前时间不可打卡,请重新选择研发时间
+                      : <View style={{ color: "red", fontWeight: "bold" }}>
+                        {dayInfo.dayStatus == 1 && "不在研发时间内,请重新选择"}
+                        {dayInfo.color == 3 && "未到打卡时间,请重新选择"}
                       </View>
                   }
                 </View>