dev01 2 years ago
parent
commit
1071cbe57c

+ 2 - 2
src/components/common/NavBar/index.js

@@ -56,8 +56,8 @@ function getSystemInfo() {
         top: systemInfo.statusBarHeight + gap,
         width: width
       };
-      console.log('error', error);
-      console.log('rect', rect);
+      //console.log('error', error);
+      //console.log('rect', rect);
     }
 
     let navBarHeight = '';

+ 1 - 1
src/components/common/PickerReduce/timePicker.js

@@ -91,7 +91,7 @@ Component({
     // yearEnd:2100
   },
   detached: function() {
-    console.log("dele");
+    //console.log("dele");
   },
   attached: function() {},
   ready: function() {

+ 7 - 8
src/components/common/imagePicker/index.jsx

@@ -37,7 +37,6 @@ class ImagePicker extends Component{
       })
     }else{
       let fileArr = this.state.files.concat([]);
-      console.log(fileArr.length,files.length - fileArr.length)
       let arr = type === 'camera' ? files : files.splice(fileArr.length,files.length - fileArr.length)
       this.setState({
         loading:true
@@ -73,19 +72,19 @@ class ImagePicker extends Component{
             }
           },
           fail: function (err){
-            console.log(err);
+            //console.log(err);
             Taro.showToast({title:'系统错误,请稍后重试',icon:'none'});
           },
           complete: function(v){
-            console.log(v)
+            //console.log(v)
           }
         })
         uploadTask.progress((res) => {
           if(res.progress === 100){
             let num = this.state.speedProgress+1;
             let speed = num/arr.length*100;
-            console.log(num,arr.length)
-            console.log(num/arr.length)
+            //console.log(num,arr.length)
+            //console.log(num/arr.length)
             this.setState({
               speedProgress:num,
             },()=>{
@@ -99,9 +98,9 @@ class ImagePicker extends Component{
               }
             })
           }
-          console.log('上传进度', res.progress)
-          console.log('已经上传的数据长度', res.totalBytesSent)
-          console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+          //console.log('上传进度', res.progress)
+          //console.log('已经上传的数据长度', res.totalBytesSent)
+          //console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
         })
       }
     }

+ 1 - 1
src/components/common/timePicker/timePicker.js

