Merge branch 'zth' into dev

src/views/ContainerManagement/SellCtn/columns.tsx

@@ -70,6 +70,12 @@ export const columns: BasicColumn[] = [
       return RData
     },
   },
+  {
+    title: '合同号',
+    dataIndex: 'ctnReleaseNo',
+    sorter: true,
+    width: 200,
+  },
   {
     title: '已提箱',
     dataIndex: 'pickupCtntotal',
@@ -272,6 +278,12 @@ export const formSchema: FormSchema[] = [
       format: 'YYYY-MM',
     },
   },
+  {
+    field: 'ctnReleaseNo',
+    label: '合同号',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
   {
     field: 'isBusinessLocking',
     label: '业务锁定',

src/views/system/org/OrgModal.vue

@@ -23,7 +23,14 @@
             }}</span>
           </template>
           <template #files>
-            <DsFile :maxCount="10" ref="dsFileRef" :id="rowId" :show="false" height="300">
+            <DsFile
+              :maxCount="10"
+              fileType="org"
+              ref="dsFileRef"
+              :id="rowId"
+              :show="false"
+              height="300"
+            >
               <a-button
                 type="link"
                 size="mini"