Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/components/Table/src/Table.vue

@@ -352,7 +352,7 @@ export default defineComponent({
         }
       }
       //默认排序
-      updateSort(columns)
+      // updateSort(columns)
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
         (columnsChildren || columns).map((v) => {
           const zhName = v.label || '';//中文名称

src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts

@@ -233,19 +233,19 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       value: 0
     }
   },
-  {
-    label: '已结数量',
-    field: 'finishdQuantity',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-    isTableForm:false,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    }
-  },
+  // {
+  //   label: '已结数量',
+  //   field: 'finishdQuantity',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150,
+  //   },
+  //   isTableForm:false,
+  //   form: {
+  //     component: 'InputNumber',
+  //     value: 0
+  //   }
+  // },
   {
     label: '销售单价',
     field: 'unitPrice',