Merge branch 'dev' into test

ec632265 · XieZhiXiong · ca380a87 · 526ae9a5 · ec632265 · ec632265
Commit ec632265 authored Jan 18, 2021 by XieZhiXiong
14 changed files
--- a/src/pages/afterService/components/ExchangeAddressInfo/index.tsx
+++ b/src/pages/afterService/components/ExchangeAddressInfo/index.tsx
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2020-11-06 09:54:04
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-13 17:49:15
+ * @LastEditTime: 2021-01-18 15:30:22
 * @Description: 换货收货地址
 */
 import React from 'react';
@@ -196,6 +196,7 @@ const ExchangeAddressInfo: React.FC<ExchangeAddressInfo> = ({
        actions={modalFormActions}
        schema={schema}
        onSubmit={handleSubmit}
+        colon
      />
    </MellowCard>
  );

--- a/src/pages/afterService/components/ExchangeAddressInfo/schema/index.ts
+++ b/src/pages/afterService/components/ExchangeAddressInfo/schema/index.ts
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2020-11-09 15:56:35
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-12-25 10:30:08
+ * @LastEditTime: 2021-01-18 15:34:24
 * @Description: 
 */
 import { ISchema } from '@formily/antd';
@@ -15,7 +15,7 @@ export const schema: ISchema = {
      type: 'object',
      'x-component': 'mega-layout',
      'x-component-props': {
-        labelCol: 8, 
+        labelCol: 6, 
        wrapperCol: 16, 
        labelAlign: 'left', 
      },

--- a/src/pages/afterService/components/ReturnAddressInfo/schema/index.ts
+++ b/src/pages/afterService/components/ReturnAddressInfo/schema/index.ts
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2020-11-09 15:56:35
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-01-07 13:50:54
+ * @LastEditTime: 2021-01-18 15:33:52
 * @Description: 
 */
 import { ISchema } from '@formily/antd';
@@ -15,7 +15,8 @@ export const schema: ISchema = {
      type: 'object',
      'x-component': 'mega-layout',
      'x-component-props': {
-        wrapperCol: 18, 
+        labelCol: 6, 
+        wrapperCol: 16, 
        labelAlign: 'left', 
      },
      properties: {

--- a/src/pages/afterService/exchangeApplication/exchangePrAddDeliver/schema/index.ts
+++ b/src/pages/afterService/exchangeApplication/exchangePrAddDeliver/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeApplication/exchangePrAddWarehousing/schema/index.ts
+++ b/src/pages/afterService/exchangeApplication/exchangePrAddWarehousing/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeApplication/exchangePrConfirmBack/schema/index.ts
+++ b/src/pages/afterService/exchangeApplication/exchangePrConfirmBack/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeApplication/exchangePrDeliver/schema/index.ts
+++ b/src/pages/afterService/exchangeApplication/exchangePrDeliver/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeApplication/exchangePrReceived/schema/index.ts
+++ b/src/pages/afterService/exchangeApplication/exchangePrReceived/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeManage/exchangePrAddDeliver/schema/index.ts
+++ b/src/pages/afterService/exchangeManage/exchangePrAddDeliver/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeManage/exchangePrAddWarehousing/schema/index.ts
+++ b/src/pages/afterService/exchangeManage/exchangePrAddWarehousing/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeManage/exchangePrConfirmBack/schema/index.ts
+++ b/src/pages/afterService/exchangeManage/exchangePrConfirmBack/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeManage/exchangePrDeliver/schema/index.ts
+++ b/src/pages/afterService/exchangeManage/exchangePrDeliver/schema/index.ts
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/afterService/exchangeManage/exchangePrReceived/schema/index.ts
+++ b/src/pages/afterService/exchangeManage/exchangePrReceived/schema/index.ts
@@ -2,7 +2,7 @@
 * @Author: XieZhiXiong
 * @Date: 2020-09-29 10:03:06
 * @LastEditors: XieZhiXiong
- * @LastEditTime: 2020-11-18 17:51:42
+ * @LastEditTime: 2021-01-18 15:43:23
 * @Description: 
 */
 import { ISchema } from '@formily/antd';
@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
            columns: 6,
          },
          properties: {
-            abstract: {
+            applyAbstract: {
              type: 'string',
              'x-component-props': {
                placeholder: '申请单摘要', 

--- a/src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
+++ b/src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
@@ -201,7 +201,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
        productCount: transforDirection(rest.invoicesTypeId) ? item.storageCount : item.shipmentQuantity,
        // 生成通知单字段不同，做兼容
        product: item.produceNoticeOrderDetailId || item.relationInvoicesId, 
-        amount: `￥${(transforDirection(rest.invoicesTypeId) ? item.storageCount : item.shipmentQuantity * item.price).toFixed(2)}`,
+        amount: `￥${((transforDirection(rest.invoicesTypeId) ? item.storageCount : item.shipmentQuantity) * item.price).toFixed(2)}`,
        extraData: {
          productName: item.productName, 
          deliveryType,