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-09-26 11:45:26 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
fec704c36b4aeba3760564836eb9541abce039bb
fec704c3
1 parent
8855465c
图标增加,序号增加,样式修正
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
31 deletions
src/assets/icons/svg/drag-text.svg
src/assets/languages/tableHeaders.js
src/components/Drag/index.vue
src/views/allocationConfig/flightAllocConfig/info.vue
src/views/basicInformation/goodsStation/dialog.vue
src/views/basicInformation/goodsStationFlight/dialog.vue
src/assets/icons/svg/drag-text.svg
0 → 100644
View file @
fec704c
<?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"); }
</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
src/assets/languages/tableHeaders.js
View file @
fec704c
...
...
@@ -994,7 +994,7 @@ let tableHeaders = {
status
:
1
},
{
columnChineseName
:
"航线
优先级
"
,
columnChineseName
:
"航线
配舱设置
"
,
columnName
:
"flightRoute"
,
columnWidth
:
""
,
status
:
1
...
...
src/components/Drag/index.vue
View file @
fec704c
...
...
@@ -5,6 +5,7 @@
@dragstart="handleDragStart($event, item)" @dragover.prevent="handleDragOver($event, item)"
@dragenter="handleDragEnter($event, item)" @dragend="handleDragEnd($event, item)">
<svg-icon v-if="!disabled" icon-class="drag-text" class="el-input__icon input-icon" style="color:#bfbfbf" />
<span style="margin-right:20px">{{index}}</span>
<span>{{ item.route }}</span>
</div>
</transition-group>
...
...
@@ -81,10 +82,8 @@ export default {
.container {
max-width: 350px;
min-height: 32px;
//
max-height: 150px;
max-height: 150px;
overflow-y: scroll;
display: flex;
flex-direction: column;
padding: 0;
border: 1px solid #ccc;
...
...
src/views/allocationConfig/flightAllocConfig/info.vue
View file @
fec704c
...
...
@@ -22,8 +22,14 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6" v-if="infoForm.route != null">
<el-form-item label="航线">
<el-input v-model.tirm="infoForm.route" @change="getRoutes" disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item prop="route" label="航线
:
">
<el-form-item prop="route" label="航线
优先级
">
<Drag :routes="routeList" :disabled="true" @drag="drag">
</Drag>
</el-form-item>
...
...
@@ -79,10 +85,11 @@
<el-col :span="10">
<el-input v-if="val.isLocation == '1'" v-model="val.location"
type="textarea" :rows="4" resize="none" style="width: 500px"
placeholder="站点之间用回车符分隔">
placeholder="站点之间用回车符分隔"
@change="change" @input="change($event)"
>
</el-input>
<el-input v-else v-model="val.notLocation" type="textarea" :rows="4"
resize="none" style="width: 500px" placeholder="站点之间用回车符分隔">
resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
@change="change" @input="change($event)">
</el-input>
</el-col>
</el-form-item>
...
...
@@ -91,14 +98,16 @@
<el-col :span="12">
<el-form-item label="URSA包含">
<el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none"
style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_">
style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_"
@change="change" @input="change($event)">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="URSA不包含">
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4"
resize="none" style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_">
resize="none" style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_"
@change="change" @input="change($event)">
</el-input>
</el-form-item>
</el-col>
...
...
@@ -108,13 +117,15 @@
<el-form-item label="件数">
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
<el-col style="text-align: center" :span="1">-</el-col>
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
...
...
@@ -123,13 +134,15 @@
<el-form-item label="重量(KG)">
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
<el-col style="text-align: center" :span="1">-</el-col>
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
...
...
@@ -286,10 +299,12 @@
</el-col>
<el-col :span="10">
<el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
:rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔">
:rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔"
@change="change" @input="change($event)">
</el-input>
<el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none"
style="width: 500px" placeholder="站点之间用回车符分隔">
style="width: 500px" placeholder="站点之间用回车符分隔" @change="change"
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
...
...
@@ -298,14 +313,16 @@
<el-col :span="12">
<el-form-item label="URSA包含">
<el-input v-model="val.includeUrsa" type="textarea" :rows="4" resize="none"
style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_">
style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_" @change="change"
@input="change($event)">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="URSA不包含">
<el-input v-model="val.notIncludeUrsa" type="textarea" :rows="4" resize="none"
style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_">
style="width:500px" placeholder="URSA之间用分号分隔,例:F2;F3;P_" @change="change"
@input="change($event)">
</el-input>
</el-form-item>
</el-col>
...
...
@@ -315,13 +332,15 @@
<el-form-item label="件数">
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
<el-col style="text-align: center" :span="1">-</el-col>
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxNumOfPieces"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
...
...
@@ -330,13 +349,15 @@
<el-form-item label="重量(KG)">
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.minWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
<el-col style="text-align: center" :span="1">-</el-col>
<el-col :span="10">
<el-input class="numberInput" v-model.trim="val.maxWeight"
oninput="value=value.replace(/[^\d\.\-]/g,'')">
oninput="value=value.replace(/[^\d\.\-]/g,'')" @change="change"
@input="change($event)">
</el-input>
</el-col>
</el-form-item>
...
...
@@ -861,9 +882,9 @@ export default {
this.loading = false
if (res.code === 200) {
this.fltNoDisabled = true
this.$forceUpdate()
this.msgSuccess('保存成功!')
this.infoForm.list[val] = this.dataHandle(res.data)
this.$forceUpdate()
} else {
this.msgWarning(res.msg)
}
...
...
@@ -1020,9 +1041,9 @@ export default {
val.location ? val.isLocation = '1' : ''
val.notLocation ? val.isLocation = '2' : ''
val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数
val.maxWeight == null ? val.max
NumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces
//最大重量
val.minNumOfPieces == null ? val.m
axNumOfPieces = undefined : val.maxNumOfPieces = val.max
NumOfPieces//最小件数
val.minWeight == null ? val.m
axNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces
//最小件数
val.maxWeight == null ? val.max
Weight = undefined : val.maxWeight = val.maxWeight
//最大重量
val.minNumOfPieces == null ? val.m
inNumOfPieces = undefined : val.minNumOfPieces = val.min
NumOfPieces//最小件数
val.minWeight == null ? val.m
inWeight = undefined : val.minWeight = val.minWeight
//最小件数
val.typeOfGoods != null ? val.typeOfGoods = val.typeOfGoods.split(';') : val.typeOfGoods = []//申报类型
val.declarationCategory != null ? val.declarationCategory = val.declarationCategory.split(';') : val.declarationCategory = []//货物类型
val.puporpuxCode != null ? val.puporpuxCode = val.puporpuxCode.split(';') : val.puporpuxCode = []//取件扫描码
...
...
src/views/basicInformation/goodsStation/dialog.vue
View file @
fec704c
...
...
@@ -5,11 +5,11 @@
<el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
<el-form-item label="货站名称" prop="goodsStation">
<el-input type="text" v-model="formData.goodsStation" maxlength="
50
" placeholder="请输入货站名称">
<el-input type="text" v-model="formData.goodsStation" maxlength="
25
" placeholder="请输入货站名称">
</el-input>
</el-form-item>
<el-form-item label="品名" prop="goodsList">
<el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="
254
"
<el-input type="textarea" v-model="formData.goodsList" rows="4" maxlength="
125
"
placeholder="请输入品名,多个用“;”隔开">
</el-input>
</el-form-item>
...
...
src/views/basicInformation/goodsStationFlight/dialog.vue
View file @
fec704c
...
...
@@ -5,12 +5,11 @@
<el-form class="form-header" :model="formData" size="small" ref="addForm" label-width="auto"
label-position="left" style="margin-bottom:10px" :rules="rules" @submit.native.prevent>
<el-form-item label="货站名称" prop="goodsStation">
<el-input type="text" v-model="formData.goodsStation" maxlength="
50
" placeholder="请输入货站名称">
<el-input type="text" v-model="formData.goodsStation" maxlength="
25
" placeholder="请输入货站名称">
</el-input>
</el-form-item>
<el-form-item label="航班" prop="flightList">
<el-input type="textarea" v-model="formData.flightList" rows="4" maxlength="254"
placeholder="请输入航班,多个用“;”隔开" oninput="value=value.replace(/[^A-Za-z0-9\;]/g, '')">
<el-input type="textarea" v-model="flightList" rows="4" maxlength="125" placeholder="请输入航班,多个用“;”隔开">
</el-input>
</el-form-item>
</el-form>
...
...
@@ -64,7 +63,7 @@ export default {
//提交
submit() {
let obj = {}
obj.goodsStation = this.formData.goodsStation
t
obj.goodsStation = this.formData.goodsStation
if (this.formData.flightList != null && this.formData.flightList != '') {
this.formData.flightList = this.formData.flightList.toUpperCase()
obj.flightList = this.formData.flightList.split(';')
...
...
@@ -96,6 +95,19 @@ export default {
this.$refs["addForm"].clearValidate();
this.$emit('close')
}
},
computed: {
flightList: {
get: function () {
return this.formData.flightList
},
set: function (val) {
const reg = /^([a-zA-Z0-9]{0,40}(\;[a-zA-Z0-9]{0,40})*)$/
if (reg.test(val)) {
this.formData.flightList = val
}
},
},
}
}
...
...
Please
register
or
login
to post a comment