dev01 2 år sedan
förälder
incheckning
e54fec7026

+ 36 - 30
src/pages/applyDepart/publicContent.jsx

@@ -503,37 +503,43 @@ class PublicContent extends Component {
         <View className="tips">
           以地图为中心100米范围为可打卡区域,移动红标只需要拖动地图即可
         </View>
-        <View className="formItems" style={{ paddingBottom: 0, marginTop: 10 }}>
-          <View className="formNames">技术协单: </View>
-          <View className="formValues">
-            {
-              cList.length == 0
-                ? <Text>无</Text>
-                : cList.map((item, index) =>
-                  <View className="fitems" key={index}>
-                    {item.name}
-                    <View className="fclose"
-                      onClick={() => {
-                        coorderList.includes(item.id) &&
-                          (
-                            cList.splice(coorderList.indexOf(item.id), 1),
-                            coorderList.splice(coorderList.indexOf(item.id), 1)
-                          )
-                        this.setState({
-                          cList,
-                          coorderList,
-                        })
-                      }}
-                    ><AtIcon value="close-circle" size="15" color="#bbbbbb" /></View>
-                  </View>
-                )
-            }
-            {cList.length < 5 && <Button className="addbuttom" type='primary' onClick={this.popupClick.bind(this)}>新增技术协单</Button>}
+        {
+          this.props.enterpriseInfor.type === 0 &&
+          <View className="formItems" style={{ paddingBottom: 0, marginTop: 10 }}>
+            <View className="formNames">技术协单: </View>
+            <View className="formValues">
+              {
+                cList.length == 0
+                  ? <Text>无</Text>
+                  : cList.map((item, index) =>
+                    <View className="fitems" key={index}>
+                      {item.name}
+                      <View className="fclose"
+                        onClick={() => {
+                          coorderList.includes(item.id) &&
+                            (
+                              cList.splice(coorderList.indexOf(item.id), 1),
+                              coorderList.splice(coorderList.indexOf(item.id), 1)
+                            )
+                          this.setState({
+                            cList,
+                            coorderList,
+                          })
+                        }}
+                      ><AtIcon value="close-circle" size="15" color="#bbbbbb" /></View>
+                    </View>
+                  )
+              }
+              {cList.length < 5 && <Button className="addbuttom" type='primary' onClick={this.popupClick.bind(this)}>新增技术协单</Button>}
+            </View>
           </View>
-        </View>
-        <View className="tips">
-          技术协单,将统计相关的公出成本等
-        </View>
+        }
+        {
+          this.props.enterpriseInfor.type === 0 &&
+          <View className="tips">
+            技术协单,将统计相关的公出成本等
+          </View>
+        }
         <View
           className="formItem"
           style={{ display: "block", paddingTop: "15px" }}

+ 36 - 30
src/pages/egressDetails/publicContent.jsx

@@ -501,37 +501,43 @@ class PublicContent extends Component {
           <View className="formName">总时长:</View>
           <View className="formValue">{this.state.totalDuration}小时</View>
         </View>
-        <View className="formItem" style={{ alignItems: "flex-start" }}>
-          <View className="formName">技术协单:</View>
-          <View className="formValues">
-            {
-              cList.length === 0
-                ? <Text>无</Text>
-                : cList.map((item, index) =>
-                  <View className="fitems" key={index}>
-                    {item.name}
-                    <View className="fclose"
-                      onClick={() => {
-                        coorderList.includes(item.id) &&
-                          (
-                            cList.splice(coorderList.indexOf(item.id), 1),
-                            coorderList.splice(coorderList.indexOf(item.id), 1)
-                          )
-                        this.setState({
-                          cList,
-                          coorderList,
-                        })
-                      }}
-                    ><AtIcon value="close-circle" size="15" color="#bbbbbb" /></View>
-                  </View>
-                )
-            }
-            {cList.length < 5 && <Button className="addbuttom" type='primary' onClick={this.popupClick.bind(this)}>新增技术协单</Button>}
+        {
+          dtails.type === 0 &&
+          <View className="formItem" style={{ alignItems: "flex-start" }}>
+            <View className="formName">技术协单:</View>
+            <View className="formValues">
+              {
+                cList.length === 0
+                  ? <Text>无</Text>
+                  : cList.map((item, index) =>
+                    <View className="fitems" key={index}>
+                      {item.name}
+                      <View className="fclose"
+                        onClick={() => {
+                          coorderList.includes(item.id) &&
+                            (
+                              cList.splice(coorderList.indexOf(item.id), 1),
+                              coorderList.splice(coorderList.indexOf(item.id), 1)
+                            )
+                          this.setState({
+                            cList,
+                            coorderList,
+                          })
+                        }}
+                      ><AtIcon value="close-circle" size="15" color="#bbbbbb" /></View>
+                    </View>
+                  )
+              }
+              {cList.length < 5 && <Button className="addbuttom" type='primary' onClick={this.popupClick.bind(this)}>新增技术协单</Button>}
+            </View>
           </View>
-        </View>
-        <View className="tips">
-          技术协单,将统计相关的公出成本等
-        </View>
+        }
+        {
+          dtails.type === 0 &&
+          <View className="tips">
+            技术协单,将统计相关的公出成本等
+          </View>
+        }
         {this.state.validDates.length !== 0 ? (
           <View
             className="formItem"

+ 3 - 1
src/pages/mybusiness/index.config.js

@@ -1,6 +1,8 @@
 export default {
   navigationBarTitleText: '我的',
+  enablePullDownRefresh: true,
+  onReachBottomDistance: 50,
   usingComponents: {
-    timePicker: '../../components/common/timePicker/timePicker'
+    timePicker: '../../components/common/PickerReduce/timePicker'
   }
 }

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

@@ -39,9 +39,10 @@
         font-size: 25px;
         color: #8e8d8d;
         display: flex;
-        align-items: center;
+        align-items: flex-start;
 
         .nickname {
+          width: 270px;
           color: #4564DC;
         }
       }
@@ -57,6 +58,7 @@
       margin-left: auto;
       font-size: 25px;
       align-self: flex-start;
+
     }
 
     .switchContent {

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

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