diff --git a/package.json b/package.json index 53e177eb..4bd8452e 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "vue-json-pretty": "^2.0.6", "vue-router": "^4.0.14", "vue-types": "^4.1.1", - "vuedraggable": "^2.24.3", + "vuedraggable": "^4.1.0", "vuex": "^4.1.0", "vxe-table": "^4.5.21", "vxe-table-plugin-export-xlsx": "^3.0.4", diff --git a/src/views/ContainerManagement/BaseInfo/TenantAuditStepModal.vue b/src/views/ContainerManagement/BaseInfo/TenantAuditStepModal.vue index c178ce19..98637b65 100644 --- a/src/views/ContainerManagement/BaseInfo/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/BaseInfo/TenantAuditStepModal.vue @@ -3,7 +3,8 @@ v-bind="$attrs" :use-wrapper="true" title="箱状态批量维护" - width="55%" + width="30%" + :height="600" @register="registerModal" @ok="handleSave" > diff --git a/src/views/ContainerManagement/BaseInfo/columns.tsx b/src/views/ContainerManagement/BaseInfo/columns.tsx index 780f1821..f1d94405 100644 --- a/src/views/ContainerManagement/BaseInfo/columns.tsx +++ b/src/views/ContainerManagement/BaseInfo/columns.tsx @@ -1,5 +1,4 @@ import { BasicColumn, FormSchema } from '/@/components/Table' -import { Tag } from 'ant-design-vue' import { GetCtnSelectList } from '/@/api/common' export const columns: BasicColumn[] = [ { @@ -15,128 +14,14 @@ export const columns: BasicColumn[] = [ width: 150, }, { - title: '集装箱类型', - dataIndex: 'ctnType', - sorter: true, - width: 200, - }, - { - title: '新旧箱', - dataIndex: 'usedState', - sorter: true, - width: 200, - }, - { - title: '箱主', - dataIndex: 'ctnOwner', - sorter: true, - width: 200, - }, - { - title: '业务所属分部', - dataIndex: 'corpid', - sorter: true, - width: 200, - }, - { - title: '箱来源', - dataIndex: 'ctnSource', - sorter: true, - width: 200, - }, - { - title: '箱业务状态', - dataIndex: 'ctnBizState', - sorter: true, - width: 200, - }, - { - title: '箱业务编号', - dataIndex: 'billno', - sorter: true, - width: 200, - }, - { - title: '关联放箱单号', - dataIndex: 'ctnReleaseNo', - sorter: true, - width: 200, - }, - { - title: '箱状态', - dataIndex: 'ctnState', - sorter: true, - width: 200, - }, - { - title: '箱损坏', - dataIndex: 'ctnBreakState', - sorter: true, - width: 200, - }, - { - title: '是否上线', - dataIndex: 'isOnline', - sorter: true, - width: 200, - }, - { - title: '空重箱', - dataIndex: 'isHeavy', - sorter: true, - width: 200, - }, - { - title: '当前港口', - dataIndex: 'portid', - sorter: true, - width: 200, - }, - { - title: '码头或场站', - dataIndex: 'depot', - sorter: true, - width: 200, - }, - { - title: '运输工具', - dataIndex: 'vehicleName', - sorter: true, - width: 200, - }, - { - title: '当前业务编号', - dataIndex: 'mblno', - sorter: true, - width: 200, - }, - { - title: '业务委托单位', - dataIndex: 'customerName', - sorter: true, - width: 200, - }, - { - title: 'ETD', - dataIndex: 'etd', - sorter: true, - width: 200, - }, - { - title: 'ETA', - dataIndex: 'eta', - sorter: true, - width: 200, - }, - { - title: '状态时间', - dataIndex: 'stateTime', + title: '箱皮重', + dataIndex: 'ctnWeight', sorter: true, width: 200, }, { - title: '箱皮重', - dataIndex: 'ctnWeight', + title: '箱生产时间', + dataIndex: 'productionDate', sorter: true, width: 200, }, @@ -150,8 +35,8 @@ export const columns: BasicColumn[] = [ export const searchFormSchema: FormSchema[] = [ { - field: 'CtnName', - label: '表现形式', + field: 'cntrno', + label: '集装箱号', component: 'Input', colProps: { span: 6 }, }, @@ -167,20 +52,14 @@ export const formSchema: FormSchema[] = [ { field: 'cntrno', label: '集装箱号', - component: 'InputTextArea', - required: true, - colProps: { span: 24 }, - componentProps: { - placeholder: '请输入,多个箱号请以“,”逗号间隔', - rows: 3, - }, + component: 'Input', + colProps: { span: 20 }, }, { field: 'ctnall', label: '箱型', component: 'ApiSelect', - colProps: { span: 6 }, - required: true, + colProps: { span: 20 }, componentProps: () => { return { api: GetCtnSelectList, @@ -190,140 +69,26 @@ export const formSchema: FormSchema[] = [ } }, }, - { - field: 'usedState', - label: '新旧箱', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'ctnOwner', - label: '箱主', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'corpid', - label: '业务所属分部', - component: 'Input', - - colProps: { span: 6 }, - }, - - { - field: 'ctnSource', - label: '箱来源', - component: 'Input', - - colProps: { span: 6 }, - }, - { - field: 'ctnBizState', - label: '箱业务状态', - component: 'InputNumber', - colProps: { span: 6 }, - }, - { - field: 'billno', - label: '箱业务编号', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'ctnReleaseNo', - label: '关联放箱单号', - component: 'Input', - colProps: { span: 6 }, - required: true, - }, - { - field: 'ctnState', - label: '箱状态', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'ctnBreakState', - label: '箱损坏', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'isOnline', - label: '是否上线', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'isHeavy', - label: '空重箱', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'portid', - label: '当前港口', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'depot', - label: '码头或场站', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'vehicleName', - label: '运输工具', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'mblno', - label: '当前业务编号', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'customerName', - label: '业务委托单位', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'etd', - label: 'ETD', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'eta', - label: 'ETA', - component: 'Input', - colProps: { span: 6 }, - }, - { - field: 'stateTime', - label: '状态时间', - component: 'Input', - colProps: { span: 6 }, - }, { field: 'ctnWeight', label: '箱皮重', - component: 'Input', - colProps: { span: 6 }, + component: 'InputNumber', + colProps: { span: 20 }, }, { field: 'productionDate', label: '生产日期', - component: 'Input', - colProps: { span: 6 }, + component: 'DatePicker', + colProps: { span: 20 }, + componentProps: { + showTime: false, + style: 'width:100%', + }, }, { field: 'ctnValue_Base', label: '箱初期成本', - component: 'Input', - colProps: { span: 6 }, + component: 'InputNumber', + colProps: { span: 20 }, }, ] diff --git a/src/views/ContainerManagement/BaseInfo/index.vue b/src/views/ContainerManagement/BaseInfo/index.vue index 9ea7fcff..81e48c60 100644 --- a/src/views/ContainerManagement/BaseInfo/index.vue +++ b/src/views/ContainerManagement/BaseInfo/index.vue @@ -2,12 +2,12 @@
-