lijingjia
/
ds-wms-client-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新任务

Browse Source
szh-new
sunzehua 4 months ago
parent e7b2ae21a6
commit 6380e082d4
3 changed files with 143 additions and 84 deletions
Show Stats Download Patch File Download Diff File

127
src/views/taskmanage/columns.tsx
Unescape Escape View File

@ -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()

98
src/views/taskmanage/taskList/rollingNomination.vue
Unescape Escape View File

@ -11,49 +11,85 @@
<p>时间：{{ taskData.createTime }}</p>
</div>
<div class="main-box" v-for="(item, index) in taskData.fromToList" :key="index">
<div class="box">
<div class="box-item">
<div class="box-title">
原船
</div>
<div class="content">
<div class="row">
<i class="icon-chuanfanguanli-chuanfanshenqing iconfont"></i>
船名/航次：{{ item.fromShip.vessel }} /
{{ item.fromShip.voyNo }}
</div>
<div class="row">
{{ item.fromShip.port }}ETD：{{ item.fromShip.etd }}
<i class="icon-shijian1 iconfont"></i>
{{ item.fromShip.port }} <i class="icon-calendar iconfont"></i> ETD：{{ item.fromShip.etd
}}
</div>
<div class="row">
<i class="icon-biaoqian iconfont"></i>
{{ item.fromShip.terminal }}
</div>
</div>
</div>
<div class="middle">换船</div>
<div class="middle">
<div> <i class="icon-qiehuan iconfont"></i> </div>
换船
</div>
<div v-for="(toData, index1) in item.toShipList" :key="index1"
style="display: flex;align-items: center;">
<div class="middleOr" v-if="index1 !== 0">或</div>
<div class="box">
<div class="middleOr" v-if="index1 !== 0">or</div>
<div class="box-item new-box">
<div class="box-title">
新船{{ index1 + 1 }}
VslCode:{{ toData.vslCode }} String:{{ toData.shipString }}
</div>
<div class="content">
<div class="row">
<i class="icon-chuanfanguanli-chuanfanshenqing iconfont"></i>
船名/航次：{{ toData.vessel }} / {{
toData.voyNo }}
</div>
<div class="row">
{{ toData.port }}
<i class="icon-shijian1 iconfont"></i>
{{ toData.port }}<i class="icon-calendar iconfont" style="margin-left: 5px;"></i>
ETD：{{
toData.etd ? toData.etd : '-' }}
</div>
<div class="row">
<i class="icon-biaoqian iconfont"></i>
{{ toData.terminal }}
</div>
</div>
</div>
</div>
</div>
<div class="LeftHead">
<p>
Rolling Plan
<span style="margin-left: 10px;font-weight: 400;">Before {{ taskData.confirmDeadLine }}</span>
</p>
</div>
<div class="plan">
<div v-for="(item, index) in taskData.rollingPlanList" :key="index" style="margin-bottom: 5px;">
{{ item }}
</div>
{{ taskData.rollingTouchDoubleRollRemark ? taskData.rollingTouchDoubleRollRemark : '' }}
</div>
</div>
<div class="box">
<div class="LeftHead">
<p>
预甩明细
<a-button style="margin-left: 20px;" type="link" @click="handleSendNotice"
size="small"> <i class="icon-zhuanfa iconfont" ></i> 发送通知</a-button>
<a-button style="margin-left: 20px;" type="link" @click="handleRefsh"
size="small"><i class="icon-refresh-1-copy iconfont" ></i>刷新订舱对应</a-button>
<a-button style="margin-left: 20px;" type="link" @click="handleRefshPage"
size="small"><i class="icon-refresh-1-copy iconfont" ></i>刷新</a-button>
</p>
</div>
</div>
</a-spin>
@ -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;
}
</style>

2
src/views/taskmanage/taskList/taskStyle.less
Unescape Escape View File

@ -1,7 +1,7 @@
.LeftHead {
display: flex;
justify-content: space-between;
margin-top: 15px;
.title {
font-size: 12px;
font-weight: 700;

Write Preview
Loading…
Cancel
Save