dev01 1 year ago
parent
commit
7880a4f851

+ 4 - 4
src/app.jsx

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

+ 12 - 8
src/pages/drafts/index.jsx

@@ -725,7 +725,7 @@ class Drafts extends Component {
                   <View className="formName">地点:</View>
                   <View className="formValue">
                     <View className="ftxt">{item.startDistrict}</View>
-                    <Text style={{ fontSize: "30px", padding: "0 2px" }}>⇀</Text>
+                    <Text style={{ fontSize: "30px", padding: "0 5px" }}>⇀</Text>
                     <View className="ftxt">{item.endDistrict}</View>
                   </View>
                 </View>
@@ -735,14 +735,17 @@ class Drafts extends Component {
                 </View>
               </View>
               : <View className="inputFormItems" key={item.id}>
-                <AtInput
+                {/* <AtInput
                   name={item.id}
                   title={getTypeName(item.type) + ":"}
                   type='number'
                   placeholder='请输入金额(元)'
                   value={item.amount}
-                />
-                (元)
+                /> */}
+                <View className="formItem">
+                  <View className="formName">{getTypeName(item.type) + ":"}</View>
+                  <View className="formValue">{item.amount}(元)</View>
+                </View>
                 <View className="close"
                   onClick={() => {
                     this.setState({
@@ -773,10 +776,11 @@ class Drafts extends Component {
                 }}
               >删除</View>
               {/* <View className="edit">编辑</View> */}
-              <View className="formItem">
-                <View className="formName">{data.type == 5 ? "支付时间:" : "需付款时间:"}</View>
-                <View className="formValue">{item.agreeTimeStr.slice(0, 10)}</View>
-              </View>
+              {!!item.agreeTimeStr &&
+                <View className="formItem">
+                  <View className="formName">{data.type == 5 ? "支付时间:" : "需付款时间:"}</View>
+                  <View className="formValue">{item.agreeTimeStr.slice(0, 10)}</View>
+                </View>}
               <View className="formItem">
                 <View className="formName">
                   {data.type == 4

+ 20 - 13
src/pages/drafts/index.less

@@ -22,18 +22,6 @@
 
     }
 
-    .formValues {
-      display: flex;
-      flex: 1;
-      margin-left: 20px;
-
-      .at-textarea__textarea {
-        font-size: 30px;
-      }
-
-    }
-
-
     .formValue {
       text-align: right;
       flex: 1;
@@ -82,6 +70,25 @@
       display: flex;
       flex: 1;
       flex-flow: row nowrap;
+
+      .at-textarea {
+        margin-left: 20px;
+      }
+
+      .at-textarea__textarea {
+        font-size: 30px;
+      }
+
+    }
+
+    .formValueremarks {
+      display: flex;
+      flex: 1;
+      // flex-wrap: wrap;
+      margin-left: 20px;
+      justify-content: flex-end;
+      word-break: break-all;
+
     }
   }
 
@@ -176,7 +183,7 @@
 
       .formName {
         min-width: 150px;
-        margin-right: 16px;
+        // margin-right: 16px;
         white-space: nowrap;
         display: flex;
 

+ 1 - 1
src/pages/drafts/modal.jsx

@@ -254,7 +254,7 @@ class Modal extends Component {
                     }}
 
                   />
-                  <Text style={{ fontSize: "30px", padding:"0 2px" }}>⇀</Text>
+                  <Text style={{ fontSize: "30px", padding:"0 5px" }}>⇀</Text>
                   <AtInput name="endDistrict" className="pin" type='text' placeholder='目的地' value={data.endDistrict}
                     onChange={e => {
                       this.setState({

+ 4 - 4
src/pages/draftsdetail/index.jsx

@@ -241,7 +241,7 @@ class Drafts extends Component {
         </View>
         <View className="formItem">
           <View className="formName">{(data.type == 4 || data.type == 5) ? "说明:" : "报销事由:"}</View>
-          <View className="formValue">{data.remarks}</View>
+          <View className="formValueremarks">{data.remarks}</View>
         </View>
         <View className="formTitle">
           {data.type != 4 && data.type != 5 && "报销"}费用详细
@@ -259,7 +259,7 @@ class Drafts extends Component {
                   <View className="formName">时间:</View>
                   <View className="formValue">
                     <View className="ftxt">{item.startTimeStr}</View>
-                    &nbsp;&nbsp;至&nbsp;&nbsp;
+                    <View style={{ width: "34px", textAlign: "center" }}>至</View>
                     <View className="ftxt">{item.endTimeStr}</View>
                   </View>
                 </View>
@@ -267,12 +267,12 @@ class Drafts extends Component {
                   <View className="formName">地点:</View>
                   <View className="formValue">
                     <View className="ftxt">{item.startDistrict}</View>
-                    <Text style={{ fontSize: "30px", padding: "0 2px" }}>⇀</Text>
+                    <View style={{ width: "34px", textAlign: "center" }}>⇀</View>
                     <View className="ftxt">{item.endDistrict}</View>
                   </View>
                 </View>
                 <View className="formItem">
-                  <View className="formName">金额(元):</View>
+                  <View className="formName">金额:</View>
                   <View className="formValue">{item.amount}(元)</View>
                 </View>
               </View>

+ 3 - 3
src/utils/tools/index.js

@@ -137,7 +137,7 @@ export const getNameList = (aidList, arr) => {
 }
 
 // 获取报销申请类型
-export const getAccountName = (type, other) => {
+export const getAccountName = (type, other = "其他") => {
   let theType = "";
   accountList.map(function (item) {
     if (item.value == type) {
@@ -151,7 +151,7 @@ export const getAccountName = (type, other) => {
 }
 
 // 获取报销费用类型
-export const getTypeName = (type, other) => {
+export const getTypeName = (type, other = "其他") => {
   let theType = "";
   typeList.map(function (item) {
     if (item.value == type) {
@@ -165,7 +165,7 @@ export const getTypeName = (type, other) => {
 }
 
 // 获取交通工具类型
-export const getVehicleName = (type, other) => {
+export const getVehicleName = (type, other = "其他") => {
   let theType = "";
   vehiclelist.map(function (item) {
     if (item.value == type) {