@@ -91,7 +91,7 @@ Component({
     // yearEnd:2100
   },
   detached: function() {
-    console.log("dele");
+    //console.log("dele");
   },
   attached: function() {},
   ready: function() {

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

@@ -95,7 +95,6 @@ class UserQuery extends Component {
                   <AtListItem
                     title={v.name}
                     onClick={() => {
-                      console.log("coorderList==", coorderList)
                       if (coorderList.includes(v.id)) {
                         Taro.showToast({ title: "你已经邀请过Ta了", icon: "none" });
                         return

+ 1 - 1
src/components/historicalClock/index.jsx

@@ -52,7 +52,7 @@ class HistoricalClock extends Component {
     }).catch(err => {
       Taro.hideLoading();
       Taro.showToast({ title: '系统错误.请稍后重试', icon: 'none' })
-      console.log(err)
+      //console.log(err)
     })
   }
 

+ 4 - 2
src/pages/applyDepart/publicContent.jsx

@@ -238,7 +238,7 @@ class PublicContent extends Component {
         }
       })
       .catch((err) => {
-        console.log(err);
+        //console.log(err);
       });
   }
 
@@ -310,7 +310,9 @@ class PublicContent extends Component {
           <View className="formValue">
             {this.props.enterpriseInfor.type == 0
               ? "业务公出" : this.props.enterpriseInfor.type == 1
-                ? "技术公出" : this.props.enterpriseInfor.type == 2 && "行政公出"}
+                ? "技术公出" : this.props.enterpriseInfor.type == 2
+                  ? "行政公出" : this.props.enterpriseInfor.type == 3
+                    ? "技术协单" : ""}
           </View>
         </View>
         {this.props.enterpriseInfor.contractNo ? (

+ 13 - 17
src/pages/egressDetails/index.jsx

@@ -313,7 +313,7 @@ class EgressDetails extends Component {
           ) : (
             <View>
               <View className="title">
-                {dtails.aname}提交的公出申请
+                {dtails.type === 3 ? dtails.mainName : dtails.aname}提交的公出申请
                 {dtails.updateStatus == 1 && (
                   <View className="titRight">改</View>
                 )}
@@ -330,14 +330,10 @@ class EgressDetails extends Component {
               <Image
                 src={
                   dtails.status === 0
-                    ? Rejected
-                    : dtails.status === 1
-                      ? Reviewed
-                      : dtails.status === 2
-                        ? Passed
-                        : dtails.status === 3
-                          ? Revoke
-                          : ""
+                    ? Rejected : dtails.status === 1
+                      ? Reviewed : dtails.status === 2
+                        ? Passed : dtails.status === 3
+                          ? Revoke : ""
                 }
                 className="startIcon"
               />
@@ -353,7 +349,7 @@ class EgressDetails extends Component {
             <View className="item">
               <View className="title">
                 公出地点:
-                {dtails.permission === 0 &&
+                {dtails.permission === 0 && dtails.type !== 3 &&
                   (dtails.status === 0 || dtails.status === 3) ? (
                   <View
                     className="edit"
@@ -432,10 +428,10 @@ class EgressDetails extends Component {
               <View className="title">公出类型</View>
               <View className="value">
                 {dtails.type == 0
-                  ? "业务公出"
-                  : dtails.type == 1
-                    ? "技术公出"
-                    : dtails.type == 2 && "行政公出"}
+                  ? "业务公出" : dtails.type == 1
+                    ? "技术公出" : dtails.type == 2
+                      ? "行政公出" : dtails.type == 3
+                        ? "技术协单" : ""}
               </View>
             </View>
             {dtails.type == 1 ? (
@@ -454,7 +450,7 @@ class EgressDetails extends Component {
               dtails.assistAidName != null && dtails.assistAidName != "" &&
               <View className="item">
                 <View className="title" style={{ color: "red" }}>技术协单</View>
-                <View className="value">{dtails.assistAidName.replace(",", " ")}</View>
+                <View className="value">{dtails.assistAidName.replace(/,/g, " ")}</View>
               </View>
             }
             {/* 公出目标 */}
@@ -551,7 +547,7 @@ class EgressDetails extends Component {
                 </AtButton>
               </View>
             ) : null}
-            {dtails.permission === 0 && dtails.status !== 3 ? (
+            {dtails.permission === 0 && dtails.status !== 3 && dtails.type !== 3 ? (
               <View className="item">
                 <View className="title">修改/撤销</View>
                 <AtTextarea
@@ -566,7 +562,7 @@ class EgressDetails extends Component {
                 />
               </View>
             ) : null}
-            {dtails.permission === 0 && dtails.status !== 3 ? (
+            {dtails.permission === 0 && dtails.status !== 3 && dtails.type !== 3 ? (
               <View className="operation">
                 <Button
                   type="warn"

+ 0 - 1
src/pages/egressDetails/modify.jsx

@@ -56,7 +56,6 @@ class Modify extends Component {
   }
 
   onChange(value, visi) {
-    // console.log("----", value, visi);
     value.type = this.state.type;
     this.setState({
       dtails: {

+ 5 - 8
src/pages/egressDetails/publicContent.jsx

@@ -140,7 +140,7 @@ class PublicContent extends Component {
         }
       })
       .catch((err) => {
-        console.log(err);
+        //console.log(err);
       });
   }
 
@@ -192,9 +192,6 @@ class PublicContent extends Component {
     this.setState({
       loading: true,
     });
-    let a = this.state.coorderList.length === 0 ? 0 : 1
-    let b = this.state.coorderList.length === 0 ? "" : this.state.coorderList.join(",")
-    console.log(a, "=====", b)
     let datas;
     if (this.props.dtails.type == 0) {
       datas = {
@@ -390,10 +387,10 @@ class PublicContent extends Component {
           <View className="formName">公出类型:</View>
           <View className="formValue">
             {dtails.type == 0
-              ? "业务公出"
-              : dtails.type == 1
-                ? "技术公出"
-                : dtails.type == 2 && "行政公出"}
+              ? "业务公出" : dtails.type == 1
+                ? "技术公出" : dtails.type == 2
+                  ? "行政公出" : dtails.type == 3
+                    ? "技术协单" : ""}
           </View>
         </View>
         {dtails.contractNo && dtails.type == 1 ? (

+ 0 - 2
src/pages/examine/index.jsx

@@ -307,7 +307,6 @@ class Examine extends Component {
     this.setState({
       seeListState: 'LOADING',
     })
-    console.log(this.state.clockInStarts2);
     let data = {
       pageNo: pageNo,
       pageSize: 10,
@@ -359,7 +358,6 @@ class Examine extends Component {
     this.setState({
       coListState: 'LOADING',
     })
-    console.log(this.state.clockInStarts3);
     let data = {
       pageNo: pageNo,
       pageSize: 10,

+ 1 - 1
src/pages/examine/myList.jsx

@@ -53,7 +53,7 @@ class MyList extends Component {
               <View className="infor">
                 <View className="title">
                   <View className="aname">
-                    {v.aname}提交的公出申请
+                    {v.type === 3 ? v.mainName : v.aname}提交的公出申请
                     {v.updateStatus == 1 && <View className="aIcon">改</View>}
                   </View>
                   <View className="createTimes">{v.createTimes}</View>

+ 4 - 9
src/pages/login/index.jsx

@@ -68,7 +68,7 @@ class Login extends Component {
     Taro.getSetting({
       withSubscriptions: true,
       success:(res)=>{
-        console.log(res.subscriptionsSetting,'res.subscriptionsSetting')
+        //console.log(res.subscriptionsSetting,'res.subscriptionsSetting')
         if(res.subscriptionsSetting.mainSwitch){
           if(res.subscriptionsSetting['j7WH3EwQnxGxwuV2HwmJhryxySPE8vOiV5cVOpp-42I'] === "reject" || res.subscriptionsSetting['pWia-KJPFwDM8ReDu_BOa9FJn31VFc81bp3yxfBmIRI'] === "reject" || res.subscriptionsSetting['vo28uzT2sLS-9ioroNyZbMSvu0mMvf6le2pDZVN891U'] === "reject"){
             this.setState({
@@ -94,7 +94,7 @@ class Login extends Component {
               _this.setState({
                 loading:false,
               })
-              console.log(err)
+              //console.log(err)
             }
           })
         }else{
@@ -167,7 +167,7 @@ class Login extends Component {
         this.getWorkingHours(msg.data.departmentId);
       }
     }).catch((err)=>{
-      console.log(err)
+      //console.log(err)
       this.setState({
         loading:false
       })
@@ -189,7 +189,7 @@ class Login extends Component {
         Taro.showToast({title:msg.error[0].message,icon:'none'})
       }
     }).catch((err)=>{
-      console.log(err)
+      // console.log(err)
     })
   }
 
@@ -288,11 +288,6 @@ class Login extends Component {
                       password:v.password,
                       isopenUsernameList:false
                     })
-                    console.log({
-                      username:v.username,
-                      password:v.password,
-                      isopenUsernameList:false
-                    })
                   }}>
                     <AtIcon value='user' size='20' color='#c6c4c4'/>
                     <View className='value'>

+ 1 - 1
src/pages/punchClock/index.less

@@ -48,8 +48,8 @@
 
       .types {
         font-size: 28px;
-        color: red;
         margin-top: 10px;
+        font-weight: bold;
       }
     }
 

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

@@ -325,7 +325,7 @@ class PunchClocks extends Component {
         })
       }
     }).catch((err) => {
-      console.log(err)
+      // console.log(err)
       this.setState({
         loading: false
       })
@@ -427,7 +427,9 @@ class PunchClocks extends Component {
                     }
                   </View>
                 </View>
-                <View className='types'>
+                <View className='types'
+                  style={{ color: ["#1D4FEA", "#1E90FF", "#FF5500", "red"][dtails.type] }}
+                >
                   {["业务公出", "技术公出", "行政公出", "技术协单"][dtails.type]}
                 </View>
               </View>

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

@@ -7,8 +7,8 @@ const getBaseUrl = (url) => {
     // 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

+ 1 - 1
src/utils/servers/servers.js

@@ -29,7 +29,7 @@ export const login = (res) => {
       Taro.showToast({title:'系统错误,请稍后重试',icon:'none'});
       Taro.hideLoading();
       reject();
-      console.log(err,'login')
+      // console.log(err,'login')
     }
   })
 }

+ 9 - 0
src/utils/tools/index.js

@@ -133,4 +133,13 @@ export const deepClone1 = (obj) => {
   }
   return objClone;
 }
+// 是否是登录人的id
+export const isOneself = (id) => {
+  let userInfor = Taro.getStorageSync('userInfor');
+  if (userInfor.aid === id) {
+    return true
+  } else {
+    return false
+  }
+}