Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/ContainerManagement/CurrentState/columns.tsx

@@ -263,7 +263,6 @@ export const searchFormSchema: FormSchema[] = [
     label: '是否上线',
     component: 'ApiSelect',
     colProps: { span: 4 },
-    defaultValue: '1',
     componentProps: () => {
       return {
         api: () => {

src/views/ContainerManagement/CurrentState/index.vue

@@ -2,7 +2,7 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable">
       <template #tableTitle>
-        <a-button type="link" class="pl0" @click="derivedExcel">
+        <a-button type="link" @click="derivedExcel">
           <span class="iconfont icon-Excel"></span>
           导出待上线
         </a-button>

src/views/ContainerManagement/OfflineAudit/columns.tsx

@@ -2,11 +2,16 @@ import { BasicColumn, FormSchema } from '/@/components/Table'
 import { Tag } from 'ant-design-vue'
 export const columns: BasicColumn[] = [
   {
-    title: '系统业务号',
-    dataIndex: 'billno',
+    title: '全部箱号',
+    dataIndex: 'cntrnoAll',
     sorter: true,
-    width: 150,
-    align: 'center',
+    width: 200,
+  },
+  {
+    title: '箱型',
+    dataIndex: 'ctntotal',
+    sorter: true,
+    width: 200,
   },
   {
     title: '执行状态',
@@ -27,24 +32,6 @@ export const columns: BasicColumn[] = [
       }
     },
   },
-  {
-    title: '业务日期',
-    dataIndex: 'bsdate',
-    sorter: true,
-    width: 200,
-  },
-  {
-    title: '租买箱客户',
-    dataIndex: 'rentCustomerName',
-    sorter: true,
-    width: 200,
-  },
-  // {
-  //   title: '原箱主',
-  //   dataIndex: 'OldContainerOwner',
-  //   sorter: true,
-  //   width: 200,
-  // },
   {
     title: '箱业务',
     dataIndex: 'ctnBizStateId',
@@ -63,17 +50,30 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '全部箱号',
-    dataIndex: 'cntrnoAll',
+    title: '系统业务号',
+    dataIndex: 'billno',
+    sorter: true,
+    width: 150,
+    align: 'center',
+  },
+  {
+    title: '业务日期',
+    dataIndex: 'bsdate',
     sorter: true,
     width: 200,
   },
   {
-    title: '箱型',
-    dataIndex: 'ctntotal',
+    title: '租买箱客户',
+    dataIndex: 'rentCustomerName',
     sorter: true,
     width: 200,
   },
+  // {
+  //   title: '原箱主',
+  //   dataIndex: 'OldContainerOwner',
+  //   sorter: true,
+  //   width: 200,
+  // },
 ]
 
 export const searchFormSchema: FormSchema[] = [

src/views/ContainerManagement/OfflineAudit/index.vue

@@ -106,7 +106,7 @@
       pagination: true,
       striped: true,
       useSearchForm: true,
-      showTableSetting: false,
+      showTableSetting: true,
       bordered: true,
       showIndexColumn: true,
       indexColumnProps: {