dev01 1 year ago
parent
commit
5eb3a248d8

+ 2 - 2
src/app.jsx

@@ -87,9 +87,9 @@ class App extends Component {
       // 测试
       // url: 'wss://bm.jishutao.com/webSocketServer',
       // 本地
-      url: 'wss://172.16.0.255:8080/webSocketServer'
+      // url: 'wss://172.16.0.255:8080/webSocketServer'
       // 生产
-      // url: 'wss://uat.jishutao.com/webSocketServer'
+      url: 'wss://uat.jishutao.com/webSocketServer'
     })
 
     //连接成功

+ 3 - 3
src/components/common/auditModal/index.jsx

@@ -81,7 +81,7 @@ class AuditDetails extends Component {
                       style={{ color: processStatus == v.processStatus && !v.id && "black", }}
                     >
                       {v.auditorName}
-                          
+                         
                       {processStatus == v.processStatus && !v.id && <Text style={{ color: "#FFA500" }}>审核中...</Text>}
                     </View>
                   </View>
@@ -97,8 +97,8 @@ class AuditDetails extends Component {
                       {v.remarks &&
                         <View className='contentItem'>
                           <AtIcon className='atIcon' value='settings' size='15' color='#999999' />
-                          操作:<Text style={{ color: ["#1D4FEA", "#1D4FEA", "#34DE38", "red", "#1D4FEA"][v.status] }}
-                          >{["【发起】", "【发起】", "【通过】", "【驳回】", "【重新发起】"][v.status]}</Text>
+                          操作:<Text style={{ color: ["#1D4FEA", "#34DE38", "#108EE9", "red", "#1D4FEA"][v.status] }}
+                          >{["【发起】", "【通过】", "【完成】", "【驳回】", "【重新发起】"][v.status]}</Text>
                         </View>}
                       {v.remarks &&
                         <View className='contentItem'>

+ 1 - 0
src/components/common/auditModal/index.less

@@ -23,6 +23,7 @@
       }
       .clockTime{
         font-size: 26px;
+        max-width: 90%;
 
       }
     }

+ 7 - 1
src/pages/drafts/index.jsx

@@ -377,6 +377,12 @@ class Drafts extends Component {
         return;
       }
     }
+    if (data.type != 3 && data.type != 5) {
+      if (!bankData.id) {
+        Taro.showToast({ title: "请选择收款账户", icon: "none" });
+        return;
+      }
+    }
 
     this.setState({
       loading: true,
@@ -719,7 +725,7 @@ class Drafts extends Component {
                   <View className="formName">地点:</View>
                   <View className="formValue">
                     <View className="ftxt">{item.startDistrict}</View>
-                    &nbsp;&nbsp;至&nbsp;&nbsp;
+                    <Text style={{ fontSize: "30px", padding: "0 2px" }}>⇀</Text>
                     <View className="ftxt">{item.endDistrict}</View>
                   </View>
                 </View>

+ 15 - 1
src/pages/drafts/index.less

@@ -101,12 +101,26 @@
 
   }
 
-  .operation{
+  .operation {
     display: flex;
     flex-flow: row nowrap;
     margin: 30px 0;
   }
 
+  .select {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 30px;
+    color: #fff;
+    background: #6190E8;
+    margin: 40px auto;
+    padding: 20px;
+    border-radius: 20px;
+
+  }
+
   .unobstructedList {
     .noAccout {
       border: 1px solid #eae8e8;

+ 30 - 3
src/pages/draftsdetail/index.jsx

@@ -3,6 +3,7 @@ import Taro, { getCurrentInstance } from "@tarojs/taro";
 import { Text, View, Picker } from "@tarojs/components";
 import ImagePicker from "../../components/common/imagePicker";
 import InquiryModal from "../../components/common/inquiryModal";
+import AuditModal from "../../components/common/auditModal";
 import {
   getPridDetail,
   getAccountList,
@@ -15,13 +16,13 @@ import {
   getVehicleName,
   commonAdd,
 } from "../../utils/tools";
-import { AtTextarea, AtButton } from "taro-ui";
+import { AtTextarea, AtButton, AtIcon } from "taro-ui";
 import { resourceAddress } from "../../utils/config";
+
 import "taro-ui/dist/style/components/form.scss";
 import "taro-ui/dist/style/components/button.scss";
 import "taro-ui/dist/style/components/loading.scss";
 import "taro-ui/dist/style/components/icon.scss";
-import "taro-ui/dist/style/components/icon.scss";
 import "taro-ui/dist/style/components/textarea.scss";
 import "taro-ui/dist/style/components/input.scss";
 
@@ -38,6 +39,7 @@ class Drafts extends Component {
       total: 0,
       bankData: {},
       reason: "",
+      visible: false,
     };
   }
 
@@ -265,7 +267,7 @@ class Drafts extends Component {
                   <View className="formName">地点:</View>
                   <View className="formValue">
                     <View className="ftxt">{item.startDistrict}</View>
-                    &nbsp;&nbsp;至&nbsp;&nbsp;
+                    <Text style={{ fontSize: "30px", padding: "0 2px" }}>⇀</Text>
                     <View className="ftxt">{item.endDistrict}</View>
                   </View>
                 </View>
@@ -397,6 +399,20 @@ class Drafts extends Component {
             </View>}
           </View>}
 
+        <View
+          className="select"
+          onClick={(e) => {
+            e.stopPropagation();
+            this.setState({
+              visible: true,
+              id: data.id
+            });
+          }}
+        >
+          查看审核详情
+          <AtIcon value="chevron-right" size="20" color="#fff" />
+        </View>
+
         {
           data.examine == 1 &&
           <View>
@@ -484,6 +500,17 @@ class Drafts extends Component {
             });
           }}
         />
+        {/* 审核详情 */}
+        {this.state.visible &&
+          <AuditModal
+            id={this.state.id}
+            isOpened={this.state.visible}
+            onClose={() => {
+              this.setState({
+                visible: false
+              })
+            }}
+          />}
 
       </View>
     );

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

@@ -10,6 +10,7 @@ import ListBottomStart from "../../components/common/listBottomStart";
 import AuditModal from "../../components/common/auditModal";
 
 import './index.less';
+
 import 'taro-ui/dist/style/components/tabs.scss';
 import "taro-ui/dist/style/components/flex.scss";
 import "taro-ui/dist/style/components/action-sheet.scss";
@@ -301,6 +302,7 @@ class Examine extends Component {
             this.onSetPickerTime(v)
           }}>
         </timePicker>
+        {/* 审核详情 */}
         {this.state.visible &&
           <AuditModal
             id={this.state.id}

+ 2 - 2
src/utils/config.js

@@ -1,7 +1,7 @@
 // 本地
-export const resourceAddress = 'http://172.16.0.255:3000/upload';
+// export const resourceAddress = 'http://172.16.0.255:3000/upload';
 // 生产
 // export const resourceAddress = 'https://s.jishutao.com/upload';
 // 测试
-// export const resourceAddress = 'https://static.jishutao.com/upload';
+export const resourceAddress = 'https://static.jishutao.com/upload';
 

+ 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