Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
35f92e54 1 parent 6a82cec2

状态修正，说明增加

Inline Side-by-side
Showing 2 changed files with 84 additions and 9 deletions
...@@ -53,8 +53,8 @@ let ductLabels = { ...@@ -53,8 +53,8 @@ let ductLabels = {
53 "status": { 53 "status": {
54 "0": "未处理", 54 "0": "未处理",
55 "1": "已处理", 55 "1": "已处理",
56 - "2": "处理失败", 56 + "2": "无需处理",
57 - "3": "无需处理", 57 + "3": "处理失败",
58 "4": "校验不通过", 58 "4": "校验不通过",
59 "5": "数据不能被多次处理", 59 "5": "数据不能被多次处理",
60 "9": "处理中", 60 "9": "处理中",
......
...@@ -33,6 +33,16 @@ ...@@ -33,6 +33,16 @@
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 <el-col :span="6"> 35 <el-col :span="6">
36 + <el-form-item label="运单号">
37 + <el-input
38 + v-model="selectForm.awbNbr"
39 + class="formItem"
40 + placeholder="请输入运单号"
41 + clearable
42 + ></el-input>
43 + </el-form-item>
44 + </el-col>
45 + <el-col :span="6">
36 <el-form-item label="配舱结果"> 46 <el-form-item label="配舱结果">
37 <el-select 47 <el-select
38 v-model="selectForm.status" 48 v-model="selectForm.status"
...@@ -42,8 +52,8 @@ ...@@ -42,8 +52,8 @@
42 > 52 >
43 <el-option label="0-未处理" value="0"></el-option> 53 <el-option label="0-未处理" value="0"></el-option>
44 <el-option label="1-已处理" value="1"></el-option> 54 <el-option label="1-已处理" value="1"></el-option>
45 - <el-option label="2-处理失败" value="2"></el-option> 55 + <el-option label="2-无需处理" value="2"></el-option>
46 - <el-option label="3-无需处理" value="3"></el-option> 56 + <el-option label="3-处理失败" value="3"></el-option>
47 <el-option label="4-校验不通过" value="4"></el-option> 57 <el-option label="4-校验不通过" value="4"></el-option>
48 <el-option label="5-数据不能被多次处理" value="5"></el-option> 58 <el-option label="5-数据不能被多次处理" value="5"></el-option>
49 <el-option label="9-处理中" value="9"></el-option> 59 <el-option label="9-处理中" value="9"></el-option>
...@@ -81,7 +91,7 @@ ...@@ -81,7 +91,7 @@
81 </el-form-item> 91 </el-form-item>
82 </el-col> 92 </el-col>
83 </el-row> 93 </el-row>
84 - <div> 94 + <div style="display: flex">
85 <el-button 95 <el-button
86 type="primary" 96 type="primary"
87 size="small" 97 size="small"
...@@ -91,6 +101,62 @@ ...@@ -91,6 +101,62 @@
91 @click="selectDMData(0)" 101 @click="selectDMData(0)"
92 >查询</el-button 102 >查询</el-button
93 > 103 >
104 + <div class="tags">
105 + <div>状态说明：</div>
106 + <!-- <el-tooltip
107 + class="tagTip"
108 + effect="dark"
109 + content="123"
110 + placement="top"
111 + >
112 + <el-tag size="medium">未处理</el-tag>
113 + </el-tooltip> -->
114 + <!-- <el-tooltip
115 + class="tagTip"
116 + effect="dark"
117 + content="123"
118 + placement="top"
119 + >
120 + <el-tag size="medium" type="success">已处理</el-tag>
121 + </el-tooltip> -->
122 + <el-tooltip class="tagTip" effect="dark" placement="top">
123 + <div slot="content">
124 + 1.判断配舱类型失败<br />2.数据初始化失败<br />3.配舱失败
125 + </div>
126 + <el-tag size="medium" type="danger">处理失败</el-tag>
127 + </el-tooltip>
128 + <el-tooltip class="tagTip" effect="dark" placement="top">
129 + <div slot="content">
130 + 1.货物状态为OSPR、配舱航班ID不为空、是手动配舱，不做处理<br />
131 + 2.ACCS发送时间早于货物上一次得ACCS发送时间
132 + </div>
133 + <el-tag size="medium" type="warning">无需处理</el-tag>
134 + </el-tooltip>
135 + <el-tooltip
136 + class="tagTip"
137 + effect="dark"
138 + content="缺少必填得数据或数据超长"
139 + placement="top"
140 + >
141 + <el-tag size="medium" type="warning">校验不通过</el-tag>
142 + </el-tooltip>
143 + <el-tooltip
144 + class="tagTip"
145 + effect="dark"
146 + content="同一条数据只能处理一次"
147 + placement="top"
148 + >
149 + <el-tag size="medium" type="warning">数据不能被多次处理</el-tag>
150 + </el-tooltip>
151 + <!-- <el-tooltip
152 + class="tagTip"
153 + effect="dark"
154 + content="123"
155 + placement="top"
156 + >
157 + <el-tag size="medium">处理中</el-tag>
158 + </el-tooltip> -->
159 + </div>
94 </div> 160 </div>
95 </el-form> 161 </el-form>
96 <Tables 162 <Tables
...@@ -113,9 +179,9 @@ ...@@ -113,9 +179,9 @@
113 scope.row.status == 1 179 scope.row.status == 1
114 ? 'success' 180 ? 'success'
115 : scope.row.status == 2 181 : scope.row.status == 2
116 - ? 'danger'
117 - : scope.row.status == 3
118 ? 'warning' 182 ? 'warning'
183 + : scope.row.status == 3
184 + ? 'danger'
119 : scope.row.status == 4 185 : scope.row.status == 4
120 ? 'warning' 186 ? 'warning'
121 : scope.row.status == 5 187 : scope.row.status == 5
...@@ -406,7 +472,7 @@ export default { ...@@ -406,7 +472,7 @@ export default {
406 value: "originCity", 472 value: "originCity",
407 width: "140", 473 width: "140",
408 align: "center", 474 align: "center",
409 - sorTable: true, 475 + sorTable: false,
410 fixed: false, 476 fixed: false,
411 disabled: true, 477 disabled: true,
412 }, 478 },
...@@ -627,5 +693,14 @@ export default { ...@@ -627,5 +693,14 @@ export default {
627 }; 693 };
628 </script> 694 </script>
629 695
630 -<style> 696 +<style scoped>
697 +.tags {
698 + display: flex;
699 + margin: 0 20px 0 auto;
700 + color: black;
701 + line-height: 32px;
702 +}
703 +.tagTip {
704 + margin: 0 5px;
705 +}
631 </style> 706 </style>
...\ No newline at end of file ...\ No newline at end of file
......