Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
shanyunduo.cheng
ee219551 1 parent cf2e51c6

列表展示和详情样式

Inline Side-by-side
Showing 2 changed files with 61 additions and 12 deletions
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
33 > 33 >
34 <el-table 34 <el-table
35 :data="flyList" 35 :data="flyList"
36 - style="width: 800px"
37 v-loading="loading" 36 v-loading="loading"
38 size="small" 37 size="small"
39 > 38 >
...@@ -52,6 +51,15 @@ ...@@ -52,6 +51,15 @@
52 </template> 51 </template>
53 </el-table-column> 52 </el-table-column>
54 53
54 + <el-table-column prop="createUserName" label="操作人" align="center">
55 + </el-table-column>
56 +
57 + <el-table-column prop="createTime" label="更新时间" align="center">
58 + <template slot-scope="scope">
59 + {{scope.row.createTime | formatTimer}}
60 + </template>
61 + </el-table-column>
62 +
55 <el-table-column label="操作" prop="id" align="center"> 63 <el-table-column label="操作" prop="id" align="center">
56 <template slot-scope="scope"> 64 <template slot-scope="scope">
57 <el-button 65 <el-button
...@@ -115,6 +123,10 @@ import { ...@@ -115,6 +123,10 @@ import {
115 enableOrDisable, 123 enableOrDisable,
116 } from "@/api/destinationFlight"; 124 } from "@/api/destinationFlight";
117 125
126 +import {
127 + parseTime
128 +} from "@/utils/FedEx";
129 +
118 export default { 130 export default {
119 data() { 131 data() {
120 return { 132 return {
...@@ -193,10 +205,33 @@ export default { ...@@ -193,10 +205,33 @@ export default {
193 }) 205 })
194 .catch(function () {}); 206 .catch(function () {});
195 }, 207 },
208 + parseDate(time){
209 + // debugger
210 + let str = new Date(time).format("yyyy-MM-dd");
211 + // let str = parseTime(date, 'yyyy-dd-mm');
212 + return str;
213 + }
196 }, 214 },
197 created() { 215 created() {
198 this.getList(); 216 this.getList();
199 }, 217 },
218 + filters: {
219 + formatTimer: function(value) {
220 + let date = new Date(value);
221 + let y = date.getFullYear();
222 + let MM = date.getMonth() + 1;
223 + MM = MM < 10 ? "0" + MM : MM;
224 + let d = date.getDate();
225 + d = d < 10 ? "0" + d : d;
226 + let h = date.getHours();
227 + h = h < 10 ? "0" + h : h;
228 + let m = date.getMinutes();
229 + m = m < 10 ? "0" + m : m;
230 + let s = date.getSeconds();
231 + s = s < 10 ? "0" + s : s;
232 + return y + "-" + MM + "-" + d + " " + h + ":" + m + ":" + s;
233 + }
234 + },
200 }; 235 };
201 </script> 236 </script>
202 237
......
...@@ -121,6 +121,7 @@ ...@@ -121,6 +121,7 @@
121 </el-form-item> 121 </el-form-item>
122 122
123 <el-form-item label="申报类别"> 123 <el-form-item label="申报类别">
124 + <el-card shadow="never" style="width:70%">
124 <el-checkbox-group v-model="form.typeOfGoods"> 125 <el-checkbox-group v-model="form.typeOfGoods">
125 <el-checkbox 126 <el-checkbox
126 v-for="item in cargoType" 127 v-for="item in cargoType"
...@@ -129,20 +130,24 @@ ...@@ -129,20 +130,24 @@
129 :name="item.chineseName" 130 :name="item.chineseName"
130 ></el-checkbox> 131 ></el-checkbox>
131 </el-checkbox-group> 132 </el-checkbox-group>
133 + </el-card>
132 </el-form-item> 134 </el-form-item>
133 135
134 <el-form-item label="货物类型"> 136 <el-form-item label="货物类型">
135 - <el-checkbox-group v-model="form.declarationCategory"> 137 + <el-card shadow="never" style="width:70%">
136 - <el-checkbox 138 + <el-checkbox-group v-model="form.declarationCategory">
137 - v-for="item in cargoStatus" 139 + <el-checkbox
138 - :key="item.id" 140 + v-for="item in cargoStatus"
139 - :label="item.chineseName" 141 + :key="item.id"
140 - :name="item.chineseName" 142 + :label="item.chineseName"
141 - ></el-checkbox> 143 + :name="item.chineseName"
142 - </el-checkbox-group> 144 + ></el-checkbox>
145 + </el-checkbox-group>
146 + </el-card>
143 </el-form-item> 147 </el-form-item>
144 148
145 <el-form-item label="Service Code"> 149 <el-form-item label="Service Code">
150 + <el-card shadow="never" style="width:70%">
146 <el-checkbox-group v-model="form.serviceCode"> 151 <el-checkbox-group v-model="form.serviceCode">
147 <el-checkbox 152 <el-checkbox
148 v-for="item in serviceCode" 153 v-for="item in serviceCode"
...@@ -151,9 +156,11 @@ ...@@ -151,9 +156,11 @@
151 :name="item.englishName" 156 :name="item.englishName"
152 ></el-checkbox> 157 ></el-checkbox>
153 </el-checkbox-group> 158 </el-checkbox-group>
159 + </el-card>
154 </el-form-item> 160 </el-form-item>
155 161
156 <el-form-item label="Sub Category"> 162 <el-form-item label="Sub Category">
163 + <el-card shadow="never" style="width:70%">
157 <el-checkbox-group v-model="form.subCategory"> 164 <el-checkbox-group v-model="form.subCategory">
158 <el-checkbox 165 <el-checkbox
159 v-for="item in subCategory" 166 v-for="item in subCategory"
...@@ -162,6 +169,7 @@ ...@@ -162,6 +169,7 @@
162 :name="item.englishName" 169 :name="item.englishName"
163 ></el-checkbox> 170 ></el-checkbox>
164 </el-checkbox-group> 171 </el-checkbox-group>
172 + </el-card>
165 </el-form-item> 173 </el-form-item>
166 </el-form> 174 </el-form>
167 <el-row style="margin-left: 200px"> 175 <el-row style="margin-left: 200px">
...@@ -317,17 +325,23 @@ export default { ...@@ -317,17 +325,23 @@ export default {
317 <style rel="stylesheet/scss" lang="scss"> 325 <style rel="stylesheet/scss" lang="scss">
318 .el-textarea.is-disabled .el-textarea__inner { 326 .el-textarea.is-disabled .el-textarea__inner {
319 background-color: rgba(255, 255, 255, 0.5); 327 background-color: rgba(255, 255, 255, 0.5);
320 - color: #82848a; 328 + color: #303133;
321 } 329 }
322 .el-input.is-disabled .el-input__inner { 330 .el-input.is-disabled .el-input__inner {
323 background-color: rgba(255, 255, 255, 0.5); 331 background-color: rgba(255, 255, 255, 0.5);
324 - color: #82848a; 332 + color: #303133;
325 } 333 }
326 .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { 334 .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
327 background-color: rgba(255, 255, 255, 0.5); 335 background-color: rgba(255, 255, 255, 0.5);
328 } 336 }
329 .el-checkbox__input.is-disabled + span.el-checkbox__label { 337 .el-checkbox__input.is-disabled + span.el-checkbox__label {
330 - color: #82848a; 338 + color: #303133;
339 +}
340 +.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
341 + border-color: #303133;
342 +}
343 +.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{
344 + border-color: #606266
331 } 345 }
332 </style> 346 </style>
333 347
......