dev01 1 yıl önce
ebeveyn
işleme
553ee5ecf6

+ 0 - 1
src/components/common/imagePicker/index.jsx

@@ -106,7 +106,6 @@ class ImagePicker extends Component {
 
   }
   onImageClick(index) {
-    console.log("***")
     let arr = [];
     for (let i of this.state.files) {
       arr.push(i.url)

+ 1 - 1
src/components/common/userFloatingLayer/index.jsx

@@ -29,7 +29,7 @@ class UserFloatingLayer extends Component{
           <OpenData type='userAvatarUrl'/>
         </View>
         <View className='userNickName'>
-          {this.state.userInfor.userName}
+          {this.state.userInfor.nickName}
           <View className='welcome' onClick={()=>{
             Taro.setStorageSync("token", "");
             Taro.setStorageSync('userInfor', "");

BIN
src/image/egressSelect.png


BIN
src/image/egressUnSelect.png


BIN
src/image/location.png


BIN
src/image/punchRange.png


BIN
src/image/switch.png


+ 1 - 1
src/pages/detail/index.jsx

@@ -257,7 +257,7 @@ class Detail extends Component {
                           opinion: value,
                         });
                       }}
-                      maxLength={50}
+                      maxLength={100}
                       placeholder="请填写审批意见"
                     />
                     <View className="operation">

+ 6 - 0
src/pages/detail/index.less

@@ -19,4 +19,10 @@
   top: 100px;
   width: 222px;
   height: 197px;
+}
+
+textarea {
+  background: #D7D7D7;
+  padding: 20px;
+  border-radius: 20px;
 }

+ 16 - 12
src/pages/mybusiness/myList.jsx

@@ -56,19 +56,23 @@ class MyList extends Component {
                 </View>
                 {
                   v.processStatus == 1 &&
-                  <View className="releaseStarts">
-                    <View
-                      className="punchClock"
-                      // onClick={(e) => {
-                      //   e.stopPropagation();
-                      // }}
-                    >
-                      去审核
-                    </View>
-                  </View>
+                  (
+                    type == 0 ?
+                      <View style={{ textAlign: "right", color: "blue" }}>已打卡,待审核</View> :
+                      <View className="releaseStarts">
+                        <View
+                          className="punchClock"
+                        // onClick={(e) => {
+                        //   e.stopPropagation();
+                        // }}
+                        >
+                          去审核
+                        </View>
+                      </View>
+                  )
                 }
-                {v.processStatus == 2 && <View style={{ textAlign: "right" }}>已审核</View>}
-                {v.processStatus == 3 && <View style={{ textAlign: "right", color: "red" }}>已驳回</View>}
+                {v.processStatus == 2 && <View style={{ textAlign: "right", color: "green" }}>{type == 0 ? "已打卡,已审核" : "已审核"}</View>}
+                {v.processStatus == 3 && <View style={{ textAlign: "right", color: "red" }}>{type == 0 ? "已打卡,已驳回" : "已驳回"}</View>}
               </View>
             </View>
           ))}

+ 1 - 1
src/pages/punchClock/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '打卡',
+  navigationBarTitleText: '研发打卡',
 }

+ 7 - 4
src/pages/punchClock/index.less

@@ -7,7 +7,7 @@
   .item {
     width: 100%;
     font-size: 28px;
-    margin-bottom: 15px;
+    margin-bottom: 25px;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -17,6 +17,7 @@
       display: flex;
       flex-direction: row;
       align-items: center;
+      font-size: 30px;
 
     }
 
