dev01 1 year ago
parent
commit
3d94ee7093

+ 3 - 3
src/pages/debitnote/index.jsx

@@ -61,9 +61,9 @@ class DebitNote extends Component {
               list?.map((v, k) => (
                 <View className="dlitem" key={k}>
                   <View className="txt">
-                    <View className="num">{commonAdd(v.totalAmount, -v.settlementAmount)}元</View>
+                    <View className="num">{commonAdd(v.realAmount, -v.settlementAmount)}元</View>
                     <View className="info">
-                      总金额:{v.totalAmount}元,
+                      总金额:{v.realAmount}元,
                       已使用:{v.settlementAmount}元
                     </View>
                   </View>
@@ -77,7 +77,7 @@ class DebitNote extends Component {
                       let prevPage = pages[pages.length - 2];
                       prevPage.setData({
                         debitId: v.id,
-                        totalAmount: commonAdd(v.totalAmount, -v.settlementAmount),
+                        totalAmount: commonAdd(v.realAmount, -v.settlementAmount),
                       });
                       Taro.navigateBack({
                         delta: 1

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

@@ -1010,7 +1010,7 @@ class Drafts extends Component {
         {
           data.type != 4 && data.type != 5 &&
           <View className="formItem" style={{ paddingTop: "10px" }}>
-            <View className="formName">实报金额:</View>
+            <View className="formName">本次报销金额:</View>
             <View className="formValue"><Text style={{ color: "red" }}>{this.state.reality}</Text>(元)</View>
           </View>
         }

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

@@ -219,7 +219,7 @@ class Examine extends Component {
                       >
                         {/* {item.status == 1 && <View className='lbt' onClick={e => { e.stopPropagation(); this.setState({ visible: true, id: item.id }) }}>查看审核详情</View>} */}
                         <View className='line' style={{ color: "#6190E8" }}>报销编号:{item.checkNo}</View>
-                        <View className='line' style={{ color: "#6190E8" }}>总金额:{item.amount}元</View>
+                        <View className='line' style={{ color: "#6190E8" }}>总金额:{item.realAmount}元</View>
                         <View className='line'>报销人:{item.aname}</View>
                         <View className='line'>报销部门:{item.applyDepName}</View>
                         <View className='line'>报销时间:{item.createTimeStr}</View>

+ 5 - 2
src/pages/recordlist/index.jsx

@@ -187,7 +187,7 @@ class Examine extends Component {
       }
     }
     for (var k = 0; k < xlist.length; k++) {
-      amount = commonAdd(amount, xlist[k].totalAmount)
+      amount = commonAdd(amount, xlist[k].realAmount)
     }
     return amount
   }
@@ -205,6 +205,9 @@ class Examine extends Component {
           loading: false,
         })
         if (v.error.length === 0) {
+          this.setState({
+            sublist: []
+          })
           Taro.navigateTo({
             url: '/pages/mergedetail/index?id=' + v.data,
           });
@@ -371,7 +374,7 @@ class Examine extends Component {
                 </View>
                 <View className='right'>
                   {/* {item.status == 1 && <View className='lbt' onClick={e => { e.stopPropagation(); this.setState({ visible: true, id: item.id }) }}>查看审核详情</View>} */}
-                  <View className='line' style={{ color: "#6190E8" }}>报销金额:{item.totalAmount}</View>
+                  <View className='line' style={{ color: "#6190E8" }}>报销金额:{item.realAmount}(元)</View>
                   {!!item.checkNo && <View className='line' style={{ color: "#6190E8" }}>报销编号:{item.checkNo}</View>}
                   {!!item.checkNo && <View className='lbt' onClick={e => { e.stopPropagation(); copyText(item.checkNo) }}>复制编号</View>}
                   <View className='line'>

+ 2 - 2
src/utils/config.js

@@ -1,7 +1,7 @@
 // 本地
 // export const resourceAddress = 'http://172.16.0.255:3000/upload';
 // 生产
-// export const resourceAddress = 'https://s.jishutao.com/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

@@ -8,8 +8,8 @@ const getBaseUrl = (url) => {
   } else {
     // 生产环境
     // BASE_URL = 'http://172.16.0.255:8080'
-    BASE_URL = 'https://uat.jishutao.com'
-    // BASE_URL = 'https://bm.jishutao.com'
+    // BASE_URL = 'https://uat.jishutao.com'
+    BASE_URL = 'https://bm.jishutao.com'
   }
   return BASE_URL
 }