Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/contract/manage/editing/components/fromtable.tsx

@@ -50,7 +50,7 @@ const FormList = (props: any) => {
       render: (_, item, index) => <DatePicker
         style={{ width: '100%' }}
         format="YYYY-MM-DD"
-        value={item.expectPayTime}
+        defaultValue={item.expectPayTime}
         onChange={(e) => onSelectChange(e, 'expectPayTime', index)}
       />
     },

src/pages/transaction/components/orderDeleveRecord/index.tsx

@@ -31,9 +31,9 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
   const outOrderCols: any[] = [
     {
       title: '商品ID',
-      dataIndex: 'productId',
+      dataIndex: 'skuId',
       align: 'center',
-      key: 'productId'
+      key: 'skuId'
     },
     {
       title: '商品名称',
@@ -114,9 +114,9 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
   const sideChildrenCols: any[] = [
     {
       title: '商品ID',
-      dataIndex: 'productId',
+      dataIndex: 'skuId',
       align: 'center',
-      key: 'productId',
+      key: 'skuId',
     },
     {
       title: '商品名称',
@@ -278,7 +278,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
                 columns={outOrderCols}
                 dataSource={deliveries}
                 pagination={false}
-                rowKey="productId"
+                rowKey="skuId"
               />
             </Tabs.TabPane>
           }

src/pages/transaction/components/orderHandDeleved/index.tsx

@@ -95,7 +95,7 @@ const schema: ISchema = {
           type: 'array',
           "x-component": 'MultTable',
           "x-component-props": {
-            rowKey: 'productId',
+            rowKey: 'skuId',
             columns: "{{productColumns}}",
             components: "{{productComponents}}",
             // expandable: "{{productChildren}}",

src/pages/transaction/components/orderHandDeleved/model/useProductTable.tsx

@@ -6,9 +6,9 @@ import ProductTableCell, { ProductEditableRow } from '../components/productTable
 const productColumns: any = [
   {
     title: '商品ID',
-    dataIndex: 'productId',
+    dataIndex: 'skuId',
     align: 'center',
-    key: 'productId'
+    key: 'skuId'
   },
   {
     title: '商品名称',
@@ -109,7 +109,7 @@ export const useProductTable = (ctx: ISchemaFormActions | ISchemaFormAsyncAction
   const handleSave = row => {
     return new Promise((resolve, reject) => {
       const newData = [...ctx.getFieldValue('products')];
-      const index = newData.findIndex(item => row.productId === item.productId);
+      const index = newData.findIndex(item => row.skuId === item.skuId);
       const item = newData[index];
       newData.splice(index, 1, {
         ...item,

src/pages/transaction/components/orderProductTable/index.tsx

@@ -218,9 +218,9 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
   const productInfoColumns: any[] = [
     {
       title: 'ID',
-      dataIndex: 'productId',
+      dataIndex: 'skuId',
       align: 'center',
-      key: 'productId',
+      key: 'skuId',
     },
     {
       title: '商品名称',
@@ -417,7 +417,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
         columns={ contractOrder ? materialInfo : productInfoColumns }
         dataSource={product.products}
         components={productComponents}
-        rowKey='id'
+        rowKey='skuId'
         pagination={false}
       />
       <MoneyTotalBox dataSource={data} preview={preview}/>

src/pages/transaction/components/orderSaleRecord/index.tsx

@@ -35,9 +35,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
   const outOrderCols: any[] = [
     {
       title: '商品ID',
-      dataIndex: 'productId',
+      dataIndex: 'skuId',
       align: 'center',
-      key: 'productId'
+      key: 'skuId'
     },
     {
       title: '商品名称',
@@ -118,9 +118,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
   const sideChildrenCols: any[] = [
     {
       title: '商品ID',
-      dataIndex: 'productId',
+      dataIndex: 'skuId',
       align: 'center',
-      key: 'productId',
+      key: 'skuId',
     },
     {
       title: '商品名称',
@@ -343,7 +343,7 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
                 columns={outOrderCols}
                 dataSource={deliveries}
                 pagination={false}
-                rowKey="productId"
+                rowKey="skuId"
               />
             </Tabs.TabPane>
           }

src/pages/transaction/components/saleOrderProductTable/index.tsx

@@ -379,9 +379,9 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
   const productInfoColumns: any[] = [
     {
       title: 'ID',
-      dataIndex: 'productId',
+      dataIndex: 'skuId',
       align: 'center',
-      key: 'productId',
+      key: 'skuId',
     },
     {
       title: '商品名称',
@@ -588,7 +588,7 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
         columns={ contractOrder ? materialInfo : columns}
         dataSource={product.products}
         components={productComponents}
-        rowKey='id'
+        rowKey='skuId'
         pagination={false}
       />
       <MoneyTotalBox dataSource={data} isEditData={isEditData}/>