@@ -25,12 +26,13 @@
   .items {
     width: 100%;
     font-size: 28px;
-    margin-bottom: 15px;
+    margin-bottom: 25px;
 
     .ititle {
       display: flex;
       flex-direction: row;
       align-items: center;
+      font-size: 30px;
 
       .input {
         width: 140px;
@@ -41,6 +43,7 @@
     .ititles {
       display: flex;
       flex-direction: row;
+      font-size: 30px;
 
     }
 
@@ -72,7 +75,7 @@
         .item_name {
           width: 80%;
           margin-right: 5%;
-          font-size: 32px;
+          font-size: 34px;
           font-weight: bolder;
 
         }
@@ -409,7 +412,7 @@
 }
 
 .picker {
-  padding: 5px 15px;
+  padding: 10px 20px;
   border-radius: 100px;
   background: #D7D7D7;
 

+ 12 - 5
src/pages/punchClock/punchClocks.jsx

@@ -38,6 +38,7 @@ class PunchClocks extends Component {
     super(props);
     this.state = {
       imgs: [],
+      nowTime: '00:00:00',
       loading: false,
       selector: [{ value: 0, lable: "调研阶段" },],
       dateSel: dayjs().format('YYYY-MM-DD'),
@@ -52,7 +53,7 @@ class PunchClocks extends Component {
     this.publicReleaseClockIn = this.publicReleaseClockIn.bind(this);
     this.onClose = this.onClose.bind(this);
   }
-
+  nowTime = null;
 
   componentDidMount() {
     this.imagePickerRef && this.imagePickerRef.clear();
@@ -65,6 +66,12 @@ class PunchClocks extends Component {
     })
   }
   componentWillMount() {
+    this.nowTime = setInterval(() => {
+      this.setState({
+        nowTime: dayjs().format('HH:mm:ss')
+      })
+    }, 1000)
+
     Taro.eventCenter.on('GoPunchIn', (arg) => {
       this.setState({
         data: arg
@@ -178,12 +185,12 @@ class PunchClocks extends Component {
                       background: '#828e83',
                       marginTop: '85px',
                     }}>
-                    <View className='punchClockTitle'>打卡</View>
+                    <View className='punchClockTitle'>研发打卡</View>
                     <View className='punchClockTime'>{this.state.nowTime}</View>
                   </View>
                   <View className='noData'>
                     <View className='tipsNoData'>
-                      暂无打卡项目
+                      {/* 暂无打卡项目 */}
                     </View>
                     <View className='goOut' onClick={() => {
                       Taro.switchTab({
@@ -223,7 +230,7 @@ class PunchClocks extends Component {
                   <View className='items'>
                     <View className='ititle'><Text style={{ color: "red", width: "7px" }}>*</Text>研发工时:
                       <Input value={this.state.duration} type='digit' className='input' placeholder='请输入'
-                        style={{ textAlign: "center", background: "#D7D7D7", borderRadius: "10px", }}
+                        style={{ textAlign: "center", background: "#D7D7D7", borderRadius: "15px", padding: "3px 5px" }}
                         // border: "1px solid #d6e4ef",
                         onInput={e => {
                           this.setState({
@@ -291,7 +298,7 @@ class PunchClocks extends Component {
                         boxShadow: '1px 1px 15px 1px #acb8ad',
                         background: '#009DD9',
                       }}>
-                      <View className='punchClockTitle'>打卡</View>
+                      <View className='punchClockTitle'>研发打卡</View>
                     </View>
                   </View>
                 </View>

+ 11 - 3
src/pages/reclockin/index.jsx

@@ -99,6 +99,14 @@ class ReClockin extends Component {
   }
 
   updateRecordClockIn() {
+    let arr = []
+    for (let i of this.state.imgs) {
+      if (!!i.url) {
+        arr.push(i.url.split(resourceAddress).join(""));
+      } else {
+        arr.push(i)
+      }
+    }
     if (!this.state.dateSel) {
       Taro.showToast({ title: '请选择研发时间!', icon: 'none' });
       return
@@ -114,11 +122,11 @@ class ReClockin extends Component {
     Taro.showLoading({ title: '打卡中...' });
     updateRecord({
       id: this.$instance.router.params.id,
-      pid: this.state.data.id,
+      pid: this.state.data.pid,
       projectStatus: this.state.selectorChecked.value,
       duration: this.state.duration,
       content: this.state.content,
-      annexUrl: this.state.imgs.join(','),
+      annexUrl: arr.join(','),
       processStatus: 1,
       recordTime: this.state.dateSel,
     }).then(v => {
@@ -182,7 +190,7 @@ class ReClockin extends Component {
               <View className='items'>
                 <View className='ititle'><Text style={{ color: "red", width: "7px" }}>*</Text>研发工时:
                   <Input value={this.state.duration} type='digit' className='input' placeholder='请输入'
-                    style={{ textAlign: "center", border: "1px solid #d6e4ef", background: "#D7D7D7", borderRadius: "10px", }}
+                    style={{ textAlign: "center", background: "#D7D7D7", borderRadius: "15px", padding: "3px 5px" }}
                     onInput={e => {
                       this.setState({
                         duration: e.detail.value

+ 7 - 5
src/pages/reclockin/index.less

@@ -7,7 +7,7 @@
   .item {
     width: 100%;
     font-size: 28px;
-    margin-bottom: 15px;
+    margin-bottom: 25px;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -17,6 +17,7 @@
       display: flex;
       flex-direction: row;
       align-items: center;
+      font-size: 30px;
 
     }
 
@@ -25,12 +26,13 @@
   .items {
     width: 100%;
     font-size: 28px;
-    margin-bottom: 15px;
+    margin-bottom: 25px;
 
     .ititle {
       display: flex;
       flex-direction: row;
       align-items: center;
+      font-size: 30px;
 
       .input {
         width: 140px;
@@ -73,7 +75,7 @@
         .item_name{
           width: 80%;
           margin-right: 5%;
-          font-size: 32px;
+          font-size: 34px;
           font-weight: bolder;
           
         }
@@ -406,8 +408,8 @@
 }
 
 .picker {
-  padding: 5px 15px;
+  padding: 10px 20px;
   border-radius: 100px;
   background: #D7D7D7;
 
-}
+}

+ 1 - 0
src/utils/tools/config.js

@@ -45,3 +45,4 @@ export const clockJournalState = [
     color: '#f31212'
   },
 ];
+