Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
fec704c3 1 parent 8855465c

图标增加，序号增加，样式修正

Expand all
Inline Side-by-side
Showing 6 changed files with 23 additions and 10 deletions
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660113358419" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2396" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
2 +</style></defs><path d="M393.846154 78.769231c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.76923-78.769231-35.446154-78.769231-78.76923 35.446154-78.769231 78.769231-78.769231z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.76923-78.769231-35.446154-78.769231-78.76923 35.446154-78.769231 78.769231-78.769231zM393.846154 315.076923c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231zM393.846154 551.384615c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.769231s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.769231zM393.846154 787.692308c43.323077 0 78.769231 35.446154 78.769231 78.76923s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.76923z m236.307692 0c43.323077 0 78.769231 35.446154 78.769231 78.76923s-35.446154 78.769231-78.769231 78.769231-78.769231-35.446154-78.769231-78.769231 35.446154-78.769231 78.769231-78.76923z" p-id="2397"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -994,7 +994,7 @@ let tableHeaders = { ...@@ -994,7 +994,7 @@ let tableHeaders = {
994 status: 1 994 status: 1
995 }, 995 },
996 { 996 {
997 - columnChineseName: "航线优先级", 997 + columnChineseName: "航线配舱设置",
998 columnName: "flightRoute", 998 columnName: "flightRoute",
999 columnWidth: "", 999 columnWidth: "",
1000 status: 1 1000 status: 1
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)" 5 @dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)"
6 @dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)"> 6 @dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)">
7 <svg-icon v-if="!disabled" icon-class="drag-text" class="el-input__icon input-icon" style="color:#bfbfbf" /> 7 <svg-icon v-if="!disabled" icon-class="drag-text" class="el-input__icon input-icon" style="color:#bfbfbf" />
8 + <span style="margin-right:20px">{{index}}</span>
8 <span>{{ item.route }}</span> 9 <span>{{ item.route }}</span>
9 </div> 10 </div>
10 </transition-group> 11 </transition-group>
...@@ -81,10 +82,8 @@ export default { ...@@ -81,10 +82,8 @@ export default {
81 .container { 82 .container {
82 max-width: 350px; 83 max-width: 350px;
83 min-height: 32px; 84 min-height: 32px;
84 - // max-height: 150px; 85 + max-height: 150px;
85 overflow-y: scroll; 86 overflow-y: scroll;
86 - display: flex;
87 - flex-direction: column;
88 padding: 0; 87 padding: 0;
89 border: 1px solid #ccc; 88 border: 1px solid #ccc;
90 89
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <el-form-item label="货站名称" prop="goodsStation"> 7 <el-form-item label="货站名称" prop="goodsStation">
8 - <el-input type="text" v-model="formData.goodsStation" maxlength="50" placeholder="请输入货站名称"> 8 + <el-input type="text" v-model="formData.goodsStation" maxlength="25" placeholder="请输入货站名称">
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item label="品名" prop="goodsList"> 11 <el-form-item label="品名" prop="goodsList">
12 - <el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="254" 12 + <el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="125"
13 placeholder="请输入品名，多个用“;”隔开"> 13 placeholder="请输入品名，多个用“;”隔开">
14 </el-input> 14 </el-input>
15 </el-form-item> 15 </el-form-item>
......
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto" 5 <el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent> 6 label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
7 <el-form-item label="货站名称" prop="goodsStation"> 7 <el-form-item label="货站名称" prop="goodsStation">
8 - <el-input type="text" v-model="formData.goodsStation" maxlength="50" placeholder="请输入货站名称"> 8 + <el-input type="text" v-model="formData.goodsStation" maxlength="25" placeholder="请输入货站名称">
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item label="航班" prop="flightList"> 11 <el-form-item label="航班" prop="flightList">
12 - <el-input type="textarea" v-model="formData.flightList" rows="4" maxlength="254" 12 + <el-input type="textarea" v-model="flightList" rows="4" maxlength="125" placeholder="请输入航班，多个用“;”隔开">
13 - placeholder="请输入航班，多个用“;”隔开" oninput="value=value.replace(/[^A-Za-z0-9\;]/g, '')">
14 </el-input> 13 </el-input>
15 </el-form-item> 14 </el-form-item>
16 </el-form> 15 </el-form>
...@@ -64,7 +63,7 @@ export default { ...@@ -64,7 +63,7 @@ export default {
64 //提交 63 //提交
65 submit() { 64 submit() {
66 let obj = {} 65 let obj = {}
67 - obj.goodsStation = this.formData.goodsStationt 66 + obj.goodsStation = this.formData.goodsStation
68 if (this.formData.flightList != null && this.formData.flightList != '') { 67 if (this.formData.flightList != null && this.formData.flightList != '') {
69 this.formData.flightList = this.formData.flightList.toUpperCase() 68 this.formData.flightList = this.formData.flightList.toUpperCase()
70 obj.flightList = this.formData.flightList.split(';') 69 obj.flightList = this.formData.flightList.split(';')
...@@ -96,6 +95,19 @@ export default { ...@@ -96,6 +95,19 @@ export default {
96 this.$refs["addForm"].clearValidate(); 95 this.$refs["addForm"].clearValidate();
97 this.$emit('close') 96 this.$emit('close')
98 } 97 }
98 + },
99 + computed: {
100 + flightList: {
101 + get: function () {
102 + return this.formData.flightList
103 + },
104 + set: function (val) {
105 + const reg = /^([a-zA-Z0-9]{0,40}(\;[a-zA-Z0-9]{0,40})*)$/
106 + if (reg.test(val)) {
107 + this.formData.flightList = val
108 + }
109 + },
110 + },
99 } 111 }
100 } 112 }
101 113
......