diff --git a/src/views/taskmanage/columns.tsx b/src/views/taskmanage/columns.tsx index 53eb7678..6b283d7f 100644 --- a/src/views/taskmanage/columns.tsx +++ b/src/views/taskmanage/columns.tsx @@ -10,6 +10,12 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', colProps: { span: 4 }, }, + { + field: 'taskNo', + label: '任务流水号', + component: 'Input', + colProps: { span: 4 }, + }, { field: 'goodsCode', label: '接收人', @@ -41,30 +47,18 @@ export const searchFormSchema: FormSchema[] = [ { field: 'taskType', label: '任务类型', - component: 'ApiSelect', + component: 'Select', required: false, dynamicDisabled: false, colProps: { span: 4 }, componentProps: ({ formModel }) => { return { - api: () => { - return new Promise((resolve) => { - GetTaskPlatEnumDict().then((res) => { - let arr = [] - res.data.forEach((item) => { - if(item.type==='TASK_TYPE'){ - arr = item.data - } - }) - res.selectData = arr - resolve(res) - }) - }) + options: typeData.value, + fieldNames: { + label: 'name', + value: 'code' }, - labelField: 'name', - valueField: 'code', - immediate:false, - resultField: 'selectData', + showSearch: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, @@ -74,30 +68,18 @@ export const searchFormSchema: FormSchema[] = [ { field: 'taskSource', label: '任务来源', - component: 'ApiSelect', + component: 'Select', required: false, dynamicDisabled: false, colProps: { span: 4 }, componentProps: ({ formModel }) => { return { - api: () => { - return new Promise((resolve) => { - GetTaskPlatEnumDict().then((res) => { - let arr = [] - res.data.forEach((item) => { - if(item.type==='SOURCE'){ - arr = item.data - } - }) - res.selectData = arr - resolve(res) - }) - }) + options: sourceData.value, + fieldNames: { + label: 'name', + value: 'code' }, - labelField: 'name', - valueField: 'code', - immediate:false, - resultField: 'selectData', + showSearch: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, @@ -107,30 +89,18 @@ export const searchFormSchema: FormSchema[] = [ { field: 'taskCategory', label: '任务分类', - component: 'ApiSelect', + component: 'Select', required: false, dynamicDisabled: false, colProps: { span: 4 }, componentProps: ({ formModel }) => { return { - api: () => { - return new Promise((resolve) => { - GetTaskPlatEnumDict().then((res) => { - let arr = [] - res.data.forEach((item) => { - if(item.type==='CATEGORY'){ - arr = item.data - } - }) - res.selectData = arr - resolve(res) - }) - }) + options: categoryData.value, + fieldNames: { + label: 'name', + value: 'code' }, - labelField: 'name', - valueField: 'code', - immediate:false, - resultField: 'selectData', + showSearch: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, @@ -140,30 +110,18 @@ export const searchFormSchema: FormSchema[] = [ { field: 'status', label: '任务状态', - component: 'ApiSelect', + component: 'Select', required: false, dynamicDisabled: false, colProps: { span: 4 }, componentProps: ({ formModel }) => { return { - api: () => { - return new Promise((resolve) => { - GetTaskPlatEnumDict().then((res) => { - let arr = [] - res.data.forEach((item) => { - if(item.type==='STATUS'){ - arr = item.data - } - }) - res.selectData = arr - resolve(res) - }) - }) + options: statusData.value, + fieldNames: { + label: 'name', + value: 'code' }, - labelField: 'name', - valueField: 'code', - immediate:false, - resultField: 'selectData', + showSearch: true, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, @@ -287,7 +245,30 @@ export const columns: BasicColumn[] = [ ellipsis: true } ] - +export const typeData = ref([]) as any +export const statusData = ref([]) as any +export const sourceData = ref([]) as any +export const categoryData = ref([]) as any +function init() { + GetTaskPlatEnumDict().then((res) => { + res.data.forEach((item) => { + if (item.type === 'TASK_TYPE') { + typeData.value = item.data + } + if (item.type === 'STATUS') { + statusData.value = item.data + } + if (item.type === 'CATEGORY') { + categoryData.value = item.data + } + if (item.type === 'SOURCE') { + sourceData.value = item.data + } + }) + console.log(typeData.value) + }) +} +init() diff --git a/src/views/taskmanage/taskList/rollingNomination.vue b/src/views/taskmanage/taskList/rollingNomination.vue index ad814229..4f8f0aef 100644 --- a/src/views/taskmanage/taskList/rollingNomination.vue +++ b/src/views/taskmanage/taskList/rollingNomination.vue @@ -11,49 +11,85 @@

时间：{{ taskData.createTime }}

-
+
原船
+ 船名/航次：{{ item.fromShip.vessel }} / {{ item.fromShip.voyNo }}
- {{ item.fromShip.port }}ETD：{{ item.fromShip.etd }} + + {{ item.fromShip.port }} ETD：{{ item.fromShip.etd + }}
+ {{ item.fromShip.terminal }}
-
换船
+
+
+ 换船 +
-
或
-
+
or
+
新船{{ index1 + 1 }} VslCode:{{ toData.vslCode }} String:{{ toData.shipString }}
+ 船名/航次：{{ toData.vessel }} / {{ toData.voyNo }}
- {{ toData.port }} + + {{ toData.port }} ETD：{{ toData.etd ? toData.etd : '-' }}
+ {{ toData.terminal }}
+
+

+ Rolling Plan + Before {{ taskData.confirmDeadLine }} +

+ +
+
+
+ {{ item }} +
+ {{ taskData.rollingTouchDoubleRollRemark ? taskData.rollingTouchDoubleRollRemark : '' }} +
+
+
+
+

+ 预甩明细 + 发送通知 + 刷新订舱对应 + 刷新 +

+
@@ -205,23 +241,65 @@ function loadingStop() { .main-box { display: flex; align-items: center; - margin-top: 15px; font-size: 12px; - .box { + .box-item { border-radius: 2px; + + .iconfont { + color: rgba(37, 122, 250, 1); + } + .box-title { background: rgba(37, 122, 250, 1); + font-weight: 700; color: white; height: 26px; line-height: 26px; padding-left: 16px; } - .content{ + + .content { background: rgba(245, 249, 252, 1); - padding-left: 16px; + padding: 10px 16px; + } + + .row { + margin: 5px 0; + } + + &.new-box { + .iconfont { + color: rgba(23, 166, 163, 1); + } + + .box-title { + background: rgba(23, 166, 163, 1); + } } } } + +.middle { + color: rgba(37, 122, 250, 1); + margin: 0 25px; + text-align: center; + + .iconfont { + font-size: 17px + } +} + +.middleOr { + width: 24px; + height: 24px; + border-radius: 50%; + background: rgba(23, 166, 163, 1); + text-align: center; + line-height: 24px; + color: white; + font-size: 14px; + margin: 0 25px; +} \ No newline at end of file diff --git a/src/views/taskmanage/taskList/taskStyle.less b/src/views/taskmanage/taskList/taskStyle.less index 717b341e..a6efd22a 100644 --- a/src/views/taskmanage/taskList/taskStyle.less +++ b/src/views/taskmanage/taskList/taskStyle.less @@ -1,7 +1,7 @@ .LeftHead { display: flex; justify-content: space-between; - + margin-top: 15px; .title { font-size: 12px; font-weight: 700;