Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
5b51f554 1 parent c611516b

fix: 优化和调整列

Inline Side-by-side
Showing 4 changed files with 107 additions and 88 deletions
...@@ -106,6 +106,24 @@ ...@@ -106,6 +106,24 @@
106 @sizeChange="sizeChange" 106 @sizeChange="sizeChange"
107 @currentChange="currentChange" 107 @currentChange="currentChange"
108 > 108 >
109 + <template v-slot:skuname="scope">
110 + <el-popover trigger="hover" placement="top">
111 + <div class="name-wrapper-content">{{ scope.row.skuname }}</div>
112 + <span slot="reference" class="name-wrapper">
113 + {{ scope.row.skuname }}
114 + </span>
115 + </el-popover>
116 + </template>
117 + <template v-slot:declarationElement="scope">
118 + <el-popover trigger="hover" placement="top">
119 + <div class="name-wrapper-content">
120 + {{ scope.row.declarationElement }}
121 + </div>
122 + <span slot="reference" class="name-wrapper">
123 + {{ scope.row.declarationElement }}
124 + </span>
125 + </el-popover>
126 + </template>
109 <template slot="optionColumn"> 127 <template slot="optionColumn">
110 <el-table-column align="center" label="操作" width="150"> 128 <el-table-column align="center" label="操作" width="150">
111 <template slot-scope="scope"> 129 <template slot-scope="scope">
...@@ -156,13 +174,13 @@ export default { ...@@ -156,13 +174,13 @@ export default {
156 { 174 {
157 name: "序号", 175 name: "序号",
158 value: "gnum", 176 value: "gnum",
159 - width: "", 177 + width: "60px",
160 align: "left", 178 align: "left",
161 }, 179 },
162 { 180 {
163 name: "商品编号", 181 name: "商品编号",
164 value: "skuCode", 182 value: "skuCode",
165 - width: "", 183 + width: "150px",
166 align: "left", 184 align: "left",
167 }, 185 },
168 { 186 {
...@@ -170,29 +188,33 @@ export default { ...@@ -170,29 +188,33 @@ export default {
170 value: "skuname", 188 value: "skuname",
171 width: "", 189 width: "",
172 align: "left", 190 align: "left",
191 + slot: true,
192 + showOverflowTooltip: false,
173 }, 193 },
174 { 194 {
175 name: "申报要素", 195 name: "申报要素",
176 value: "declarationElement", 196 value: "declarationElement",
177 width: "", 197 width: "",
178 align: "left", 198 align: "left",
199 + slot: true,
200 + showOverflowTooltip: false,
179 }, 201 },
180 { 202 {
181 name: "第一法定单位", 203 name: "第一法定单位",
182 value: "unitLegalFirst", 204 value: "unitLegalFirst",
183 - width: "", 205 + width: "130px",
184 align: "left", 206 align: "left",
185 }, 207 },
186 { 208 {
187 name: "第二法定单位", 209 name: "第二法定单位",
188 value: "unitLegalSecond", 210 value: "unitLegalSecond",
189 - width: "", 211 + width: "130px",
190 align: "left", 212 align: "left",
191 }, 213 },
192 { 214 {
193 name: "更新时间", 215 name: "更新时间",
194 value: "updateTime", 216 value: "updateTime",
195 - width: "", 217 + width: "140px",
196 align: "left", 218 align: "left",
197 }, 219 },
198 ], 220 ],
...@@ -390,4 +412,14 @@ export default { ...@@ -390,4 +412,14 @@ export default {
390 transform: translate(0, -50%); 412 transform: translate(0, -50%);
391 z-index: 10; 413 z-index: 10;
392 } 414 }
415 +.name-wrapper {
416 + overflow: hidden;
417 + white-space: nowrap;
418 + text-overflow: ellipsis;
419 + max-width: 100%;
420 + display: inline-block;
421 +}
422 +.name-wrapper-content {
423 + max-width: 400px;
424 +}
393 </style> 425 </style>
......
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
182 { 182 {
183 name: "操作接口", 183 name: "操作接口",
184 value: "interfaceName", 184 value: "interfaceName",
185 - width: "", 185 + width: "200px",
186 align: "left", 186 align: "left",
187 slot: true, 187 slot: true,
188 showOverflowTooltip: false, 188 showOverflowTooltip: false,
...@@ -190,7 +190,7 @@ export default { ...@@ -190,7 +190,7 @@ export default {
190 { 190 {
191 name: "IP地址", 191 name: "IP地址",
192 value: "ipAddress", 192 value: "ipAddress",
193 - width: "150px", 193 + width: "140px",
194 align: "left", 194 align: "left",
195 }, 195 },
196 { 196 {
...@@ -352,7 +352,7 @@ export default { ...@@ -352,7 +352,7 @@ export default {
352 overflow: hidden; 352 overflow: hidden;
353 white-space: nowrap; 353 white-space: nowrap;
354 text-overflow: ellipsis; 354 text-overflow: ellipsis;
355 - max-width: 200px; 355 + max-width: 100%;
356 display: inline-block; 356 display: inline-block;
357 } 357 }
358 .name-wrapper-content { 358 .name-wrapper-content {
......
...@@ -535,12 +535,6 @@ export default { ...@@ -535,12 +535,6 @@ export default {
535 align: "left", 535 align: "left",
536 }, 536 },
537 { 537 {
538 - name: "航班号",
539 - value: "flightNumber",
540 - width: "",
541 - align: "left",
542 - },
543 - {
544 name: "物流运单编号", 538 name: "物流运单编号",
545 value: "logisticsWaybillNumber", 539 value: "logisticsWaybillNumber",
546 width: "", 540 width: "",
...@@ -553,6 +547,12 @@ export default { ...@@ -553,6 +547,12 @@ export default {
553 align: "left", 547 align: "left",
554 }, 548 },
555 { 549 {
550 + name: "航班号",
551 + value: "flightNumber",
552 + width: "",
553 + align: "left",
554 + },
555 + {
556 name: "电商企业名称", 556 name: "电商企业名称",
557 value: "ecomEntName", 557 value: "ecomEntName",
558 width: "", 558 width: "",
......
...@@ -17,68 +17,56 @@ ...@@ -17,68 +17,56 @@
17 label-position="left" 17 label-position="left"
18 size="small" 18 size="small"
19 > 19 >
20 - <el-row :gutter="5"> 20 + <Formitem label="提运单号" prop="billNo" type="edit">
21 - <el-col :span="16"> 21 + <el-input
22 - <Formitem label="提运单号" prop="billNo" type="edit"> 22 + type="text"
23 - <el-input 23 + id="inputInner-edit-billNo"
24 - type="text" 24 + class="inputShadow"
25 - id="inputInner-edit-billNo" 25 + resize="none"
26 - class="inputShadow" 26 + v-model="weightForm.billNo"
27 - resize="none" 27 + clearable
28 - v-model="weightForm.billNo" 28 + placeholder="请输入提运单号"
29 - clearable 29 + @change="inputChange"
30 - placeholder="请输入提运单号" 30 + ></el-input>
31 - @change="inputChange" 31 + </Formitem>
32 - ></el-input> 32 + <Formitem label="件数" prop="count" type="edit">
33 - </Formitem> 33 + <el-input
34 - </el-col> 34 + type="text"
35 - <el-col :span="8"> 35 + id="inputInner-edit-count"
36 - <Formitem label="件数" prop="count" type="edit"> 36 + class="inputShadow"
37 - <el-input 37 + resize="none"
38 - type="text" 38 + v-model="weightForm.count"
39 - id="inputInner-edit-count" 39 + clearable
40 - class="inputShadow" 40 + disabled
41 - resize="none" 41 + placeholder="请输入件数"
42 - v-model="weightForm.count" 42 + ></el-input>
43 - clearable 43 + </Formitem>
44 - disabled 44 + <Formitem label="原毛重" prop="totalWeight" type="edit">
45 - placeholder="请输入件数" 45 + <el-input
46 - ></el-input> 46 + type="text"
47 - </Formitem> 47 + id="inputInner-edit-totalWeight"
48 - </el-col> 48 + class="inputShadow"
49 - </el-row> 49 + resize="none"
50 - <el-row :gutter="5"> 50 + v-model="weightForm.totalWeight"
51 - <el-col :span="12"> 51 + clearable
52 - <Formitem label="原毛重" prop="totalWeight" type="edit"> 52 + disabled
53 - <el-input 53 + placeholder="请输入原毛重"
54 - type="text" 54 + ></el-input>
55 - id="inputInner-edit-totalWeight" 55 + </Formitem>
56 - class="inputShadow" 56 + <Formitem label="修改后毛重" prop="weight" type="edit">
57 - resize="none" 57 + <el-input
58 - v-model="weightForm.totalWeight" 58 + type="text"
59 - clearable 59 + id="inputInner-edit-weight"
60 - disabled 60 + class="inputShadow"
61 - placeholder="请输入原毛重" 61 + resize="none"
62 - ></el-input> 62 + v-model="weightForm.weight"
63 - </Formitem> 63 + clearable
64 - </el-col> 64 + placeholder="请输入修改后毛重"
65 - <el-col :span="12"> 65 + @change="weightChange"
66 - <Formitem label="修改后毛重" prop="weight" type="edit"> 66 + ></el-input>
67 - <el-input 67 + </Formitem>
68 - type="text" 68 + <Formitem label="" prop="content" type="edit">
69 - id="inputInner-edit-weight" 69 + <!-- <el-input
70 - class="inputShadow"
71 - resize="none"
72 - v-model="weightForm.weight"
73 - clearable
74 - placeholder="请输入修改后毛重"
75 - @change="weightChange"
76 - ></el-input>
77 - </Formitem>
78 - </el-col>
79 - <el-col :span="24">
80 - <Formitem label="" prop="content" type="edit">
81 - <!-- <el-input
82 type="textarea" 70 type="textarea"
83 id="inputInner-edit-content" 71 id="inputInner-edit-content"
84 class="inputShadow" 72 class="inputShadow"
...@@ -88,15 +76,13 @@ ...@@ -88,15 +76,13 @@
88 clearable 76 clearable
89 placeholder="请输入修改内容" 77 placeholder="请输入修改内容"
90 ></el-input> --> 78 ></el-input> -->
91 - <div class="form-item-tips"> 79 + <div class="form-item-tips">
92 - <h2>修改内容</h2> 80 + <h2>修改内容</h2>
93 - <div> 81 + <div>
94 - {{ weightForm.content }} 82 + {{ weightForm.content }}
95 - </div> 83 + </div>
96 - </div> 84 + </div>
97 - </Formitem> 85 + </Formitem>
98 - </el-col>
99 - </el-row>
100 </el-form> 86 </el-form>
101 </div> 87 </div>
102 <div class="dialogOption entrySave revokeOperation"> 88 <div class="dialogOption entrySave revokeOperation">
...@@ -233,14 +219,15 @@ export default { ...@@ -233,14 +219,15 @@ export default {
233 this.msgSuccess("修改成功"); 219 this.msgSuccess("修改成功");
234 this.cancelModify(1); 220 this.cancelModify(1);
235 } else { 221 } else {
236 - this.alertWarningMsg(res.message); 222 + this.msgError(res.message);
237 - this.cancelModify(0); 223 + // this.cancelModify(0);
224 + this.dialogLoading = false;
238 } 225 }
239 }) 226 })
240 .catch((err) => { 227 .catch((err) => {
241 console.log(err); 228 console.log(err);
242 this.alertWarningMsg(err.message); 229 this.alertWarningMsg(err.message);
243 - this.cancelModify(0); 230 + // this.cancelModify(0);
244 }); 231 });
245 } else { 232 } else {
246 return false; 233 return false;
......