Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
jinhui.wang
2022-05-05 17:29:29 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
35f92e54701c6faae2ce9d1839275c79cda3daa5
35f92e54
1 parent
6a82cec2
状态修正,说明增加
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
84 additions
and
9 deletions
src/assets/languages/dictLabels.js
src/views/systemLog/dmLog/index.vue
src/assets/languages/dictLabels.js
View file @
35f92e5
...
...
@@ -53,8 +53,8 @@ let ductLabels = {
"status"
:
{
"0"
:
"未处理"
,
"1"
:
"已处理"
,
"2"
:
"
处理失败
"
,
"3"
:
"
无需处理
"
,
"2"
:
"
无需处理
"
,
"3"
:
"
处理失败
"
,
"4"
:
"校验不通过"
,
"5"
:
"数据不能被多次处理"
,
"9"
:
"处理中"
,
...
...
src/views/systemLog/dmLog/index.vue
View file @
35f92e5
...
...
@@ -33,6 +33,16 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运单号">
<el-input
v-model="selectForm.awbNbr"
class="formItem"
placeholder="请输入运单号"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="配舱结果">
<el-select
v-model="selectForm.status"
...
...
@@ -42,8 +52,8 @@
>
<el-option label="0-未处理" value="0"></el-option>
<el-option label="1-已处理" value="1"></el-option>
<el-option label="2-
处理失败
" value="2"></el-option>
<el-option label="3-
无需处理
" value="3"></el-option>
<el-option label="2-
无需处理
" value="2"></el-option>
<el-option label="3-
处理失败
" value="3"></el-option>
<el-option label="4-校验不通过" value="4"></el-option>
<el-option label="5-数据不能被多次处理" value="5"></el-option>
<el-option label="9-处理中" value="9"></el-option>
...
...
@@ -81,7 +91,7 @@
</el-form-item>
</el-col>
</el-row>
<div>
<div
style="display: flex"
>
<el-button
type="primary"
size="small"
...
...
@@ -91,6 +101,62 @@
@click="selectDMData(0)"
>查询</el-button
>
<div class="tags">
<div>状态说明:</div>
<!-- <el-tooltip
class="tagTip"
effect="dark"
content="123"
placement="top"
>
<el-tag size="medium">未处理</el-tag>
</el-tooltip> -->
<!-- <el-tooltip
class="tagTip"
effect="dark"
content="123"
placement="top"
>
<el-tag size="medium" type="success">已处理</el-tag>
</el-tooltip> -->
<el-tooltip class="tagTip" effect="dark" placement="top">
<div slot="content">
1.判断配舱类型失败<br />2.数据初始化失败<br />3.配舱失败
</div>
<el-tag size="medium" type="danger">处理失败</el-tag>
</el-tooltip>
<el-tooltip class="tagTip" effect="dark" placement="top">
<div slot="content">
1.货物状态为OSPR、配舱航班ID不为空、是手动配舱,不做处理<br />
2.ACCS发送时间早于货物上一次得ACCS发送时间
</div>
<el-tag size="medium" type="warning">无需处理</el-tag>
</el-tooltip>
<el-tooltip
class="tagTip"
effect="dark"
content="缺少必填得数据或数据超长"
placement="top"
>
<el-tag size="medium" type="warning">校验不通过</el-tag>
</el-tooltip>
<el-tooltip
class="tagTip"
effect="dark"
content="同一条数据只能处理一次"
placement="top"
>
<el-tag size="medium" type="warning">数据不能被多次处理</el-tag>
</el-tooltip>
<!-- <el-tooltip
class="tagTip"
effect="dark"
content="123"
placement="top"
>
<el-tag size="medium">处理中</el-tag>
</el-tooltip> -->
</div>
</div>
</el-form>
<Tables
...
...
@@ -113,9 +179,9 @@
scope.row.status == 1
? 'success'
: scope.row.status == 2
? 'danger'
: scope.row.status == 3
? 'warning'
: scope.row.status == 3
? 'danger'
: scope.row.status == 4
? 'warning'
: scope.row.status == 5
...
...
@@ -406,7 +472,7 @@ export default {
value: "originCity",
width: "140",
align: "center",
sorTable:
tru
e,
sorTable:
fals
e,
fixed: false,
disabled: true,
},
...
...
@@ -627,5 +693,14 @@ export default {
};
</script>
<style>
<style scoped>
.tags {
display: flex;
margin: 0 20px 0 auto;
color: black;
line-height: 32px;
}
.tagTip {
margin: 0 5px;
}
</style>
\ No newline at end of file
...
...
Please
register
or
login
to post a comment