显示样式及提交后提示

(cherry picked from commit 0d650bdf)

src/pages/settlement/detail.styl

@@ -35,6 +35,10 @@
     margin-bottom 10px
     justify-content space-between
 
+    &__text
+      flex 1
+      font-size 16px
+
 .card
   @extend .row
   align-items center
@@ -51,9 +55,14 @@
     color second_text_color
     font-size 15px
     margin-bottom 5px
+    flex-wrap nowrap
+    flex 1
 
     &-key
-      width 60px
+      color second_text_color
+      font-size 15px
+      margin-bottom 5px
+      width 55px
 
   &-select
     @extend .middle

src/pages/settlement/detail.tsx

@@ -2,7 +2,7 @@
  * @FilePath: /BoneHouse_Business_APP/src/pages/settlement/detail.tsx
  * @Author: peii
  * @Date: 2021-12-20 15:27:45
- * @LastEditTime: 2021-12-23 12:15:45
+ * @LastEditTime: 2021-12-24 17:27:08
  * @LastEditors: peii
  * @Vision: 1.0
  * @Description: 结算详情
@@ -124,7 +124,10 @@ class Detail extends React.Component<IProps, IState> {
     this.setState({ submitting: false })
     if (res.error_code !== 0) return
 
-    this.props.navigation.pop(2)
+    show('确认成功!')
+    setTimeout(() => {
+      this.props.navigation.pop(2)
+    }, 1000)
   }
 
   refreshHandler() {
@@ -181,19 +184,19 @@ class Detail extends React.Component<IProps, IState> {
           onPress={() => this.itemPressHandler(item)}
         >
           <View style={g(styles, 'card-line')}>
-            <Text style={g(styles, 'card-text', 'card-text-key')}>销售单: </Text>
+            <Text style={g(styles, 'card-text-key')}>销售单: </Text>
             <Text style={g(styles, 'card-text')}>{item.order_number}</Text>
           </View>
           <View style={g(styles, 'card-line')}>
-            <Text style={g(styles, 'card-text', 'card-text-key')}>出库单: </Text>
+            <Text style={g(styles, 'card-text-key')}>出库单: </Text>
             <Text style={g(styles, 'card-text')}>{item.source_header_number}</Text>
           </View>
           <View style={g(styles, 'card-line')}>
-            <Text style={g(styles, 'card-text', 'card-text-key')}>数量: </Text>
+            <Text style={g(styles, 'card-text-key')}>数量: </Text>
             <Text style={g(styles, 'card-text')}>{item.sum_quantity}</Text>
           </View>
           <View style={g(styles, 'card-line')}>
-            <Text style={g(styles, 'card-text', 'card-text-key')}>金额: </Text>
+            <Text style={g(styles, 'card-text-key')}>金额: </Text>
             <Text style={g(styles, 'card-text')}>{item.sum_settlement_amount}</Text>
           </View>
         </TouchableOpacity>

src/pages/settlement/reject.tsx

@@ -2,7 +2,7 @@
  * @FilePath: /BoneHouse_Business_APP/src/pages/settlement/reject.tsx
  * @Author: peii
  * @Date: 2021-12-18 17:12:57
- * @LastEditTime: 2021-12-24 10:09:52
+ * @LastEditTime: 2021-12-24 17:28:59
  * @LastEditors: peii
  * @Vision: 1.0
  * @Description: 结算驳回
@@ -18,7 +18,7 @@ import { FieldType } from '../../enums'
 import Header from '../../components/header/header'
 import Form from '../../components/form/index'
 import Resolution from '../../components/common/Resolution'
-import { g, getFormItem } from '../../utils/utils'
+import { g, getFormItem, show } from '../../utils/utils'
 import { SettlementProcessCode } from '../../enums'
 import api from '../../services/api'
 import styles from './reject.styl'
@@ -80,13 +80,15 @@ class Reject extends React.Component<IProps, IState> {
     const params = {
       process_code: SettlementProcessCode.USER_REJECT,
       sale_settlement_number: order.settlement_number,
-      reject_reason: data.reject_reason
+      reject_reason: data.reject_reason,
     }
     const res = await api.postSettlementProcess(params)
     if (res.error_code !== 0) return
 
-    this.props.navigation.pop(3)
-
+    show('驳回理由提交成功!')
+    setTimeout(() => {
+      this.props.navigation.pop(3)
+    }, 1000)
   }
 
   render() {

src/pages/settlement/saleDetail.tsx

@@ -2,7 +2,7 @@
  * @FilePath: /BoneHouse_Business_APP/src/pages/settlement/saleDetail.tsx
  * @Author: peii
  * @Date: 2021-12-20 15:27:45
- * @LastEditTime: 2021-12-24 11:18:49
+ * @LastEditTime: 2021-12-24 17:19:24
  * @LastEditors: peii
  * @Vision: 1.0
  * @Description: 结算销售物料详情
@@ -99,8 +99,8 @@ class SaleDetail extends React.Component<IProps, IState> {
               <Text style={g(styles, 'card-text')}>{item.specification}</Text>
             </View>
             <View style={g(styles, 'card-line')}>
-              <Text style={g(styles, 'card-text-key')}>序列号: </Text>
-              <Text style={g(styles, 'card-text')}>{item.serial_number}</Text>
+              <Text style={g(styles, 'card-text-key')}>存储条件: </Text>
+              <Text style={g(styles, 'card-text')}>{item.storage_condition_name}</Text>
             </View>
 
             <View style={g(styles, 'card-line')}>
@@ -125,8 +125,8 @@ class SaleDetail extends React.Component<IProps, IState> {
           </View>
 
           <View style={g(styles, 'card-line-half', 'ml20')}>
-            <Text style={g(styles, 'card-text-key')}>存储条件: </Text>
-            <Text style={g(styles, 'card-text')}>{item.storage_condition_name}</Text>
+            <Text style={g(styles, 'card-text-key')}>序号: </Text>
+            <Text style={g(styles, 'card-text')}>{item.production_serial_number}</Text>
           </View>
         </View>